Fix balancing of nested trees.

Author: Moderocky

hello.csk

@@ -0,0 +1,3 @@
+
+key: value
+thing: hello there!

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.byteskript</groupId>
     <artifactId>byteskript</artifactId>
-    <version>1.0.21</version>
+    <version>1.0.22</version>
     <name>ByteSkript</name>
     <description>A compiled JVM implementation of the Skript language.</description>
 

src/main/java/org/byteskript/skript/compiler/Context.java

@@ -163,6 +163,11 @@ public Section getParent() {
         return sections.get(0).handler();
     }
 
+    public void destroySections() {
+        do destroySection();
+        while (!sections.isEmpty());
+    }
+    
     public void destroySection() {
         if (sections.isEmpty()) return;
         final SectionMeta meta = sections.remove(0);
@@ -173,15 +178,6 @@ public void destroySection() {
         }
     }
 
-    public void destroySections() {
-        for (final SectionMeta section : sections) {
-            for (final Section handler : section.getHandlers()) {
-                handler.onSectionExit(this, section);
-            }
-        }
-        this.sections.clear();
-    }
-    
     public abstract boolean hasFunction(String name, int arguments);
 
     public Function getDefaultFunction(String name, int arguments) {

src/main/java/org/byteskript/skript/compiler/FileContext.java

@@ -45,7 +45,6 @@ public class FileContext extends Context {
     LanguageElement expected;
     SyntaxElement currentEffect;
     private HandlerType mode = StandardHandlers.GET;
-    
     public FileContext(Type type) {
         this.type = type;
         this.state = CompileState.ROOT;
@@ -72,6 +71,10 @@ private void addSkriptFunctions() {
         }
     }
 
+    public List<ProgrammaticSplitTree> getTrees() {
+        return trees;
+    }
+    
     public PostCompileClass[] compile() {
         for (List<PropertyAccessGenerator> value : usedProperties.values()) {
             for (PropertyAccessGenerator generator : value) {

src/main/java/org/byteskript/skript/lang/syntax/flow/conditional/ElseIfSection.java

@@ -13,6 +13,7 @@
 import org.byteskript.skript.api.syntax.Section;
 import org.byteskript.skript.compiler.*;
 import org.byteskript.skript.compiler.structure.IfElseTree;
+import org.byteskript.skript.compiler.structure.ProgrammaticSplitTree;
 import org.byteskript.skript.compiler.structure.SectionMeta;
 import org.byteskript.skript.error.ScriptCompileError;
 import org.byteskript.skript.lang.element.StandardElements;
@@ -68,7 +69,10 @@ public boolean allowedIn(State state, Context context) {
 
     @Override
     public void onSectionExit(Context context, SectionMeta meta) {
-        if (!(context.getTree(context.getSection()) instanceof IfElseTree tree))
+        final ProgrammaticSplitTree current;
+        if (context.getTree(context.getSection()) instanceof IfElseTree found) current = found;
+        else current = context.getCurrentTree();
+        if (!(current instanceof IfElseTree tree))
             throw new ScriptCompileError(context.lineNumber(), "Unable to balance if/else flow tree.");
         context.setState(CompileState.CODE_BODY);
         final MethodBuilder method = context.getMethod();

src/main/java/org/byteskript/skript/lang/syntax/flow/conditional/ElseSection.java

@@ -15,6 +15,7 @@
 import org.byteskript.skript.compiler.Pattern;
 import org.byteskript.skript.compiler.SkriptLangSpec;
 import org.byteskript.skript.compiler.structure.IfElseTree;
+import org.byteskript.skript.compiler.structure.ProgrammaticSplitTree;
 import org.byteskript.skript.compiler.structure.SectionMeta;
 import org.byteskript.skript.error.ScriptCompileError;
 import org.byteskript.skript.lang.element.StandardElements;
@@ -67,7 +68,10 @@ public boolean allowedIn(State state, Context context) {
 
     @Override
     public void onSectionExit(Context context, SectionMeta meta) {
-        if (!(context.getTree(context.getSection()) instanceof IfElseTree tree))
+        final ProgrammaticSplitTree current;
+        if (context.getTree(context.getSection()) instanceof IfElseTree found) current = found;
+        else current = context.getCurrentTree();
+        if (!(current instanceof IfElseTree tree))
             throw new ScriptCompileError(context.lineNumber(), "Unable to balance if/else flow tree.");
         context.setState(CompileState.CODE_BODY);
         tree.close(context);

src/main/java/org/byteskript/skript/lang/syntax/flow/conditional/IfSection.java

@@ -69,7 +69,9 @@ public boolean allowedIn(State state, Context context) {
 
     @Override
     public void onSectionExit(Context context, SectionMeta meta) {
-        final ProgrammaticSplitTree current = context.getCurrentTree();
+        final ProgrammaticSplitTree current;
+        if (context.getTree(context.getSection()) instanceof IfElseTree found) current = found;
+        else current = context.getCurrentTree();
         if (current instanceof IfElseTree tree) {
             context.setState(CompileState.CODE_BODY);
             final MethodBuilder method = context.getMethod();

src/main/java/org/byteskript/skript/lang/syntax/flow/loop/LoopInSection.java

@@ -14,6 +14,7 @@
 import org.byteskript.skript.compiler.*;
 import org.byteskript.skript.compiler.structure.LoopTree;
 import org.byteskript.skript.compiler.structure.PreVariable;
+import org.byteskript.skript.compiler.structure.ProgrammaticSplitTree;
 import org.byteskript.skript.compiler.structure.SectionMeta;
 import org.byteskript.skript.error.ScriptCompileError;
 import org.byteskript.skript.error.ScriptParseError;
@@ -117,7 +118,10 @@ private PreVariable getHolderVariable(Context context, Pattern.Match match) {
 
     @Override
     public void onSectionExit(Context context, SectionMeta meta) {
-        if (!(context.getTree(context.getSection()) instanceof LoopTree tree))
+        final ProgrammaticSplitTree current;
+        if (context.getTree(context.getSection()) instanceof LoopTree found) current = found;
+        else current = context.getCurrentTree();
+        if (!(current instanceof LoopTree tree))
             throw new ScriptCompileError(context.lineNumber(), "Unable to balance loop flow tree.");
         context.setState(CompileState.CODE_BODY);
         final MethodBuilder method = context.getMethod();

src/main/java/org/byteskript/skript/lang/syntax/flow/loop/LoopTimesSection.java

@@ -14,6 +14,7 @@
 import org.byteskript.skript.compiler.*;
 import org.byteskript.skript.compiler.structure.LoopTree;
 import org.byteskript.skript.compiler.structure.PreVariable;
+import org.byteskript.skript.compiler.structure.ProgrammaticSplitTree;
 import org.byteskript.skript.compiler.structure.SectionMeta;
 import org.byteskript.skript.error.ScriptCompileError;
 import org.byteskript.skript.lang.element.StandardElements;
@@ -85,7 +86,10 @@ public boolean allowedIn(State state, Context context) {
 
     @Override
     public void onSectionExit(Context context, SectionMeta meta) {
-        if (!(context.getTree(context.getSection()) instanceof LoopTree tree))
+        final ProgrammaticSplitTree current;
+        if (context.getTree(context.getSection()) instanceof LoopTree found) current = found;
+        else current = context.getCurrentTree();
+        if (!(current instanceof LoopTree tree))
             throw new ScriptCompileError(context.lineNumber(), "Unable to balance loop flow tree.");
         context.setState(CompileState.CODE_BODY);
         final MethodBuilder method = context.getMethod();

src/main/java/org/byteskript/skript/lang/syntax/flow/loop/WhileSection.java

@@ -15,6 +15,7 @@
 import org.byteskript.skript.compiler.Context;
 import org.byteskript.skript.compiler.Pattern;
 import org.byteskript.skript.compiler.SkriptLangSpec;
+import org.byteskript.skript.compiler.structure.ProgrammaticSplitTree;
 import org.byteskript.skript.compiler.structure.SectionMeta;
 import org.byteskript.skript.compiler.structure.WhileTree;
 import org.byteskript.skript.error.ScriptCompileError;
@@ -80,7 +81,10 @@ public boolean allowedIn(State state, Context context) {
 
     @Override
     public void onSectionExit(Context context, SectionMeta meta) {
-        if (!(context.getTree(context.getSection()) instanceof WhileTree tree))
+        final ProgrammaticSplitTree current;
+        if (context.getTree(context.getSection()) instanceof WhileTree found) current = found;
+        else current = context.getCurrentTree();
+        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();