Add type tests.

Author: Moderocky

src/main/java/org/byteskript/skript/lang/syntax/type/property/LocalEntry.java

@@ -29,12 +29,18 @@ public LocalEntry() {
     public void compile(Context context, Pattern.Match match) {
         final String name = match.meta();
         final boolean value = Boolean.parseBoolean(name);
-        if (value) {
-            context.getField().removeModifiers(0x0001);
-            context.getField().addModifiers(0x0002);
-        } else {
-            context.getField().removeModifiers(0x0002);
-            context.getField().addModifiers(0x0001);
+        if (context.getField() != null) {
+            if (value) {
+                context.getField().removeModifiers(0x0001);
+            } else {
+                context.getField().addModifiers(0x0001);
+            }
+        } else if (context.getMethod() != null) {
+            if (value) {
+                context.getMethod().removeModifiers(0x0001);
+            } else {
+                context.getMethod().addModifiers(0x0001);
+            }
         }
         context.setState(CompileState.MEMBER_BODY);
     }
@@ -51,9 +57,7 @@ public Pattern.Match match(String thing, Context context) {
 
     @Override
     public boolean allowedIn(State state, Context context) {
-        return context.getState() == CompileState.MEMBER_BODY
-            && context.hasFlag(AreaFlag.IN_TYPE)
-            && context.hasFlag(AreaFlag.IN_PROPERTY);
+        return context.getState() == CompileState.MEMBER_BODY;
     }
 
 

src/main/java/org/byteskript/skript/lang/syntax/type/property/PropertyMember.java

@@ -26,7 +26,7 @@
     examples = """
         type Square:
             property sides:
-                type Integer
+                type: Integer
         """
 )
 public class PropertyMember extends Member {

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

@@ -44,15 +44,29 @@ public static CallSite createBridge(MethodHandles.Lookup caller, String name, Me
     }
 
     private static Method findTarget(MethodHandles.Lookup caller, String name, Class<?> owner, Class<?>... parameters) {
-        final Method[] methods = owner.getMethods();
-        for (final Method method : methods) {
-            if (!method.getName().equals(name)) continue;
-            if (Arrays.equals(method.getParameterTypes(), parameters)) return method;
+        {
+            final Method[] methods = owner.getMethods();
+            for (final Method method : methods) {
+                if (!method.getName().equals(name)) continue;
+                if (Arrays.equals(method.getParameterTypes(), parameters)) return method;
+            }
+            for (final Method method : methods) {
+                if (!Modifier.isStatic(method.getModifiers())) continue; // can only hit statics for now
+                if (!method.getName().equals(name)) continue;
+                if (parameters.length == method.getParameterCount()) return method;
+            }
         }
-        for (final Method method : methods) {
-            if (!Modifier.isStatic(method.getModifiers())) continue; // can only hit statics for now
-            if (!method.getName().equals(name)) continue;
-            if (parameters.length == method.getParameterCount()) return method;
+        {
+            final Method[] methods = owner.getDeclaredMethods();
+            for (final Method method : methods) {
+                if (!method.getName().equals(name)) continue;
+                if (Arrays.equals(method.getParameterTypes(), parameters)) return method;
+            }
+            for (final Method method : methods) {
+                if (!Modifier.isStatic(method.getModifiers())) continue; // can only hit statics for now
+                if (!method.getName().equals(name)) continue;
+                if (parameters.length == method.getParameterCount()) return method;
+            }
         }
         throw new ScriptRuntimeError("Unable to find function '" + name + Arrays.toString(parameters).replace('[', '(')
             .replace(']', ')') + "' from " + owner.getSimpleName());

src/test/resources/tests/every.bsk

@@ -0,0 +1,8 @@
+
+every 5 minutes: // parse test only
+    trigger:
+        assert true
+
+function test:
+    trigger:
+        return true

src/test/resources/tests/finalmember.bsk

@@ -0,0 +1,15 @@
+
+type Box:
+    property test:
+        final: true
+
+function test:
+    trigger:
+        set {var} to a new box
+        assert {var} exists
+        assert {var} is a box
+        try:
+            set test of {var} to "hello"
+        catch {error}:
+        assert {error} exists
+        return true

src/test/resources/tests/localmember.bsk

@@ -0,0 +1,10 @@
+
+function blob:
+    local: true
+    trigger:
+        return 4
+
+function test:
+    trigger:
+        assert blob() is 4
+        return true

src/test/resources/tests/propertymember.bsk

@@ -0,0 +1,15 @@
+
+type Square:
+    property sides:
+        type: Integer
+
+function test:
+    trigger:
+        set {var} to a new square
+        set sides of {var} to 1
+        assert sides of {var} is 1
+        try:
+            set sides of {var} to "hello"
+        catch {error}:
+        assert {error} exists
+        return true

src/test/resources/tests/sleep.bsk

@@ -0,0 +1,17 @@
+
+function test:
+    trigger:
+        set {thread} to the current process
+        set {@thing} to false
+        set {var} to a new runnable:
+            wait 1 milliseconds
+            set {@thing} to true
+            wake {thread}
+        assert {@thing} is false
+        run {var} in the background
+        delete {@thing}
+        assert {@thing} is null
+        sleep
+        assert {@thing} is true
+        delete {@thing}
+        return true

src/test/resources/tests/templatetype.bsk

@@ -0,0 +1,26 @@
+
+template type Foo:
+    function box:
+        trigger:
+            return 3
+
+type Bar:
+    template: Foo
+
+type Cee:
+    template: Foo
+    function box:
+        trigger:
+            return 2
+
+function test:
+    trigger:
+        set {bar} to a new bar
+        assert {bar} is a bar
+        assert {bar} is a foo
+        assert box() from {bar} is 3
+        set {cee} to a new cee
+        assert {cee} is a cee
+        assert {cee} is a foo
+        assert box() from {cee} is 2
+        return true

src/test/resources/tests/threadexpression.bsk

@@ -0,0 +1,17 @@
+
+function test:
+    trigger:
+        set {thread} to the current process
+        set {@thing} to false
+        set {var} to a new runnable:
+            wait 1 milliseconds
+            set {@thing} to true
+            wake {thread}
+        assert {@thing} is false
+        run {var} in the background
+        delete {@thing}
+        assert {@thing} is null
+        sleep
+        assert {@thing} is true
+        delete {@thing}
+        return true