Add generic tests and improve brackets.

Moderocky · Moderocky · commit 0d795ecf23aa · 2022-03-20T12:05:05.000Z
diff --git a/src/main/java/org/byteskript/skript/compiler/Pattern.java b/src/main/java/org/byteskript/skript/compiler/Pattern.java
@@ -61,7 +61,7 @@ protected void handle(final String string) {
                         current = builder;
                     } else {
                         input = true;
-                        builder.append("(.+)");
+                        builder.append("(\\(.+\\)|.+?)");
                         current = new StringBuilder();
                     }
                 }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/generic/BinaryOtherwiseExpression.java b/src/main/java/org/byteskript/skript/lang/syntax/generic/BinaryOtherwiseExpression.java
@@ -10,10 +10,7 @@
 import mx.kenzie.foundation.Type;
 import org.byteskript.skript.api.note.Documentation;
 import org.byteskript.skript.api.syntax.SimpleExpression;
-import org.byteskript.skript.compiler.CommonTypes;
-import org.byteskript.skript.compiler.Context;
-import org.byteskript.skript.compiler.Pattern;
-import org.byteskript.skript.compiler.SkriptLangSpec;
+import org.byteskript.skript.compiler.*;
 import org.byteskript.skript.lang.element.StandardElements;
 import org.objectweb.asm.Label;
 
@@ -39,20 +36,27 @@ public Type getReturnType() {
         return CommonTypes.OBJECT;
     }
     
+    @Override
+    public void preCompile(Context context, Pattern.Match match) throws Throwable {
+        super.preCompile(context, match);
+        context.getCompileCurrent().nested()[1].compile = false;
+    }
+    
     @Override
     public void compile(Context context, Pattern.Match match) throws Throwable {
         final MethodBuilder method = context.getMethod();
-        final Label first = new Label(), second = new Label();
+        final ElementTree tree = context.getCompileCurrent().nested()[1];
+        final Label end = new Label();
         method.writeCode((writer, visitor) -> {
-            visitor.visitInsn(95); // swap
             visitor.visitInsn(89); // dup
-            visitor.visitJumpInsn(199, first); // notnull
-            visitor.visitInsn(87); // pop
-            visitor.visitJumpInsn(167, second); // goto
-            visitor.visitLabel(first);
-            visitor.visitInsn(95); // swap
-            visitor.visitInsn(87); // pop
-            visitor.visitLabel(second); // x or y
+            visitor.visitJumpInsn(199, end); // notnull
+            visitor.visitInsn(87); // pop other null
+        });
+        tree.compile = true;
+        tree.preCompile(context);
+        tree.compile(context);
+        method.writeCode((writer, visitor) -> {
+            visitor.visitLabel(end); // x or y
         });
     }
     
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/generic/BracketExpression.java b/src/main/java/org/byteskript/skript/lang/syntax/generic/BracketExpression.java
@@ -31,7 +31,7 @@
 )
 public class BracketExpression extends InnerModifyExpression {
     
-    private static final java.util.regex.Pattern PATTERN = java.util.regex.Pattern.compile("\\((.+)\\)");
+    private static final java.util.regex.Pattern PATTERN = java.util.regex.Pattern.compile("^\\((.+)\\)$");
     
     public BracketExpression() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "(brackets)");
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/generic/TernaryOtherwiseExpression.java b/src/main/java/org/byteskript/skript/lang/syntax/generic/TernaryOtherwiseExpression.java
@@ -10,10 +10,7 @@
 import mx.kenzie.foundation.Type;
 import org.byteskript.skript.api.note.Documentation;
 import org.byteskript.skript.api.syntax.SimpleExpression;
-import org.byteskript.skript.compiler.CommonTypes;
-import org.byteskript.skript.compiler.Context;
-import org.byteskript.skript.compiler.Pattern;
-import org.byteskript.skript.compiler.SkriptLangSpec;
+import org.byteskript.skript.compiler.*;
 import org.byteskript.skript.lang.element.StandardElements;
 import org.objectweb.asm.Label;
 
@@ -42,25 +39,37 @@ public Type getReturnType() {
         return CommonTypes.OBJECT;
     }
     
+    @Override
+    public void preCompile(Context context, Pattern.Match match) throws Throwable {
+        super.preCompile(context, match);
+        final ElementTree[] nested = context.getCompileCurrent().nested();
+        nested[1].compile = false;
+        nested[2].compile = false;
+    }
+    
     // switched to raw bytecode form
-    // had to use the avatar state for this manipulation :o
     @Override
     public void compile(Context context, Pattern.Match match) throws Throwable {
         final MethodBuilder method = context.getMethod();
-        final Label first = new Label(), second = new Label();
+        final Label alternative = new Label(), end = new Label();
+        final ElementTree[] nested = context.getCompileCurrent().nested();
         method.writeCode((writer, visitor) -> {
-            visitor.visitInsn(93); // dup2x1
-            visitor.visitInsn(87); // pop
-            visitor.visitInsn(87); // pop
             visitor.visitTypeInsn(192, "java/lang/Boolean"); // checkcast
             visitor.visitMethodInsn(182, "java/lang/Boolean", "booleanValue", "()Z", false); // virtual
-            visitor.visitJumpInsn(153, first); // if 0
-            visitor.visitInsn(87); // pop
-            visitor.visitJumpInsn(167, second); // goto
-            visitor.visitLabel(first);
-            visitor.visitInsn(95); // swap
-            visitor.visitInsn(87); // pop
-            visitor.visitLabel(second); // x or y
+            visitor.visitJumpInsn(153, alternative); // if 0
+        });
+        nested[1].compile = true;
+        nested[1].preCompile(context);
+        nested[1].compile(context);
+        method.writeCode((writer, visitor) -> {
+            visitor.visitJumpInsn(167, end); // goto
+            visitor.visitLabel(alternative);
+        });
+        nested[2].compile = true;
+        nested[2].preCompile(context);
+        nested[2].compile(context);
+        method.writeCode((writer, visitor) -> {
+            visitor.visitLabel(end); // x or y
         });
     }
     
diff --git a/src/test/java/org/byteskript/skript/test/ConversionTest.java b/src/test/java/org/byteskript/skript/test/ConversionTest.java
diff --git a/src/test/java/org/byteskript/skript/test/PatternsTest.java b/src/test/java/org/byteskript/skript/test/PatternsTest.java
@@ -85,7 +85,7 @@ public void strange() {
     public void strangeNested() {
         final Pattern pattern = new Pattern(new String[]{"%Integer% (ms|millis|milli[ ]second[s])"}, null);
         final java.util.regex.Pattern result = pattern.getCompiledPatterns()[0];
-        assert result.pattern().equals("^(.+) (?:ms|millis|milli(?: )?second(?:s)?)$");
+        assert result.pattern().equals("^(\\(.+\\)|.+?) (?:ms|millis|milli(?: )?second(?:s)?)$");
         assert result.matcher("4 millis").matches();
         assert result.matcher("4 ms").matches();
         assert !result.matcher("5 mseconds").matches();
diff --git a/src/test/java/org/byteskript/skript/test/PropertiesTest.java b/src/test/java/org/byteskript/skript/test/PropertiesTest.java
diff --git a/src/test/java/org/byteskript/skript/test/SyntaxCreationTest.java b/src/test/java/org/byteskript/skript/test/SyntaxCreationTest.java
@@ -63,7 +63,7 @@ public void test_effect() throws Throwable {
         assert strings[0].equals("my [cool] %String% and %Number%");
         final Pattern pattern = new Pattern(strings, null);
         final java.util.regex.Pattern result = pattern.getCompiledPatterns()[0];
-        assert result.pattern().equals("^my (?:cool )?(.+) and (.+)$");
+        assert result.pattern().equals("^my (?:cool )?(\\(.+\\)|.+?) and (\\(.+\\)|.+?)$");
         assert result.matcher("my cool hello and 5").matches();
         assert result.matcher("my blob and blob").matches();
     }
@@ -81,7 +81,7 @@ public void test_expression() throws Throwable {
         assert strings[0].equals("a [cool] %String%");
         final Pattern pattern = new Pattern(strings, null);
         final java.util.regex.Pattern result = pattern.getCompiledPatterns()[0];
-        assert result.pattern().equals("^a (?:cool )?(.+)$");
+        assert result.pattern().equals("^a (?:cool )?(\\(.+\\)|.+?)$");
         assert result.matcher("a cool hello").matches();
         assert result.matcher("a bean?").matches();
     }
diff --git a/src/test/resources/tests/binaryotherwise.bsk b/src/test/resources/tests/binaryotherwise.bsk
@@ -0,0 +1,28 @@
+
+function box:
+    trigger:
+        assert false
+        return 5
+
+function test:
+    trigger:
+        set {var} to 10 ? 5
+        assert {var} is 10
+        set {var} to null ? 5
+        assert {var} is 5
+        assert (10 ? 5) is 10
+        assert (null ? 5) is 5
+        set {var} to 10 ? box()
+        assert {var} is 10
+        set {var} to {blob} otherwise "hello"
+        assert {var} is "hello": "Binary otherwise (long form) failed."
+        set {var} to "goodbye" otherwise "hello"
+        assert {var} is "goodbye": "Binary otherwise (long form) failed."
+        set {var} to "bean" ? "hello"
+        assert {var} is "bean": "Binary otherwise (short form) failed."
+        set {var} to null ? "hello"
+        assert {var} is "hello": "Binary otherwise (short form) failed."
+        assert ("hi" ? "bye") is "hi": "Binary otherwise (short form) failed."
+        assert (null ? "bye") is "bye": "Binary otherwise (short form) failed."
+        assert (null ? null) is null: "Binary otherwise (short form) failed."
+        return true
diff --git a/src/test/resources/tests/bracket.bsk b/src/test/resources/tests/bracket.bsk
@@ -0,0 +1,10 @@
+
+function test:
+    trigger:
+        set {var} to 1 - 2 - 3
+        assert {var} is 2: ("Var was " + {var})
+        set {var} to (1 - (2 - 3))
+        assert {var} is 2: ("Var was " + {var})
+        set {var} to ((1 - 2) - 3)
+        assert {var} is -4: ("Var was " + {var})
+        return true
diff --git a/src/test/resources/tests/conversion.bsk b/src/test/resources/tests/conversion.bsk
@@ -12,3 +12,4 @@ function test:
         assert {thing} is a class
         set {thing} to {thing} as a string
         assert {thing} is a string
+        return true
diff --git a/src/test/resources/tests/javaversion.bsk b/src/test/resources/tests/javaversion.bsk
@@ -0,0 +1,5 @@
+
+function test:
+    trigger:
+        assert the java version exists
+        return true
diff --git a/src/test/resources/tests/newline.bsk b/src/test/resources/tests/newline.bsk
@@ -0,0 +1,7 @@
+
+function test:
+    trigger:
+        assert new line exists
+        assert newline is a string: "New line is not a string."
+        assert "hello" + new line + "there" exists
+        return true
diff --git a/src/test/resources/tests/print.bsk b/src/test/resources/tests/print.bsk
@@ -0,0 +1,6 @@
+
+function test:
+    trigger:
+        if false is true:
+            print "hello" // parsing only
+        return true
diff --git a/src/test/resources/tests/properties.bsk b/src/test/resources/tests/properties.bsk
@@ -1,4 +1,33 @@
 
+type Foo:
+    property blob:
+
+type Blob:
+    property name:
+        type: String
+    property age:
+        type: Number
+    property house:
+        local: true
+    function set_house(house):
+        trigger:
+            set (house of (this object)) to {house}
+            assert house of this object is {house}: "Set comparison failed."
+            set {foo} to a new Foo
+            assert {foo} exists: "Creating type in type failed."
+            set blob of {foo} to 5
+            assert blob of {foo} is 5: "Other type property set failed."
+
+function simple_example: // todo - check other property accessors inside types
+    trigger:
+        set {thing} to a new Blob
+        set name of {thing} to "Thing"
+        set age of {thing} to 62
+        assert name of {thing} is "Thing": "Name property set/access failed."
+        assert age of {thing} is 62: "Age property set/access failed."
+        run set_house("hello") from {thing}
+        assert house of {thing} is "hello": "Local set failed."
+
 type Thing:
     property name:
         final: true
@@ -11,7 +40,7 @@ type Thing:
         trigger:
             return "hello"
 
-function basic_use:
+function test:
     trigger:
         set {thing} to a new Thing
         assert {thing} exists: "New object does not exist."
@@ -34,33 +63,5 @@ function basic_use:
         delete {error}
         assert blob of {thing} is null: "Empty field was set somehow."
         assert blob() from {thing} is "hello": "Function access failed."
-
-
-type Foo:
-    property blob:
-
-type Blob:
-    property name:
-        type: String
-    property age:
-        type: Number
-    property house:
-        local: true
-    function set_house(house):
-        trigger:
-            set (house of (this object)) to {house}
-            assert house of this object is {house}: "Set comparison failed."
-            set {foo} to a new Foo
-            assert {foo} exists: "Creating type in type failed."
-            set blob of {foo} to 5
-            assert blob of {foo} is 5: "Other type property set failed."
-
-function simple_example: // todo - check other property accessors inside types
-    trigger:
-        set {thing} to a new Blob
-        set name of {thing} to "Thing"
-        set age of {thing} to 62
-        assert name of {thing} is "Thing": "Name property set/access failed."
-        assert age of {thing} is 62: "Age property set/access failed."
-        run set_house("hello") from {thing}
-        assert house of {thing} is "hello": "Local set failed."
+        run simple_example()
+        return true
diff --git a/src/test/resources/tests/systemproperty.bsk b/src/test/resources/tests/systemproperty.bsk
@@ -0,0 +1,8 @@
+
+function test:
+    trigger:
+        set system property "blob" to "hello"
+        set {var} to system property "blob"
+        assert {var} is "hello": "System property setting failed."
+        delete system property "blob"
+        return true
diff --git a/src/test/resources/tests/ternaryotherwise.bsk b/src/test/resources/tests/ternaryotherwise.bsk

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ protected void handle(final String string) {`
`61`	`61`	`current = builder;`
`62`	`62`	`} else {`
`63`	`63`	`input = true;`
`64`		`- builder.append("(.+)");`
	`64`	`+ builder.append("(\\(.+\\)\|.+?)");`
`65`	`65`	`current = new StringBuilder();`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`)`
`32`	`32`	`public class BracketExpression extends InnerModifyExpression {`
`33`	`33`
`34`		`- private static final java.util.regex.Pattern PATTERN = java.util.regex.Pattern.compile("\\((.+)\\)");`
	`34`	`+ private static final java.util.regex.Pattern PATTERN = java.util.regex.Pattern.compile("^\\((.+)\\)$");`
`35`	`35`
`36`	`36`	`public BracketExpression() {`
`37`	`37`	`super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "(brackets)");`