Added sufficient support for wildcards so that everything compiles and existing unit tests run

Author: stanhebben

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

@@ -7,6 +7,9 @@
 
 import java.util.List;
 
+/**
+ * Represents a wildcard type with an upper bound. (e.g. ? super Number)
+ */
 public class WildcardInTypeID implements TypeID {
 	public final TypeID upperBound;
 

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

@@ -7,6 +7,12 @@
 
 import java.util.List;
 
+/**
+ * Represents a wildcard type with an upper bound. (eg. ? extends Number)
+ * <p>
+ * This is used in the context of type arguments, where the type argument is not known, but it is known that it is a
+ * subtype of the given bound.
+ */
 public class WildcardOutTypeID implements TypeID {
 	public final TypeID lowerBound;
 

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaBoxingTypeVisitor.java

@@ -140,4 +140,16 @@ public Void visitOptional(OptionalTypeID type) {
 		//NO-OP
 		return null;
 	}
+
+	@Override
+	public Void visitWildcardIn(WildcardInTypeID type) {
+		//NO-OP
+		return null;
+	}
+
+	@Override
+	public Void visitWildcardOut(WildcardOutTypeID type) {
+		//NO-OP
+		return null;
+	}
 }

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaTypeExpressionVisitor.java

@@ -119,4 +119,16 @@ public Void visitRange(JavaWriter writer, RangeTypeID range) {
 	public Void visitOptional(JavaWriter writer, OptionalTypeID type) {
 		return type.baseType.accept(writer, this);
 	}
+
+	@Override
+	public Void visitWildcardIn(JavaWriter writer, WildcardInTypeID type) throws RuntimeException {
+		writer.constant(Object.class);
+		return null;
+	}
+
+	@Override
+	public Void visitWildcardOut(JavaWriter writer, WildcardOutTypeID type) throws RuntimeException {
+		type.lowerBound.accept(writer, this);
+		return null;
+	}
 }

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaUnboxingTypeVisitor.java

@@ -135,4 +135,16 @@ public Void visitOptional(OptionalTypeID type) {
 		//NO-OP
 		return null;
 	}
+
+	@Override
+	public Void visitWildcardIn(WildcardInTypeID type) {
+		//NO-OP
+		return null;
+	}
+
+	@Override
+	public Void visitWildcardOut(WildcardOutTypeID type) {
+		//NO-OP
+		return null;
+	}
 }

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaSyntheticTypeSignatureConverter.java

@@ -145,4 +145,14 @@ public String visitOptional(OptionalTypeID type) {
 		result.append(type.baseType.accept(this));
 		return result.toString();
 	}
+
+	@Override
+	public String visitWildcardIn(WildcardInTypeID type) {
+		return "-" + type.upperBound.accept(this);
+	}
+
+	@Override
+	public String visitWildcardOut(WildcardOutTypeID type) {
+		return "+" + type.lowerBound.accept(this);
+	}
 }

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeCheckIfGenericVisitor.java

@@ -56,4 +56,14 @@ public Boolean visitRange(RangeTypeID range) {
 	public Boolean visitOptional(OptionalTypeID type) {
 		return type.baseType.accept(this);
 	}
+
+	@Override
+	public Boolean visitWildcardIn(WildcardInTypeID type) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitWildcardOut(WildcardOutTypeID type) {
+		return true;
+	}
 }

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeDescriptorVisitor.java

@@ -152,6 +152,16 @@ public String visitOptional(OptionalTypeID modified) {
 		return modified.withoutOptional().accept(forOptional);
 	}
 
+	@Override
+	public String visitWildcardIn(WildcardInTypeID type) {
+		return "Ljava/lang/Object;";
+	}
+
+	@Override
+	public String visitWildcardOut(WildcardOutTypeID type) {
+		return type.accept(this);
+	}
+
 	@Override
 	public String visitGenericMap(GenericMapTypeID map) {
 		return "Ljava/util/Map;";

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeGenericVisitor.java

@@ -195,6 +195,16 @@ public String visitOptional(OptionalTypeID type) {
 		return type.baseType.accept(this);
 	}
 
+	@Override
+	public String visitWildcardIn(WildcardInTypeID type) {
+		return "Ljava/lang/Object;";
+	}
+
+	@Override
+	public String visitWildcardOut(WildcardOutTypeID type) {
+		return type.lowerBound.accept(this);
+	}
+
 	public String getMethodSignatureExpansion(FunctionHeader header, TypeID expandedClass) {
 		final StringBuilder stringBuilder = new StringBuilder();
 		final ArrayList<TypeParameter> typeParameters = new ArrayList<>();

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeInfo.java

@@ -79,5 +79,15 @@ public JavaTypeInfo visitRange(TypeID context, RangeTypeID range) {
 		public JavaTypeInfo visitOptional(TypeID context, OptionalTypeID type) {
 			return type.baseType == BasicTypeID.USIZE ? PRIMITIVE : OBJECT;
 		}
+
+		@Override
+		public JavaTypeInfo visitWildcardIn(TypeID context, WildcardInTypeID type) throws RuntimeException {
+			return OBJECT;
+		}
+
+		@Override
+		public JavaTypeInfo visitWildcardOut(TypeID context, WildcardOutTypeID type) throws RuntimeException {
+			return OBJECT;
+		}
 	}
 }