Improved naming + fix wildcard casting test

Author: stanhebben

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/DefinitionTypeID.java

@@ -118,23 +118,23 @@ public Optional<Expression> castImplicitFrom(CodePosition position, Expression v
 	}
 
 	@Override
-	public boolean isEquivalentTo(TypeID other, List<ExpansionSymbol> expansions) {
-		if (other instanceof DefinitionTypeID) {
-			DefinitionTypeID otherType = (DefinitionTypeID) other;
+	public boolean canCastToBecauseOfWildcardGenerics(TypeID to, List<ExpansionSymbol> expansions) {
+		if (to instanceof DefinitionTypeID) {
+			DefinitionTypeID otherType = (DefinitionTypeID) to;
 			if (definition.equals(otherType.definition)) {
 				if (typeArguments.length != otherType.typeArguments.length)
-					throw new IllegalArgumentException("Type arguments do not match: " + this + " -> " + other);
+					throw new IllegalArgumentException("Type arguments do not match: " + this + " -> " + to);
 
 				for (int i = 0; i < typeArguments.length; i++) {
 					if (!otherType.typeArguments[i].canCastGenericFrom(typeArguments[i], expansions))
-						return TypeID.super.isEquivalentTo(other, expansions);
+						return TypeID.super.canCastToBecauseOfWildcardGenerics(to, expansions);
 				}
 
 				return true;
 			}
 		}
 
-		return TypeID.super.isEquivalentTo(other, expansions);
+		return TypeID.super.canCastToBecauseOfWildcardGenerics(to, expansions);
 	}
 
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/TypeID.java

@@ -155,12 +155,12 @@ default boolean extendsOrImplements(TypeID type, List<ExpansionSymbol> expansion
 	/**
 	 * Similar to equals, but takes into account wildcard generics.
 	 *
-	 * @param type
+	 * @param to
 	 * @param expansions
 	 * @return
 	 */
-	default boolean isEquivalentTo(TypeID type, List<ExpansionSymbol> expansions) {
-		return this.equals(type);
+	default boolean canCastToBecauseOfWildcardGenerics(TypeID to, List<ExpansionSymbol> expansions) {
+		return this.equals(to);
 	}
 
 	/**

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

@@ -132,7 +132,7 @@ public List<MethodSymbol> getInterfaceMethodsToImplement() {
 
 	@Override
 	public boolean extendsOrImplements(TypeID type, List<ExpansionSymbol> expansions) {
-		return this.type.isEquivalentTo(type, expansions);
+		return this.type.canCastToBecauseOfWildcardGenerics(type, expansions);
 	}
 
 	@Override

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

@@ -155,6 +155,6 @@ public List<MethodSymbol> getInterfaceMethodsToImplement() {
 
 	@Override
 	public boolean extendsOrImplements(TypeID type, List<ExpansionSymbol> expansions) {
-		return this.type.isEquivalentTo(type, expansions);
+		return this.type.canCastToBecauseOfWildcardGenerics(type, expansions);
 	}
 }

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

@@ -114,7 +114,7 @@ public List<MethodSymbol> getInterfaceMethodsToImplement() {
 
 	@Override
 	public boolean extendsOrImplements(TypeID type, List<ExpansionSymbol> expansions) {
-		return this.type.isEquivalentTo(type, expansions);
+		return this.type.canCastToBecauseOfWildcardGenerics(type, expansions);
 	}
 
 	@Override

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

@@ -125,7 +125,6 @@ public Expression eval() {
 
 		@Override
 		public CastedExpression cast(CastedEval cast) {
-			TypeID type = cast.type.simplified();
 			return resolved.cast(cast);
 		}
 

ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/actual_test/generics/WildcardCastingTest.java

@@ -13,9 +13,11 @@ void testPrinter() {
 		//TODO Should this work? We couldn't decide
 		ScriptBuilder.create()
 				.add("import test_module.Generator;")
+				.add("import test_module.Singleton;")
 				.add("var generator = new Generator();")
 				.add("var stuff = generator.generate();")
-				.add("generator.print<string>(stuff);")
+				.add("var morestuff = stuff as Singleton<string>;")
+				.add("generator.print<string>(morestuff);")
 				.execute(this);
 	}
 
@@ -50,5 +52,10 @@ public static class Singleton<T> {
 		public Singleton(T value) {
 			this.value = value;
 		}
+
+		/*@ZenCodeType.Caster(implicit = true)
+		public <U> Singleton<U> cast(Class<U> clazz) {
+			return new Singleton<>(clazz.cast(value));
+		}*/
 	}
 }

Shared/src/main/java/org/openzen/zencode/shared/SourceFile.java

@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.io.Reader;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;