Merge pull request #178 from ZenCodeLang/feature/refactor-incomplete-…

…implementation Check for incomplete implementations of interfaces
ZenCodeLang · Oct 11, 2024 · aa11ee4 · aa11ee4
2 parents beaae44 + 0d59d2e
commit aa11ee4
Show file tree

Hide file tree

Showing 29 changed files with 299 additions and 95 deletions.
diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/CompileErrors.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/CompileErrors.java
@@ -5,7 +5,9 @@
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.identifiers.MethodID;
+import org.openzen.zenscript.codemodel.identifiers.MethodSymbol;
 import org.openzen.zenscript.codemodel.identifiers.instances.MethodInstance;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
@@ -579,4 +581,22 @@ public static CompileError invalidLambdaHeader(FunctionHeader header) {
 	public static CompileError unreachableStatement() {
 		return new CompileError(CompileExceptionCode.UNREACHABLE_STATEMENT, "Unreachable statement");
 	}
+
+	public static CompileError definitionNotAllowedHere(String text) {
+		return new CompileError(CompileExceptionCode.DEFINITION_NOT_ALLOWED_HERE, text);
+	}
+
+	public static CompileError incompleteImplementation(List<MethodSymbol> unimplementedMembers) {
+
+		String text;
+		if(unimplementedMembers.size() == 1) {
+			text = unimplementedMembers.get(0).toString() + " is not implemented";
+		} else {
+			text = unimplementedMembers.stream()
+					.map(MethodSymbol::toString)
+					.collect(Collectors.joining("\n  - ", "Implementation incomplete: " + unimplementedMembers.size() + " members not yet implemented:\n", ""));
+		}
+
+		return new CompileError(CompileExceptionCode.INCOMPLETE_IMPLEMENTATION, text);
+	}
 }
diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/ResolvedType.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/ResolvedType.java
@@ -6,6 +6,7 @@
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.switchvalue.SwitchValue;
+import org.openzen.zenscript.codemodel.identifiers.MethodSymbol;
 import org.openzen.zenscript.codemodel.identifiers.TypeSymbol;
 import org.openzen.zenscript.codemodel.identifiers.instances.IteratorInstance;
 import org.openzen.zenscript.codemodel.type.TypeID;
@@ -84,6 +85,8 @@ default boolean canCastImplicitlyTo(TypeID target) {
 
 	Optional<StaticCallable> findStaticOperator(OperatorType operator);
 
+	List<MethodSymbol> getInterfaceMethodsToImplement();
+
 	interface SwitchMember {
 		SwitchValue toSwitchValue(List<CompilingVariable> bindings);
 	}

diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/definition/InterfaceDefinition.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/definition/InterfaceDefinition.java
@@ -4,9 +4,12 @@
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.compilation.ResolvedType;
+import org.openzen.zenscript.codemodel.compilation.ResolvingType;
 import org.openzen.zenscript.codemodel.identifiers.ModuleSymbol;
 import org.openzen.zenscript.codemodel.identifiers.TypeSymbol;
 import org.openzen.zenscript.codemodel.type.TypeID;
+import org.openzen.zenscript.codemodel.type.member.InterfaceResolvingType;
 import org.openzen.zenscript.codemodel.type.member.MemberSet;
 
 import java.util.ArrayList;
@@ -19,10 +22,6 @@ public InterfaceDefinition(CodePosition position, ModuleSymbol module, ZSPackage
 		super(position, module, pkg, name, modifiers, outerDefinition);
 	}
 
-	public void addBaseInterface(TypeID baseInterface) {
-		baseInterfaces.add(baseInterface);
-	}
-
 	@Override
 	public boolean isStatic() {
 		return true;
@@ -39,9 +38,7 @@ public <C, R> R accept(C context, DefinitionVisitorWithContext<C, R> visitor) {
 	}
 
 	@Override
-	protected void resolveAdditional(TypeID type, MemberSet.Builder members, GenericMapper mapper) {
-		for (TypeID baseType : baseInterfaces) {
-			// TODO: register those members
-		}
+	public ResolvingType resolve(TypeID[] typeArguments) {
+		return InterfaceResolvingType.of(super.resolve(typeArguments), baseInterfaces);
 	}
 }
diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/CasterMember.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/CasterMember.java
@@ -7,11 +7,8 @@
 import org.openzen.zenscript.codemodel.type.TypeID;
 import org.openzen.zenscript.codemodel.type.member.MemberSet;
 
-import java.util.Optional;
-
 public class CasterMember extends FunctionalMember {
 	public TypeID toType;
-	public MethodInstance overrides;
 
 	public CasterMember(
 			CodePosition position,
@@ -67,11 +64,5 @@ public Modifiers getEffectiveModifiers() {
 	}
 
 	@Override
-	public Optional<MethodInstance> getOverrides() {
-		return Optional.ofNullable(overrides);
-	}
-
-	public void setOverrides(MethodInstance overrides) {
-		this.overrides = overrides;
-	}
+	protected void inferFromOverride(MethodInstance overrides) {}
 }
diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ConstructorMember.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ConstructorMember.java
@@ -78,6 +78,9 @@ public Optional<MethodInstance> getOverrides() {
 		return Optional.empty();
 	}
 
+	@Override
+	protected void inferFromOverride(MethodInstance overrides) {}
+
 	@Override
 	public Modifiers getEffectiveModifiers() {
 		Modifiers result = modifiers.withStatic();

diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/FunctionalMember.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/FunctionalMember.java
@@ -4,16 +4,22 @@
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.identifiers.DefinitionSymbol;
 import org.openzen.zenscript.codemodel.identifiers.MethodID;
 import org.openzen.zenscript.codemodel.identifiers.MethodSymbol;
+import org.openzen.zenscript.codemodel.identifiers.instances.MethodInstance;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
+import java.util.Optional;
+
 public abstract class FunctionalMember extends DefinitionMember implements MethodSymbol {
 	public FunctionHeader header;
 	public Statement body = null;
 	private final MethodID id;
+	protected MethodInstance overrides;
+	private boolean expectsOverride = false;
 
 	public FunctionalMember(
 			CodePosition position,
@@ -34,6 +40,10 @@ public void setBody(Statement body) {
 
 	public abstract FunctionalKind getKind();
 
+	public boolean doesExpectOverride() {
+		return expectsOverride;
+	}
+
 	@Override
 	public Modifiers getModifiers() {
 		return getEffectiveModifiers();
@@ -46,6 +56,8 @@ public Modifiers getEffectiveModifiers() {
 			result = result.withPublic();
 		if (!result.hasAccessModifiers())
 			result = result.withInternal();
+		if (isImplicitlyAbstract())
+			result = result.withAbstract();
 
 		return result;
 	}
@@ -76,4 +88,25 @@ public MethodID getID() {
 	public FunctionHeader getHeader() {
 		return header;
 	}
+
+	@Override
+	public Optional<MethodInstance> getOverrides() {
+		return Optional.ofNullable(overrides);
+	}
+
+	public void setOverrides(MethodInstance overrides) {
+		this.overrides = overrides;
+		this.expectsOverride = true;
+		if (overrides != null) {
+			inferFromOverride(overrides);
+		}
+	}
+
+	protected abstract void inferFromOverride(MethodInstance overrides);
+
+	private boolean isImplicitlyAbstract() {
+		return definition.isInterface()
+				&& !modifiers.isStatic()
+				&& !getID().getOperator().filter(op -> op == OperatorType.CONSTRUCTOR).isPresent();
+	}
 }
diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/GetterMember.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/GetterMember.java
@@ -15,7 +15,6 @@ public class GetterMember extends FunctionalMember {
 	public final String name;
 	public TypeID type;
 	public Statement body = null;
-	private MethodInstance overrides;
 
 	public GetterMember(
 			CodePosition position,
@@ -75,15 +74,9 @@ public <C, R> R accept(C context, MemberVisitorWithContext<C, R> visitor) {
 	}
 
 	@Override
-	public Optional<MethodInstance> getOverrides() {
-		return Optional.ofNullable(overrides);
-	}
-
-	public void setOverrides(MethodInstance override) {
-		this.overrides = override;
-
+	protected void inferFromOverride(MethodInstance overrides) {
 		if (type == BasicTypeID.UNDETERMINED)
-			type = override.getHeader().getReturnType();
+			type = overrides.getHeader().getReturnType();
 	}
 
 	@Override

diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/IteratorMember.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/IteratorMember.java
@@ -14,7 +14,6 @@
 public class IteratorMember extends FunctionalMember {
 	private final TypeID[] iteratorTypes;
 	public Statement body;
-	public MethodInstance overrides;
 
 	public IteratorMember(CodePosition position, HighLevelDefinition definition, Modifiers modifiers, TypeID[] iteratorTypes) {
 		super(position, definition, modifiers, MethodID.iterator(iteratorTypes.length), createIteratorHeader(iteratorTypes));
@@ -69,11 +68,5 @@ public FunctionalKind getKind() {
 	}
 
 	@Override
-	public Optional<MethodInstance> getOverrides() {
-		return Optional.ofNullable(overrides);
-	}
-
-	public void setOverrides(MethodInstance overrides) {
-		this.overrides = overrides;
-	}
+	protected void inferFromOverride(MethodInstance overrides) {}
 }
diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/MethodMember.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/MethodMember.java
@@ -7,11 +7,8 @@
 import org.openzen.zenscript.codemodel.type.TypeID;
 import org.openzen.zenscript.codemodel.type.member.MemberSet;
 
-import java.util.Optional;
-
 public class MethodMember extends FunctionalMember {
 	public final String name;
-	private MethodInstance overrides;
 
 	public MethodMember(CodePosition position, HighLevelDefinition definition, Modifiers modifiers, String name, FunctionHeader header) {
 		super(position, definition, modifiers, modifiers.isStatic() ? MethodID.staticMethod(name) : MethodID.instanceMethod(name), header);
@@ -62,12 +59,7 @@ public Modifiers getEffectiveModifiers() {
 	}
 
 	@Override
-	public Optional<MethodInstance> getOverrides() {
-		return Optional.ofNullable(overrides);
-	}
-
-	public void setOverrides(MethodInstance overrides) {
-		this.overrides = overrides;
+	protected void inferFromOverride(MethodInstance overrides) {
 		header = header.inferFromOverride(overrides.getHeader());
 	}
 }
diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/OperatorMember.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/OperatorMember.java
@@ -11,7 +11,6 @@
 
 public class OperatorMember extends FunctionalMember {
 	public final OperatorType operator;
-	private MethodInstance overrides;
 
 	public OperatorMember(
 			CodePosition position,
@@ -67,12 +66,7 @@ public Modifiers getEffectiveModifiers() {
 	}
 
 	@Override
-	public Optional<MethodInstance> getOverrides() {
-		return Optional.ofNullable(overrides);
-	}
-
-	public void setOverrides(MethodInstance overrides) {
-		this.overrides = overrides;
+	protected void inferFromOverride(MethodInstance overrides) {
 		header = header.inferFromOverride(overrides.getHeader());
 	}
 }
diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/SetterMember.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/SetterMember.java
@@ -16,7 +16,6 @@ public class SetterMember extends FunctionalMember {
 	public TypeID type;
 	public Statement body;
 	public FunctionParameter parameter;
-	private MethodInstance overrides;
 
 	public SetterMember(
 			CodePosition position,
@@ -66,13 +65,7 @@ public <C, R> R accept(C context, MemberVisitorWithContext<C, R> visitor) {
 	}
 
 	@Override
-	public Optional<MethodInstance> getOverrides() {
-		return Optional.ofNullable(overrides);
-	}
-
-	public void setOverrides(MethodInstance overrides) {
-		this.overrides = overrides;
-
+	public void inferFromOverride(MethodInstance overrides) {
 		if (type == BasicTypeID.UNDETERMINED) {
 			this.type = overrides.getHeader().getReturnType();
 			parameter = new FunctionParameter(overrides.getHeader().getReturnType(), "$");

diff --git a/...Model/src/main/java/org/openzen/zenscript/codemodel/type/member/ExpandedResolvedType.java b/...Model/src/main/java/org/openzen/zenscript/codemodel/type/member/ExpandedResolvedType.java
@@ -4,6 +4,7 @@
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.compilation.*;
 import org.openzen.zenscript.codemodel.identifiers.ExpansionSymbol;
+import org.openzen.zenscript.codemodel.identifiers.MethodSymbol;
 import org.openzen.zenscript.codemodel.identifiers.TypeSymbol;
 import org.openzen.zenscript.codemodel.identifiers.instances.IteratorInstance;
 import org.openzen.zenscript.codemodel.identifiers.instances.MethodInstance;
@@ -175,6 +176,11 @@ public Optional<StaticCallable> findStaticOperator(OperatorType operator) {
 		return Optional.ofNullable(result);
 	}
 
+	@Override
+	public List<MethodSymbol> getInterfaceMethodsToImplement() {
+		return base.getInterfaceMethodsToImplement();
+	}
+
 	@Override
 	public Optional<Field> findField(String name) {
 		return base.findField(name);

diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/MemberSet.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/MemberSet.java
@@ -4,6 +4,7 @@
 import org.openzen.zenscript.codemodel.compilation.*;
 import org.openzen.zenscript.codemodel.identifiers.ExpansionSymbol;
 import org.openzen.zenscript.codemodel.identifiers.MethodID;
+import org.openzen.zenscript.codemodel.identifiers.MethodSymbol;
 import org.openzen.zenscript.codemodel.identifiers.TypeSymbol;
 import org.openzen.zenscript.codemodel.identifiers.instances.FieldInstance;
 import org.openzen.zenscript.codemodel.identifiers.instances.IteratorInstance;
@@ -116,6 +117,19 @@ public Optional<StaticCallable> findStaticOperator(OperatorType operator) {
 		return findStatic(MethodID.staticOperator(operator));
 	}
 
+	@Override
+	public List<MethodSymbol> getInterfaceMethodsToImplement() {
+		List<MethodSymbol> result = new ArrayList<>();
+		for (List<InstanceCallableMethod> methods : instanceMethods.values()) {
+			for (InstanceCallableMethod method : methods) {
+				if (method.getModifiers().isAbstract()) {
+					method.asMethod().ifPresent(m -> result.add(m.method));
+				}
+			}
+		}
+		return result;
+	}
+
 	@Override
 	public Optional<Field> findField(String name) {
 		return Optional.ofNullable(fields.get(name));

diff --git a/...Model/src/main/java/org/openzen/zenscript/codemodel/type/member/OptionalResolvedType.java b/...Model/src/main/java/org/openzen/zenscript/codemodel/type/member/OptionalResolvedType.java
@@ -3,6 +3,7 @@
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.compilation.*;
+import org.openzen.zenscript.codemodel.identifiers.MethodSymbol;
 import org.openzen.zenscript.codemodel.identifiers.TypeSymbol;
 import org.openzen.zenscript.codemodel.identifiers.instances.IteratorInstance;
 import org.openzen.zenscript.codemodel.identifiers.instances.MethodInstance;
@@ -135,4 +136,9 @@ public Optional<IteratorInstance> findIterator(int variables) {
 	public Optional<StaticCallable> findStaticOperator(OperatorType operator) {
 		return Optional.empty();
 	}
+
+	@Override
+	public List<MethodSymbol> getInterfaceMethodsToImplement() {
+		return Collections.emptyList();
+	}
 }
diff --git a/CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/SubtypeResolvedType.java b/CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/SubtypeResolvedType.java
@@ -8,6 +8,7 @@
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.SupertypeCastExpression;
+import org.openzen.zenscript.codemodel.identifiers.MethodSymbol;
 import org.openzen.zenscript.codemodel.identifiers.TypeSymbol;
 import org.openzen.zenscript.codemodel.identifiers.instances.IteratorInstance;
 import org.openzen.zenscript.codemodel.identifiers.instances.MethodInstance;
@@ -163,6 +164,16 @@ public Optional<StaticCallable> findStaticOperator(OperatorType operator) {
 		return thisType.findStaticOperator(operator);
 	}
 
+	@Override
+	public List<MethodSymbol> getInterfaceMethodsToImplement() {
+		Set<MethodSymbol> overridden = new HashSet<>();
+		return Stream.concat(baseTypes.stream(), Stream.of(thisType))
+				.flatMap(type -> type.getInterfaceMethodsToImplement().stream())
+				.filter(method -> !overridden.contains(method))
+				.peek(m -> m.getOverrides().ifPresent(override -> overridden.add(override.method)))
+				.collect(Collectors.toList());
+	}
+
 	private <T> Optional<T> findFirstInLocalOrBaseTypes(Function<ResolvedType, Optional<T>> mapper) {
 		return streamAllTypes()
 				.map(mapper)