Add loop and section tests.

Author: Moderocky

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

@@ -105,8 +105,6 @@ public void setStoredVariableName(String storedVariableName) {
 
     public abstract <Tree extends ProgrammaticSplitTree> Tree findTree(Class<Tree> type);
 
-    public abstract ProgrammaticSplitTree getTree(SectionMeta meta);
-    
     public abstract void closeAllTrees();
 
     public abstract void removeTree(ProgrammaticSplitTree tree);
@@ -174,8 +172,12 @@ public void destroySection() {
             final Section section = handlers[i];
             section.onSectionExit(this, meta);
         }
+        final ProgrammaticSplitTree tree = this.getTree(meta);
+        if (tree != null) tree.close(this);
     }
 
+    public abstract ProgrammaticSplitTree getTree(SectionMeta meta);
+    
     public abstract boolean hasFunction(String name, int arguments);
 
     public Function getDefaultFunction(String name, int arguments) {

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

@@ -296,14 +296,6 @@ public <Tree extends ProgrammaticSplitTree> Tree findTree(Class<Tree> type) {
         return null;
     }
 
-    @Override
-    public ProgrammaticSplitTree getTree(SectionMeta meta) {
-        for (final ProgrammaticSplitTree tree : trees) {
-            if (tree.owner() == meta) return tree;
-        }
-        return null;
-    }
-    
     @Override
     public synchronized void closeAllTrees() {
         for (final ProgrammaticSplitTree tree : trees.toArray(new ProgrammaticSplitTree[0])) {
@@ -412,6 +404,14 @@ public ProgrammaticSplitTree getCurrentTree() {
         return trees.isEmpty() ? null : trees.get(0);
     }
 
+    @Override
+    public ProgrammaticSplitTree getTree(SectionMeta meta) {
+        for (final ProgrammaticSplitTree tree : trees) {
+            if (tree.owner() == meta) return tree;
+        }
+        return null;
+    }
+    
     @Override
     public boolean hasFunction(String name, int arguments) {
         for (Function function : functions) {

src/main/java/org/byteskript/skript/compiler/structure/TryCatchTree.java

@@ -7,19 +7,22 @@
 package org.byteskript.skript.compiler.structure;
 
 import mx.kenzie.foundation.MethodBuilder;
+import mx.kenzie.foundation.WriteInstruction;
 import org.byteskript.skript.api.SyntaxElement;
 import org.byteskript.skript.compiler.CommonTypes;
 import org.byteskript.skript.compiler.Context;
 import org.byteskript.skript.error.ScriptCompileError;
 import org.byteskript.skript.lang.syntax.flow.error.CatchSection;
 import org.objectweb.asm.Label;
+import org.objectweb.asm.Opcodes;
 
 public class TryCatchTree extends ProgrammaticSplitTree {
 
     private final SectionMeta owner;
     private final Label startTry = new Label();
     private final Label startCatch = new Label();
     private final MultiLabel end;
+    protected boolean caught;
     private boolean open;
 
     public TryCatchTree(SectionMeta owner, MultiLabel end) {
@@ -57,13 +60,21 @@ public void start(Context context) {
 
     @Override
     public void branch(Context context) {
+        this.caught = true;
     }
 
     @Override
     public void close(Context context) {
         this.open = false;
         final MethodBuilder method = context.getMethod();
         if (method == null) throw new ScriptCompileError(context.lineNumber(), "Try/catch section left unclosed.");
+        if (!caught) {
+            context.getMethod().writeCode(((writer, visitor) -> {
+                visitor.visitJumpInsn(Opcodes.GOTO, end.use());
+                visitor.visitLabel(startCatch);
+            }));
+            method.writeCode(WriteInstruction.pop());
+        }
         method.writeCode(end.instruction());
         context.removeTree(this);
     }

src/main/java/org/byteskript/skript/lang/syntax/entry/Extends.java

@@ -32,7 +32,7 @@ public Extends() {
     @Override
     public void compile(Context context, Pattern.Match match) {
         final String name = match.meta();
-        final Type type = context.getType(name);
+        final Type type = context.findType(name);
         if (type != null) context.getBuilder().setSuperclass(type);
         else context.getBuilder().setSuperclass(new Type(name.replace('.', '/')));
         context.setState(CompileState.ROOT);

src/main/java/org/byteskript/skript/lang/syntax/entry/ReturnType.java

@@ -37,7 +37,7 @@ public ReturnType() {
     @Override
     public void compile(Context context, Pattern.Match match) {
         final String name = match.meta();
-        final Type type = context.getType(name);
+        final Type type = context.findType(name);
         if (type != null) context.getMethod().setReturnType(type);
         else context.getMethod().setReturnType(new Type(name.replace('.', '/')));
         context.setState(CompileState.MEMBER_BODY);

src/main/java/org/byteskript/skript/lang/syntax/entry/Template.java

@@ -32,7 +32,7 @@ public Template() {
     @Override
     public void compile(Context context, Pattern.Match match) {
         final String name = match.meta();
-        final Type type = context.getType(name);
+        final Type type = context.findType(name);
         if (type != null) context.getBuilder().addInterfaces(type);
         else context.getBuilder().addInterfaces(new Type(name.replace('.', '/')));
         context.setState(CompileState.ROOT);

src/main/java/org/byteskript/skript/lang/syntax/flow/StopEffect.java

@@ -7,6 +7,7 @@
 package org.byteskript.skript.lang.syntax.flow;
 
 import mx.kenzie.foundation.MethodBuilder;
+import mx.kenzie.foundation.Type;
 import mx.kenzie.foundation.WriteInstruction;
 import org.byteskript.skript.api.note.Documentation;
 import org.byteskript.skript.api.syntax.Effect;
@@ -42,8 +43,12 @@ public StopEffect() {
     public void compile(Context context, Pattern.Match match) {
         final MethodBuilder method = context.getMethod();
         assert method != null;
-        method.writeCode(WriteInstruction.pushNull());
-        method.writeCode(WriteInstruction.returnObject());
+        if (method.getErasure().returnType().equals(new Type(void.class))) {
+            method.writeCode(WriteInstruction.returnEmpty());
+        } else {
+            method.writeCode(WriteInstruction.pushNull());
+            method.writeCode(WriteInstruction.returnObject());
+        }
         context.setState(CompileState.CODE_BODY);
     }
 

src/main/java/org/byteskript/skript/lang/syntax/flow/error/CatchSection.java

@@ -71,6 +71,7 @@ public void compile(Context context, Pattern.Match match) throws Throwable {
         final Label label = tree.getEnd().use();
         final Label next = tree.getStartCatch();
         final MethodBuilder method = context.getMethod();
+        tree.branch(context);
         if (method == null) throw new ScriptCompileError(context.lineNumber(), "Try/catch used outside method.");
         context.getMethod().writeCode(((writer, visitor) -> {
             visitor.visitJumpInsn(Opcodes.GOTO, label);

src/main/java/org/byteskript/skript/lang/syntax/type/property/TypeEntry.java

@@ -34,7 +34,7 @@ public TypeEntry() {
     @Override
     public void compile(Context context, Pattern.Match match) {
         final String name = match.meta();
-        final Type type = context.getType(name);
+        final Type type = context.findType(name);
         if (type != null) context.getField().setType(type);
         else context.getField().setType(new Type(name.replace('.', '/')));
         context.setState(CompileState.MEMBER_BODY);

src/test/java/org/byteskript/skript/test/GenericTest.java

@@ -78,6 +78,8 @@ public void all() throws Throwable {
                 try (final OutputStream output = new FileOutputStream(test)) {
                     output.write(classes[0].code());
                 }
+            } catch (Throwable ex) {
+                ex.printStackTrace();
             }
         }
         assert failure < 1 : failure + " tests have failed.";