ref #13 get rid pf tokens for private/protected, added open attribute parsing

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

@@ -39,13 +39,6 @@ class Compiler(
                         }
                 }
 
-                Token.Type.PRIVATE, Token.Type.PROTECTED -> {
-                    if (cc.nextIdValue() in setOf("var", "val", "class", "fun", "fn")) {
-                        continue
-                    } else
-                        throw ScriptError(t.pos, "unexpected keyword ${t.value}")
-                }
-
                 Token.Type.PLUS2, Token.Type.MINUS2 -> {
                     cc.previous()
                     parseExpression(cc)
@@ -458,17 +451,14 @@ class Compiler(
                 }
 
                 Token.Type.NEWLINE -> {}
-                Token.Type.PROTECTED, Token.Type.PRIVATE -> {
-                    if (!isClassDeclaration) {
-                        cc.restorePos(startPos); return null
-                    }
-                }
 
                 Token.Type.ID -> {
                     // visibility
-                    val visibility = if (isClassDeclaration)
+                    val visibility = if( isClassDeclaration && t.value == "private" ) {
-                        cc.getVisibility(Visibility.Public)
+                        t = cc.next()
-                    else Visibility.Public
+                        Visibility.Private
+                    } else Visibility.Public
+
                     // val/var?
                     val access = when (t.value) {
                         "val" -> {
@@ -707,8 +697,8 @@ class Compiler(
      * @return parsed statement or null if, for example. [id] is not among keywords
      */
     private fun parseKeywordStatement(id: Token, cc: CompilerContext): Statement? = when (id.value) {
-        "val" -> parseVarDeclaration(id.value, false, cc)
+        "val" -> parseVarDeclaration(false, Visibility.Public, cc)
-        "var" -> parseVarDeclaration(id.value, true, cc)
+        "var" -> parseVarDeclaration(true, Visibility.Public, cc)
         "while" -> parseWhileStatement(cc)
         "do" -> parseDoWhileStatement(cc)
         "for" -> parseForStatement(cc)
@@ -719,7 +709,24 @@ class Compiler(
         "class" -> parseClassDeclaration(cc, false)
         "try" -> parseTryStatement(cc)
         "throw" -> parseThrowStatement(cc)
-        else -> null
+        else -> {
+            // triples
+            cc.previous()
+            when {
+                cc.matchQualifiers("fun", "private") -> parseFunctionDeclaration(cc, Visibility.Private)
+                cc.matchQualifiers("fn", "private") -> parseFunctionDeclaration(cc, Visibility.Private)
+                cc.matchQualifiers("fun", "open") -> parseFunctionDeclaration(cc, isOpen = true)
+                cc.matchQualifiers("fn", "open") -> parseFunctionDeclaration(cc, isOpen = true)
+                cc.matchQualifiers("val", "private") -> parseVarDeclaration(false, Visibility.Private, cc)
+                cc.matchQualifiers("var", "private") -> parseVarDeclaration(true, Visibility.Private, cc)
+                cc.matchQualifiers("val", "open") -> parseVarDeclaration(false, Visibility.Private, cc, true)
+                cc.matchQualifiers("var", "open") -> parseVarDeclaration(true, Visibility.Private, cc, true)
+                else -> {
+                    cc.next()
+                    null
+                }
+            }
+        }
     }
 
     private fun parseThrowStatement(cc: CompilerContext): Statement {
@@ -785,8 +792,10 @@ class Compiler(
             } else {
                 // no (e: Exception) block: should be shortest variant `catch { ... }`
                 cc.skipTokenOfType(Token.Type.LBRACE, "expected catch(...) or catch { ... } here")
-                catches += CatchBlockData(Token("it", cc.currentPos(), Token.Type.ID), listOf("Exception"),
+                catches += CatchBlockData(
-                    parseBlock(cc,true))
+                    Token("it", cc.currentPos(), Token.Type.ID), listOf("Exception"),
+                    parseBlock(cc, true)
+                )
                 t = cc.next()
             }
         }
@@ -805,8 +814,7 @@ class Compiler(
             try {
                 // body is a parsed block, it already has separate context
                 result = body.execute(this)
-            }
+            } catch (e: Exception) {
-            catch (e: Exception) {
                 // convert to appropriate exception
                 val objException = when (e) {
                     is ExecutionError -> e.errorObject
@@ -835,8 +843,7 @@ class Compiler(
                 // rethrow if not caught this exception
                 if (!isCaught)
                     throw e
-            }
+            } finally {
-            finally {
                 // finally clause does not alter result!
                 finallyClause?.execute(this)
             }
@@ -1106,8 +1113,7 @@ class Compiler(
                 doContext = it.copy().apply { skipContextCreation = true }
                 try {
                     result = body.execute(doContext)
-                }
+                } catch (e: LoopBreakContinueException) {
-                catch( e: LoopBreakContinueException) {
                     if (e.label == label || e.label == null) {
                         if (e.doContinue) continue
                         else {
@@ -1273,9 +1279,11 @@ class Compiler(
         }
     }
 
-    private fun parseFunctionDeclaration(tokens: CompilerContext): Statement {
+    private fun parseFunctionDeclaration(
-        val visibility = tokens.getVisibility()
+        tokens: CompilerContext,
-
+        visibility: Visibility = Visibility.Public,
+        @Suppress("UNUSED_PARAMETER") isOpen: Boolean = false
+    ): Statement {
         var t = tokens.next()
         val start = t.pos
         val name = if (t.type != Token.Type.ID)
@@ -1337,26 +1345,22 @@ class Compiler(
         }
     }
 
-    private fun parseVarDeclaration(kind: String, mutable: Boolean, tokens: CompilerContext): Statement {
+    private fun parseVarDeclaration(
-        // we are just after var/val, visibility if exists is 2 steps behind
+        isMutable: Boolean,
-        val visibility = when (tokens.atOffset(-2)?.type) {
+        visibility: Visibility,
-            Token.Type.PRIVATE ->
+        tokens: CompilerContext,
-                Visibility.Private
+        @Suppress("UNUSED_PARAMETER") isOpen: Boolean = false
-
+    ): Statement {
-            Token.Type.PROTECTED -> Visibility.Protected
-            else -> Visibility.Public
-        }
-
         val nameToken = tokens.next()
         val start = nameToken.pos
         if (nameToken.type != Token.Type.ID)
-            throw ScriptError(nameToken.pos, "Expected identifier after '$kind'")
+            throw ScriptError(nameToken.pos, "Expected identifier here")
         val name = nameToken.value
 
         val eqToken = tokens.next()
         var setNull = false
         if (eqToken.type != Token.Type.ASSIGN) {
-            if (!mutable)
+            if (!isMutable)
                 throw ScriptError(start, "val must be initialized")
             else {
                 tokens.previous()
@@ -1375,7 +1379,7 @@ class Compiler(
             // create a separate copy:
             val initValue = initialExpression?.execute(context)?.byValueCopy() ?: ObjNull
 
-            context.addItem(name, mutable, initValue, visibility)
+            context.addItem(name, isMutable, initValue, visibility)
             initValue
         }
     }
@@ -1519,7 +1523,8 @@ class Compiler(
         /**
          * The keywords that stop processing of expression term
          */
-        val stopKeywords = setOf("do", "break", "continue", "return", "if", "when", "do", "while", "for", "class", "struct")
+        val stopKeywords =
+            setOf("do", "break", "continue", "return", "if", "when", "do", "while", "for", "class", "struct")
     }
 }
 

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

@@ -102,6 +102,7 @@ internal class CompilerContext(val tokens: List<Token>) {
      * Return value of the next token if it is an identifier, null otherwise.
      * Does not change position.
      */
+    @Suppress("unused")
     fun nextIdValue(): String? {
         return if (hasNext()) {
             val nt = tokens[currentIndex]
@@ -117,21 +118,31 @@ internal class CompilerContext(val tokens: List<Token>) {
     /**
      * If the token at current position plus offset (could be negative) exists, returns it, otherwise returns null.
      */
+    @Suppress("unused")
     fun atOffset(offset: Int): Token? =
         if (currentIndex + offset in tokens.indices) tokens[currentIndex + offset] else null
 
-    /**
+    fun matchQualifiers(keyword: String, vararg qualifiers: String): Boolean {
-     * Scan backwards as deep as specified looking for visibility token. Does not change position.
+        val pos = savePos()
-     */
+        var count = 0
-    fun getVisibility(default: Visibility = Visibility.Public, depths: Int = 2): Visibility {
+        while( count < qualifiers.size) {
-        for( i in -depths .. -1) {
+            val t = next()
-            when( atOffset(i)?.type) {
+            when(t.type) {
-                Token.Type.PROTECTED -> return Visibility.Protected
+                Token.Type.ID -> {
-                Token.Type.PRIVATE -> return Visibility.Private
+                    if( t.value in qualifiers ) count++
-                else -> {}
+                    else { restorePos(pos); return false }
+                }
+                Token.Type.MULTILINE_COMMENT, Token.Type.SINLGE_LINE_COMMENT, Token.Type.NEWLINE -> {}
+                else -> { restorePos(pos); return false }
             }
         }
-        return default
+        val t = next()
+        if( t.type == Token.Type.ID && t.value == keyword ) {
+            return true
+        } else {
+            restorePos(pos)
+            return false
+        }
     }
 
 //    fun expectKeyword(vararg keyword: String): String {

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

@@ -137,15 +137,19 @@ private class Parser(fromPos: Pos) {
                 if (currentChar == '.') {
                     pos.advance()
                     // .. already parsed:
-                    if (currentChar == '.') {
+                    when (currentChar) {
+                        '.' -> {
                             pos.advance()
                             Token("...", from, Token.Type.ELLIPSIS)
-                    } else if (currentChar == '<') {
+                        }
+                        '<' -> {
                             pos.advance()
                             Token("..<", from, Token.Type.DOTDOTLT)
-                    } else {
+                        }
+                        else -> {
                             Token("..", from, Token.Type.DOTDOT)
                         }
+                    }
                 } else
                     Token(".", from, Token.Type.DOT)
             }
@@ -280,8 +284,6 @@ private class Parser(fromPos: Pos) {
                         when (text) {
                             "in" -> Token("in", from, Token.Type.IN)
                             "is" -> Token("is", from, Token.Type.IS)
-                            "protected" -> Token("protected", from, Token.Type.PROTECTED)
-                            "private" -> Token("private", from, Token.Type.PRIVATE)
                             else -> Token(text, from, Token.Type.ID)
                         }
                 } else
@@ -338,7 +340,7 @@ private class Parser(fromPos: Pos) {
             // could be integer, also hex:
             if (currentChar == 'x' && p1 == "0") {
                 pos.advance()
-                Token(loadChars({ it in hexDigits }), start, Token.Type.HEX).also {
+                Token(loadChars { it in hexDigits }, start, Token.Type.HEX).also {
                     if (currentChar.isLetter())
                         raise("invalid hex literal")
                 }

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

@@ -17,7 +17,6 @@ data class Token(val value: String, val pos: Pos, val type: Type) {
         AND, BITAND, OR, BITOR, NOT, BITNOT, DOT, ARROW, QUESTION, COLONCOLON,
         SINLGE_LINE_COMMENT, MULTILINE_COMMENT,
         LABEL, ATLABEL, // label@ at@label
-        PRIVATE, PROTECTED,
         //PUBLIC, PROTECTED, INTERNAL, EXPORT, OPEN, INLINE, OVERRIDE, ABSTRACT, SEALED, EXTERNAL, VAL, VAR, CONST, TYPE, FUN, CLASS, INTERFACE, ENUM, OBJECT, TRAIT, THIS,
         ELLIPSIS, DOTDOT, DOTDOTLT,
         NEWLINE,

library/src/commonTest/kotlin/ScriptTest.kt

@@ -1876,4 +1876,23 @@ class ScriptTest {
         """.trimIndent())
     }
 
+    @Test
+    fun testReturnValue1() = runTest {
+        val r = eval("""
+            class Point(x,y) {
+                println("1")
+                fun length() { sqrt(d2()) }
+                println("2")
+                private fun d2() {x*x + y*y}
+                println("3")
+            }
+            println("Helluva")
+            val p = Point(3,4)
+//            assertEquals( 5, p.length() )
+//            assertThrows { p.d2() }
+            "111"        
+        """.trimIndent())
+        assertEquals("111", r.toString())
+    }
+
 }