Syntax creation and testing.

Author: Moderocky

pom.xml

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

src/main/java/org/byteskript/skript/app/SkriptApp.java

@@ -10,7 +10,9 @@
 import org.byteskript.skript.runtime.Skript;
 
 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;
@@ -53,7 +55,11 @@ protected static void registerLibraries(final Skript skript) {
                     ex.printStackTrace();
                 }
             } else if (file.getName().endsWith(".class")) {
-                // todo
+                try (final InputStream stream = new FileInputStream(file)) {
+                    skript.registerLibraryClass(stream.readAllBytes());
+                } catch (IOException exception) {
+                    throw new ScriptLibraryError("Error while loading library '" + file.getName() + "'", exception);
+                }
             }
         }
     }

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

@@ -30,7 +30,7 @@ public final class Script {
     private final Structure[] members;
 
     public Script(Skript skript, File sourceFile, Class<?>... classes) {
-        this(false, skript, sourceFile, classes);
+        this(true, skript, sourceFile, classes);
     }
 
     public Script(boolean init, Skript skript, File sourceFile, Class<?>... classes) {

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

@@ -11,6 +11,7 @@
 import mx.kenzie.mirror.Mirror;
 import org.byteskript.skript.api.Event;
 import org.byteskript.skript.api.Library;
+import org.byteskript.skript.api.ModifiableLibrary;
 import org.byteskript.skript.compiler.SkriptCompiler;
 import org.byteskript.skript.error.ScriptCompileError;
 import org.byteskript.skript.error.ScriptLoadError;
@@ -21,6 +22,7 @@
 import org.byteskript.skript.runtime.threading.*;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -170,6 +172,18 @@ public void stop() {
     //endregion
 
     //region Libraries
+    public void registerLibraryClass(byte[] bytes) throws IOException {
+        final String name = getClassName(new ByteArrayInputStream(bytes));
+        final Class<?> source = new ClassLoader(Skript.class.getClassLoader()) {
+            public Class<?> defineClass(String name, byte[] bytes) {
+                return defineClass(name, bytes, 0, bytes.length);
+            }
+        }.defineClass(name, bytes);
+        final ModifiableLibrary library = new ModifiableLibrary(name);
+        library.generateSyntaxFrom(source);
+        compiler.addLibrary(library);
+    }
+    
     public boolean registerLibrary(Library library) {
         return compiler.addLibrary(library);
     }
@@ -199,10 +213,9 @@ public Collection<File> compileScripts(final File root, final File outputDirecto
         if (!root.isDirectory()) throw new ScriptLoadError("Root must be a folder.");
         final List<File> files = getFiles(new ArrayList<>(), root.toPath());
         final List<File> outputs = new ArrayList<>();
-        final int length = root.getAbsolutePath().length();
         for (final File file : files) {
             try (final InputStream input = new FileInputStream(file)) {
-                final String name = createClassName(file.getName(), file.getAbsolutePath().substring(length));
+                final String name = getClassName(file, root);
                 outputs.addAll(compileComplexScript(input, name, outputDirectory));
             }
         }
@@ -253,6 +266,14 @@ public PostCompileClass[] compileComplexScript(final InputStream stream, final S
         return classes;
     }
 
+    /**
+     * This method may be unavailable in some distributions.
+     */
+    @Deprecated
+    public PostCompileClass compileScript(final String code, final String name) {
+        return compileScript(new ByteArrayInputStream(code.getBytes(StandardCharsets.UTF_8)), name);
+    }
+    
     public PostCompileClass compileScript(final InputStream stream, final String name) {
         final PostCompileClass[] classes = compiler.compile(stream, new Type(name));
         if (classes.length < 1) throw new ScriptCompileError(-1, "Script does not compile to a class.");

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

@@ -8,6 +8,8 @@
 
 import org.byteskript.skript.error.ScriptError;
 
+import java.util.Arrays;
+
 public class ScriptExceptionHandler implements Thread.UncaughtExceptionHandler, ScriptError {
 
     @Override

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

@@ -18,18 +18,37 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.ByteArrayInputStream;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 
 public class SyntaxCreationTest extends SkriptTest {
 
     private static final Skript skript = new Skript();
     private static Script script;
+    private static Script use;
 
     @BeforeClass
     public static void start() throws Throwable {
         final PostCompileClass cls = skript.compileScript(SyntaxCreationTest.class.getClassLoader()
             .getResourceAsStream("syntax.bsk"), "skript.syntax");
         script = skript.loadScript(cls);
+        skript.registerLibraryClass(cls.code());
+        use = skript.loadScript(skript.compileScript(new ByteArrayInputStream("""
+            function run_syntax:
+                trigger:
+                    assert true
+                    my cool "hello" and 5
+                    set {var} to a "bean?"
+                    assert {var} exists
+                    assert {var} is "hello"
+            """.getBytes(StandardCharsets.UTF_8)), "skript.syntax_test"));
+    }
+    
+    @Test
+    public void run_syntax() throws Throwable {
+        final Member function = use.getFunction("run_syntax");
+        function.run(skript).get();
     }
 
     @Test
@@ -71,7 +90,7 @@ public void test_expression() throws Throwable {
     public void test_set_property() throws Throwable {
         final Member function = script.getFunction("test_set_property");
         assert function != null;
-        final Method method = script.mainClass().getDeclaredMethod("test_set_property", Object.class);
+        final Method method = script.mainClass().getDeclaredMethod("test_set_property", Object.class, Object.class);
         assert !method.isAnnotationPresent(Expression.class);
         assert method.isAnnotationPresent(Property.class);
         final Property annotation = method.getAnnotation(Property.class);
@@ -84,7 +103,7 @@ public void test_set_property() throws Throwable {
     public void test_get_property() throws Throwable {
         final Member function = script.getFunction("test_get_property");
         assert function != null;
-        final Method method = script.mainClass().getDeclaredMethod("test_get_property");
+        final Method method = script.mainClass().getDeclaredMethod("test_get_property", Object.class);
         assert !method.isAnnotationPresent(Expression.class);
         assert method.isAnnotationPresent(Property.class);
         final Property annotation = method.getAnnotation(Property.class);
@@ -93,4 +112,34 @@ public void test_get_property() throws Throwable {
         assert annotation.type() == StandardHandlers.GET;
     }
 
+    @Test
+    public void composite() throws Throwable {
+        final String first = """
+            function test_eff (name):
+                syntax:
+                    effect: hello %String%
+                trigger:
+                    print "hello"
+                    print {name}
+            """;
+        final String test = """
+            function test_eff (name):
+                syntax:
+                    effect: hello %String%
+                trigger:
+                    assert true
+                    
+            on load:
+                trigger:
+                    assert true
+                    hello "hi"
+            
+            """;
+        final Skript skript = new Skript();
+        final PostCompileClass syntax = skript.compileScript(first, "skript.test_blob");
+        skript.registerLibraryClass(syntax.code());
+        final PostCompileClass output = skript.compileScript(test, "skript.test_blob");
+        final Script script = skript.loadScript(output);
+    }
+    
 }

src/test/resources/syntax.bsk

@@ -3,7 +3,8 @@ function test_effect(string, number):
     syntax:
         effect: my [cool] %String% and %Number%
     trigger:
-        print "hello"
+        assert {string} is "hello"
+        assert {number} is 5
 
 function test_expression(string):
     syntax:
@@ -12,14 +13,14 @@ function test_expression(string):
     trigger:
         return "hello"
 
-function test_set_property(string):
+function test_set_property(thing, string):
     syntax:
         property: prop
         mode: set
     trigger:
         print "hello"
 
-function test_get_property:
+function test_get_property(thing):
     syntax:
         property: prop
         mode: get