Tidy up code.

Moderocky · Aug 22, 2022 · 65b14fe · 65b14fe
1 parent 768d0e7
commit 65b14fe
Show file tree

Hide file tree

Showing 57 changed files with 199 additions and 219 deletions.
diff --git a/pom.xml b/pom.xml
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
-            <version>9.2</version>
+            <version>9.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/org/byteskript/skript/api/SyntaxElement.java b/src/main/java/org/byteskript/skript/api/SyntaxElement.java
@@ -112,7 +112,7 @@ default boolean isDelay() {
     default boolean requiresMainThread() {
         return false;
     }*/
-
+    
     @Ignore
     default void addSkipInstruction(Context context, Consumer<Context> consumer) {
         context.addSkipInstruction(consumer);

diff --git a/src/main/java/org/byteskript/skript/api/automatic/GeneratedEntryNode.java b/src/main/java/org/byteskript/skript/api/automatic/GeneratedEntryNode.java
@@ -25,12 +25,12 @@ public GeneratedEntryNode(Library provider, final RecordComponent target, String
         super(provider, StandardElements.NODE, patterns);
         this.target = target;
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public void preCompile(Context context, Pattern.Match match) throws Throwable {
         final ElementTree tree = context.getCompileCurrent().nested()[0];

diff --git a/src/main/java/org/byteskript/skript/api/automatic/GeneratedEntrySection.java b/src/main/java/org/byteskript/skript/api/automatic/GeneratedEntrySection.java
@@ -30,12 +30,12 @@ public GeneratedEntrySection(Library provider, final Class<Record> target, Strin
         super(provider, StandardElements.SECTION, patterns);
         this.target = target;
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public void compile(Context context, Pattern.Match match) throws Throwable {
         context.setState(CompileState.AREA_BODY);

diff --git a/src/main/java/org/byteskript/skript/api/syntax/Effect.java b/src/main/java/org/byteskript/skript/api/syntax/Effect.java
@@ -26,12 +26,7 @@ public abstract class Effect extends Element implements SyntaxElement {
     public Effect(final Library provider, final LanguageElement type, final String... patterns) {
         super(provider, type, patterns);
     }
-
-    @Override
-    public Type getReturnType() {
-        return CommonTypes.VOID;
-    }
-
+
     @Override
     public CompileState getSubState() {
         return CompileState.STATEMENT; // looking for expressions here
@@ -42,6 +37,11 @@ public boolean allowAsInputFor(Type type) {
         return true; // support meta-effects
     }
 
+    @Override
+    public Type getReturnType() {
+        return CommonTypes.VOID;
+    }
+
     @Override
     public void preCompile(Context context, Pattern.Match match) throws Throwable {
         final Method target = handlers.get(StandardHandlers.RUN);

diff --git a/src/main/java/org/byteskript/skript/api/syntax/Member.java b/src/main/java/org/byteskript/skript/api/syntax/Member.java
@@ -31,15 +31,15 @@ public void onSectionExit(Context context, SectionMeta meta) {
         context.setField(null);
         context.setState(CompileState.ROOT);
     }
-
-    @Override
-    public Type getReturnType() {
-        return CommonTypes.VOID;
-    }
-
+
     @Override
     public boolean allowAsInputFor(Type type) {
         return false;
     }
 
+    @Override
+    public Type getReturnType() {
+        return CommonTypes.VOID;
+    }
+
 }
diff --git a/src/main/java/org/byteskript/skript/api/syntax/SectionEntry.java b/src/main/java/org/byteskript/skript/api/syntax/SectionEntry.java
@@ -23,12 +23,12 @@ public SectionEntry(Library provider, LanguageElement type, String... patterns)
     public CompileState getSubState() {
         return CompileState.MEMBER_BODY;
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public boolean allowedIn(State state, Context context) {
         return state == CompileState.MEMBER_BODY;

diff --git a/src/main/java/org/byteskript/skript/api/syntax/SimpleEntry.java b/src/main/java/org/byteskript/skript/api/syntax/SimpleEntry.java
@@ -29,17 +29,17 @@ public Pattern.Match match(String thing, Context context) {
     public CompileState getSubState() {
         return CompileState.MEMBER_BODY;
     }
-
-    @Override
-    public Type getReturnType() {
-        return CommonTypes.VOID;
-    }
-
+
     @Override
     public boolean allowAsInputFor(Type type) {
         return false;
     }
 
+    @Override
+    public Type getReturnType() {
+        return CommonTypes.VOID;
+    }
+
     @Override
     public boolean allowedIn(State state, Context context) {
         return state == CompileState.MEMBER_BODY;

diff --git a/src/main/java/org/byteskript/skript/compiler/FileContext.java b/src/main/java/org/byteskript/skript/compiler/FileContext.java
@@ -359,7 +359,6 @@ public MethodErasure useHandle(String property, HandlerType type) {
         final List<PropertyAccessGenerator> list = this.usedProperties.get(type);
         boolean unused = true;
         for (Library library : this.libraries) {
-            sub:
             for (PropertyHandler handler : library.getProperties()) {
                 if (!handler.name().equals(property)) continue;
                 if (!handler.type().equals(type)) continue;
@@ -389,7 +388,7 @@ public MethodErasure useHandle(String property, HandlerType type) {
             list.add(generator);
         }
         final Type ret = type.expectReturn() ? CommonTypes.OBJECT : new Type(void.class);
-        final Type[] params = type.expectInputs() ? new Type[]{CommonTypes.OBJECT, CommonTypes.OBJECT} : new Type[]{CommonTypes.OBJECT};
+        final Type[] params = type.expectInputs() ? new Type[] {CommonTypes.OBJECT, CommonTypes.OBJECT} : new Type[] {CommonTypes.OBJECT};
         return new MethodErasure(ret, "property_" + type.name() + "$" + property, params);
     }
 

diff --git a/src/main/java/org/byteskript/skript/compiler/SimpleSkriptCompiler.java b/src/main/java/org/byteskript/skript/compiler/SimpleSkriptCompiler.java
@@ -228,7 +228,6 @@ public ElementTree assembleStatement(final String statement, final FileContext c
             context.setState(handler.getSubState()); // move state change to syntax
             context.currentEffect = handler;
             details.lineMatched = handler;
-            inner:
             for (int i = 0; i < types.length; i++) {
                 final String input = inputs[i];
                 final Type type = types[i];
@@ -268,7 +267,6 @@ public ElementTree assembleExpression(String expression, final Type expected, fi
                 if (inputs.length < types.length) continue;
                 context.setState(handler.getSubState()); // anticipate inner-effect state change
                 details.expressionMatched = handler;
-                inner:
                 for (int i = 0; i < types.length; i++) {
                     final String input = inputs[i];
                     final Type type = types[i];

diff --git a/src/main/java/org/byteskript/skript/compiler/structure/PropertyAccessGenerator.java b/src/main/java/org/byteskript/skript/compiler/structure/PropertyAccessGenerator.java
@@ -86,7 +86,6 @@ public void compile(Context context) {
             else method.writeCode(WriteInstruction.returnEmpty()); // return empty
             method.writeCode((writer, visitor) -> visitor.visitLabel(jump)); // end
         }
-        field_property:
         {
             if (this.type == StandardHandlers.GET) method.writeCode((writer, visitor) -> {
                 visitor.visitVarInsn(25, 0); // load holder

diff --git a/src/main/java/org/byteskript/skript/lang/syntax/config/ExprKeyInConfig.java b/src/main/java/org/byteskript/skript/lang/syntax/config/ExprKeyInConfig.java
@@ -71,11 +71,11 @@ public Type getHolderType() {
     public boolean allowAsInputFor(Type type) {
         return super.allowAsInputFor(type) || CommonTypes.REFERENT.equals(type);
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.OBJECT;
     }
-
-
+    
+    
 }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/entry/EntryExtends.java b/src/main/java/org/byteskript/skript/lang/syntax/entry/EntryExtends.java
@@ -59,12 +59,12 @@ public Pattern.Match match(String thing, Context context) {
     public boolean allowAsInputFor(Type type) {
         return false;
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public boolean allowedIn(State state, Context context) {
         return context.getState() == CompileState.ROOT && context.hasFlag(AreaFlag.IN_TYPE);

diff --git a/src/main/java/org/byteskript/skript/lang/syntax/entry/EntryReturn.java b/src/main/java/org/byteskript/skript/lang/syntax/entry/EntryReturn.java
@@ -60,12 +60,12 @@ public Pattern.Match match(String thing, Context context) {
     public boolean allowAsInputFor(Type type) {
         return false;
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public boolean allowedIn(State state, Context context) {
         return super.allowedIn(state, context) && context.hasFlag(AreaFlag.IN_FUNCTION);

diff --git a/src/main/java/org/byteskript/skript/lang/syntax/entry/EntryVerifySection.java b/src/main/java/org/byteskript/skript/lang/syntax/entry/EntryVerifySection.java
@@ -41,6 +41,33 @@ public EntryVerifySection() {
         super(SkriptLangSpec.LIBRARY, StandardElements.SECTION, "verify");
     }
 
+    @Override
+    public void onSectionExit(Context context, SectionMeta meta) {
+        final MethodBuilder method = context.getMethod();
+        assert method != null;
+        context.closeAllTrees();
+        if (method.getErasure().returnType().equals(new Type(void.class))) {
+            method.writeCode(WriteInstruction.returnEmpty());
+        } else {
+            method.writeCode(WriteInstruction.pushNull());
+            method.writeCode(WriteInstruction.returnObject());
+        }
+        context.emptyVariables();
+        context.removeFlag(AreaFlag.IN_TRIGGER);
+        context.removeFlag(AreaFlag.IN_VERIFIER);
+        context.setState(CompileState.MEMBER_BODY);
+    }
+
+    @Override
+    public boolean allowAsInputFor(Type type) {
+        return false;
+    }
+
+    @Override
+    public Type getReturnType() {
+        return CommonTypes.VOID;
+    }
+
     @Override
     public void compile(Context context, Pattern.Match match) {
         final MethodBuilder target = context.getMethod();
@@ -76,31 +103,4 @@ private WriteInstruction prepareVariables(VerifyTree context) {
         };
     }
 
-    @Override
-    public void onSectionExit(Context context, SectionMeta meta) {
-        final MethodBuilder method = context.getMethod();
-        assert method != null;
-        context.closeAllTrees();
-        if (method.getErasure().returnType().equals(new Type(void.class))) {
-            method.writeCode(WriteInstruction.returnEmpty());
-        } else {
-            method.writeCode(WriteInstruction.pushNull());
-            method.writeCode(WriteInstruction.returnObject());
-        }
-        context.emptyVariables();
-        context.removeFlag(AreaFlag.IN_TRIGGER);
-        context.removeFlag(AreaFlag.IN_VERIFIER);
-        context.setState(CompileState.MEMBER_BODY);
-    }
-
-    @Override
-    public boolean allowAsInputFor(Type type) {
-        return false;
-    }
-
-    @Override
-    public Type getReturnType() {
-        return CommonTypes.VOID;
-    }
-
 }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/entry/syntax/EntrySyntax.java b/src/main/java/org/byteskript/skript/lang/syntax/entry/syntax/EntrySyntax.java
@@ -75,7 +75,7 @@ public void onSectionExit(Context context, SectionMeta meta) {
             final AnnotationBuilder<?> builder = context.getMethod().addAnnotation(handler.type().annotation)
                 .setVisible(true);
             if (handler.type() != SyntaxTree.Type.PROPERTY) {
-                builder.addValue("value", new String[]{handler.pattern()});
+                builder.addValue("value", new String[] {handler.pattern()});
             } else {
                 builder.addValue("value", handler.pattern());
                 builder.addValue("type", mode == null ? StandardHandlers.GET : mode);

diff --git a/src/main/java/org/byteskript/skript/lang/syntax/flow/conditional/ElseIfSection.java b/src/main/java/org/byteskript/skript/lang/syntax/flow/conditional/ElseIfSection.java
@@ -46,12 +46,12 @@ public Pattern.Match match(String thing, Context context) {
         if (!thing.startsWith("else if ")) return null;
         return super.match(thing, context);
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public void compile(Context context, Pattern.Match match) throws Throwable {
         if (!(context.getTree(context.getSection(1)) instanceof IfElseTree tree))

diff --git a/src/main/java/org/byteskript/skript/lang/syntax/flow/conditional/ElseSection.java b/src/main/java/org/byteskript/skript/lang/syntax/flow/conditional/ElseSection.java
@@ -45,12 +45,12 @@ public Pattern.Match match(String thing, Context context) {
         if (!thing.equals("else")) return null;
         return super.match(thing, context);
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public void compile(Context context, Pattern.Match match) {
         if (!(context.getTree(context.getSection(1)) instanceof IfElseTree tree))

diff --git a/src/main/java/org/byteskript/skript/lang/syntax/flow/conditional/IfSection.java b/src/main/java/org/byteskript/skript/lang/syntax/flow/conditional/IfSection.java
@@ -46,12 +46,12 @@ public Pattern.Match match(String thing, Context context) {
         if (!thing.startsWith("if ")) return null;
         return super.match(thing, context);
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public void compile(Context context, Pattern.Match match) throws Throwable {
         final IfElseTree tree = new IfElseTree(context.getSection(1), new MultiLabel());

diff --git a/src/main/java/org/byteskript/skript/lang/syntax/flow/error/CatchSection.java b/src/main/java/org/byteskript/skript/lang/syntax/flow/error/CatchSection.java
@@ -42,12 +42,12 @@ public Pattern.Match match(String thing, Context context) {
         if (!thing.startsWith("catch ")) return null;
         return super.match(thing, context);
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public void preCompile(Context context, Pattern.Match match) throws Throwable {
         final ElementTree holder = context.getCompileCurrent().nested()[0];
@@ -72,7 +72,6 @@ public boolean allowedIn(State state, Context context) {
     public void compileTogether(Context context, Pattern.Match match, TryCatchTree tree) throws Throwable {
         final ElementTree holder = context.getCompileCurrent().nested()[0];
         tree.branch(context);
-        store:
         {
             holder.type = StandardHandlers.SET;
             holder.compile = true;

diff --git a/src/main/java/org/byteskript/skript/lang/syntax/flow/error/TrySection.java b/src/main/java/org/byteskript/skript/lang/syntax/flow/error/TrySection.java
@@ -41,12 +41,12 @@ public Pattern.Match match(String thing, Context context) {
         if (!thing.startsWith("try")) return null;
         return super.match(thing, context);
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public void compile(Context context, Pattern.Match match) throws Throwable {
         final TryCatchTree tree = new TryCatchTree(context.getSection(1), new MultiLabel());

diff --git a/src/main/java/org/byteskript/skript/lang/syntax/flow/execute/EffectMonitorSection.java b/src/main/java/org/byteskript/skript/lang/syntax/flow/execute/EffectMonitorSection.java
@@ -40,12 +40,12 @@ public Pattern.Match match(String thing, Context context) {
         if (!thing.startsWith("monitor ")) return null;
         return super.match(thing, context);
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public void compile(Context context, Pattern.Match match) throws Throwable {
         final MonitorTree tree = new MonitorTree(context.getSection(1));