修复while的编译问题

Author: Alumopper

.mclib

@@ -4,7 +4,7 @@
 			"id":"default",
 			"functions":[
 				{
-					"id":"base",
+					"id":"generateSequence",
 					"normalParams":[
 
 					],
@@ -15,7 +15,7 @@
 					]
 				},
 				{
-					"id":"_if_branch_ed5be6b6-1b8d-44c7-911d-9f257d1b8761",
+					"id":"_while_1721ca59-7dd8-4e3b-b146-190ad749a4f2",
 					"normalParams":[
 
 					],
@@ -26,7 +26,7 @@
 					]
 				},
 				{
-					"id":"expression_2b5d5e58-dff2-4c90-b43d-720c0f3baa42",
+					"id":"expression_67b9dd31-2e5e-4873-a1a3-f4b5f0da11e2",
 					"normalParams":[
 
 					],
@@ -37,7 +37,7 @@
 					]
 				},
 				{
-					"id":"_if_branch_c2e1e1ba-f3a4-48ce-9e2b-518a32dbacbb",
+					"id":"_while_block_4b041b7f-b519-423e-82cf-f816f0d548a3",
 					"normalParams":[
 
 					],

src/main/java/top/mcfpp/lang/NBTListData.java

@@ -163,12 +163,12 @@ public class NBTListData extends MNIMethodContainer {
                         command = new Command("data modify " +
                                 "entity @s " +
                                 "data." + list.getIdentifier() + " " +
-                                "insert ").build("", index.getIdentifier()).build (" value " + SNBTUtil.toSNBT(tag));
+                                "insert ").build("", index.getIdentifier()).build ("value " + SNBTUtil.toSNBT(tag));
                     } else {
                         command = new Command("data modify " +
                                 "storage mcfpp:system " +
                                 Project.INSTANCE.getCurrNamespace() + ".stack_frame[" + list.getStackIndex() + "]." + list.getIdentifier() + " " +
-                                "insert ").build("", index.getIdentifier()).build(" value " + SNBTUtil.toSNBT(tag));
+                                "insert ").build("", index.getIdentifier()).build("value " + SNBTUtil.toSNBT(tag));
                     }
                 } catch (IOException ex) {
                     throw new RuntimeException(ex);
@@ -191,7 +191,7 @@ public class NBTListData extends MNIMethodContainer {
                     command = new Command("data modify " +
                             "storage mcfpp:system " +
                             Project.INSTANCE.getCurrNamespace() + ".stack_frame[" + list.getStackIndex() + "]." + list.getIdentifier() + " " +
-                            "insert ").build("", index.getIdentifier()).build(" from " +
+                            "insert ").build("", index.getIdentifier()).build("from " +
                             "storage mcfpp:system " +
                             Project.INSTANCE.getCurrNamespace() + ".stack_frame[" + list.getStackIndex() + "]." + e.getIdentifier());
                 }

src/main/kotlin/top/mcfpp/command/Command.kt

@@ -116,10 +116,10 @@ open class Command {
      * 在这条命令的末尾继续构建命令
      *
      * @param command 固定的命令字符串
-     * @param withBlank 是否会在此字符串和已有的字符串之间添加空格
      * @return
      */
     fun build(command: String) : Command{
+        commandStringList.add(" ")
         commandStringList.add(command)
         return this
     }
@@ -140,8 +140,8 @@ open class Command {
      * @return
      */
     fun build(command: String, pointID: String) : Command{
-        replacePoint[pointID] = commandStringList.size
         commandStringList.add(" ")
+        replacePoint[pointID] = commandStringList.size
         commandStringList.add(command)
         return this
     }

src/main/kotlin/top/mcfpp/command/Commands.kt

@@ -44,7 +44,7 @@ object Commands {
         return Command.build("scoreboard players add")
             .build(target.name, target.name)
             .build(target.`object`.toString(), target.`object`.toString())
-            .build(" $value")
+            .build("$value")
     }
 
     /**

src/main/kotlin/top/mcfpp/lang/MCInt.kt

@@ -105,7 +105,7 @@ open class MCInt : MCNumber<Int> {
                     if(final.size == 2){
                         Function.addCommand(final[0])
                     }
-                    final.last().build(Commands.sbPlayerSet(this,b.value as Int))
+                    final.last().build(Commands.sbPlayerSet(this, b.value))
                 }else{
                     Function.replaceCommand(final.last().build(replace), Function.currFunction.commands.size - 1)
                 }
@@ -134,7 +134,7 @@ open class MCInt : MCNumber<Int> {
                                 Commands.selectRun(parent)
                             }
                             is MCFPPClassType -> {
-                                arrayOf(Command.build("execute as ${parent.cls.uuid} run "))
+                                arrayOf(Command.build("execute as ${parent.cls.uuid} run"))
                             }
                             else -> TODO()
                         }
@@ -149,7 +149,7 @@ open class MCInt : MCNumber<Int> {
                                 .build(replace), Function.currFunction.commands.size-1)
                         }
                     }
-                    val append = "store result storage mcfpp:system " + Project.config.defaultNamespace + ".stack_frame[" + stackIndex + "]." + identifier + " int 1 run "
+                    val append = "store result storage mcfpp:system " + Project.config.defaultNamespace + ".stack_frame[" + stackIndex + "]." + identifier + " int 1 run"
                     //是成员
                     val cmd = when(val parent = a.parent){
                         is ClassPointer -> {
@@ -170,7 +170,7 @@ open class MCInt : MCNumber<Int> {
                         Function.replaceCommand(cmd.last().build(replace), Function.currFunction.commands.size-1)
                     }
                 }else{
-                    val head = if(isTemp) "" else "execute store result storage mcfpp:system " + Project.config.defaultNamespace + ".stack_frame[" + stackIndex + "]." + identifier + " int 1 run "
+                    val head = if(isTemp) "" else "execute store result storage mcfpp:system " + Project.config.defaultNamespace + ".stack_frame[" + stackIndex + "]." + identifier + " int 1 run"
                     //变量进栈
                     if(replace == null){
                         Function.addCommand(Command.build(head)

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

@@ -13,12 +13,30 @@ class LogicStatementTest {
                     dynamic int i = 5;
                     if(i < 7){
                         print("i < 7");
+                        dynamic int p;
                     }else{
                         print("i >= 7");
+                        dynamic int p;
                     }
+                    print(p);
                     print("end");
                 }
             """.trimIndent()
         MCFPPStringTest.readFromString(test, "D:\\.minecraft\\saves\\MCFPP Studio\\datapacks")
     }
+
+    @Test
+    fun whileTest(){
+        val test =
+            """
+                func generateSequence(){
+                    dynamic int i = 0;
+                    while(i < 10){
+                        print(i);
+                        i = i + 1;
+                    }
+            }
+            """.trimIndent()
+        MCFPPStringTest.readFromString(test, "D:\\.minecraft\\saves\\MCFPP Studio\\datapacks")
+    }
 }