library/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt

@@ -402,9 +402,7 @@ class Compiler(
     }
 
     enum class AccessType(val isMutable: Boolean) {
-        Val(false), Var(true),
+        Val(false), Var(true), Initialization(false)
-        @Suppress("unused")
-        Initialization(false)
     }
 
     enum class Visibility {
@@ -715,6 +713,7 @@ class Compiler(
         cc.skipTokenOfType(Token.Type.NEWLINE, isOptional = true)
         val t = cc.next()
 
+        var extraInit: Statement? = null
         val bodyInit: Statement? = if (t.type == Token.Type.LBRACE) {
             // parse body
             parseScript(t.pos, cc).also {
@@ -727,9 +726,10 @@ class Compiler(
 
         // create class
         val className = nameToken.value
+        lateinit var classContext: Context
 
-        @Suppress("UNUSED_VARIABLE") val defaultAccess = if (isStruct) AccessType.Var else AccessType.Initialization
+        val defaultAccess = if (isStruct) AccessType.Var else AccessType.Initialization
-        @Suppress("UNUSED_VARIABLE") val defaultVisibility = Visibility.Public
+        val defaultVisibility = Visibility.Public
 
         // create instance constructor
         // create custom objClass with all fields and instance constructor
@@ -741,11 +741,14 @@ class Compiler(
 
             // the context now is a "class creation context", we must use its args to initialize
             // fields. Note that 'this' is already set by class
-            constructorArgsDeclaration?.assignToContext(this)
+            constructorArgsDeclaration?.let { cad ->
+                cad.assignToContext(this)
+                // note that accessors are created in ObjClass instance, not during instance
+                // initialization (not here)
+            }
             bodyInit?.execute(this)
             // export public
             for( (name,record) in objects ) {
-                println("-- $name $record")
                 when(record.visibility) {
                     Visibility.Public -> {
                         thisObj.publicFields += name

library/src/commonMain/kotlin/net/sergeych/lyng/Context.kt

@@ -27,7 +27,6 @@ class Context(
 
     fun raiseClassCastError(msg: String): Nothing = raiseError(ObjClassCastError(this, msg))
 
-    @Suppress("unused")
     fun raiseSymbolNotFound(name: String): Nothing = raiseError(ObjSymbolNotDefinedError(this, "symbol is not defined: $name"))
 
     fun raiseError(message: String): Nothing {
@@ -79,7 +78,7 @@ class Context(
 
     fun getOrCreateNamespace(name: String): ObjClass {
         val ns = objects.getOrPut(name) { ObjRecord(ObjNamespace(name), isMutable = false) }.value
-        return ns.objClass
+        return ns!!.objClass
     }
 
     inline fun addVoidFn(vararg names: String, crossinline fn: suspend Context.() -> Unit) {

library/src/commonMain/kotlin/net/sergeych/lyng/Obj.kt

@@ -69,7 +69,7 @@ open class Obj {
         args: Arguments = Arguments.EMPTY
     ): T = invokeInstanceMethod(context, name, args) as T
 
-    open suspend fun invokeInstanceMethod(
+    suspend fun invokeInstanceMethod(
         context: Context,
         name: String,
         args: Arguments = Arguments.EMPTY

library/src/commonMain/kotlin/net/sergeych/lyng/ObjClass.kt

@@ -46,7 +46,7 @@ class ObjClass(
     ) {
         if (name in members || allParentsSet.any { name in it.members } == true)
             throw ScriptError(pos, "$name is already defined in $objClass or one of its supertypes")
-        members[name] = ObjRecord(initialValue, isMutable, visibility)
+        members[name] = ObjRecord(initialValue, isMutable)
     }
 
     fun addFn(name: String, isOpen: Boolean = false, code: suspend Context.() -> Obj) {
@@ -151,3 +151,25 @@ val ObjArray by lazy {
     }
 }
 
+class ObjInstance(override val objClass: ObjClass) : Obj() {
+
+    internal val publicFields = mutableSetOf<String>()
+    internal val protectedFields = mutableSetOf<String>()
+
+    internal lateinit var instanceContext: Context
+
+    override suspend fun readField(context: Context, name: String): ObjRecord {
+        return if( name in publicFields ) instanceContext[name]!!
+        else super.readField(context, name)
+    }
+
+    override suspend fun writeField(context: Context, name: String, newValue: Obj) {
+        if( name in publicFields ) {
+            val f = instanceContext[name]!!
+            if( !f.isMutable ) ObjIllegalAssignmentError(context, "can't reassign val $name").raise()
+            if( f.value.assign(context, newValue) == null)
+                f.value = newValue
+        }
+        else super.writeField(context, name, newValue)
+    }
+}

library/src/commonMain/kotlin/net/sergeych/lyng/ObjInstance.kt

@@ -1,29 +0,0 @@
-package net.sergeych.lyng
-
-class ObjInstance(override val objClass: ObjClass) : Obj() {
-
-    internal val publicFields = mutableSetOf<String>()
-    internal val protectedFields = mutableSetOf<String>()
-
-    internal lateinit var instanceContext: Context
-
-    override suspend fun readField(context: Context, name: String): ObjRecord {
-        return if( name in publicFields ) instanceContext[name]!!
-        else super.readField(context, name)
-    }
-
-    override suspend fun writeField(context: Context, name: String, newValue: Obj) {
-        if( name in publicFields ) {
-            val f = instanceContext[name]!!
-            if( !f.isMutable ) ObjIllegalAssignmentError(context, "can't reassign val $name").raise()
-            if( f.value.assign(context, newValue) == null)
-                f.value = newValue
-        }
-        else super.writeField(context, name, newValue)
-    }
-
-    override suspend fun invokeInstanceMethod(context: Context, name: String, args: Arguments): Obj {
-        if( name in publicFields ) return instanceContext[name]!!.value.invoke(context, this, args)
-        return super.invokeInstanceMethod(context, name, args)
-    }
-}

library/src/commonTest/kotlin/ScriptTest.kt

@@ -1435,22 +1435,4 @@ class ScriptTest {
             assert( p.length == 5 )
             """.trimIndent())
     }
-
-    @Test
-    fun testStructBodyFun() = runTest {
-        val c = Context()
-        c.eval("""
-            struct Point(x,y) {
-                fun length() { 
-                    sqrt(x*x+y*y) 
-                }
-                var foo = "zero"
-            }
-            val p = Point(3,4)
-            assertEquals(5, p.length())
-            p.y = 10
-            println(p.length())
-            assertEquals(sqrt(109), p.length())
-            """.trimIndent())
-    }
 }