修复do-while的编译问题

Author: Alumopper

.mclib

@@ -4,7 +4,7 @@
 			"id":"default",
 			"functions":[
 				{
-					"id":"generateSequence",
+					"id":"generateSequenceDoWhile",
 					"normalParams":[
 
 					],
@@ -15,7 +15,7 @@
 					]
 				},
 				{
-					"id":"_while_1721ca59-7dd8-4e3b-b146-190ad749a4f2",
+					"id":"_dowhile_78ddf9e4-56ed-4439-93bc-bceb4e47f9ec",
 					"normalParams":[
 
 					],
@@ -26,7 +26,7 @@
 					]
 				},
 				{
-					"id":"expression_67b9dd31-2e5e-4873-a1a3-f4b5f0da11e2",
+					"id":"_dowhile_de4d3e61-9c4a-4c3f-81ae-3e7decf37e3b",
 					"normalParams":[
 
 					],
@@ -37,7 +37,7 @@
 					]
 				},
 				{
-					"id":"_while_block_4b041b7f-b519-423e-82cf-f816f0d548a3",
+					"id":"expression_52569370-85ad-4996-bbe1-8b209ead925a",
 					"normalParams":[
 
 					],

src/main/kotlin/top/mcfpp/antlr/McfppImVisitor.kt

@@ -699,7 +699,8 @@ open class McfppImVisitor: mcfppParserBaseVisitor<Any?>() {
         Project.ctx = ctx
         //调用完毕，将子函数的栈销毁
         Function.addCommand("data remove storage mcfpp:system " + Project.config.defaultNamespace + ".stack_frame[0]")
-        //调用完毕，将子函数的栈销毁
+        //返回1
+        Function.addCommand("return 1")
         Function.currFunction = Function.currFunction.parent[0]
         Function.addCommand("#do while end")
     }
@@ -919,8 +920,10 @@ open class McfppImVisitor: mcfppParserBaseVisitor<Any?>() {
         Function.addCommand("#" + ctx.text)
         //return语句
         if(ctx.BREAK() != null){
+            //break，完全跳出while
             Function.addCommand("return 0")
         }else{
+            //continue，跳过当次
             Function.addCommand("return 1")
         }
         Function.currFunction.isReturned = true

src/test/kotlin/top/mcfpp/test/LogicStatementTest.kt

@@ -39,4 +39,32 @@ class LogicStatementTest {
             """.trimIndent()
         MCFPPStringTest.readFromString(test, "D:\\.minecraft\\saves\\MCFPP Studio\\datapacks")
     }
+
+    @Test
+    fun doWhileTest() {
+        val test =
+            """
+            func generateSequenceDoWhile(){
+                dynamic int i = 0;
+                do {
+                    print(i);
+                    i = i + 1;
+                } while(i < 10);
+            }
+        """.trimIndent()
+        MCFPPStringTest.readFromString(test, "D:\\.minecraft\\saves\\MCFPP Studio\\datapacks")
+    }
+
+    @Test
+    fun forTest() {
+        val test =
+            """
+            func generateSequenceFor(){
+                for(dynamic int i = 0; i < 10; i = i + 1){
+                    print(i);
+                }
+            }
+        """.trimIndent()
+        MCFPPStringTest.readFromString(test, "D:\\.minecraft\\saves\\MCFPP Studio\\datapacks")
+    }
 }