Added sufficient support for wildcards so that everything compiles an…

…d existing unit tests run
ZenCodeLang · Feb 28, 2025 · 3df6cf0 · 3df6cf0
1 parent 7778b45
commit 3df6cf0
Show file tree

Hide file tree

Showing 16 changed files with 166 additions and 1 deletion.
diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/WildcardInTypeID.java b/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;
 

diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/WildcardOutTypeID.java b/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;
 

diff --git a/...iler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaBoxingTypeVisitor.java b/...iler/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;
+	}
 }
diff --git a/.../src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaTypeExpressionVisitor.java b/.../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;
+	}
 }
diff --git a/...er/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaUnboxingTypeVisitor.java b/...er/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;
+	}
 }
diff --git a/...d/src/main/java/org/openzen/zenscript/javashared/JavaSyntheticTypeSignatureConverter.java b/...d/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);
+	}
 }
diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeCheckIfGenericVisitor.java b/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;
+	}
 }
diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeDescriptorVisitor.java b/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;";

diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeGenericVisitor.java b/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<>();

diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeInfo.java b/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;
+		}
 	}
 }
diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeInternalNameVisitor.java b/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeInternalNameVisitor.java
@@ -136,6 +136,16 @@ public String visitOptional(OptionalTypeID modified) {
 		return modified.baseType.accept(this);
 	}
 
+	@Override
+	public String visitWildcardIn(WildcardInTypeID type) {
+		return "java/lang/Object";
+	}
+
+	@Override
+	public String visitWildcardOut(WildcardOutTypeID type) {
+		return "java/lang/Object";
+	}
+
 	@Override
 	public String visitGenericMap(GenericMapTypeID map) {
 		return "java/util/Map";

diff --git a/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeNameVisitor.java b/JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeNameVisitor.java
@@ -115,4 +115,14 @@ public String visitOptional(OptionalTypeID type) {
 		result.append(type.baseType.accept(this));
 		return result.toString();
 	}
+
+	@Override
+	public String visitWildcardIn(WildcardInTypeID type) {
+		return "In" + type.upperBound.accept(this);
+	}
+
+	@Override
+	public String visitWildcardOut(WildcardOutTypeID type) {
+		return "Out" + type.lowerBound.accept(this);
+	}
 }
diff --git a/...Shared/src/main/java/org/openzen/zenscript/javashared/prepare/JavaPrepareTypeVisitor.java b/...Shared/src/main/java/org/openzen/zenscript/javashared/prepare/JavaPrepareTypeVisitor.java
@@ -66,4 +66,16 @@ public Void visitOptional(OptionalTypeID type) {
 		type.baseType.accept(this);
 		return null;
 	}
+
+	@Override
+	public Void visitWildcardIn(WildcardInTypeID type) {
+		type.upperBound.accept(this);
+		return null;
+	}
+
+	@Override
+	public Void visitWildcardOut(WildcardOutTypeID type) {
+		type.lowerBound.accept(this);
+		return null;
+	}
 }
diff --git a/Parser/src/main/java/org/openzen/zenscript/parser/type/IParsedType.java b/Parser/src/main/java/org/openzen/zenscript/parser/type/IParsedType.java
@@ -35,7 +35,7 @@ static List<IParsedType> parseTypeArguments(ZSTokenParser tokens) throws ParseEx
 
 		List<IParsedType> genericParameters = new ArrayList<>();
 		do {
-			IParsedType type = tryParse(tokens);
+			IParsedType type = tryParse(tokens, true);
 			if (type == null) {
 				tokens.reset();
 				return Collections.emptyList();
@@ -61,6 +61,10 @@ static List<IParsedType> parseTypeArguments(ZSTokenParser tokens) throws ParseEx
 	}
 
 	static IParsedType tryParse(ZSTokenParser tokens) throws ParseException {
+		return tryParse(tokens, false);
+	}
+
+	static IParsedType tryParse(ZSTokenParser tokens, boolean allowWildcards) throws ParseException {
 		CodePosition position = tokens.getPosition();
 
 		IParsedType result;
@@ -139,12 +143,22 @@ static IParsedType tryParse(ZSTokenParser tokens) throws ParseException {
 			}
 			case K_IN: {
 				tokens.next();
+
+				// TODO: should this be moved to the validator?
+				if (!allowWildcards)
+					throw new ParseException(tokens.getPosition(), "wildcards are not allowed here");
+
 				IParsedType upperBound = tryParse(tokens);
 				result = new ParsedWildcardInType(upperBound);
 				break;
 			}
 			case K_OUT: {
 				tokens.next();
+
+				// TODO: should this be moved to the validator?
+				if (!allowWildcards)
+					throw new ParseException(tokens.getPosition(), "wildcards are not allowed here");
+
 				IParsedType lowerBound = tryParse(tokens);
 				result = new ParsedWildcardOutType(lowerBound);
 				break;

diff --git a/Validator/src/main/java/org/openzen/zenscript/validator/visitors/SupertypeValidator.java b/Validator/src/main/java/org/openzen/zenscript/validator/visitors/SupertypeValidator.java
@@ -83,6 +83,18 @@ public Void visitOptional(OptionalTypeID type) {
 		return null;
 	}
 
+	@Override
+	public Void visitWildcardIn(WildcardInTypeID type) {
+		validator.logError(position, CompileErrors.invalidSuperclass(type));
+		return null;
+	}
+
+	@Override
+	public Void visitWildcardOut(WildcardOutTypeID type) {
+		validator.logError(position, CompileErrors.invalidSuperclass(type));
+		return null;
+	}
+
 	@Override
 	public Void visitGenericMap(GenericMapTypeID map) {
 		validator.logError(position, CompileErrors.invalidSuperclass(map));

diff --git a/Validator/src/main/java/org/openzen/zenscript/validator/visitors/TypeValidator.java b/Validator/src/main/java/org/openzen/zenscript/validator/visitors/TypeValidator.java
@@ -98,6 +98,18 @@ public Void visitOptional(TypeContext context, OptionalTypeID type) {
 		return null;
 	}
 
+	@Override
+	public Void visitWildcardOut(TypeContext context, WildcardOutTypeID type) throws RuntimeException {
+		validate(context, type.lowerBound);
+		return null;
+	}
+
+	@Override
+	public Void visitWildcardIn(TypeContext context, WildcardInTypeID type) throws RuntimeException {
+		validate(context, type.upperBound);
+		return null;
+	}
+
 	@Override
 	public Void visitGenericMap(TypeContext context, GenericMapTypeID map) {
 		validate(context, map.value);