SergeychWorks/lyng
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 16 Wiki Activity

Refactor decodeClassObj to mimic compiler behavior for qualified names, add evaluateQualifiedNameAsCompiled.

Browse Source
This commit is contained in:
Sergey Chernov 2025-12-14 00:06:46 +01:00
parent d487886c8f
commit 5a8881bfd5
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lynglib/src/commonMain/kotlin/net/sergeych/lynon/LynonDecoder.kt
View File

@ -17,10 +17,9 @@
package net.sergeych.lynon package net.sergeych.lynon
import net.sergeych.lyng.Pos
import net.sergeych.lyng.Scope import net.sergeych.lyng.Scope
import net.sergeych.lyng.obj.Obj import net.sergeych.lyng.obj.*
import net.sergeych.lyng.obj.ObjClass
import net.sergeych.lyng.obj.ObjString
open class LynonDecoder(val bin: BitInput, val settings: LynonSettings = LynonSettings.default) { open class LynonDecoder(val bin: BitInput, val settings: LynonSettings = LynonSettings.default) {
@ -83,15 +82,27 @@ open class LynonDecoder(val bin: BitInput, val settings: LynonSettings = LynonSe
scope.raiseClassCastError("Expected obj class but got ${it::class.simpleName}") scope.raiseClassCastError("Expected obj class but got ${it::class.simpleName}")
it it
} ?: run { } ?: run {
println("NotFound: $className, trying eval") // Precisely mimic what `scope.eval(className.value)` would compile and execute for
val fallback = runCatching { scope.eval(className.value) }.getOrNull() // a simple qualified name: LocalVarRef(head) followed by chained FieldRef segments.
println("Fallback result: $fallback") val evaluated = evaluateQualifiedNameAsCompiled(scope, className.value)
if (fallback != null) { if (evaluated !is ObjClass)
println("Fallback to eval successful") scope.raiseClassCastError("Expected obj class but got ${evaluated::class.simpleName}")
fallback as ObjClass evaluated
} }
else scope.raiseSymbolNotFound("can't deserialize: not found type $className")
} }
// Build and execute the exact ObjRef chain that the compiler would emit for an identifier
// with optional dotted selectors, e.g., "A.B.C" -> LocalVarRef("A") -> FieldRef(..., "B") -> FieldRef(..., "C")
private suspend fun evaluateQualifiedNameAsCompiled(scope: Scope, name: String): Obj {
val trimmed = name.trim()
if (trimmed.isEmpty()) scope.raiseSymbolNotFound("empty identifier")
val parts = trimmed.split('.')
// Use built-in position; eval() would carry a Source position, which does not affect resolution semantics here
var ref: ObjRef = LocalVarRef(parts[0], Pos.builtIn)
for (i in 1 until parts.size) {
ref = FieldRef(ref, parts[i], false)
}
return ref.evalValue(scope)
} }
suspend fun decodeAnyList(scope: Scope, fixedSize: Int? = null): MutableList<Obj> { suspend fun decodeAnyList(scope: Scope, fixedSize: Int? = null): MutableList<Obj> {