Repair stacking section closers.

Moderocky · Moderocky · commit 49b12720b7f5 · 2022-03-10T16:08:27.000Z
diff --git a/src/main/java/org/byteskript/skript/compiler/DebugSkriptCompiler.java b/src/main/java/org/byteskript/skript/compiler/DebugSkriptCompiler.java
@@ -58,7 +58,7 @@ public PostCompileClass[] compile(String source, Type path) {
     
     @Override
     protected FileContext createContext(Type path) {
-        return new FileContext(path, 0);
+        return new FileContext(path, 1);
     }
     
     protected void debug(ElementTree tree, FileContext context) {
diff --git a/src/main/java/org/byteskript/skript/compiler/structure/ExtractionTree.java b/src/main/java/org/byteskript/skript/compiler/structure/ExtractionTree.java
@@ -10,8 +10,6 @@
 import org.byteskript.skript.api.SyntaxElement;
 import org.byteskript.skript.compiler.Context;
 import org.byteskript.skript.error.ScriptCompileError;
-import org.byteskript.skript.lang.syntax.flow.conditional.ElseIfSection;
-import org.byteskript.skript.lang.syntax.flow.conditional.ElseSection;
 import org.objectweb.asm.Label;
 
 public class ExtractionTree extends ProgrammaticSplitTree {
@@ -67,7 +65,7 @@ public void close(Context context) {
     
     @Override
     public boolean permit(SyntaxElement element) {
-        return element instanceof ElseIfSection || element instanceof ElseSection;
+        return false;
     }
     
     @Override
diff --git a/src/main/java/org/byteskript/skript/compiler/structure/WhileTree.java b/src/main/java/org/byteskript/skript/compiler/structure/WhileTree.java
@@ -6,10 +6,23 @@
 
 package org.byteskript.skript.compiler.structure;
 
+import mx.kenzie.foundation.MethodBuilder;
+import org.byteskript.skript.compiler.Context;
+import org.byteskript.skript.error.ScriptCompileError;
+import org.objectweb.asm.Label;
+
 public class WhileTree extends LoopTree {
     
     public WhileTree(SectionMeta owner) {
         super(owner);
     }
     
+    @Override
+    public void close(Context context) {
+        final MethodBuilder method = context.getMethod();
+        if (method == null) throw new ScriptCompileError(context.lineNumber(), "While block left unclosed.");
+        final Label top = this.getTop();
+        method.writeCode((writer, visitor) -> visitor.visitJumpInsn(167, top));
+        super.close(context);
+    }
 }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/flow/lambda/RunnableSection.java b/src/main/java/org/byteskript/skript/lang/syntax/flow/lambda/RunnableSection.java
@@ -9,7 +9,6 @@
 import mx.kenzie.foundation.MethodBuilder;
 import mx.kenzie.foundation.MethodErasure;
 import mx.kenzie.foundation.Type;
-import mx.kenzie.foundation.WriteInstruction;
 import org.byteskript.skript.api.note.Documentation;
 import org.byteskript.skript.api.syntax.ExtractedSection;
 import org.byteskript.skript.compiler.CommonTypes;
@@ -78,17 +77,13 @@ public void compile(Context context, Pattern.Match match) throws Throwable {
         context.addInnerClass(Type.of("java/lang/invoke/MethodHandles$Lookup"), Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL);
         final MethodBuilder method = context.getMethod();
         final int index = context.getLambdaIndex();
-        final int load = context.getVariableCount();
         context.increaseLambdaIndex();
         final String internal = context.getType().internalName();
         final String name = "lambda$L" + index;
         final MethodBuilder child = context.getBuilder().addMethod(name)
             .setModifiers(Modifier.PUBLIC | Modifier.STATIC | 0x00001000)
             .setReturnType(new Type(void.class));
-        for (int i = 0; i < load; i++) {
-            child.addParameter(CommonTypes.OBJECT);
-            method.writeCode(WriteInstruction.loadObject(i));
-        }
+        SupplierSection.extractVariables(context, method, child);
         final MethodErasure target = child.getErasure();
         final MethodErasure creator = new MethodErasure(CommonTypes.RUNNABLE, "run", child.getErasure()
             .parameterTypes());
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/flow/lambda/SupplierSection.java b/src/main/java/org/byteskript/skript/lang/syntax/flow/lambda/SupplierSection.java
@@ -9,13 +9,13 @@
 import mx.kenzie.foundation.MethodBuilder;
 import mx.kenzie.foundation.MethodErasure;
 import mx.kenzie.foundation.Type;
-import mx.kenzie.foundation.WriteInstruction;
 import org.byteskript.skript.api.note.Documentation;
 import org.byteskript.skript.api.syntax.ExtractedSection;
 import org.byteskript.skript.compiler.CommonTypes;
 import org.byteskript.skript.compiler.Context;
 import org.byteskript.skript.compiler.Pattern;
 import org.byteskript.skript.compiler.SkriptLangSpec;
+import org.byteskript.skript.compiler.structure.PreVariable;
 import org.byteskript.skript.error.ScriptCompileError;
 import org.byteskript.skript.lang.element.StandardElements;
 import org.objectweb.asm.Handle;
@@ -79,17 +79,13 @@ public void compile(Context context, Pattern.Match match) throws Throwable {
         context.addInnerClass(Type.of("java/lang/invoke/MethodHandles$Lookup"), Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL);
         final MethodBuilder method = context.getMethod();
         final int index = context.getLambdaIndex();
-        final int load = context.getVariableCount();
         context.increaseLambdaIndex();
         final String internal = context.getType().internalName();
         final String name = "lambda$L" + index;
         final MethodBuilder child = context.getBuilder().addMethod(name)
             .setModifiers(Modifier.PUBLIC | Modifier.STATIC | 0x00001000)
             .setReturnType(CommonTypes.OBJECT);
-        for (int i = 0; i < load; i++) {
-            child.addParameter(CommonTypes.OBJECT);
-            method.writeCode(WriteInstruction.loadObject(i));
-        }
+        extractVariables(context, method, child);
         final MethodErasure target = child.getErasure();
         final MethodErasure creator = new MethodErasure(CommonTypes.SUPPLIER, "get", child.getErasure()
             .parameterTypes());
@@ -98,5 +94,16 @@ public void compile(Context context, Pattern.Match match) throws Throwable {
         method.writeCode((writer, visitor) -> visitor.visitInvokeDynamicInsn("get", creator.getDescriptor(), new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", bootstrap.name(), bootstrap.getDescriptor(), false), org.objectweb.asm.Type.getType("()Ljava/lang/Object;"), new Handle(6, internal, target.name(), target.getDescriptor(), false), org.objectweb.asm.Type.getType("()Ljava/lang/Object;")));
     }
     
+    static void extractVariables(Context context, MethodBuilder method, MethodBuilder child) {
+        int i = 0;
+        for (final PreVariable variable : context.getVariables()) {
+            if (!variable.internal) {
+                child.addParameter(CommonTypes.OBJECT);
+                method.writeCode(variable.load(i));
+            }
+            ++i;
+        }
+    }
+    
     
 }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/flow/loop/LoopInSection.java b/src/main/java/org/byteskript/skript/lang/syntax/flow/loop/LoopInSection.java
@@ -127,7 +127,7 @@ public void onSectionExit(Context context, SectionMeta meta) {
         final MethodBuilder method = context.getMethod();
         final Label top = tree.getTop();
         method.writeCode((writer, visitor) -> visitor.visitJumpInsn(Opcodes.GOTO, top));
-        method.writeCode(tree.getEnd().instruction());
+        tree.close(context);
     }
     
     @Override
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/flow/loop/LoopTimesSection.java b/src/main/java/org/byteskript/skript/lang/syntax/flow/loop/LoopTimesSection.java
@@ -97,7 +97,7 @@ public void onSectionExit(Context context, SectionMeta meta) {
         final int slot = tree.slot;
         method.writeCode(WriteInstruction.loadSmall(slot));
         method.writeCode((writer, visitor) -> visitor.visitJumpInsn(Opcodes.IFGT, top));
-        method.writeCode(tree.getEnd().instruction());
+        tree.close(context);
     }
     
     @Override
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/flow/loop/WhileSection.java b/src/main/java/org/byteskript/skript/lang/syntax/flow/loop/WhileSection.java
@@ -87,10 +87,7 @@ public void onSectionExit(Context context, SectionMeta meta) {
         if (!(current instanceof WhileTree tree))
             throw new ScriptCompileError(context.lineNumber(), "Unable to balance while flow tree.");
         context.setState(CompileState.CODE_BODY);
-        final MethodBuilder method = context.getMethod();
-        final Label top = tree.getTop();
-        method.writeCode((writer, visitor) -> visitor.visitJumpInsn(167, top));
-        method.writeCode(tree.getEnd().instruction());
+        tree.close(context);
     }
     
     @Override
diff --git a/src/test/java/org/byteskript/skript/test/FlowTest.java b/src/test/java/org/byteskript/skript/test/FlowTest.java
@@ -22,7 +22,6 @@ public class FlowTest extends SkriptTest {
     public static void start() throws Throwable {
         final PostCompileClass cls = skript.compileScript(FlowTest.class.getClassLoader()
             .getResourceAsStream("flow.bsk"), "skript.flow");
-        debug(cls); //todo
         script = skript.loadScript(cls);
     }
     
diff --git a/src/test/resources/flow.bsk b/src/test/resources/flow.bsk
@@ -80,6 +80,14 @@ function loop_flow:
             if {item} is greater than 2:
                 continue loop
             assert {item} is less than 3: "Continue-loop instruction failed."
+        set {var} to a new runnable:
+            set {count} to 0
+            loop 4 times:
+                set {phase} to {count} as a string
+                set {tag} to "a" + {phase}
+                assert {tag} is a string
+                set {count} to {count} + 1
+        run {var}
 
 function while_flow:
     trigger:
@@ -104,7 +112,6 @@ function while_flow:
                 set {tag} to "a" + {phase}
                 assert {tag} is a string
                 set {count} to {count} + 1
-            assert true is true // todo - currently un-fixable
         run {var}
         return "ended"
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public PostCompileClass[] compile(String source, Type path) {`
`58`	`58`
`59`	`59`	`@Override`
`60`	`60`	`protected FileContext createContext(Type path) {`
`61`		`- return new FileContext(path, 0);`
	`61`	`+ return new FileContext(path, 1);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`protected void debug(ElementTree tree, FileContext context) {`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public void onSectionExit(Context context, SectionMeta meta) {`
`127`	`127`	`final MethodBuilder method = context.getMethod();`
`128`	`128`	`final Label top = tree.getTop();`
`129`	`129`	`method.writeCode((writer, visitor) -> visitor.visitJumpInsn(Opcodes.GOTO, top));`
`130`		`- method.writeCode(tree.getEnd().instruction());`
	`130`	`+ tree.close(context);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void onSectionExit(Context context, SectionMeta meta) {`
`97`	`97`	`final int slot = tree.slot;`
`98`	`98`	`method.writeCode(WriteInstruction.loadSmall(slot));`
`99`	`99`	`method.writeCode((writer, visitor) -> visitor.visitJumpInsn(Opcodes.IFGT, top));`
`100`		`- method.writeCode(tree.getEnd().instruction());`
	`100`	`+ tree.close(context);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ public class FlowTest extends SkriptTest {`
`22`	`22`	`public static void start() throws Throwable {`
`23`	`23`	`final PostCompileClass cls = skript.compileScript(FlowTest.class.getClassLoader()`
`24`	`24`	`.getResourceAsStream("flow.bsk"), "skript.flow");`
`25`		`- debug(cls); //todo`
`26`	`25`	`script = skript.loadScript(cls);`
`27`	`26`	`}`
`28`	`27`