while/else practical sample

!fixed else-while not calling on never run loop bug

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

@@ -753,23 +753,25 @@ class Compiler(
         }
         return statement(body.pos) {
             var result: Obj = ObjVoid
+            var wasBroken = false
             while (condition.execute(it).toBool()) {
                 try {
                     // we don't need to create new context here: if body is a block,
                     // parse block will do it, otherwise single statement doesn't need it:
                     result = body.execute(it)
-                    elseStatement?.let { s -> result = s.execute(it) }
                 } catch (lbe: LoopBreakContinueException) {
                     if (lbe.label == label || lbe.label == null) {
                         if (lbe.doContinue) continue
                         else {
                             result = lbe.result
+                            wasBroken = true
                             break
                         }
                     } else
                         throw lbe
                 }
             }
+            if( !wasBroken ) elseStatement?.let { s -> result = s.execute(it) }
             result
         }
     }

library/src/commonTest/kotlin/ScriptTest.kt

@@ -1041,7 +1041,8 @@ class ScriptTest {
 
     @Test
     fun testLambdaWithIt1() = runTest {
-        eval("""
+        eval(
+            """
             val x = {
                 it + "!" 
             }
@@ -1050,43 +1051,51 @@ class ScriptTest {
             assert( x is Callable)
             assert(y == "OK")
             assert( x("hello") == "hello!")
-        """.trimIndent())
+        """.trimIndent()
+        )
     }
 
     @Test
     fun testLambdaWithIt2() = runTest {
-        eval("""
+        eval(
+            """
             val x = {
                 assert(it == void)
             }
             assert( x() == void)
-        """.trimIndent())
+        """.trimIndent()
+        )
     }
 
     @Test
     fun testLambdaWithIt3() = runTest {
-        eval("""
+        eval(
+            """
             val x = {
                 assert( it == [1,2,"end"])
             }
             println("0----")
             assert( x(1, 2, "end") == void)
-        """.trimIndent())
+        """.trimIndent()
+        )
     }
 
     @Test
     fun testLambdaWithArgs() = runTest {
-        eval("""
+        eval(
+            """
             val x = { x, y, z ->
                 assert( [x, y, z] == [1,2,"end"])
             }
             assert( x(1, 2, "end") == void)
-        """.trimIndent())
+        """.trimIndent()
+        )
     }
 
     @Test
     fun testLambdaWithArgsEllipsis() = runTest {
-        eval("""
+        eval(
+            """
             val x = { x, y... ->
                 println("-- y=",y)
                 println(":: "+y::class)
@@ -1094,7 +1103,8 @@ class ScriptTest {
             }
             assert( x(1, 2, "end") == void)
             assert( x(1, ...[2, "end"]) == void)
-        """.trimIndent())
+        """.trimIndent()
+        )
     }
 
     @Test
@@ -1111,4 +1121,36 @@ class ScriptTest {
             )
         }
     }
+
+    @Test
+    fun testWhileExecuteElseIfNotExecuted() = runTest {
+        assertEquals(
+            "ok",
+            eval(
+                """
+                while( 5 < 1 ) {
+                    "bad"
+                } else "ok"
+        """.trimIndent()
+            ).toString()
+        )
+    }
+
+    @Test
+    fun testIsPrimeSampleBug() = runTest {
+        eval("""
+                fun naive_is_prime(candidate) {
+                    val x = if( candidate !is Int) candidate.toInt() else candidate
+                    var divisor = 1
+                    println("start with ",x)
+                    while( ++divisor < x/2 && divisor != 2 ) {
+                        println("x=", x, " // ", divisor, " :: ", x % divisor)
+                        if( x % divisor == 0 ) break false
+                    }
+                    else true
+                }
+                naive_is_prime(4)
+    
+        """.trimIndent())
+    }
 }