Flag triggers correctly.

Moderocky · Moderocky · commit 3da1c90f62bb · 2022-01-06T11:52:16.000Z
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.byteskript</groupId>
     <artifactId>byteskript</artifactId>
-    <version>1.0.9</version>
+    <version>1.0.10</version>
     <name>ByteSkript</name>
     <description>A compiled JVM implementation of the Skript language.</description>
 
diff --git a/src/main/java/org/byteskript/skript/api/ModifiableLibrary.java b/src/main/java/org/byteskript/skript/api/ModifiableLibrary.java
@@ -55,16 +55,16 @@ public Type registerType(Class<?> cls) {
         return type;
     }
     
-    public void registerSyntax(State state, SyntaxElement element) {
-        this.syntax.putIfAbsent(state, new ArrayList<>());
-        this.syntax.get(state).add(element);
-    }
-    
     public void registerEvent(EventHolder event) {
         this.registerSyntax(CompileState.ROOT, event);
         this.registerValues(event);
     }
     
+    public void registerSyntax(State state, SyntaxElement element) {
+        this.syntax.putIfAbsent(state, new ArrayList<>());
+        this.syntax.get(state).add(element);
+    }
+    
     public void registerProperty(String name, HandlerType type, Method handler) {
         this.properties.add(new PropertyHandler(type, handler, name));
     }
diff --git a/src/main/java/org/byteskript/skript/api/syntax/Element.java b/src/main/java/org/byteskript/skript/api/syntax/Element.java
@@ -33,18 +33,18 @@ public final Pattern getPattern() {
     }
     
     @Override
-    public String[] getPatterns() {
-        return pattern.getPatterns();
+    public Library getProvider() {
+        return provider;
     }
     
     @Override
-    public Library getProvider() {
-        return provider;
+    public Method getHandler(HandlerType type) {
+        return handlers.get(type);
     }
     
     @Override
-    public LanguageElement getType() {
-        return type;
+    public void setHandler(HandlerType type, Method method) {
+        this.handlers.put(type, method);
     }
     
     @Override
@@ -53,13 +53,13 @@ public boolean hasHandler(HandlerType type) {
     }
     
     @Override
-    public Method getHandler(HandlerType type) {
-        return handlers.get(type);
+    public LanguageElement getType() {
+        return type;
     }
     
     @Override
-    public void setHandler(HandlerType type, Method method) {
-        this.handlers.put(type, method);
+    public String[] getPatterns() {
+        return pattern.getPatterns();
     }
     
 }
diff --git a/src/main/java/org/byteskript/skript/api/syntax/EventHolder.java b/src/main/java/org/byteskript/skript/api/syntax/EventHolder.java
@@ -31,21 +31,6 @@ public void onSectionExit(Context context, SectionMeta meta) {
         super.onSectionExit(context, meta);
     }
     
-    @Override
-    public Type returnType(Context context, Pattern.Match match) {
-        return new Type(void.class);
-    }
-    
-    @Override
-    public Type[] parameters(Context context, Pattern.Match match) {
-        return new Type[0];
-    }
-    
-    @Override
-    public String callSiteName(Context context, Pattern.Match match) {
-        return null;
-    }
-    
     @Override
     public void compile(Context context, Pattern.Match match) {
         final Class<? extends Event> eventClass = eventClass();
@@ -69,5 +54,20 @@ public void compile(Context context, Pattern.Match match) {
         context.addFlag(AreaFlag.IN_EVENT);
     }
     
+    @Override
+    public String callSiteName(Context context, Pattern.Match match) {
+        return null;
+    }
+    
+    @Override
+    public Type returnType(Context context, Pattern.Match match) {
+        return new Type(void.class);
+    }
+    
+    @Override
+    public Type[] parameters(Context context, Pattern.Match match) {
+        return new Type[0];
+    }
+    
     public abstract Class<? extends Event> eventClass();
 }
diff --git a/src/main/java/org/byteskript/skript/app/SkriptApp.java b/src/main/java/org/byteskript/skript/app/SkriptApp.java
@@ -23,20 +23,20 @@
 import java.util.jar.JarFile;
 
 public abstract class SkriptApp {
-    protected static final File ROOT;
-
-    static {
+    protected static final File ROOT = getRoot();
+    protected static final File SOURCE = new File(ROOT, "skript/");
+    protected static final File RESOURCES = new File(ROOT, "resources/");
+    protected static final File LIBRARIES = new File(ROOT, "libraries/");
+    protected static final File OUTPUT = new File(ROOT, "compiled/");
+    
+    private static File getRoot() {
         try {
-            ROOT = new File(SkriptApp.class.getProtectionDomain().getCodeSource().getLocation()
+            return new File(SkriptApp.class.getProtectionDomain().getCodeSource().getLocation()
                 .toURI()).getParentFile();
         } catch (URISyntaxException e) {
             throw new IllegalStateException("Unable to get root file.", e);
         }
     }
-    protected static final File SOURCE = new File(ROOT, "skript/");
-    protected static final File RESOURCES = new File(ROOT, "resources/");
-    protected static final File LIBRARIES = new File(ROOT, "libraries/");
-    protected static final File OUTPUT = new File(ROOT, "compiled/");
     
     protected static void registerLibraries(final Skript skript) {
         final List<File> files = getFiles(new ArrayList<>(), LIBRARIES.toPath());
@@ -65,8 +65,7 @@ protected static void callLibrary(final File file, final String main, final Skri
         final LibraryClassLoader child = new LibraryClassLoader(file, SkriptApp.class.getClassLoader());
         final Class<?> target = Class.forName(main, true, child);
         try {
-            target.getMethod("load", Skript.class)
-                .invoke(null, skript);
+            target.getMethod("load", Skript.class).invoke(null, skript);
         } catch (Throwable ex) {
             throw new ScriptLibraryError("Library '" + file.getName() + "' main class is missing load method:\n" +
                 "static void load(Skript skript)");
diff --git a/src/main/java/org/byteskript/skript/compiler/AreaFlag.java b/src/main/java/org/byteskript/skript/compiler/AreaFlag.java
@@ -11,6 +11,7 @@
 public enum AreaFlag implements Flag {
     IN_SYNTAX,
     IN_FUNCTION,
+    IN_VERIFIER,
     IN_TRIGGER,
     IN_PROPERTY,
     IN_TYPE,
diff --git a/src/main/java/org/byteskript/skript/compiler/structure/ExtractionTree.java b/src/main/java/org/byteskript/skript/compiler/structure/ExtractionTree.java
@@ -38,16 +38,12 @@ public SectionMeta owner() {
         return owner;
     }
     
-    public MultiLabel getEnd() {
-        return end;
-    }
-    
     public Label getNext() {
         return next;
     }
     
-    public void setNext(Label next) {
-        this.next = next;
+    public MultiLabel getEnd() {
+        return end;
     }
     
     @Override
@@ -79,4 +75,8 @@ public boolean isOpen() {
         return open;
     }
     
+    public void setNext(Label next) {
+        this.next = next;
+    }
+    
 }
diff --git a/src/main/java/org/byteskript/skript/compiler/structure/IfElseTree.java b/src/main/java/org/byteskript/skript/compiler/structure/IfElseTree.java
@@ -32,16 +32,12 @@ public SectionMeta owner() {
         return owner;
     }
     
-    public MultiLabel getEnd() {
-        return end;
-    }
-    
     public Label getNext() {
         return next;
     }
     
-    public void setNext(Label next) {
-        this.next = next;
+    public MultiLabel getEnd() {
+        return end;
     }
     
     @Override
@@ -73,4 +69,8 @@ public boolean isOpen() {
         return open;
     }
     
+    public void setNext(Label next) {
+        this.next = next;
+    }
+    
 }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/entry/Trigger.java b/src/main/java/org/byteskript/skript/lang/syntax/entry/Trigger.java
@@ -40,8 +40,6 @@ public class Trigger extends SectionEntry {
     
     private final WriteInstruction wrap = WriteInstruction
         .invokeStatic(new Type(AtomicVariable.class), new Type(AtomicVariable.class), "wrap", CommonTypes.OBJECT);
-    private final WriteInstruction unwrap = WriteInstruction
-        .invokeStatic(new Type(AtomicVariable.class), CommonTypes.OBJECT, "unwrap", CommonTypes.OBJECT);
     
     public Trigger() {
         super(SkriptLangSpec.LIBRARY, StandardElements.SECTION, "trigger");
@@ -56,6 +54,7 @@ public Pattern.Match match(String thing, Context context) {
     public void compile(Context context, Pattern.Match match) {
         final TriggerTree tree = new TriggerTree(context.getSection(1), context.getVariables());
         context.createTree(tree);
+        context.addFlag(AreaFlag.IN_TRIGGER);
         context.setState(CompileState.CODE_BODY);
         final MethodBuilder method = context.getMethod();
         method.removeModifiers(0x0400); // not abstract
@@ -83,7 +82,7 @@ private WriteInstruction prepareVariables(TriggerTree context) {
             }
         };
     }
-
+    
     @Override
     public boolean allowedIn(State state, Context context) {
         return super.allowedIn(state, context) && context.getParent() instanceof TriggerHolder;
@@ -101,6 +100,7 @@ public void onSectionExit(Context context, SectionMeta meta) {
             method.writeCode(WriteInstruction.returnObject());
         }
         context.emptyVariables();
+        context.removeFlag(AreaFlag.IN_TRIGGER);
         context.setState(CompileState.MEMBER_BODY);
     }
     
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/entry/Verify.java b/src/main/java/org/byteskript/skript/lang/syntax/entry/Verify.java
@@ -13,10 +13,7 @@
 import org.byteskript.skript.api.note.Documentation;
 import org.byteskript.skript.api.syntax.Section;
 import org.byteskript.skript.api.syntax.TriggerHolder;
-import org.byteskript.skript.compiler.CompileState;
-import org.byteskript.skript.compiler.Context;
-import org.byteskript.skript.compiler.Pattern;
-import org.byteskript.skript.compiler.SkriptLangSpec;
+import org.byteskript.skript.compiler.*;
 import org.byteskript.skript.compiler.structure.PreVariable;
 import org.byteskript.skript.compiler.structure.SectionMeta;
 import org.byteskript.skript.compiler.structure.VerifyTree;
@@ -49,6 +46,8 @@ public void compile(Context context, Pattern.Match match) {
         final MethodBuilder target = context.getMethod();
         final VerifyTree tree = new VerifyTree(context.getSection(1), target, context.getVariables());
         context.createTree(tree);
+        context.addFlag(AreaFlag.IN_TRIGGER); // technically a trigger section
+        context.addFlag(AreaFlag.IN_VERIFIER);
         context.setState(CompileState.CODE_BODY);
         final MethodBuilder method = context.getBuilder()
             .addMethod(target.getErasure().name() + "_verify")
@@ -89,6 +88,8 @@ public void onSectionExit(Context context, SectionMeta meta) {
             method.writeCode(WriteInstruction.returnObject());
         }
         context.emptyVariables();
+        context.removeFlag(AreaFlag.IN_TRIGGER);
+        context.removeFlag(AreaFlag.IN_VERIFIER);
         context.setState(CompileState.MEMBER_BODY);
     }
     
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
@@ -85,35 +85,6 @@ public boolean allowedIn(State state, Context context) {
             && context.getMethod() != null;
     }
     
-    @Override
-    public void onSectionExit(Context context, SectionMeta meta) {
-        if (!(context.getTree(context.getSection()) instanceof LoopTree tree))
-            throw new ScriptCompileError(context.lineNumber(), "Unable to balance loop flow tree.");
-        context.setState(CompileState.CODE_BODY);
-        final MethodBuilder method = context.getMethod();
-        final Label top = tree.getTop();
-        method.writeCode((writer, visitor) -> visitor.visitJumpInsn(Opcodes.GOTO, top));
-        method.writeCode(tree.getEnd().instruction());
-    }
-    
-    @Override
-    public void compileInline(Context context, Pattern.Match match) throws Throwable {
-        if (!(context.getTree(context.getSection()) instanceof LoopTree tree))
-            throw new ScriptCompileError(context.lineNumber(), "Illegal mid-statement flow break.");
-        this.compileTogether(context, tree, match);
-    }
-    
-    @Override
-    public void preCompileInline(Context context, Pattern.Match match) throws Throwable {
-        final ElementTree holder = context.getLine().nested()[0];
-        if (!(holder.current() instanceof VariableExpression))
-            throw new ScriptParseError(context.lineNumber(), "The extracted element must be a variable.");
-        holder.type = StandardHandlers.SET;
-        holder.compile = false;
-        final LoopTree tree = new LoopTree(context.getSection());
-        context.createTree(tree);
-    }
-    
     private void compileTogether(Context context, LoopTree tree, Pattern.Match match) throws Throwable {
         final MethodBuilder method = context.getMethod();
         assert method != null;
@@ -144,4 +115,33 @@ private PreVariable getHolderVariable(Context context, Pattern.Match match) {
         return context.getVariable(name);
     }
     
+    @Override
+    public void onSectionExit(Context context, SectionMeta meta) {
+        if (!(context.getTree(context.getSection()) instanceof LoopTree tree))
+            throw new ScriptCompileError(context.lineNumber(), "Unable to balance loop flow tree.");
+        context.setState(CompileState.CODE_BODY);
+        final MethodBuilder method = context.getMethod();
+        final Label top = tree.getTop();
+        method.writeCode((writer, visitor) -> visitor.visitJumpInsn(Opcodes.GOTO, top));
+        method.writeCode(tree.getEnd().instruction());
+    }
+    
+    @Override
+    public void compileInline(Context context, Pattern.Match match) throws Throwable {
+        if (!(context.getTree(context.getSection()) instanceof LoopTree tree))
+            throw new ScriptCompileError(context.lineNumber(), "Illegal mid-statement flow break.");
+        this.compileTogether(context, tree, match);
+    }
+    
+    @Override
+    public void preCompileInline(Context context, Pattern.Match match) throws Throwable {
+        final ElementTree holder = context.getLine().nested()[0];
+        if (!(holder.current() instanceof VariableExpression))
+            throw new ScriptParseError(context.lineNumber(), "The extracted element must be a variable.");
+        holder.type = StandardHandlers.SET;
+        holder.compile = false;
+        final LoopTree tree = new LoopTree(context.getSection());
+        context.createTree(tree);
+    }
+    
 }
diff --git a/src/main/java/org/byteskript/skript/runtime/internal/Member.java b/src/main/java/org/byteskript/skript/runtime/internal/Member.java
@@ -130,13 +130,13 @@ public Script getScript() {
     public Future<?> run(Skript skript, Object... arguments) {
         final ScriptRunner runner = new ScriptRunner() {
             @Override
-            public Class<? extends CompiledScript> owner() {
-                return script.mainClass();
+            public void start() {
+                invoker.invoke(arguments);
             }
             
             @Override
-            public void start() {
-                invoker.invoke(arguments);
+            public Class<? extends CompiledScript> owner() {
+                return script.mainClass();
             }
         };
         return skript.runScript(runner);

Original file line number	Diff line number	Diff line change
`@@ -33,18 +33,18 @@ public final Pattern getPattern() {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
`36`		`- public String[] getPatterns() {`
`37`		`- return pattern.getPatterns();`
	`36`	`+ public Library getProvider() {`
	`37`	`+ return provider;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
`41`		`- public Library getProvider() {`
`42`		`- return provider;`
	`41`	`+ public Method getHandler(HandlerType type) {`
	`42`	`+ return handlers.get(type);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public LanguageElement getType() {`
`47`		`- return type;`
	`46`	`+ public void setHandler(HandlerType type, Method method) {`
	`47`	`+ this.handlers.put(type, method);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`@@ -53,13 +53,13 @@ public boolean hasHandler(HandlerType type) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`56`		`- public Method getHandler(HandlerType type) {`
`57`		`- return handlers.get(type);`
	`56`	`+ public LanguageElement getType() {`
	`57`	`+ return type;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`		`- public void setHandler(HandlerType type, Method method) {`
`62`		`- this.handlers.put(type, method);`
	`61`	`+ public String[] getPatterns() {`
	`62`	`+ return pattern.getPatterns();`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,16 +38,12 @@ public SectionMeta owner() {`
`38`	`38`	`return owner;`
`39`	`39`	`}`
`40`	`40`
`41`		`- public MultiLabel getEnd() {`
`42`		`- return end;`
`43`		`- }`
`44`		`-`
`45`	`41`	`public Label getNext() {`
`46`	`42`	`return next;`
`47`	`43`	`}`
`48`	`44`
`49`		`- public void setNext(Label next) {`
`50`		`- this.next = next;`
	`45`	`+ public MultiLabel getEnd() {`
	`46`	`+ return end;`
`51`	`47`	`}`
`52`	`48`
`53`	`49`	`@Override`
`@@ -79,4 +75,8 @@ public boolean isOpen() {`
`79`	`75`	`return open;`
`80`	`76`	`}`
`81`	`77`
	`78`	`+ public void setNext(Label next) {`
	`79`	`+ this.next = next;`
	`80`	`+ }`
	`81`	`+`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,16 +32,12 @@ public SectionMeta owner() {`
`32`	`32`	`return owner;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public MultiLabel getEnd() {`
`36`		`- return end;`
`37`		`- }`
`38`		`-`
`39`	`35`	`public Label getNext() {`
`40`	`36`	`return next;`
`41`	`37`	`}`
`42`	`38`
`43`		`- public void setNext(Label next) {`
`44`		`- this.next = next;`
	`39`	`+ public MultiLabel getEnd() {`
	`40`	`+ return end;`
`45`	`41`	`}`
`46`	`42`
`47`	`43`	`@Override`
`@@ -73,4 +69,8 @@ public boolean isOpen() {`
`73`	`69`	`return open;`
`74`	`70`	`}`
`75`	`71`
	`72`	`+ public void setNext(Label next) {`
	`73`	`+ this.next = next;`
	`74`	`+ }`
	`75`	`+`
`76`	`76`	`}`