Add function tests.

Author: Moderocky

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

@@ -182,7 +182,7 @@ public void destroySection() {
 
     public Function getDefaultFunction(String name, int arguments) {
         final Function function = this.getFunction(name, arguments);
-        if (function != null) return function;
+        if (function != null) return function.copy(arguments); // we pass objects even if types are specified
         final Type[] types = new Type[arguments];
         Arrays.fill(types, CommonTypes.OBJECT); // assert all types are actually object :)
         return new Function(name, this.getType(), CommonTypes.OBJECT, types);

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

@@ -463,6 +463,11 @@ public int indent() {
 
     @Override
     public Type getType(String name) {
-        return types.get(name);
+        final Type type = types.get(name);
+        if (type != null) return type;
+        for (final String key : types.keySet()) {
+            if (name.equalsIgnoreCase(key)) return types.get(key);
+        }
+        return null;
     }
 }

src/main/java/org/byteskript/skript/lang/syntax/flow/execute/RunEffect.java

@@ -17,7 +17,6 @@
 import org.byteskript.skript.lang.element.StandardElements;
 import org.byteskript.skript.lang.handler.StandardHandlers;
 import org.byteskript.skript.lang.syntax.flow.lambda.RunnableSection;
-import org.byteskript.skript.lang.syntax.variable.VariableExpression;
 import org.byteskript.skript.runtime.internal.Member;
 
 import java.lang.reflect.Method;
@@ -69,14 +68,14 @@ public void compile(Context context, Pattern.Match match) throws Throwable {
         final ElementTree tree = context.getCompileCurrent().nested()[0];
         final MethodBuilder method = context.getMethod();
         assert method != null;
-        if (tree.current() instanceof VariableExpression) {
-            final Method target = RunEffect.class.getMethod("run", Object.class);
-            this.writeCall(method, target, context);
-        } else if (tree.current() instanceof RunnableSection) {
+        if (tree.current() instanceof RunnableSection) {
             final Method target = Runnable.class.getMethod("run");
             method.writeCode(WriteInstruction.invokeInterface(target));
             context.setState(CompileState.CODE_BODY);
             return;
+        } else {
+            final Method target = RunEffect.class.getMethod("run", Object.class);
+            this.writeCall(method, target, context);
         }
         method.writeCode(WriteInstruction.pop());
         context.setState(CompileState.CODE_BODY);

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

@@ -118,11 +118,7 @@ public static MethodAccessor<Object> getFunction(Object source, String pattern)
         }
         if (clean.contains(" from ")) {
             final String result = clean.substring(clean.indexOf(" from ") + 6).trim();
-            try {
-                owner = Class.forName(result.replace('/', '.'));
-            } catch (ClassNotFoundException ex) {
-                throw new ScriptRuntimeError("Unable to find script '" + result + "'", ex);
-            }
+            owner = Skript.findAnyClass(result.replace('/', '.'));
         } else owner = source;
         return findFunction(owner, name, arguments);
     }

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

@@ -55,17 +55,25 @@ public void all() throws Throwable {
                 final PostCompileClass[] classes;
                 synchronized (this) {
                     try {
+                        final long now, then;
+                        now = System.currentTimeMillis();
                         classes = skript.compileComplexScript(stream, "skript." + name);
+                        then = System.currentTimeMillis();
+                        System.out.println("Parsed " + name + " in " + (then - now) + " milliseconds.");
                     } catch (Throwable ex) {
                         System.err.println("Error in '" + name + "':");
                         ex.printStackTrace(System.err);
                         failure++;
                         continue;
                     }
                     try {
+                        final long now, then;
                         final Script script = skript.loadScripts(classes).iterator().next();
+                        now = System.currentTimeMillis();
                         final boolean result = (boolean) script.getFunction("test").run(skript).get();
+                        then = System.currentTimeMillis();
                         assert result : "Test failed.";
+                        System.out.println("Run " + name + " in " + (then - now) + " milliseconds.");
                     } catch (Throwable ex) {
                         System.err.println("Error in '" + name + "':");
                         ex.printStackTrace(System.err);

src/test/resources/tests/dynamicfunction.bsk

@@ -0,0 +1,25 @@
+
+function box(a, b):
+    trigger:
+        set {!var} to {a} + {b}
+
+function box:
+    trigger:
+        set {!var} to 10
+
+function test:
+    trigger:
+        set {!var} to 1
+        assert {!var} is 1
+        run function "box()"
+        assert {!var} is 10
+        set {!var} to 1
+        assert {!var} is 1
+        run function "box() from skript/dynamicfunction"
+        assert {!var} is 10
+        run function "box(a, b) from skript/dynamicfunction" with (2, 3)
+        assert {!var} is 5
+        run function "box(a, b)" with (3, 3)
+        assert {!var} is 6
+        delete {!var}
+        return true

src/test/resources/tests/externalfunction.bsk

@@ -0,0 +1,19 @@
+
+function box(a, b):
+    trigger:
+        set {!var} to {a} + {b}
+
+function box:
+    trigger:
+        set {!var} to 10
+
+function test:
+    trigger:
+        set {!var} to 1
+        assert {!var} is 1
+        run box() from skript/externalfunction
+        assert {!var} is 10
+        run box(2, 3) from skript/externalfunction
+        assert {!var} is 5
+        delete {!var}
+        return true

src/test/resources/tests/functionexpression.bsk

@@ -0,0 +1,19 @@
+
+function box(@a, b):
+    trigger:
+        set {@a} to {b}
+        return 3
+
+function box:
+    trigger:
+        return 10
+
+function test:
+    trigger:
+        assert box() is 10
+        run box()
+        assert box(3, 4) is 3
+        set {@var} to 5
+        assert box({@var}, 2) is 3
+        assert {@var} is 2
+        return true

src/test/resources/tests/functionmember.bsk

@@ -0,0 +1,21 @@
+
+function box(@a, b):
+    return: integer
+    trigger:
+        set {@a} to {b}
+        return 3
+
+function box:
+    return: integer
+    trigger:
+        return 10
+
+function test:
+    trigger:
+        assert box() is 10
+        run box()
+        assert box(3, 4) is 3
+        set {@var} to 5
+        assert box({@var}, 2) is 3
+        assert {@var} is 2
+        return true

src/test/resources/tests/propertyfunction.bsk

@@ -0,0 +1,16 @@
+
+type Blob:
+    function test:
+        return: string
+        trigger:
+            return "hello"
+
+function test:
+    trigger:
+        set {var} to a new blob
+        assert {var} exists
+        assert {var} is a blob
+        assert test() from {var} is "hello"
+        set {x} to test() from {var}
+        assert {x} is "hello"
+        return true