Refactoring of relational expressions to support extra handlers by default.

Moderocky · Moderocky · commit f8aa5d0dd4f6 · 2021-12-24T16:24:38.000Z
diff --git a/src/main/java/org/byteskript/skript/api/SyntaxElement.java b/src/main/java/org/byteskript/skript/api/SyntaxElement.java
@@ -13,6 +13,7 @@
 import org.byteskript.skript.api.note.ForceInline;
 import org.byteskript.skript.compiler.*;
 import org.byteskript.skript.compiler.structure.PreVariable;
+import org.byteskript.skript.lang.handler.StandardHandlers;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -62,6 +63,7 @@ default CompileState getSubState() {
     }
     
     default boolean allowAsInputFor(Type type) {
+        if (CommonTypes.REFERENT.equals(type) && hasHandler(StandardHandlers.SET)) return true;
         return type.equals(CommonTypes.OBJECT) || type.equals(getReturnType());
     }
     
diff --git a/src/main/java/org/byteskript/skript/api/syntax/RelationalExpression.java b/src/main/java/org/byteskript/skript/api/syntax/RelationalExpression.java
@@ -14,7 +14,6 @@
 import org.byteskript.skript.compiler.CompileState;
 import org.byteskript.skript.compiler.Context;
 import org.byteskript.skript.compiler.Pattern;
-import org.byteskript.skript.lang.handler.StandardHandlers;
 
 import java.lang.reflect.Method;
 
@@ -28,12 +27,17 @@ public RelationalExpression(final Library provider, final LanguageElement type,
     public void compile(Context context, Pattern.Match match) throws Throwable {
         final MethodBuilder method = context.getMethod();
         assert method != null;
-        final Method target = handlers.get(StandardHandlers.FIND);
-        assert target != null;
+        final Method target = handlers.get(context.getHandlerMode());
+        assert target != null : "" + context.getHandlerMode();
         this.writeCall(method, target, context);
         context.setState(CompileState.STATEMENT);
     }
     
+    @Override
+    public Pattern.Match match(String thing, Context context) {
+        return super.match(thing, context);
+    }
+    
     @Override
     public boolean allowedIn(State state, Context context) {
         return state == CompileState.STATEMENT && context.hasCurrentUnit();
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/comparison/GT.java b/src/main/java/org/byteskript/skript/lang/syntax/comparison/GT.java
@@ -20,6 +20,7 @@ public GT() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is greater than|>) ?%Object%");
         try {
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("gt", Object.class, Object.class));
+            handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("gt", Object.class, Object.class));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/comparison/GTEQ.java b/src/main/java/org/byteskript/skript/lang/syntax/comparison/GTEQ.java
@@ -20,6 +20,7 @@ public GTEQ() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is greater than or equal to|>=) ?%Object%");
         try {
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("gteq", Object.class, Object.class));
+            handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("gteq", Object.class, Object.class));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/comparison/IsArray.java b/src/main/java/org/byteskript/skript/lang/syntax/comparison/IsArray.java
@@ -24,6 +24,7 @@ public IsArray() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is|are) a[n] array");
         try {
             handlers.put(StandardHandlers.FIND, this.getClass().getMethod("check", Object.class));
+            handlers.put(StandardHandlers.GET, this.getClass().getMethod("check", Object.class));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/comparison/IsOfType.java b/src/main/java/org/byteskript/skript/lang/syntax/comparison/IsOfType.java
@@ -24,6 +24,7 @@ public IsOfType() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is|are) a[n] %Type%");
         try {
             handlers.put(StandardHandlers.FIND, this.getClass().getMethod("check", Object.class, Object.class));
+            handlers.put(StandardHandlers.GET, this.getClass().getMethod("check", Object.class, Object.class));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/comparison/LT.java b/src/main/java/org/byteskript/skript/lang/syntax/comparison/LT.java
@@ -20,6 +20,7 @@ public LT() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is less than|<) ?%Object%");
         try {
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("lt", Object.class, Object.class));
+            handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("lt", Object.class, Object.class));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/comparison/LTEQ.java b/src/main/java/org/byteskript/skript/lang/syntax/comparison/LTEQ.java
@@ -20,6 +20,7 @@ public LTEQ() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is less than or equal to|<=) ?%Object%");
         try {
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("lteq", Object.class, Object.class));
+            handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("lteq", Object.class, Object.class));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/list/IndexOfList.java b/src/main/java/org/byteskript/skript/lang/syntax/list/IndexOfList.java
@@ -38,6 +38,16 @@ public Pattern.Match match(String thing, Context context) {
         return super.match(thing, context);
     }
     
+    @Override
+    public boolean allowAsInputFor(Type type) {
+        return super.allowAsInputFor(type);
+    }
+    
+    @Override
+    public Type getReturnType() {
+        return CommonTypes.OBJECT;
+    }
+    
     @Override
     public Type getHolderType() {
         return CommonTypes.LIST;
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/map/KeyInMap.java b/src/main/java/org/byteskript/skript/lang/syntax/map/KeyInMap.java
@@ -23,7 +23,7 @@
 public class KeyInMap extends RelationalExpression implements Referent {
     
     public KeyInMap() {
-        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "[key ]%Object% in [map ]%Map%");
+        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% in [map ]%Map%");
         try {
             handlers.put(StandardHandlers.GET, ExtractedSyntaxCalls.class.getMethod("getMapValue", Object.class, Object.class));
             handlers.put(StandardHandlers.SET, ExtractedSyntaxCalls.class.getMethod("setMapValue", Object.class, Object.class, Object.class));
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/maths/AddExpression.java b/src/main/java/org/byteskript/skript/lang/syntax/maths/AddExpression.java
@@ -22,6 +22,7 @@ public AddExpression() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% ?\\\\+ ?%Object%");
         try {
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("add", Object.class, Object.class));
+            handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("add", Object.class, Object.class));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/maths/DivideExpression.java b/src/main/java/org/byteskript/skript/lang/syntax/maths/DivideExpression.java
@@ -22,6 +22,7 @@ public DivideExpression() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Number% ?(/|÷) ?%Number%");
         try {
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("divide", Object.class, Object.class));
+            handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("divide", Object.class, Object.class));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/maths/MultiplyExpression.java b/src/main/java/org/byteskript/skript/lang/syntax/maths/MultiplyExpression.java
@@ -22,6 +22,7 @@ public MultiplyExpression() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Number% ?(\\\\*|×) ?%Number%");
         try {
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("multiply", Object.class, Object.class));
+            handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("multiply", Object.class, Object.class));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/maths/SquareRootExpression.java b/src/main/java/org/byteskript/skript/lang/syntax/maths/SquareRootExpression.java
@@ -19,6 +19,7 @@ public class SquareRootExpression extends RelationalExpression {
     public SquareRootExpression() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "[the ]sq[uare ]r[oo]t of %Number%");
         try {
+            handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("root", Object.class));
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("root", Object.class));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/maths/SubtractExpression.java b/src/main/java/org/byteskript/skript/lang/syntax/maths/SubtractExpression.java
@@ -22,6 +22,7 @@ public SubtractExpression() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Number% ?- ?%Number%");
         try {
             handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("subtract", Object.class, Object.class));
+            handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("subtract", Object.class, Object.class));
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         }
diff --git a/src/test/java/org/byteskript/skript/test/GenericTest.java b/src/test/java/org/byteskript/skript/test/GenericTest.java
@@ -60,6 +60,13 @@ public void testing_variable() throws Throwable {
         function.invoke();
     }
     
+    @Test
+    public void testing_list() throws Throwable {
+        final Member function = script.getFunction("testing_list");
+        assert function != null;
+        function.invoke();
+    }
+    
     @Test
     public void testing_map() throws Throwable {
         final Member function = script.getFunction("testing_map");
diff --git a/src/test/resources/generic.bsk b/src/test/resources/generic.bsk
@@ -60,6 +60,24 @@ function testing_variable:
         assert false = false: "False is not self-equal."
         assert true is not false: "True = false."
 
+function testing_list:
+    trigger:
+        set {test} to a new list
+        assert {test} is a list: "List type comparison failed."
+        add "hello" to {test}
+        add "goodbye" to {test}
+        assert {test} contains "hello": "List contains check failed."
+        assert {test} contains "goodbye": "List contains check failed."
+        assert index 1 in {test} is "goodbye": "List index get failed."
+        set index 1 in {test} to "there"
+        assert {test} contains "there": "List index set failed."
+        loop {word} in {test}:
+            assert {word} exists: "List object is empty."
+        clear {test}
+        loop {word} in {test}:
+            assert false: "List failed to clear."
+
+
 function testing_map:
     trigger:
         assert {bean} is null: "Variable pre-setting failed."

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`import org.byteskript.skript.api.note.ForceInline;`
`14`	`14`	`import org.byteskript.skript.compiler.*;`
`15`	`15`	`import org.byteskript.skript.compiler.structure.PreVariable;`
	`16`	`+import org.byteskript.skript.lang.handler.StandardHandlers;`
`16`	`17`
`17`	`18`	`import java.lang.reflect.Method;`
`18`	`19`	`import java.lang.reflect.Modifier;`
`@@ -62,6 +63,7 @@ default CompileState getSubState() {`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`default boolean allowAsInputFor(Type type) {`
	`66`	`+ if (CommonTypes.REFERENT.equals(type) && hasHandler(StandardHandlers.SET)) return true;`
`65`	`67`	`return type.equals(CommonTypes.OBJECT) \|\| type.equals(getReturnType());`
`66`	`68`	`}`
`67`	`69`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public GT() {`
`20`	`20`	`super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is greater than\|>) ?%Object%");`
`21`	`21`	`try {`
`22`	`22`	`handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("gt", Object.class, Object.class));`
	`23`	`+ handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("gt", Object.class, Object.class));`
`23`	`24`	`} catch (NoSuchMethodException e) {`
`24`	`25`	`e.printStackTrace();`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public GTEQ() {`
`20`	`20`	`super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is greater than or equal to\|>=) ?%Object%");`
`21`	`21`	`try {`
`22`	`22`	`handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("gteq", Object.class, Object.class));`
	`23`	`+ handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("gteq", Object.class, Object.class));`
`23`	`24`	`} catch (NoSuchMethodException e) {`
`24`	`25`	`e.printStackTrace();`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public IsArray() {`
`24`	`24`	`super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is\|are) a[n] array");`
`25`	`25`	`try {`
`26`	`26`	`handlers.put(StandardHandlers.FIND, this.getClass().getMethod("check", Object.class));`
	`27`	`+ handlers.put(StandardHandlers.GET, this.getClass().getMethod("check", Object.class));`
`27`	`28`	`} catch (NoSuchMethodException e) {`
`28`	`29`	`e.printStackTrace();`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public IsOfType() {`
`24`	`24`	`super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is\|are) a[n] %Type%");`
`25`	`25`	`try {`
`26`	`26`	`handlers.put(StandardHandlers.FIND, this.getClass().getMethod("check", Object.class, Object.class));`
	`27`	`+ handlers.put(StandardHandlers.GET, this.getClass().getMethod("check", Object.class, Object.class));`
`27`	`28`	`} catch (NoSuchMethodException e) {`
`28`	`29`	`e.printStackTrace();`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public LT() {`
`20`	`20`	`super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is less than\|<) ?%Object%");`
`21`	`21`	`try {`
`22`	`22`	`handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("lt", Object.class, Object.class));`
	`23`	`+ handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("lt", Object.class, Object.class));`
`23`	`24`	`} catch (NoSuchMethodException e) {`
`24`	`25`	`e.printStackTrace();`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public LTEQ() {`
`20`	`20`	`super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% (is less than or equal to\|<=) ?%Object%");`
`21`	`21`	`try {`
`22`	`22`	`handlers.put(StandardHandlers.FIND, OperatorHandler.class.getMethod("lteq", Object.class, Object.class));`
	`23`	`+ handlers.put(StandardHandlers.GET, OperatorHandler.class.getMethod("lteq", Object.class, Object.class));`
`23`	`24`	`} catch (NoSuchMethodException e) {`
`24`	`25`	`e.printStackTrace();`
`25`	`26`	`}`