Improve debug and external hooks.

Author: Moderocky

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.byteskript</groupId>
     <artifactId>byteskript</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <name>ByteSkript</name>
 
     <properties>

src/main/java/org/byteskript/skript/api/SyntaxElement.java

@@ -13,6 +13,7 @@
 import org.byteskript.skript.api.note.ForceInline;
 import org.byteskript.skript.compiler.*;
 import org.byteskript.skript.compiler.structure.PreVariable;
+import org.byteskript.skript.error.ScriptReassemblyError;
 import org.byteskript.skript.lang.handler.StandardHandlers;
 
 import java.lang.reflect.Method;
@@ -156,4 +157,15 @@ default Method findMethod(Class<?> owner, String name, Class<?>... parameters) {
         }
     }
 
+    /**
+     * For script reassembly - taking the post-parse structure and generating a (new) text script from it.
+     *
+     * @param inputs the (probably-expression) inputs that go into this line
+     * @return the string that would parse as this syntax, containing the inputs
+     * @throws ScriptReassemblyError if you do not wish to support this / the inputs are wrong
+     */
+    default String assemble(int line, String... inputs) throws ScriptReassemblyError {
+        throw new ScriptReassemblyError(line, "Not supported yet.");
+    }
+    
 }

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

@@ -30,8 +30,8 @@ public class SimpleSkriptCompiler extends SkriptCompiler implements SkriptParser
     final List<Library> libraries = new ArrayList<>();
 
     public SimpleSkriptCompiler(Library... libraries) {
-        this.libraries.add(SkriptLangSpec.LIBRARY);
         this.libraries.addAll(List.of(libraries));
+        this.libraries.add(SkriptLangSpec.LIBRARY); // skript goes last so addons can override
     }
 
     @Override
@@ -147,7 +147,8 @@ List<String> removeComments(final String string) {
     @Override
     public boolean addLibrary(Library library) {
         if (libraries.contains(library)) return false;
-        return libraries.add(library);
+        libraries.add(0, library); // need to make sure it goes before skript
+        return true;
     }
 
     @Override

src/main/java/org/byteskript/skript/error/ScriptReassemblyError.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2021 ByteSkript org (Moderocky)
+ * View the full licence information and permissions:
+ * https://github.com/Moderocky/ByteSkript/blob/master/LICENSE
+ */
+
+package org.byteskript.skript.error;
+
+public class ScriptReassemblyError extends Error implements ScriptError {
+    
+    private final boolean fill = true;
+    private final int line;
+    
+    public int getLine() {
+        return line;
+    }
+    
+    public ScriptReassemblyError(int line) {
+        super();
+        this.line = line;
+    }
+    
+    public ScriptReassemblyError(int line, String message) {
+        super(message);
+        this.line = line;
+    }
+    
+    public ScriptReassemblyError(int line, String message, Throwable cause) {
+        super(message, cause);
+        this.line = line;
+    }
+    
+    public ScriptReassemblyError(int line, Throwable cause) {
+        super(cause);
+        this.line = line;
+    }
+    
+    protected ScriptReassemblyError(int line, String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+        this.line = line;
+    }
+    
+    @Override
+    public String toString() {
+        String s = getClass().getSimpleName();
+        String message = getLocalizedMessage();
+        return ((message != null) ? (s + ": " + message) : s) + " (Line " + line + ")";
+    }
+    
+    @Override
+    public synchronized Throwable fillInStackTrace() {
+        if (fill && System.getProperty("debug_mode") != null)
+            return super.fillInStackTrace();
+        return this;
+    }
+}

src/main/java/org/byteskript/skript/lang/syntax/event/AnyLoadEvent.java

@@ -14,7 +14,7 @@
 public class AnyLoadEvent extends EventHolder {
 
     public AnyLoadEvent() {
-        super(SkriptLangSpec.LIBRARY, "on any [script ]load");
+        super(SkriptLangSpec.LIBRARY, "on any [script] load");
     }
 
     @Override

src/main/java/org/byteskript/skript/runtime/Skript.java

@@ -404,6 +404,10 @@ public ScheduledExecutorService getScheduler() {
         return scheduler;
     }
 
+    public static ExecutorService getExecutor() {
+        return executor;
+    }
+    
     public Future<?> schedule(Runnable runnable, long millis) {
         return scheduler.schedule(runnable, millis, TimeUnit.MILLISECONDS);
     }

src/main/java/org/byteskript/skript/runtime/internal/InvokingScriptRunner.java

@@ -13,6 +13,6 @@ public record InvokingScriptRunner(Class<? extends CompiledScript> owner, Member
 
     @Override
     public void start() {
-        method.invoke(null, parameters);
+        method.invoke(parameters);
     }
 }

src/main/java/org/byteskript/skript/runtime/threading/ScriptExceptionHandler.java

@@ -7,15 +7,18 @@
 package org.byteskript.skript.runtime.threading;
 
 import org.byteskript.skript.error.ScriptError;
-
-import java.util.Arrays;
+import org.byteskript.skript.error.ScriptParseError;
 
 public class ScriptExceptionHandler implements Thread.UncaughtExceptionHandler, ScriptError {
 
     @Override
     public void uncaughtException(Thread source, Throwable throwable) {
         if (throwable instanceof ThreadDeath) return;
-        if (source instanceof ScriptThread thread) {
+        if (System.getProperty("debug_mode") != null)
+            throwable.printStackTrace();
+        if (throwable instanceof ScriptParseError error) {
+            error.printStackTrace(System.err);
+        } else if (source instanceof ScriptThread thread) {
             final Class<?> start = thread.initiator;
             System.err.println("An error occurred while running a script.");
             System.err.println("\t" + throwable.getMessage());

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

@@ -133,7 +133,7 @@ function test_eff (name):
                 trigger:
                     assert true
                     hello "hi"
-            
+                    
             """;
         final Skript skript = new Skript();
         final PostCompileClass syntax = skript.compileScript(first, "skript.test_blob");