Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9e11519608 | ||
|
|
fba44622e5 | ||
|
|
2737aaa14e | ||
|
|
bce88ced43 | ||
|
|
fd473a32d8 | ||
|
|
d15dfb6087 |
No files matched your search
@@ -0,0 +1,28 @@
|
|||||||
|
<component name="ProjectRunConfigurationManager">
|
||||||
|
<configuration default="false" name="Tests in 'lyng.lynglib.jvmTest'" type="GradleRunConfiguration" factoryName="Gradle">
|
||||||
|
<ExternalSystemSettings>
|
||||||
|
<option name="executionName" />
|
||||||
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
|
<option name="externalSystemIdString" value="GRADLE" />
|
||||||
|
<option name="scriptParameters" value="" />
|
||||||
|
<option name="taskDescriptions">
|
||||||
|
<list />
|
||||||
|
</option>
|
||||||
|
<option name="taskNames">
|
||||||
|
<list>
|
||||||
|
<option value=":lynglib:cleanJvmTest" />
|
||||||
|
<option value=":lynglib:jvmTest" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
<option name="vmOptions" />
|
||||||
|
</ExternalSystemSettings>
|
||||||
|
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
|
||||||
|
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
|
||||||
|
<ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
|
||||||
|
<DebugAllEnabled>false</DebugAllEnabled>
|
||||||
|
<RunAsTest>true</RunAsTest>
|
||||||
|
<GradleProfilingDisabled>false</GradleProfilingDisabled>
|
||||||
|
<GradleCoverageDisabled>false</GradleCoverageDisabled>
|
||||||
|
<method v="2" />
|
||||||
|
</configuration>
|
||||||
|
</component>
|
||||||
@@ -68,6 +68,20 @@ These, again, does the thing:
|
|||||||
|
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
|
## map and mapNotNull
|
||||||
|
|
||||||
|
Used to transform either the whole iterable stream or also skipping som elements from it:
|
||||||
|
|
||||||
|
val source = [1,2,3,4]
|
||||||
|
// transform every element to string or null:
|
||||||
|
assertEquals(["n1", "n2", null, "n4"], source.map { if( it == 3 ) null else "n"+it } )
|
||||||
|
|
||||||
|
// transform every element to stirng, skipping 3:
|
||||||
|
assertEquals(["n1", "n2", "n4"], source.mapNotNull { if( it == 3 ) null else "n"+it } )
|
||||||
|
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
|
||||||
## Instance methods:
|
## Instance methods:
|
||||||
|
|
||||||
| fun/method | description |
|
| fun/method | description |
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
## Fix: prevent cycles in scope parent chain during pooled frame reuse
|
||||||
|
|
||||||
|
### What changed
|
||||||
|
- Scope.resetForReuse now fully detaches a reused scope from its previous chain/state before re-parenting:
|
||||||
|
- sets `parent = null` and regenerates `frameId`
|
||||||
|
- clears locals/slots/bindings caches
|
||||||
|
- only after that, validates the new parent with `ensureNoCycle` and assigns it
|
||||||
|
- ScopePool.borrow on all targets (JVM, Android, JS, Native, Wasm) now has a defensive fallback:
|
||||||
|
- if `resetForReuse` throws `IllegalStateException` indicating a parent-chain cycle, the pool allocates a fresh `Scope` instead of failing.
|
||||||
|
|
||||||
|
### Why
|
||||||
|
In some nested call patterns (notably instance method calls where an instance is produced by another function and immediately used), the same pooled `Scope` object can be rebound into a chain that already (transitively) contains it. Reassigning `parent` in that case forms a structural cycle, which `ensureNoCycle` correctly detects and throws. This could surface as:
|
||||||
|
|
||||||
|
```
|
||||||
|
IllegalStateException: cycle detected in scope parent chain assignment
|
||||||
|
at net.sergeych.lyng.Scope.ensureNoCycle(...)
|
||||||
|
at net.sergeych.lyng.Scope.resetForReuse(...)
|
||||||
|
at net.sergeych.lyng.ScopePool.borrow(...)
|
||||||
|
... during instance method invocation
|
||||||
|
```
|
||||||
|
|
||||||
|
The fix removes the failure mode by:
|
||||||
|
1) Detaching the reused frame from its prior chain/state before validating and assigning the new parent.
|
||||||
|
2) Falling back to a new frame allocation if a cycle is still detected (extremely rare and cheap vs. a crash).
|
||||||
|
|
||||||
|
### Expected effects
|
||||||
|
- Eliminates sporadic `cycle detected in scope parent chain` crashes during instance method invocation.
|
||||||
|
- No change to public API or normal semantics.
|
||||||
|
- Pooling remains enabled by default; the fallback only triggers on the detected cycle edge case.
|
||||||
|
- Negligible performance impact: fresh allocation is used only when a cycle would have crashed the VM previously.
|
||||||
|
|
||||||
|
### Notes
|
||||||
|
- The fix is platform-wide (all ScopePool actuals are covered).
|
||||||
|
- We recommend adding/keeping a regression test that exercises: a class with a method, a function returning an instance, and an exported function calling the instance method. The test should pass without exceptions.
|
||||||
@@ -39,12 +39,18 @@ actual object ScopePool {
|
|||||||
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
||||||
val pool = pool()
|
val pool = pool()
|
||||||
val s = if (pool.isNotEmpty()) pool.removeLast() else Scope(parent, args, pos, thisObj)
|
val s = if (pool.isNotEmpty()) pool.removeLast() else Scope(parent, args, pos, thisObj)
|
||||||
|
return try {
|
||||||
if (s.parent !== parent || s.args !== args || s.pos !== pos || s.thisObj !== thisObj) {
|
if (s.parent !== parent || s.args !== args || s.pos !== pos || s.thisObj !== thisObj) {
|
||||||
s.resetForReuse(parent, args, pos, thisObj)
|
s.resetForReuse(parent, args, pos, thisObj)
|
||||||
} else {
|
} else {
|
||||||
s.frameId = nextFrameId()
|
s.frameId = nextFrameId()
|
||||||
}
|
}
|
||||||
return s
|
s
|
||||||
|
} catch (e: IllegalStateException) {
|
||||||
|
if (e.message?.contains("cycle") == true && e.message?.contains("scope parent chain") == true) {
|
||||||
|
Scope(parent, args, pos, thisObj)
|
||||||
|
} else throw e
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
actual fun release(scope: Scope) {
|
actual fun release(scope: Scope) {
|
||||||
|
|||||||
@@ -302,11 +302,9 @@ open class Scope(
|
|||||||
* Clears locals and slots, assigns new frameId, and sets parent/args/pos/thisObj.
|
* Clears locals and slots, assigns new frameId, and sets parent/args/pos/thisObj.
|
||||||
*/
|
*/
|
||||||
fun resetForReuse(parent: Scope?, args: Arguments, pos: Pos, thisObj: Obj) {
|
fun resetForReuse(parent: Scope?, args: Arguments, pos: Pos, thisObj: Obj) {
|
||||||
ensureNoCycle(parent)
|
// Fully detach from any previous chain/state first to avoid residual ancestry
|
||||||
this.parent = parent
|
// that could interact badly with the new parent and produce a cycle.
|
||||||
this.args = args
|
this.parent = null
|
||||||
this.pos = pos
|
|
||||||
this.thisObj = thisObj
|
|
||||||
this.skipScopeCreation = false
|
this.skipScopeCreation = false
|
||||||
// fresh identity for PIC caches
|
// fresh identity for PIC caches
|
||||||
this.frameId = nextFrameId()
|
this.frameId = nextFrameId()
|
||||||
@@ -315,6 +313,12 @@ open class Scope(
|
|||||||
slots.clear()
|
slots.clear()
|
||||||
nameToSlot.clear()
|
nameToSlot.clear()
|
||||||
localBindings.clear()
|
localBindings.clear()
|
||||||
|
// Now safe to validate and re-parent
|
||||||
|
ensureNoCycle(parent)
|
||||||
|
this.parent = parent
|
||||||
|
this.args = args
|
||||||
|
this.pos = pos
|
||||||
|
this.thisObj = thisObj
|
||||||
// Pre-size local slots for upcoming parameter assignment where possible
|
// Pre-size local slots for upcoming parameter assignment where possible
|
||||||
reserveLocalCapacity(args.list.size + 4)
|
reserveLocalCapacity(args.list.size + 4)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -155,52 +155,65 @@ class Script(
|
|||||||
sqrt(args.firstAndOnly().toDouble())
|
sqrt(args.firstAndOnly().toDouble())
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
addFn( "abs" ) {
|
addFn("abs") {
|
||||||
val x = args.firstAndOnly()
|
val x = args.firstAndOnly()
|
||||||
if( x is ObjInt) ObjInt( x.value.absoluteValue ) else ObjReal( x.toDouble().absoluteValue )
|
if (x is ObjInt) ObjInt(x.value.absoluteValue) else ObjReal(x.toDouble().absoluteValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
addVoidFn("assert") {
|
addVoidFn("assert") {
|
||||||
val cond = requiredArg<ObjBool>(0)
|
val cond = requiredArg<ObjBool>(0)
|
||||||
val message = if( args.size > 1 )
|
val message = if (args.size > 1)
|
||||||
": " + (args[1] as Statement).execute(this).toString(this).value
|
": " + (args[1] as Statement).execute(this).toString(this).value
|
||||||
else ""
|
else ""
|
||||||
if( !cond.value == true )
|
if (!cond.value == true)
|
||||||
raiseError(ObjAssertionFailedException(this, "Assertion failed$message"))
|
raiseError(ObjAssertionFailedException(this, "Assertion failed$message"))
|
||||||
}
|
}
|
||||||
|
|
||||||
addVoidFn("assertEquals") {
|
addVoidFn("assertEquals") {
|
||||||
val a = requiredArg<Obj>(0)
|
val a = requiredArg<Obj>(0)
|
||||||
val b = requiredArg<Obj>(1)
|
val b = requiredArg<Obj>(1)
|
||||||
if( a.compareTo(this, b) != 0 )
|
if (a.compareTo(this, b) != 0)
|
||||||
raiseError(ObjAssertionFailedException(this,"Assertion failed: ${a.inspect(this)} == ${b.inspect(this)}"))
|
raiseError(
|
||||||
|
ObjAssertionFailedException(
|
||||||
|
this,
|
||||||
|
"Assertion failed: ${a.inspect(this)} == ${b.inspect(this)}"
|
||||||
|
)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
// alias used in tests
|
// alias used in tests
|
||||||
addVoidFn("assertEqual") {
|
addVoidFn("assertEqual") {
|
||||||
val a = requiredArg<Obj>(0)
|
val a = requiredArg<Obj>(0)
|
||||||
val b = requiredArg<Obj>(1)
|
val b = requiredArg<Obj>(1)
|
||||||
if( a.compareTo(this, b) != 0 )
|
if (a.compareTo(this, b) != 0)
|
||||||
raiseError(ObjAssertionFailedException(this,"Assertion failed: ${a.inspect(this)} == ${b.inspect(this)}"))
|
raiseError(
|
||||||
|
ObjAssertionFailedException(
|
||||||
|
this,
|
||||||
|
"Assertion failed: ${a.inspect(this)} == ${b.inspect(this)}"
|
||||||
|
)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
addVoidFn("assertNotEquals") {
|
addVoidFn("assertNotEquals") {
|
||||||
val a = requiredArg<Obj>(0)
|
val a = requiredArg<Obj>(0)
|
||||||
val b = requiredArg<Obj>(1)
|
val b = requiredArg<Obj>(1)
|
||||||
if( a.compareTo(this, b) == 0 )
|
if (a.compareTo(this, b) == 0)
|
||||||
raiseError(ObjAssertionFailedException(this,"Assertion failed: ${a.inspect(this)} != ${b.inspect(this)}"))
|
raiseError(
|
||||||
|
ObjAssertionFailedException(
|
||||||
|
this,
|
||||||
|
"Assertion failed: ${a.inspect(this)} != ${b.inspect(this)}"
|
||||||
|
)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
addFn("assertThrows") {
|
addFn("assertThrows") {
|
||||||
val code = requireOnlyArg<Statement>()
|
val code = requireOnlyArg<Statement>()
|
||||||
val result =try {
|
val result = try {
|
||||||
code.execute(this)
|
code.execute(this)
|
||||||
null
|
null
|
||||||
}
|
} catch (e: ExecutionError) {
|
||||||
catch( e: ExecutionError ) {
|
|
||||||
e.errorObject
|
e.errorObject
|
||||||
}
|
} catch (_: ScriptError) {
|
||||||
catch (_: ScriptError) {
|
|
||||||
ObjNull
|
ObjNull
|
||||||
}
|
}
|
||||||
result ?: raiseError(ObjAssertionFailedException(this,"Expected exception but nothing was thrown"))
|
result ?: raiseError(ObjAssertionFailedException(this, "Expected exception but nothing was thrown"))
|
||||||
}
|
}
|
||||||
|
|
||||||
addFn("dynamic") {
|
addFn("dynamic") {
|
||||||
@@ -209,7 +222,7 @@ class Script(
|
|||||||
|
|
||||||
addFn("require") {
|
addFn("require") {
|
||||||
val condition = requiredArg<ObjBool>(0)
|
val condition = requiredArg<ObjBool>(0)
|
||||||
if( !condition.value ) {
|
if (!condition.value) {
|
||||||
val message = args.list.getOrNull(1)?.toString() ?: "requirement not met"
|
val message = args.list.getOrNull(1)?.toString() ?: "requirement not met"
|
||||||
raiseIllegalArgument(message)
|
raiseIllegalArgument(message)
|
||||||
}
|
}
|
||||||
@@ -217,7 +230,7 @@ class Script(
|
|||||||
}
|
}
|
||||||
addFn("check") {
|
addFn("check") {
|
||||||
val condition = requiredArg<ObjBool>(0)
|
val condition = requiredArg<ObjBool>(0)
|
||||||
if( !condition.value ) {
|
if (!condition.value) {
|
||||||
val message = args.list.getOrNull(1)?.toString() ?: "check failed"
|
val message = args.list.getOrNull(1)?.toString() ?: "check failed"
|
||||||
raiseIllegalState(message)
|
raiseIllegalState(message)
|
||||||
}
|
}
|
||||||
@@ -340,7 +353,7 @@ class Script(
|
|||||||
doc = "Suspend for the given time. Accepts Duration, Int seconds, or Real seconds."
|
doc = "Suspend for the given time. Accepts Duration, Int seconds, or Real seconds."
|
||||||
) {
|
) {
|
||||||
val a = args.firstAndOnly()
|
val a = args.firstAndOnly()
|
||||||
when(a) {
|
when (a) {
|
||||||
is ObjInt -> delay(a.value * 1000)
|
is ObjInt -> delay(a.value * 1000)
|
||||||
is ObjReal -> delay((a.value * 1000).roundToLong())
|
is ObjReal -> delay((a.value * 1000).roundToLong())
|
||||||
is ObjDuration -> delay(a.duration)
|
is ObjDuration -> delay(a.duration)
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ object CompletionEngineLight {
|
|||||||
}
|
}
|
||||||
is MiniClassDecl -> add(CompletionItem(d.name, Kind.Class_))
|
is MiniClassDecl -> add(CompletionItem(d.name, Kind.Class_))
|
||||||
is MiniValDecl -> add(CompletionItem(d.name, Kind.Value, typeText = typeOf(d.type)))
|
is MiniValDecl -> add(CompletionItem(d.name, Kind.Value, typeText = typeOf(d.type)))
|
||||||
else -> add(CompletionItem(d.name, Kind.Value))
|
// else -> add(CompletionItem(d.name, Kind.Value))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -197,9 +197,20 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
!it.key.contains("::") && it.value.visibility.isPublic && it.value.type.serializable
|
!it.key.contains("::") && it.value.visibility.isPublic && it.value.type.serializable
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toString(): String {
|
override suspend fun toString(scope: Scope, calledFromLyng: Boolean): ObjString {
|
||||||
val fields = publicFields.map { "${it.key}=${it.value.value}" }.joinToString(",")
|
return ObjString(buildString {
|
||||||
return "${objClass.className}($fields)"
|
append("${objClass.className}(")
|
||||||
|
var first = true
|
||||||
|
for ((name, value) in publicFields) {
|
||||||
|
if (first) first = false else append(",")
|
||||||
|
append("$name=${value.value.toString(scope)}")
|
||||||
|
}
|
||||||
|
append(")")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun inspect(scope: Scope): String {
|
||||||
|
return toString(scope).value
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun serialize(scope: Scope, encoder: LynonEncoder, lynonType: LynonType?) {
|
override suspend fun serialize(scope: Scope, encoder: LynonEncoder, lynonType: LynonType?) {
|
||||||
|
|||||||
@@ -158,6 +158,23 @@ val ObjIterable by lazy {
|
|||||||
ObjList(result)
|
ObjList(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addFnDoc(
|
||||||
|
name = "mapNotNull",
|
||||||
|
doc = "Transform elements by applying the given lambda unless it returns null.",
|
||||||
|
params = listOf(ParamDoc("transform")),
|
||||||
|
returns = type("lyng.List"),
|
||||||
|
isOpen = true,
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
val fn = requiredArg<Statement>(0)
|
||||||
|
val result = mutableListOf<Obj>()
|
||||||
|
thisObj.toFlow(this).collect {
|
||||||
|
val transformed = fn.call(this, it)
|
||||||
|
if( transformed != ObjNull) result += transformed
|
||||||
|
}
|
||||||
|
ObjList(result)
|
||||||
|
}
|
||||||
|
|
||||||
addFnDoc(
|
addFnDoc(
|
||||||
name = "take",
|
name = "take",
|
||||||
doc = "Take the first N elements and return them as a list.",
|
doc = "Take the first N elements and return them as a list.",
|
||||||
|
|||||||
@@ -198,6 +198,18 @@ class ObjList(val list: MutableList<Obj> = mutableListOf()) : Obj() {
|
|||||||
return JsonArray(list.map { it.toJson(scope) })
|
return JsonArray(list.map { it.toJson(scope) })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override suspend fun toString(scope: Scope, calledFromLyng: Boolean): ObjString {
|
||||||
|
return ObjString(buildString {
|
||||||
|
append("[")
|
||||||
|
var first = true
|
||||||
|
for (v in list) {
|
||||||
|
if (first) first = false else append(",")
|
||||||
|
append(v.toString(scope).value)
|
||||||
|
}
|
||||||
|
append("]")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val type = object : ObjClass("List", ObjArray) {
|
val type = object : ObjClass("List", ObjArray) {
|
||||||
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
||||||
|
|||||||
@@ -52,8 +52,8 @@ class ObjMapEntry(val key: Obj, val value: Obj) : Obj() {
|
|||||||
else -> scope.raiseIndexOutOfBounds()
|
else -> scope.raiseIndexOutOfBounds()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toString(): String {
|
override suspend fun toString(scope: Scope, calledFromLyng: Boolean): ObjString {
|
||||||
return "$key=>$value"
|
return ObjString("(${key.toString(scope).value} => ${value.toString(scope).value})")
|
||||||
}
|
}
|
||||||
|
|
||||||
override val objClass = type
|
override val objClass = type
|
||||||
|
|||||||
@@ -1625,7 +1625,7 @@ class ListLiteralRef(private val entries: List<ListEntry>) : ObjRef {
|
|||||||
when (elements) {
|
when (elements) {
|
||||||
is ObjList -> {
|
is ObjList -> {
|
||||||
// Grow underlying array once when possible
|
// Grow underlying array once when possible
|
||||||
if (list is ArrayList) list.ensureCapacity(list.size + elements.list.size)
|
list.ensureCapacity(list.size + elements.list.size)
|
||||||
list.addAll(elements.list)
|
list.addAll(elements.list)
|
||||||
}
|
}
|
||||||
else -> scope.raiseError("Spread element must be list")
|
else -> scope.raiseError("Spread element must be list")
|
||||||
|
|||||||
@@ -82,7 +82,14 @@ open class LynonDecoder(val bin: BitInput, val settings: LynonSettings = LynonSe
|
|||||||
if (it !is ObjClass)
|
if (it !is ObjClass)
|
||||||
scope.raiseClassCastError("Expected obj class but got ${it::class.simpleName}")
|
scope.raiseClassCastError("Expected obj class but got ${it::class.simpleName}")
|
||||||
it
|
it
|
||||||
} ?: scope.raiseSymbolNotFound("can't deserialize: not found type $className")
|
} ?: run {
|
||||||
|
val fallback = runCatching { scope.eval(className.value) }.getOrNull()
|
||||||
|
if (fallback != null) {
|
||||||
|
println("Fallback to eval successful")
|
||||||
|
fallback as ObjClass
|
||||||
|
}
|
||||||
|
else scope.raiseSymbolNotFound("can't deserialize: not found type $className")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun decodeAnyList(scope: Scope, fixedSize: Int? = null): MutableList<Obj> {
|
suspend fun decodeAnyList(scope: Scope, fixedSize: Int? = null): MutableList<Obj> {
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
* Regression test for scope parent-chain cycle when reusing pooled frames
|
||||||
|
*/
|
||||||
|
|
||||||
|
import kotlinx.coroutines.test.runTest
|
||||||
|
import net.sergeych.lyng.eval
|
||||||
|
import kotlin.test.Test
|
||||||
|
|
||||||
|
class ScopeCycleRegressionTest {
|
||||||
|
@Test
|
||||||
|
fun instanceMethodCallDoesNotCycle() = runTest {
|
||||||
|
eval(
|
||||||
|
(
|
||||||
|
"""
|
||||||
|
class Whatever {
|
||||||
|
fun something() {
|
||||||
|
println
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun ll() { Whatever() }
|
||||||
|
|
||||||
|
fun callTest1() {
|
||||||
|
val l = ll()
|
||||||
|
l.something()
|
||||||
|
"ok"
|
||||||
|
}
|
||||||
|
|
||||||
|
assertEquals("ok", callTest1())
|
||||||
|
"""
|
||||||
|
).trimIndent()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4159,4 +4159,86 @@ class ScriptTest {
|
|||||||
""")
|
""")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testUsingClassConstructorVars() = runTest {
|
||||||
|
val r = eval("""
|
||||||
|
import lyng.time
|
||||||
|
|
||||||
|
class Request {
|
||||||
|
static val id = "rqid"
|
||||||
|
}
|
||||||
|
enum Action {
|
||||||
|
Test
|
||||||
|
}
|
||||||
|
class LogEntry(vaultId, action, data=null, createdAt=Instant.now().truncateToSecond()) {
|
||||||
|
|
||||||
|
/*
|
||||||
|
Convert to a map object that can be easily decoded outsude the
|
||||||
|
contract execution scope.
|
||||||
|
*/
|
||||||
|
fun toApi() {
|
||||||
|
{ createdAt:, requestId: Request.id, vaultId:, action: action.name, data: Map() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fun test() {
|
||||||
|
LogEntry("v1", Action.Test).toApi()
|
||||||
|
}
|
||||||
|
|
||||||
|
test()
|
||||||
|
""".trimIndent()).toJson()
|
||||||
|
println(r)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testScopeShortCircuit() = runTest() {
|
||||||
|
val baseScope = Script.newScope()
|
||||||
|
|
||||||
|
baseScope.eval("""
|
||||||
|
val exports = Map()
|
||||||
|
fun Export(name,f) {
|
||||||
|
exports[name] = f
|
||||||
|
f
|
||||||
|
}
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
|
||||||
|
val exports: MutableMap<Obj, Obj> = (baseScope.eval("exports") as ObjMap).map
|
||||||
|
|
||||||
|
baseScope.eval("""
|
||||||
|
class A(val a) {
|
||||||
|
fun methodA() {
|
||||||
|
a + 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val a0 = 100
|
||||||
|
|
||||||
|
fun someFunction(x) {
|
||||||
|
val ia = A(x)
|
||||||
|
ia.methodA()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Export
|
||||||
|
fun exportedFunction(x) {
|
||||||
|
someFunction(x)
|
||||||
|
}
|
||||||
|
""".trimIndent())
|
||||||
|
// Calling from the script is ok:
|
||||||
|
val instanceScope = baseScope.createChildScope()
|
||||||
|
instanceScope.eval("""
|
||||||
|
val a1 = a0 + 1
|
||||||
|
""".trimIndent())
|
||||||
|
assertEquals( ObjInt(2), instanceScope.eval("""
|
||||||
|
exportedFunction(1)
|
||||||
|
"""))
|
||||||
|
assertEquals( ObjInt(103), instanceScope.eval("""
|
||||||
|
exportedFunction(a1 + 1)
|
||||||
|
"""))
|
||||||
|
val dummyThis = Obj()
|
||||||
|
// but we should be able to call it directly
|
||||||
|
val otherScope = baseScope.createChildScope()
|
||||||
|
val r = (exports["exportedFunction".toObj()] as Statement).invoke(otherScope, dummyThis,ObjInt(50))
|
||||||
|
println(r)
|
||||||
|
assertEquals(51, r.toInt())
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -29,12 +29,18 @@ actual object ScopePool {
|
|||||||
|
|
||||||
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
||||||
val s = if (pool.isNotEmpty()) pool.removeLast() else Scope(parent, args, pos, thisObj)
|
val s = if (pool.isNotEmpty()) pool.removeLast() else Scope(parent, args, pos, thisObj)
|
||||||
|
return try {
|
||||||
if (s.parent !== parent || s.args !== args || s.pos !== pos || s.thisObj !== thisObj) {
|
if (s.parent !== parent || s.args !== args || s.pos !== pos || s.thisObj !== thisObj) {
|
||||||
s.resetForReuse(parent, args, pos, thisObj)
|
s.resetForReuse(parent, args, pos, thisObj)
|
||||||
} else {
|
} else {
|
||||||
s.frameId = nextFrameId()
|
s.frameId = nextFrameId()
|
||||||
}
|
}
|
||||||
return s
|
s
|
||||||
|
} catch (e: IllegalStateException) {
|
||||||
|
if (e.message?.contains("cycle") == true && e.message?.contains("scope parent chain") == true) {
|
||||||
|
Scope(parent, args, pos, thisObj)
|
||||||
|
} else throw e
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
actual fun release(scope: Scope) {
|
actual fun release(scope: Scope) {
|
||||||
|
|||||||
@@ -33,9 +33,19 @@ actual object ScopePool {
|
|||||||
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
||||||
val pool = threadLocalPool.get()
|
val pool = threadLocalPool.get()
|
||||||
val s = if (pool.isNotEmpty()) pool.removeLast() else Scope(parent, args, pos, thisObj)
|
val s = if (pool.isNotEmpty()) pool.removeLast() else Scope(parent, args, pos, thisObj)
|
||||||
|
return try {
|
||||||
// Always reset state on borrow to guarantee fresh-frame semantics
|
// Always reset state on borrow to guarantee fresh-frame semantics
|
||||||
s.resetForReuse(parent, args, pos, thisObj)
|
s.resetForReuse(parent, args, pos, thisObj)
|
||||||
return s
|
s
|
||||||
|
} catch (e: IllegalStateException) {
|
||||||
|
// Defensive fallback: if a cycle in scope parent chain is detected during reuse,
|
||||||
|
// discard pooled instance for this call frame and allocate a fresh scope instead.
|
||||||
|
if (e.message?.contains("cycle") == true && e.message?.contains("scope parent chain") == true) {
|
||||||
|
Scope(parent, args, pos, thisObj)
|
||||||
|
} else {
|
||||||
|
throw e
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
actual fun release(scope: Scope) {
|
actual fun release(scope: Scope) {
|
||||||
|
|||||||
@@ -29,12 +29,18 @@ actual object ScopePool {
|
|||||||
|
|
||||||
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
||||||
val s = if (pool.isNotEmpty()) pool.removeLast() else Scope(parent, args, pos, thisObj)
|
val s = if (pool.isNotEmpty()) pool.removeLast() else Scope(parent, args, pos, thisObj)
|
||||||
|
return try {
|
||||||
if (s.parent !== parent || s.args !== args || s.pos !== pos || s.thisObj !== thisObj) {
|
if (s.parent !== parent || s.args !== args || s.pos !== pos || s.thisObj !== thisObj) {
|
||||||
s.resetForReuse(parent, args, pos, thisObj)
|
s.resetForReuse(parent, args, pos, thisObj)
|
||||||
} else {
|
} else {
|
||||||
s.frameId = nextFrameId()
|
s.frameId = nextFrameId()
|
||||||
}
|
}
|
||||||
return s
|
s
|
||||||
|
} catch (e: IllegalStateException) {
|
||||||
|
if (e.message?.contains("cycle") == true && e.message?.contains("scope parent chain") == true) {
|
||||||
|
Scope(parent, args, pos, thisObj)
|
||||||
|
} else throw e
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
actual fun release(scope: Scope) {
|
actual fun release(scope: Scope) {
|
||||||
|
|||||||
@@ -29,12 +29,18 @@ actual object ScopePool {
|
|||||||
|
|
||||||
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
||||||
val s = if (pool.isNotEmpty()) pool.removeLast() else Scope(parent, args, pos, thisObj)
|
val s = if (pool.isNotEmpty()) pool.removeLast() else Scope(parent, args, pos, thisObj)
|
||||||
|
return try {
|
||||||
if (s.parent !== parent || s.args !== args || s.pos !== pos || s.thisObj !== thisObj) {
|
if (s.parent !== parent || s.args !== args || s.pos !== pos || s.thisObj !== thisObj) {
|
||||||
s.resetForReuse(parent, args, pos, thisObj)
|
s.resetForReuse(parent, args, pos, thisObj)
|
||||||
} else {
|
} else {
|
||||||
s.frameId = nextFrameId()
|
s.frameId = nextFrameId()
|
||||||
}
|
}
|
||||||
return s
|
s
|
||||||
|
} catch (e: IllegalStateException) {
|
||||||
|
if (e.message?.contains("cycle") == true && e.message?.contains("scope parent chain") == true) {
|
||||||
|
Scope(parent, args, pos, thisObj)
|
||||||
|
} else throw e
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
actual fun release(scope: Scope) {
|
actual fun release(scope: Scope) {
|
||||||
|
|||||||
Reference in new issue
Block a user