Improve comparisons, although they need some help

Add some extra tests, although their outputs are indetermined

Author: Witixin1512

CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/ResolvedType.java

@@ -66,7 +66,7 @@ default boolean canCastImplicitlyTo(TypeID target) {
 
 	Optional<SwitchMember> findSwitchMember(String name);
 
-	Optional<Comparator> compare();
+	Optional<Comparator> compare(TypeID typeId);
 
     Optional<IteratorInstance> findIterator(int variables);
 

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/builtin/BasicTypeMembers.java

@@ -547,7 +547,7 @@ private static MemberSet getString() {
 	private static void setup(MemberSet.Builder builder, BasicTypeID type) {
 		for (BuiltinMethodSymbol method : BuiltinMethodSymbol.values()) {
 			if (method.getDefiningType().equals(type) && method.getID().equals(COMPARE)) {
-				comparator(builder, method, type);
+				comparator(builder, method, method.getHeader().getParameterType(false, 0));
 			}/* else if (method.getID().equals(CONSTRUCTOR)) {
 				builder.constructor(new MethodInstance(method));
 			} else if (method.getDefiningType() == type) {
@@ -581,9 +581,9 @@ private static void setup(MemberSet.Builder builder, BasicTypeID type) {
 		}
 	}
 
-	private static void comparator(MemberSet.Builder builder, BuiltinMethodSymbol method, BasicTypeID ofType) {
+	private static void comparator(MemberSet.Builder builder, BuiltinMethodSymbol method, TypeID ofType) {
 		MethodInstance comparator = new MethodInstance(method);
-		builder.comparator(((compiler, position, left, right, type) -> new CompareExpression(
+		builder.comparator(ofType, ((compiler, position, left, right, type) -> new CompareExpression(
 				position,
 				left,
 				right.cast(CastedEval.implicit(compiler, position, ofType)).value,

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/ExpandedResolvedType.java

@@ -182,8 +182,8 @@ public Optional<SwitchMember> findSwitchMember(String name) {
 	}
 
 	@Override
-	public Optional<Comparator> compare() {
-		return base.compare();
+	public Optional<Comparator> compare(TypeID typeId) {
+		return base.compare(typeId);
 	}
 
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/MemberSet.java

@@ -26,7 +26,7 @@ public static Builder create() {
 	private final Map<String, SwitchMember> switchMembers = new HashMap<>();
 	private final Map<String, TypeSymbol> innerTypes = new HashMap<>();
 	private final List<IteratorInstance> iterators = new ArrayList<>();
-	private Comparator comparator;
+	private final Map<TypeID, Comparator> comparators = new HashMap<>();
 
 	@Override
 	public StaticCallable getConstructor() {
@@ -125,8 +125,8 @@ public Optional<SwitchMember> findSwitchMember(String name) {
 	}
 
 	@Override
-	public Optional<Comparator> compare() {
-		return Optional.ofNullable(comparator);
+	public Optional<Comparator> compare(TypeID typeId) {
+		return Optional.ofNullable(comparators.get(typeId));
 	}
 
 	@Override
@@ -200,8 +200,8 @@ public Builder inner(TypeSymbol type) {
 			return this;
 		}
 
-		public Builder comparator(Comparator comparator) {
-			target.comparator = comparator;
+		public Builder comparator(TypeID typeId, Comparator comparator) {
+			target.comparators.put(typeId, comparator);
 			return this;
 		}
 

JavaIntegration/src/main/java/org/openzen/zencode/java/module/JavaNativeTypeMembers.java

@@ -117,7 +117,7 @@ public Optional<SwitchMember> findSwitchMember(String name) {
 	}
 
 	@Override
-	public Optional<Comparator> compare() {
+	public Optional<Comparator> compare(TypeID typeId) {
 		return Optional.empty();
 	}
 

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionCompare.java

@@ -65,11 +65,10 @@ public Expression eval() {
 					return notEquals.get().call(compiler, position, left, TypeID.NONE, right);
 				}
 			}
-
-			return resolved.compare()
+			return resolved.compare(right.eval().type)
 					.map(comparator -> comparator.compare(compiler, position, left, right, this.type))
 					.orElseGet(() -> compiler.at(position).invalid(
-							CompileErrors.noOperatorInType(left.type, OperatorType.COMPARE),
+							CompileErrors.noOperatorInType(left.type, OperatorType.COMPARE), //TODO Make error message more descriptive and include target type.
 							BasicTypeID.BOOL));
 		}
 

ScriptingEngineTester/src/main/resources/zencode-tests/alias/alias-1.zc

@@ -0,0 +1,13 @@
+#output: Two is int
+
+alias Foo as int;
+
+val two : Foo = 2;
+
+if (two is Foo) {
+	print("Two is Foo");
+}
+
+if (two is int) {
+	print("Two is int");
+}

ScriptingEngineTester/src/main/resources/zencode-tests/operators/compare-1.zc

@@ -0,0 +1,13 @@
+#output: true
+#output: true
+#output: true
+#output: true
+#output: false
+
+println("" + ((3 < 5) ? "true" : "false"));
+println("" + ((3 < (5 as usize)) ? "true" : "false"));
+println("" + ((3 < 5.0) ? "true" : "false"));
+println("" + ((3 < 5.0f) ? "true" : "false"));
+println("" + (3 < 0x40 ? "true" : "false"));
+
+println("" + ((-5 < (3 as usize)) ? "true" : "false")); //What does this return?

ScriptingEngineTester/src/main/resources/zencode-tests/types/boolean.zc

@@ -0,0 +1,3 @@
+#output: true
+
+println("" + true);