Working on clean-up.

Author: Moderocky

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.byteskript</groupId>
     <artifactId>byteskript</artifactId>
-    <version>1.0.16</version>
+    <version>1.0.17</version>
     <name>ByteSkript</name>
     <description>A compiled JVM implementation of the Skript language.</description>
 
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>mx.kenzie</groupId>
             <artifactId>jupiter</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

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

@@ -38,7 +38,7 @@ private void prepareVariables(Method method) {
             final SyntaxElement element = inputs[i].current();
             if (element.getClass() != VariableExpression.class) continue;
             final VariableExpression expression = (VariableExpression) inputs[i].current();
-            special.put(i, expression.getVariable(context, inputs[i].match()));
+            this.special.put(i, expression.getVariable(context, inputs[i].match()));
         }
         final MethodBuilder builder = context.getMethod();
         for (int i = method.getParameterTypes().length - 1; i >= 0; i--) {
@@ -47,7 +47,7 @@ private void prepareVariables(Method method) {
                 continue;
             }
             final PreVariable var = new PreVariable("$unspec_" + i);
-            context.forceUnspecVariable(var);
+            this.context.forceUnspecVariable(var);
             final int slot = context.slotOf(var);
             builder.writeCode(WriteInstruction.storeObject(slot));
         }
@@ -88,15 +88,6 @@ public int adjustVariable(int i) {
     @Override
     public WriteInstruction return0(int opcode) {
         return this.jumpToEnd();
-//        if (opcode < 177) {
-//            int slot = this.returnSlot();
-//            return (writer, visitor) -> {
-//                visitor.visitVarInsn(opcode - 118, slot);
-//                this.jumpToEnd().accept(writer, visitor);
-//            };
-//        } else {
-//            return this.jumpToEnd();
-//        }
     }
 
     @Override

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

@@ -8,17 +8,6 @@
 
 import org.byteskript.skript.api.LanguageElement;
 
-public class Unit {
-    
-    final LanguageElement type;
-    
-    public Unit(LanguageElement type) {
-        this.type = type;
-    }
-    
-    public LanguageElement getType() {
-        return type;
-    }
-    
-    
+public record Unit(LanguageElement type) {
+
 }

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

@@ -13,12 +13,11 @@
 public class MainTest extends SkriptTest {
 
     private static final Skript skript = new Skript();
-    private static Script script;
 
-    public static void main(String[] args) throws Throwable {
+    public static void main(String[] args) {
         final PostCompileClass cls = skript.compileScript(FlowTest.class.getClassLoader()
             .getResourceAsStream("main.bsk"), "skript.main");
-        script = skript.loadScript(cls);
+        Script script = skript.loadScript(cls);
         new ExampleController(skript).run();
         System.out.println("Finished.");
     }