Restructure the script and library loaders.

Moderocky · Moderocky · commit cb6545bc7d63 · 2021-12-31T14:24:30.000Z
diff --git a/pom.xml b/pom.xml
@@ -89,7 +89,7 @@
         <dependency>
             <groupId>mx.kenzie</groupId>
             <artifactId>mirror</artifactId>
-            <version>5.0.2</version>
+            <version>5.0.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/byteskript/skript/api/syntax/EventHolder.java b/src/main/java/org/byteskript/skript/api/syntax/EventHolder.java
@@ -51,7 +51,7 @@ public void compile(Context context, Pattern.Match match) {
         method
             .addAnnotation(EventData.class).setVisible(true)
             .addValue("name", name())
-            .addValue("event", org.objectweb.asm.Type.getObjectType(new Type(eventClass).internalName()))
+            .addValue("event", eventClass.getName())
             .addValue("async", AsyncEvent.class.isAssignableFrom(eventClass));
         context.addFlag(AreaFlag.IN_EVENT);
     }
diff --git a/src/main/java/org/byteskript/skript/app/SkriptApp.java b/src/main/java/org/byteskript/skript/app/SkriptApp.java
@@ -8,15 +8,13 @@
 
 import org.byteskript.skript.error.ScriptLibraryError;
 import org.byteskript.skript.runtime.Skript;
+import org.byteskript.skript.runtime.internal.LibraryClassLoader;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
 import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -64,11 +62,8 @@ protected static void registerLibraries(final Skript skript) {
         }
     }
     
-    protected static void callLibrary(final File file, final String main, final Skript skript) throws MalformedURLException, ClassNotFoundException {
-        final URLClassLoader child = new URLClassLoader(
-            new URL[]{file.toURI().toURL()},
-            SkriptApp.class.getClassLoader()
-        );
+    protected static void callLibrary(final File file, final String main, final Skript skript) throws IOException, ClassNotFoundException {
+        final LibraryClassLoader child = new LibraryClassLoader(file, SkriptApp.class.getClassLoader());
         final Class<?> target = Class.forName(main, true, child);
         try {
             target.getMethod("load", Skript.class)
diff --git a/src/main/java/org/byteskript/skript/compiler/BridgeCompiler.java b/src/main/java/org/byteskript/skript/compiler/BridgeCompiler.java
@@ -37,7 +37,7 @@ public BridgeCompiler(MethodHandles.Lookup lookup, String owner, MethodType sour
         this.owner = owner;
         this.source = source;
         this.target = target;
-        this.location = owner + "$" + "Bridge" + new Random().nextInt(100000, 999999);
+        this.location = owner + "$" + "Bridge" + new Random().nextInt(100000, 999999) + Math.abs(owner.hashCode());
     }
     
     public Class<?> createClass()
diff --git a/src/main/java/org/byteskript/skript/compiler/FileContext.java b/src/main/java/org/byteskript/skript/compiler/FileContext.java
@@ -24,11 +24,11 @@ public class FileContext extends Context {
     final Type type;
     protected final Map<String, Type> types = new HashMap<>();
     protected String indentUnit;
-    int indent;
-    int lineNumber;
-    int lambdaIndex;
-    int indexShift;
-    boolean sectionHeader;
+    public int indent;
+    public int lineNumber;
+    public int lambdaIndex;
+    public int indexShift;
+    public boolean sectionHeader;
     LanguageElement expected;
     SyntaxElement currentEffect;
     private HandlerType mode = StandardHandlers.GET;
@@ -37,8 +37,8 @@ public class FileContext extends Context {
     final List<ClassBuilder> suppressedClasses = new ArrayList<>();
     final List<Flag> flags = new ArrayList<>();
     
-    ElementTree line;
-    ElementTree current;
+    public ElementTree line;
+    public ElementTree current;
     protected final List<Function> functions = new ArrayList<>();
     protected List<PreVariable> variables = new ArrayList<>();
     protected final List<ProgrammaticSplitTree> trees = new ArrayList<>();
diff --git a/src/main/java/org/byteskript/skript/compiler/SimpleSkriptCompiler.java b/src/main/java/org/byteskript/skript/compiler/SimpleSkriptCompiler.java
@@ -18,6 +18,7 @@
 import org.byteskript.skript.compiler.structure.SectionMeta;
 import org.byteskript.skript.error.ScriptCompileError;
 import org.byteskript.skript.error.ScriptParseError;
+import org.byteskript.skript.runtime.Skript;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -117,7 +118,7 @@ public PostCompileClass[] compile(String file, Type path) {
         return context.compile();
     }
     
-    List<String> removeComments(final String string) {
+    protected List<String> removeComments(final String string) {
         final List<String> original = string.lines().toList(); // stream of sadness :(
         final List<String> lines = new ArrayList<>();
         final String regex = "\\s+$";
@@ -163,7 +164,6 @@ public Library[] getLibraries() {
     
     private final java.util.regex.Pattern unitMatch = java.util.regex.Pattern.compile("(?<=^)[\\t ]+(?=\\S)");
     
-    
     protected void compileLine(final String line, final FileContext context) {
         final ElementTree tree = parseLine(line, context);
         if (tree == null) return;
@@ -316,8 +316,7 @@ public ElementTree assembleExpression(String expression, final Type expected, fi
     
     @Override
     public Class<?> load(byte[] bytecode, String name) {
-        return new PostCompileClass(bytecode, name, name.replace(".", "/"))
-            .compileAndLoad();
+        return Skript.LOADER.loadClass(name, bytecode);
     }
     
     @Override
diff --git a/src/main/java/org/byteskript/skript/runtime/Script.java b/src/main/java/org/byteskript/skript/runtime/Script.java
@@ -6,6 +6,7 @@
 
 package org.byteskript.skript.runtime;
 
+import org.byteskript.skript.api.Event;
 import org.byteskript.skript.error.ScriptLoadError;
 import org.byteskript.skript.runtime.data.EventData;
 import org.byteskript.skript.runtime.data.Function;
@@ -59,7 +60,7 @@ public Script(boolean init, Skript skript, File sourceFile, Class<?>... classes)
                 final EventData event = method.getAnnotation(EventData.class);
                 final Member member = new Member(this, method, event.async());
                 this.events.add(member);
-                skript.registerEventHandler(event.event(), new InvokingScriptRunner(mainClass(), member));
+                skript.registerEventHandler((Class<? extends Event>) skript.getClass(event.event()), new InvokingScriptRunner(mainClass(), member));
             }
         }
         this.members = structures.toArray(new Structure[0]);
diff --git a/src/main/java/org/byteskript/skript/runtime/Skript.java b/src/main/java/org/byteskript/skript/runtime/Skript.java
@@ -8,6 +8,7 @@
 
 import mx.kenzie.foundation.Type;
 import mx.kenzie.foundation.language.PostCompileClass;
+import mx.kenzie.mirror.ClassProvider;
 import mx.kenzie.mirror.Mirror;
 import org.byteskript.skript.api.Event;
 import org.byteskript.skript.api.Library;
@@ -33,6 +34,7 @@ public final class Skript {
     
     public static final ThreadGroup THREAD_GROUP = new ThreadGroup("skript");
     public static final int JAVA_VERSION = 61;
+    public static final RuntimeClassLoader LOADER = new RuntimeClassLoader(Skript.class.getClassLoader());
     private static Skript skript;
     private static ExecutorService executor;
     static SkriptThreadProvider factory;
@@ -44,9 +46,43 @@ public final class Skript {
     final SkriptMirror mirror = new SkriptMirror(Skript.class);
     static final GlobalVariableMap VARIABLES = new GlobalVariableMap();
     
+    public static class RuntimeClassLoader extends ClassLoader implements ClassProvider {
+        protected RuntimeClassLoader(ClassLoader parent) {
+            super(parent);
+        }
+        
+        @Override
+        public Class<?> loadClass(String name) throws ClassNotFoundException {
+            return super.loadClass(name);
+        }
+        
+        @Override
+        public Class<?> findClass(String name) {
+            try {
+                return super.findClass(name);
+            } catch (ClassNotFoundException e) {
+                return Skript.currentInstance().getClass(name);
+            }
+        }
+        
+        public Class<?> loadClass(String name, byte[] bytecode) {
+            return super.defineClass(name, bytecode, 0, bytecode.length);
+        }
+        
+        @Override
+        public Class<?> loadClass(Class<?> aClass, String name, byte[] bytecode) {
+            try {
+                return Class.forName(name, false, this);
+            } catch (ClassNotFoundException ex) {
+                return super.defineClass(name, bytecode, 0, bytecode.length);
+            }
+        }
+    }
+    
     static class SkriptMirror extends Mirror<Object> {
         protected SkriptMirror(Object target) {
             super(target);
+            useProvider(LOADER);
         }
         
         @Override
@@ -172,6 +208,24 @@ public void stop() {
     //endregion
     
     //region Libraries
+    public Class<?> getClass(String name) {
+        final Class<?> found = getClass(name, Skript.class);
+        if (found != null) return found;
+        for (Library library : compiler.getLibraries()) {
+            final Class<?> test = getClass(name, library.getClass());
+            if (test != null) return test;
+        }
+        return null;
+    }
+    
+    private static Class<?> getClass(String name, Class<?> owner) {
+        try {
+            return Class.forName(name, false, owner.getClassLoader());
+        } catch (ClassNotFoundException ex) {
+            return null;
+        }
+    }
+    
     public void registerLibraryClass(byte[] bytes) throws IOException {
         final String name = getClassName(new ByteArrayInputStream(bytes));
         final Class<?> source = new ClassLoader(Skript.class.getClassLoader()) {
diff --git a/src/main/java/org/byteskript/skript/runtime/data/EventData.java b/src/main/java/org/byteskript/skript/runtime/data/EventData.java
@@ -6,8 +6,6 @@
 
 package org.byteskript.skript.runtime.data;
 
-import org.byteskript.skript.api.Event;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -19,7 +17,7 @@
     
     String name();
     
-    Class<? extends Event> event();
+    String event();
     
     boolean async();
     
diff --git a/src/main/java/org/byteskript/skript/runtime/internal/LibraryClassLoader.java b/src/main/java/org/byteskript/skript/runtime/internal/LibraryClassLoader.java
@@ -0,0 +1,25 @@
+/*
+ * 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.runtime.internal;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+public class LibraryClassLoader extends URLClassLoader {
+    
+    public LibraryClassLoader(File file, ClassLoader parent) throws IOException {
+        super(new URL[]{file.toURI().toURL()}, parent);
+    }
+    
+    @Override
+    protected Class<?> findClass(String name) throws ClassNotFoundException {
+        return super.findClass(name);
+    }
+    
+}
diff --git a/src/main/java/org/byteskript/skript/runtime/internal/Member.java b/src/main/java/org/byteskript/skript/runtime/internal/Member.java
@@ -30,7 +30,7 @@ public Member(Script script, Method method, boolean async) {
         this.script = script;
         this.async = async;
         this.parameters = method.getParameterCount();
-        final Mirror<?> mirror = Mirror.of(script.mainClass());
+        final Mirror<?> mirror = Mirror.of(script.mainClass()).useProvider(Skript.LOADER);
         this.invoker = mirror.method(method);
         this.verifier = mirror.method(method.getName() + "_verify", method.getParameterTypes());
     }
@@ -98,11 +98,11 @@ else if (thing instanceof Future future)
     public static MethodAccessor<Object> findFunction(Object owner, String name, Number arguments) {
         final Class<?>[] parameters = new Class[arguments.intValue()];
         Arrays.fill(parameters, Object.class);
-        return Mirror.of(owner).method(name, parameters);
+        return Mirror.of(owner).useProvider(Skript.LOADER).method(name, parameters);
     }
     
     public static MethodAccessor<Object> findFunction(Object owner, String name) {
-        return Mirror.of(owner).method(name);
+        return Mirror.of(owner).useProvider(Skript.LOADER).method(name);
     }
     
     public static MethodAccessor<Object> getFunction(Object source, String pattern) {
diff --git a/src/main/java/org/byteskript/skript/runtime/internal/Metafactory.java b/src/main/java/org/byteskript/skript/runtime/internal/Metafactory.java
@@ -10,6 +10,7 @@
 import mx.kenzie.mirror.Mirror;
 import org.byteskript.skript.compiler.BridgeCompiler;
 import org.byteskript.skript.error.ScriptRuntimeError;
+import org.byteskript.skript.runtime.Skript;
 
 import java.lang.invoke.*;
 import java.lang.reflect.Method;
@@ -29,7 +30,7 @@ public static CallSite createBridge(MethodHandles.Lookup caller, String name, Me
     }
     
     public static Object callFunction(String name, Object target, Object[] parameters) {
-        final MethodAccessor<Object> accessor = Mirror.of(target).method(name, parameters);
+        final MethodAccessor<Object> accessor = Mirror.of(target).useProvider(Skript.LOADER).method(name, parameters);
         if (accessor == null) throw new ScriptRuntimeError("Unable to find function '" + name + "' from " + target);
         return accessor.invoke(parameters);
     }
diff --git a/src/main/java/skript.java b/src/main/java/skript.java
@@ -2,6 +2,7 @@
 import mx.kenzie.mirror.MethodAccessor;
 import mx.kenzie.mirror.Mirror;
 import org.byteskript.skript.error.ScriptRuntimeError;
+import org.byteskript.skript.runtime.Skript;
 import org.byteskript.skript.runtime.threading.ScriptThread;
 import org.byteskript.skript.runtime.type.AtomicVariable;
 
@@ -185,25 +186,25 @@ public static MethodAccessor<Object> get_java_method(Object owner, Object name,
         else {
             arguments = new Class[]{(Class<?>) parameters};
         }
-        return Mirror.of((owner)).method(name + "", arguments);
+        return Mirror.of((owner)).useProvider(Skript.LOADER).method(name + "", arguments);
     }
     
     public static MethodAccessor<Object> get_java_method(Object owner, Object name) {
-        return Mirror.of((owner)).method(name + "");
+        return Mirror.of((owner)).useProvider(Skript.LOADER).method(name + "");
     }
     
     public static boolean has_java_field(Object owner, Object name) {
-        return Mirror.of((owner)).field((name) + "") != null;
+        return Mirror.of((owner)).useProvider(Skript.LOADER).field((name) + "") != null;
     }
     
     public static Object get_java_field(Object owner, Object name) {
-        final FieldAccessor<?> accessor = Mirror.of((owner)).field((name) + "");
+        final FieldAccessor<?> accessor = Mirror.of((owner)).useProvider(Skript.LOADER).field((name) + "");
         if (accessor == null) return null;
         return accessor.get();
     }
     
     public static Void set_java_field(Object owner, Object name, Object value) {
-        Mirror.of((owner)).field((name) + "").set((value));
+        Mirror.of((owner)).useProvider(Skript.LOADER).field((name) + "").set((value));
         return null;
     }
     //endregion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public void compile(Context context, Pattern.Match match) {`
`51`	`51`	`method`
`52`	`52`	`.addAnnotation(EventData.class).setVisible(true)`
`53`	`53`	`.addValue("name", name())`
`54`		`- .addValue("event", org.objectweb.asm.Type.getObjectType(new Type(eventClass).internalName()))`
	`54`	`+ .addValue("event", eventClass.getName())`
`55`	`55`	`.addValue("async", AsyncEvent.class.isAssignableFrom(eventClass));`
`56`	`56`	`context.addFlag(AreaFlag.IN_EVENT);`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public BridgeCompiler(MethodHandles.Lookup lookup, String owner, MethodType sour`
`37`	`37`	`this.owner = owner;`
`38`	`38`	`this.source = source;`
`39`	`39`	`this.target = target;`
`40`		`- this.location = owner + "$" + "Bridge" + new Random().nextInt(100000, 999999);`
	`40`	`+ this.location = owner + "$" + "Bridge" + new Random().nextInt(100000, 999999) + Math.abs(owner.hashCode());`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public Class<?> createClass()`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`package org.byteskript.skript.runtime;`
`8`	`8`
	`9`	`+import org.byteskript.skript.api.Event;`
`9`	`10`	`import org.byteskript.skript.error.ScriptLoadError;`
`10`	`11`	`import org.byteskript.skript.runtime.data.EventData;`
`11`	`12`	`import org.byteskript.skript.runtime.data.Function;`
`@@ -59,7 +60,7 @@ public Script(boolean init, Skript skript, File sourceFile, Class<?>... classes)`
`59`	`60`	`final EventData event = method.getAnnotation(EventData.class);`
`60`	`61`	`final Member member = new Member(this, method, event.async());`
`61`	`62`	`this.events.add(member);`
`62`		`- skript.registerEventHandler(event.event(), new InvokingScriptRunner(mainClass(), member));`
	`63`	`+ skript.registerEventHandler((Class<? extends Event>) skript.getClass(event.event()), new InvokingScriptRunner(mainClass(), member));`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`	`this.members = structures.toArray(new Structure[0]);`