- Added support for implementations and method overriding

- Added override method header inference: if a method overrides or implements another method, and types are missing from the header, these will be inherited from the base method. This works with any kind of method (method, operator, getter, setter, caller)
- Added method return type inference, which is automatically inferred from the return value of the contents of the method. This functionality is not yet fully implemented, and will fail with certain expressions (most notably, member expressions and calls). The goal is to make this system work as long as there is no recursion. This works with methods, operators, getters, calls as well as fields and constants with initializers.
- Removed the any type. With return type inference its usefulness has become even more limited, and proper implementation of the any type is expected to be complicated, thus not worth the effort. (this may be revisited later on, as "any" remains a reserved keyword)
- Fixed compilation of throw as panic expressions in lambda function bodies
- Moved name from FunctionalMember to MethodMember, where it makes more sense
- Each method (or functional) is now also aware of the member that it overrides

CodeFormatter/src/main/java/org/openzen/zenscript/formatter/FormattingUtils.java

@@ -78,7 +78,7 @@ public class FormattingUtils {
 			if (parameter.variadic)
 				result.append("...");
 			
-			if (!settings.showAnyInFunctionHeaders || parameter.type != BasicTypeID.ANY) {
+			if (!settings.showAnyInFunctionHeaders || parameter.type != BasicTypeID.UNDETERMINED) {
 				result.append(" as ");
 				result.append(header.returnType.accept(typeFormatter));
 			}
@@ -86,7 +86,7 @@ public class FormattingUtils {
 			parameterIndex++;
 		}
 		result.append(")");
-		if (!settings.showAnyInFunctionHeaders || header.returnType != BasicTypeID.ANY) {
+		if (!settings.showAnyInFunctionHeaders || header.returnType != BasicTypeID.UNDETERMINED) {
 			result.append(" as ");
 			result.append(header.returnType.accept(typeFormatter));
 		}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/FunctionHeader.java

@@ -5,6 +5,8 @@
  */
 package org.openzen.zenscript.codemodel;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -15,6 +17,7 @@ import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.type.GenericTypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
 
 /**
@@ -31,6 +34,7 @@ public class FunctionHeader {
 	
 	public final int minParameters;
 	public final int maxParameters;
+	public final boolean hasUnknowns;
 	
 	public FunctionHeader(ITypeID returnType) {
 		if (returnType == null)
@@ -43,6 +47,7 @@ public class FunctionHeader {
 		
 		minParameters = 0;
 		maxParameters = 0;
+		hasUnknowns = returnType == BasicTypeID.UNDETERMINED;
 	}
 	
 	public FunctionHeader(ITypeID returnType, ITypeID... parameterTypes) {
@@ -59,6 +64,7 @@ public class FunctionHeader {
 		
 		minParameters = parameterTypes.length;
 		maxParameters = parameterTypes.length;
+		hasUnknowns = hasUnknowns(parameterTypes);
 	}
 	
 	public FunctionHeader(ITypeID returnType, FunctionParameter... parameters) {
@@ -72,6 +78,7 @@ public class FunctionHeader {
 		
 		minParameters = getMinParameters(parameters);
 		maxParameters = getMaxParameters(parameters);
+		hasUnknowns = hasUnknowns(parameters);
 	}
 	
 	public FunctionHeader(TypeParameter[] genericParameters, ITypeID returnType, ITypeID thrownType, FunctionParameter... parameters) {
@@ -87,12 +94,50 @@ public class FunctionHeader {
 		
 		minParameters = getMinParameters(parameters);
 		maxParameters = getMaxParameters(parameters);
+		hasUnknowns = hasUnknowns(parameters);
 	}
 	
 	public int getNumberOfTypeParameters() {
 		return typeParameters.length;
 	}
 	
+	public FunctionHeader withReturnType(ITypeID returnType) {
+		return new FunctionHeader(typeParameters, returnType, thrownType, parameters);
+	}
+	
+	public FunctionHeader inferFromOverride(GlobalTypeRegistry registry, FunctionHeader overridden) {
+		TypeParameter[] resultTypeParameters = typeParameters;
+		GenericMapper mapper;
+		if (resultTypeParameters == TypeParameter.NONE) {
+			resultTypeParameters = overridden.typeParameters;
+			mapper = new GenericMapper(registry, Collections.emptyMap());
+		} else {
+			Map<TypeParameter, ITypeID> mapping = new HashMap<>();
+			for (int i = 0; i < overridden.typeParameters.length; i++)
+				mapping.put(overridden.typeParameters[i], new GenericTypeID(typeParameters[i]));
+			mapper = new GenericMapper(registry, mapping);
+		}
+		
+		ITypeID resultReturnType = this.returnType;
+		if (resultReturnType == BasicTypeID.UNDETERMINED)
+			resultReturnType = overridden.returnType.instance(mapper);
+		
+		ITypeID resultThrownType = this.thrownType;
+		if (resultThrownType == null && overridden.thrownType != null)
+			resultThrownType = overridden.thrownType.instance(mapper);
+		
+		FunctionParameter[] resultParameters = Arrays.copyOf(parameters, parameters.length);
+		for (int i = 0; i < resultParameters.length; i++) {
+			if (resultParameters[i].type == BasicTypeID.UNDETERMINED) {
+				FunctionParameter parameter = resultParameters[i];
+				FunctionParameter original = overridden.parameters[i];
+				resultParameters[i] = new FunctionParameter(original.type.instance(mapper), parameter.name, parameter.defaultValue, original.variadic);
+			}
+		}
+		
+		return new FunctionHeader(resultTypeParameters, resultReturnType, resultThrownType, resultParameters);
+	}
+	
 	public boolean matchesExactly(CallArguments arguments, TypeScope scope) {
 		if (arguments.arguments.length < minParameters || arguments.arguments.length > maxParameters)
 			return false;
@@ -211,6 +256,25 @@ public class FunctionHeader {
 		return true;
 	}
 	
+	public boolean canOverride(TypeScope scope, FunctionHeader other) {
+		if (parameters.length != other.parameters.length)
+			return false;
+		if (returnType != BasicTypeID.UNDETERMINED && !scope.getTypeMembers(returnType).canCastImplicit(other.returnType))
+			return false;
+		
+		for (int i = 0; i < parameters.length; i++) {
+			if (parameters[i].type == BasicTypeID.UNDETERMINED)
+				continue;
+			
+			if (parameters[i].variadic != other.parameters[i].variadic)
+				return false;
+			if (!scope.getTypeMembers(other.parameters[i].type).canCastImplicit(parameters[i].type))
+				return false;
+		}
+		
+		return true;
+	}
+	
 	/**
 	 * Checks if two function headers are equivalent. Functions headers are
 	 * equivalent if their types are the same.
@@ -361,4 +425,20 @@ public class FunctionHeader {
 		
 		return parameters[parameters.length - 1].variadic ? Integer.MAX_VALUE : parameters.length;
 	}
+	
+	private static boolean hasUnknowns(ITypeID[] types) {
+		for (ITypeID type : types)
+			if (type == BasicTypeID.UNDETERMINED)
+				return true;
+		
+		return false;
+	}
+	
+	private static boolean hasUnknowns(FunctionParameter[] parameters) {
+		for (FunctionParameter parameter : parameters)
+			if (parameter.type == BasicTypeID.UNDETERMINED)
+				return true;
+		
+		return false;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/Modifiers.java

@@ -73,4 +73,8 @@ public class Modifiers {
 	public static boolean isExtern(int modifiers) {
 		return (modifiers & EXTERN) > 0;
 	}
+	
+	public static boolean isOverride(int modifiers) {
+		return (modifiers & OVERRIDE) > 0;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/annotations/AnnotationProcessor.java

@@ -32,6 +32,8 @@ import org.openzen.zenscript.codemodel.member.MethodMember;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.member.StaticInitializerMember;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
+import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.scope.DefinitionScope;
 import org.openzen.zenscript.codemodel.scope.FileScope;
 import org.openzen.zenscript.codemodel.scope.FunctionScope;
@@ -187,7 +189,11 @@ public class AnnotationProcessor implements ModuleProcessor {
 		@Override
 		public Void visitStaticInitializer(StaticInitializerMember member) {
 			StatementScope scope = new FunctionScope(this.scope, new FunctionHeader(BasicTypeID.VOID));
-			member.body = process(member.body, scope);
+			if (member.body == null) {
+				throw new IllegalStateException("No body in static initializer @ " + member.position);
+			} else {
+				member.body = process(member.body, scope);
+			}
 			return null;
 		}
 		
@@ -195,8 +201,8 @@ public class AnnotationProcessor implements ModuleProcessor {
 			for (MemberAnnotation annotation : member.annotations)
 				annotation.apply(member, scope);
 			
-			if (member.overrides != null) {
-				functional(member, member.overrides);
+			if (member.getOverrides() != null) {
+				functional(member, member.getOverrides());
 			}
 			
 			if (member.body == null)
@@ -207,12 +213,12 @@ public class AnnotationProcessor implements ModuleProcessor {
 			return null;
 		}
 		
-		private void functional(FunctionalMember member, FunctionalMember overrides) {
-			for (MemberAnnotation annotation : overrides.annotations)
+		private void functional(FunctionalMember member, DefinitionMemberRef overrides) {
+			for (MemberAnnotation annotation : overrides.getAnnotations())
 				annotation.applyOnOverridingMethod(member, scope);
 			
-			if (overrides.overrides != null) {
-				functional(member, overrides.overrides);
+			if (overrides.getOverrides() != null) {
+				functional(member, overrides.getOverrides());
 			}
 		}
 	}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/CallArguments.java

@@ -18,20 +18,19 @@ import org.openzen.zenscript.codemodel.type.ITypeID;
  * @author Hoofdgebruiker
  */
 public class CallArguments {
-	public static final ITypeID[] NO_TYPE_ARGUMENTS = new ITypeID[0];
 	public static final CallArguments EMPTY = new CallArguments(new Expression[0]);
 	
 	public final ITypeID[] typeArguments;
 	public final Expression[] arguments;
 	
 	public CallArguments(Expression... arguments) {
-		this.typeArguments = NO_TYPE_ARGUMENTS;
+		this.typeArguments = ITypeID.NONE;
 		this.arguments = arguments;
 	}
 	
 	public CallArguments(ITypeID[] typeArguments, Expression[] arguments) {
 		if (typeArguments == null)
-			typeArguments = NO_TYPE_ARGUMENTS;
+			typeArguments = ITypeID.NONE;
 		if (arguments == null)
 			throw new IllegalArgumentException("Arguments cannot be null!");
 		
@@ -39,6 +38,13 @@ public class CallArguments {
 		this.arguments = arguments;
 	}
 	
+	public CallArguments(ITypeID... dummy) {
+		this.typeArguments = ITypeID.NONE;
+		this.arguments = new Expression[dummy.length];
+		for (int i = 0; i < dummy.length; i++)
+			arguments[i] = new DummyExpression(dummy[i]);
+	}
+	
 	public int getNumberOfTypeArguments() {
 		return typeArguments.length;
 	}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/Expression.java

@@ -81,6 +81,16 @@ public abstract class Expression implements IPartialExpression {
 		return scope.getTypeMembers(type).castImplicit(position, this, asType, true);
 	}
 	
+	/**
+	 * Determines if this expression aborts execution; that is, it is either a
+	 * throw or a panic expression.
+	 * 
+	 * @return abort flag
+	 */
+	public boolean aborts() {
+		return false;
+	}
+	
 	@Override
 	public List<ITypeID>[] predictCallTypes(TypeScope scope, List<ITypeID> hints, int arguments) {
 		return scope.getTypeMembers(type).getOrCreateGroup(OperatorType.CALL).predictCallTypes(scope, hints, arguments);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/PanicExpression.java

@@ -20,6 +20,11 @@ public class PanicExpression extends Expression {
 		
 		this.value = value;
 	}
+	
+	@Override
+	public boolean aborts() {
+		return true;
+	}
 
 	@Override
 	public <T> T accept(ExpressionVisitor<T> visitor) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/ThrowExpression.java

@@ -20,6 +20,11 @@ public class ThrowExpression extends Expression {
 		
 		this.value = value;
 	}
+	
+	@Override
+	public boolean aborts() {
+		return true;
+	}
 
 	@Override
 	public <T> T accept(ExpressionVisitor<T> visitor) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/CallerMember.java

@@ -9,6 +9,9 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
+import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
@@ -18,6 +21,8 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
  * @author Hoofdgebruiker
  */
 public class CallerMember extends FunctionalMember {
+	public FunctionalMemberRef overrides;
+	
 	public CallerMember(
 			CodePosition position,
 			HighLevelDefinition definition,
@@ -25,7 +30,7 @@ public class CallerMember extends FunctionalMember {
 			FunctionHeader header,
 			BuiltinID builtin)
 	{
-		super(position, definition, modifiers, "()", header, builtin);
+		super(position, definition, modifiers, header, builtin);
 	}
 	
 	@Override
@@ -52,4 +57,14 @@ public class CallerMember extends FunctionalMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitCaller(this);
 	}
+	
+	public void setOverrides(GlobalTypeRegistry registry, FunctionalMemberRef overrides) {
+		this.overrides = overrides;
+		header = header.inferFromOverride(registry, overrides.getHeader());
+	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return overrides;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/CasterMember.java

@@ -11,6 +11,7 @@ import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.member.ref.CasterMemberRef;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
@@ -22,6 +23,7 @@ import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
  */
 public class CasterMember extends FunctionalMember {
 	public final ITypeID toType;
+	public CasterMemberRef overrides;
 	
 	public CasterMember(
 			CodePosition position,
@@ -30,7 +32,7 @@ public class CasterMember extends FunctionalMember {
 			ITypeID toType,
 			BuiltinID builtin)
 	{
-		super(position, definition, modifiers, "as", new FunctionHeader(toType), builtin);
+		super(position, definition, modifiers, new FunctionHeader(toType), builtin);
 		
 		this.toType = toType;
 	}
@@ -67,4 +69,13 @@ public class CasterMember extends FunctionalMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitCaster(this);
 	}
+	
+	public void setOverrides(GlobalTypeRegistry registry, CasterMemberRef overrides) {
+		this.overrides = overrides;
+	}
+
+	@Override
+	public CasterMemberRef getOverrides() {
+		return overrides;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ConstMember.java

@@ -10,6 +10,7 @@ import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.member.ref.ConstMemberRef;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
@@ -21,7 +22,7 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
  */
 public class ConstMember extends DefinitionMember {
 	public final String name;
-	public final ITypeID type;
+	public ITypeID type;
 	public Expression value;
 	public final BuiltinID builtin;
 	
@@ -52,4 +53,9 @@ public class ConstMember extends DefinitionMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitConst(this);
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ConstructorMember.java

@@ -11,6 +11,7 @@ import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.expression.ConstructorSuperCallExpression;
 import org.openzen.zenscript.codemodel.expression.ConstructorThisCallExpression;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.statement.BlockStatement;
 import org.openzen.zenscript.codemodel.statement.ExpressionStatement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
@@ -34,7 +35,6 @@ public class ConstructorMember extends FunctionalMember {
 				position,
 				definition,
 				modifiers,
-				"this",
 				new FunctionHeader(header.typeParameters, BasicTypeID.VOID, header.thrownType, header.parameters),
 				builtin);
 	}
@@ -79,4 +79,9 @@ public class ConstructorMember extends FunctionalMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitConstructor(this);
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/CustomIteratorMember.java

@@ -9,6 +9,7 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -23,6 +24,7 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 public class CustomIteratorMember extends DefinitionMember implements IIteratorMember {
 	private final ITypeID[] iteratorTypes;
 	public Statement body;
+	public IteratorMemberRef overrides;
 	
 	public CustomIteratorMember(CodePosition position, HighLevelDefinition definition, int modifiers, ITypeID[] iteratorTypes) {
 		super(position, definition, modifiers);
@@ -68,4 +70,13 @@ public class CustomIteratorMember extends DefinitionMember implements IIteratorM
 	public <T> T acceptForIterator(ForeachIteratorVisitor<T> visitor) {
 		return visitor.visitCustomIterator();
 	}
+	
+	public void setOverrides(IteratorMemberRef overrides) {
+		this.overrides = overrides;
+	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return overrides;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/DefinitionMember.java

@@ -18,7 +18,7 @@ import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 public abstract class DefinitionMember extends Taggable implements IDefinitionMember {
 	public final CodePosition position;
 	public final HighLevelDefinition definition;
-	public final int modifiers;
+	public int modifiers;
 	public MemberAnnotation[] annotations = MemberAnnotation.NONE;
 	
 	public DefinitionMember(CodePosition position, HighLevelDefinition definition, int modifiers) {
@@ -47,4 +47,12 @@ public abstract class DefinitionMember extends Taggable implements IDefinitionMe
 	public boolean isPrivate() {
 		return Modifiers.isPrivate(modifiers);
 	}
+	
+	public boolean isPublic() {
+		return Modifiers.isPublic(modifiers);
+	}
+	
+	public boolean isProtected() {
+		return Modifiers.isProtected(modifiers);
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/DestructorMember.java

@@ -9,6 +9,8 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
+import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
@@ -19,9 +21,10 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
  */
 public class DestructorMember extends FunctionalMember {
 	private static final FunctionHeader HEADER = new FunctionHeader(BasicTypeID.VOID);
+	public FunctionalMemberRef overrides;
 	
 	public DestructorMember(CodePosition position, HighLevelDefinition definition, int modifiers) {
-		super(position, definition, modifiers, "~this", HEADER, null);
+		super(position, definition, modifiers, HEADER, null);
 	}
 	
 	@Override
@@ -49,4 +52,9 @@ public class DestructorMember extends FunctionalMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitDestructor(this);
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return overrides;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/FieldMember.java

@@ -13,6 +13,7 @@ import org.openzen.zenscript.codemodel.expression.GetFieldExpression;
 import org.openzen.zenscript.codemodel.expression.GetFunctionParameterExpression;
 import org.openzen.zenscript.codemodel.expression.SetFieldExpression;
 import org.openzen.zenscript.codemodel.expression.ThisExpression;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.FieldMemberRef;
 import org.openzen.zenscript.codemodel.statement.ExpressionStatement;
 import org.openzen.zenscript.codemodel.statement.ReturnStatement;
@@ -29,7 +30,7 @@ import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
  */
 public class FieldMember extends DefinitionMember {
 	public final String name;
-	public final ITypeID type;
+	public ITypeID type;
 	public Expression initializer;
 	public final int autoGetterAccess;
 	public final int autoSetterAccess;
@@ -138,4 +139,9 @@ public class FieldMember extends DefinitionMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitField(this);
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/FunctionalMember.java

@@ -18,22 +18,18 @@ import org.openzen.zenscript.codemodel.type.member.BuiltinID;
  * @author Hoofdgebruiker
  */
 public abstract class FunctionalMember extends DefinitionMember {
-	public final FunctionHeader header;
-	public final String name;
+	public FunctionHeader header;
 	public final BuiltinID builtin;
 	public Statement body = null;
-	public FunctionalMember overrides = null;
 	
 	public FunctionalMember(
 			CodePosition position,
 			HighLevelDefinition definition,
 			int modifiers,
-			String name,
 			FunctionHeader header,
 			BuiltinID builtin) {
 		super(position, definition, modifiers);
 		
-		this.name = name;
 		this.header = header;
 		this.builtin = builtin;
 	}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/GetterMember.java

@@ -9,7 +9,9 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.GetterMemberRef;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
@@ -21,7 +23,8 @@ import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
  */
 public class GetterMember extends FunctionalMember {
 	public final String name;
-	public final ITypeID type;
+	public ITypeID type;
+	private GetterMemberRef overrides;
 	
 	public GetterMember(
 			CodePosition position,
@@ -30,7 +33,7 @@ public class GetterMember extends FunctionalMember {
 			String name,
 			ITypeID type,
 			BuiltinID builtin) {
-		super(position, definition, modifiers, name, new FunctionHeader(type), builtin);
+		super(position, definition, modifiers, new FunctionHeader(type), builtin);
 		
 		this.name = name;
 		this.type = type;
@@ -60,4 +63,16 @@ public class GetterMember extends FunctionalMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitGetter(this);
 	}
+
+	@Override
+	public GetterMemberRef getOverrides() {
+		return overrides;
+	}
+	
+	public void setOverrides(GetterMemberRef override) {
+		this.overrides = override;
+		
+		if (type == BasicTypeID.UNDETERMINED)
+			type = override.type;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/IDefinitionMember.java

@@ -6,7 +6,9 @@
 package org.openzen.zenscript.codemodel.member;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
@@ -31,4 +33,6 @@ public interface IDefinitionMember {
 	public <T> void setTag(Class<T> tag, T value);
 
 	<T> boolean hasTag(Class<T> tag);
+	
+	DefinitionMemberRef getOverrides();
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ImplementationMember.java

@@ -10,6 +10,7 @@ import java.util.List;
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.ImplementationMemberRef;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -57,4 +58,9 @@ public class ImplementationMember extends DefinitionMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitImplementation(this);
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/InnerDefinitionMember.java

@@ -8,6 +8,7 @@ package org.openzen.zenscript.codemodel.member;
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
@@ -48,4 +49,9 @@ public class InnerDefinitionMember extends DefinitionMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitInnerDefinition(this);
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/MethodMember.java

@@ -9,6 +9,9 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
@@ -18,8 +21,13 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
  * @author Hoofdgebruiker
  */
 public class MethodMember extends FunctionalMember {
+	public final String name;
+	private FunctionalMemberRef overrides;
+	
 	public MethodMember(CodePosition position, HighLevelDefinition definition, int modifiers, String name, FunctionHeader header, BuiltinID builtin) {
-		super(position, definition, modifiers, name, header, builtin);
+		super(position, definition, modifiers, header, builtin);
+		
+		this.name = name;
 	}
 	
 	@Override
@@ -46,4 +54,19 @@ public class MethodMember extends FunctionalMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitMethod(this);
 	}
+
+	@Override
+	public FunctionalMemberRef getOverrides() {
+		return overrides;
+	}
+	
+	public void setOverrides(GlobalTypeRegistry registry, FunctionalMemberRef overrides) {
+		this.overrides = overrides;
+		header = header.inferFromOverride(registry, overrides.header);
+		
+		if (overrides.getTarget().isPublic())
+			modifiers |= Modifiers.PUBLIC;
+		if (overrides.getTarget().isProtected())
+			modifiers |= Modifiers.PROTECTED;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/OperatorMember.java

@@ -10,6 +10,8 @@ import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.OperatorType;
+import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
@@ -20,6 +22,7 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
  */
 public class OperatorMember extends FunctionalMember {
 	public final OperatorType operator;
+	private FunctionalMemberRef overrides;
 	
 	public OperatorMember(
 			CodePosition position,
@@ -29,7 +32,7 @@ public class OperatorMember extends FunctionalMember {
 			FunctionHeader header,
 			BuiltinID builtin)
 	{
-		super(position, definition, modifiers, operator.operator, header, builtin);
+		super(position, definition, modifiers, header, builtin);
 		
 		this.operator = operator;
 	}
@@ -58,4 +61,14 @@ public class OperatorMember extends FunctionalMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitOperator(this);
 	}
+
+	@Override
+	public FunctionalMemberRef getOverrides() {
+		return overrides;
+	}
+	
+	public void setOverrides(GlobalTypeRegistry registry, FunctionalMemberRef overrides) {
+		this.overrides = overrides;
+		header = header.inferFromOverride(registry, overrides.header);
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/SetterMember.java

@@ -22,7 +22,9 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
  * @author Hoofdgebruiker
  */
 public class SetterMember extends FunctionalMember {
-	public final ITypeID type;
+	public ITypeID type;
+	public final String name;
+	private SetterMemberRef overrides;
 	
 	public SetterMember(
 			CodePosition position,
@@ -35,11 +37,11 @@ public class SetterMember extends FunctionalMember {
 		super(position,
 				definition,
 				modifiers,
-				name,
 				new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(type, "$")),
 				builtin);
 		
 		this.type = type;
+		this.name = name;
 	}
 	
 	@Override
@@ -66,4 +68,16 @@ public class SetterMember extends FunctionalMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitSetter(this);
 	}
+
+	@Override
+	public SetterMemberRef getOverrides() {
+		return overrides;
+	}
+	
+	public void setOverrides(SetterMemberRef overrides) {
+		this.overrides = overrides;
+		
+		if (type == BasicTypeID.UNDETERMINED)
+			type = overrides.type;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/StaticInitializerMember.java

@@ -9,6 +9,7 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.Taggable;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
@@ -51,4 +52,9 @@ public class StaticInitializerMember extends Taggable implements IDefinitionMemb
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitStaticInitializer(this);
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/ArrayIteratorKeyValues.java

@@ -11,6 +11,7 @@ import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
 import org.openzen.zenscript.codemodel.member.IIteratorMember;
 import org.openzen.zenscript.codemodel.member.MemberVisitor;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
@@ -75,4 +76,9 @@ public class ArrayIteratorKeyValues extends Taggable implements IIteratorMember
 	public <T> T acceptForIterator(ForeachIteratorVisitor<T> visitor) {
 		return visitor.visitArrayKeyValueIterator();
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/ArrayIteratorValues.java

@@ -11,6 +11,7 @@ import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
 import org.openzen.zenscript.codemodel.member.IIteratorMember;
 import org.openzen.zenscript.codemodel.member.MemberVisitor;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -70,4 +71,9 @@ public class ArrayIteratorValues extends Taggable implements IIteratorMember {
 	public <T> T acceptForIterator(ForeachIteratorVisitor<T> visitor) {
 		return visitor.visitArrayValueIterator();
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/AssocIterator.java

@@ -11,6 +11,7 @@ import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
 import org.openzen.zenscript.codemodel.member.IIteratorMember;
 import org.openzen.zenscript.codemodel.member.MemberVisitor;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
 import org.openzen.zenscript.codemodel.type.AssocTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -73,4 +74,9 @@ public class AssocIterator extends Taggable implements IIteratorMember {
 	public <T> T acceptForIterator(ForeachIteratorVisitor<T> visitor) {
 		return visitor.visitAssocKeyValueIterator();
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/RangeIterator.java

@@ -11,6 +11,7 @@ import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
 import org.openzen.zenscript.codemodel.member.IIteratorMember;
 import org.openzen.zenscript.codemodel.member.MemberVisitor;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -81,4 +82,9 @@ public class RangeIterator extends Taggable implements IIteratorMember {
 	public <T> T acceptForIterator(ForeachIteratorVisitor<T> visitor) {
 		return visitor.visitIntRange();
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/StringCharIterator.java

@@ -11,6 +11,7 @@ import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
 import org.openzen.zenscript.codemodel.member.IIteratorMember;
 import org.openzen.zenscript.codemodel.member.MemberVisitor;
+import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -64,4 +65,9 @@ public class StringCharIterator extends Taggable implements IIteratorMember {
 	public <T> T accept(MemberVisitor<T> visitor) {
 		throw new UnsupportedOperationException("Not a compilable member");
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ref/CasterMemberRef.java

@@ -6,7 +6,9 @@
 package org.openzen.zenscript.codemodel.member.ref;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 import org.openzen.zenscript.codemodel.expression.CastExpression;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.member.CasterMember;
@@ -47,4 +49,19 @@ public class CasterMemberRef implements DefinitionMemberRef {
 	public boolean isImplicit() {
 		return Modifiers.isImplicit(member.modifiers);
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return member.getOverrides();
+	}
+
+	@Override
+	public FunctionHeader getHeader() {
+		return member.header;
+	}
+
+	@Override
+	public MemberAnnotation[] getAnnotations() {
+		return member.annotations;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ref/ConstMemberRef.java

@@ -6,6 +6,8 @@
 package org.openzen.zenscript.codemodel.member.ref;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 import org.openzen.zenscript.codemodel.member.ConstMember;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 
@@ -36,4 +38,19 @@ public class ConstMemberRef implements DefinitionMemberRef {
 	public <T> T getTag(Class<T> type) {
 		return member.getTag(type);
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
+
+	@Override
+	public FunctionHeader getHeader() {
+		return null;
+	}
+
+	@Override
+	public MemberAnnotation[] getAnnotations() {
+		return member.annotations;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ref/DefinitionMemberRef.java

@@ -6,6 +6,8 @@
 package org.openzen.zenscript.codemodel.member.ref;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 
 /**
  *
@@ -17,4 +19,10 @@ public interface DefinitionMemberRef {
 	String describe();
 	
 	<T> T getTag(Class<T> type);
+	
+	DefinitionMemberRef getOverrides();
+	
+	FunctionHeader getHeader();
+	
+	MemberAnnotation[] getAnnotations();
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ref/FieldMemberRef.java

@@ -6,6 +6,8 @@
 package org.openzen.zenscript.codemodel.member.ref;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 
@@ -44,4 +46,19 @@ public class FieldMemberRef implements DefinitionMemberRef {
 	public boolean isFinal() {
 		return member.isFinal();
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
+
+	@Override
+	public FunctionHeader getHeader() {
+		return null;
+	}
+
+	@Override
+	public MemberAnnotation[] getAnnotations() {
+		return member.annotations;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ref/FunctionalMemberRef.java

@@ -9,6 +9,7 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.CompareType;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.OperatorType;
+import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.CallExpression;
 import org.openzen.zenscript.codemodel.expression.CallStaticExpression;
@@ -40,6 +41,10 @@ public class FunctionalMemberRef implements DefinitionMemberRef {
 		return target.position;
 	}
 	
+	public FunctionalMember getTarget() {
+		return target;
+	}
+	
 	public String getCanonicalName() {
 		return target.getCanonicalName();
 	}
@@ -49,10 +54,26 @@ public class FunctionalMemberRef implements DefinitionMemberRef {
 		return target.describe();
 	}
 	
+	@Override
 	public <T> T getTag(Class<T> cls) {
 		return target.getTag(cls);
 	}
 	
+	@Override
+	public MemberAnnotation[] getAnnotations() {
+		return target.annotations;
+	}
+	
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return target.getOverrides();
+	}
+
+	@Override
+	public FunctionHeader getHeader() {
+		return header;
+	}
+	
 	public BuiltinID getBuiltin() {
 		return target.builtin;
 	}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ref/GetterMemberRef.java

@@ -6,6 +6,8 @@
 package org.openzen.zenscript.codemodel.member.ref;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.GetterExpression;
 import org.openzen.zenscript.codemodel.expression.StaticGetterExpression;
@@ -51,4 +53,19 @@ public class GetterMemberRef implements DefinitionMemberRef {
 	public Expression getStatic(CodePosition position) {
 		return new StaticGetterExpression(position, this);
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return member.getOverrides();
+	}
+
+	@Override
+	public FunctionHeader getHeader() {
+		return member.header;
+	}
+
+	@Override
+	public MemberAnnotation[] getAnnotations() {
+		return member.annotations;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ref/ImplementationMemberRef.java

@@ -6,6 +6,8 @@
 package org.openzen.zenscript.codemodel.member.ref;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 import org.openzen.zenscript.codemodel.member.ImplementationMember;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 
@@ -36,4 +38,19 @@ public class ImplementationMemberRef implements DefinitionMemberRef {
 	public <T> T getTag(Class<T> type) {
 		return member.getTag(type);
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return null;
+	}
+
+	@Override
+	public FunctionHeader getHeader() {
+		return null;
+	}
+
+	@Override
+	public MemberAnnotation[] getAnnotations() {
+		return member.annotations;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ref/IteratorMemberRef.java

@@ -6,6 +6,9 @@
 package org.openzen.zenscript.codemodel.member.ref;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
+import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
 import org.openzen.zenscript.codemodel.member.IIteratorMember;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 
@@ -40,4 +43,23 @@ public class IteratorMemberRef implements DefinitionMemberRef {
 	public int getLoopVariableCount() {
 		return types.length;
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return target.getOverrides();
+	}
+
+	@Override
+	public FunctionHeader getHeader() {
+		return null; // TODO
+	}
+
+	@Override
+	public MemberAnnotation[] getAnnotations() {
+		if (target instanceof CustomIteratorMember) {
+			return ((CustomIteratorMember)target).annotations;
+		} else {
+			return null;
+		}
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ref/SetterMemberRef.java

@@ -6,6 +6,8 @@
 package org.openzen.zenscript.codemodel.member.ref;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 
@@ -40,4 +42,19 @@ public class SetterMemberRef implements DefinitionMemberRef {
 	public boolean isStatic() {
 		return member.isStatic();
 	}
+
+	@Override
+	public DefinitionMemberRef getOverrides() {
+		return member.getOverrides();
+	}
+
+	@Override
+	public FunctionHeader getHeader() {
+		return member.header;
+	}
+
+	@Override
+	public MemberAnnotation[] getAnnotations() {
+		return member.annotations;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/BaseScope.java

@@ -23,8 +23,6 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
  * @author Hoofdgebruiker
  */
 public abstract class BaseScope implements TypeScope {
-	public abstract LocalMemberCache getMemberCache();
-	
 	public abstract IPartialExpression get(CodePosition position, GenericName name);
 	
 	public abstract ITypeID getType(CodePosition position, List<GenericName> name);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/TypeScope.java

@@ -16,11 +16,15 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
  * @author Hoofdgebruiker
  */
 public interface TypeScope {
-	public GlobalTypeRegistry getTypeRegistry();
-	
 	public LocalMemberCache getMemberCache();
 	
-	public TypeMembers getTypeMembers(ITypeID type);
+	default TypeMembers getTypeMembers(ITypeID type) {
+		return getMemberCache().get(type);
+	}
+	
+	default GlobalTypeRegistry getTypeRegistry() {
+		return getMemberCache().getRegistry();
+	}
 	
 	public AnnotationDefinition getAnnotation(String name);
 }

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

@@ -17,7 +17,6 @@ import org.openzen.zenscript.codemodel.generic.TypeParameter;
 public enum BasicTypeID implements ITypeID {
 	VOID("void"),
 	NULL("null"),
-	ANY("any"),
 	BOOL("bool"),
 	BYTE("byte"),
 	SBYTE("sbyte"),
@@ -74,7 +73,7 @@ public enum BasicTypeID implements ITypeID {
 	
 	@Override
 	public boolean isObjectType() {
-		return this == ANY || this == STRING;
+		return this == STRING;
 	}
 
 	@Override

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

@@ -27,6 +27,7 @@ import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.expression.ConstExpression;
 import org.openzen.zenscript.codemodel.expression.PostCallExpression;
+import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.member.ref.ConstMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.FieldMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
@@ -84,6 +85,14 @@ public class DefinitionMemberGroup {
 		return this.setter == null ? null : this.setter.member;
 	}
 	
+	public FunctionalMemberRef getUnaryMethod() {
+		for (TypeMember<FunctionalMemberRef> method : methods)
+			if (method.member.header.parameters.length == 0)
+				return method.member;
+		
+		return null;
+	}
+	
 	public boolean hasMethods() {
 		return !methods.isEmpty();
 	}
@@ -350,4 +359,19 @@ public class DefinitionMemberGroup {
 		
 		return selected;
 	}
+	
+	public FunctionalMemberRef getOverride(CodePosition position, TypeScope scope, FunctionalMember member) {
+		List<FunctionalMemberRef> candidates = new ArrayList<>();
+		for (TypeMember<FunctionalMemberRef> method : methods) {
+			if (member.header.canOverride(scope, method.member.header))
+				candidates.add(method.member);
+		}
+		
+		if (candidates.isEmpty())
+			return null;
+		if (candidates.size() == 1)
+			return candidates.get(0);
+		
+		throw new CompileException(position, CompileExceptionCode.OVERRIDE_AMBIGUOUS, "Ambiguous override: has " + candidates.size() + " base candidates");
+	}
 }

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

@@ -23,7 +23,10 @@ import org.openzen.zenscript.codemodel.expression.NullExpression;
 import org.openzen.zenscript.codemodel.expression.SupertypeCastExpression;
 import org.openzen.zenscript.codemodel.expression.WrapOptionalExpression;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
+import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.member.InnerDefinition;
+import org.openzen.zenscript.codemodel.member.MethodMember;
+import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.member.ref.CasterMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.ConstMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.FieldMemberRef;
@@ -306,7 +309,7 @@ public final class TypeMembers {
 	
 	public Expression unary(CodePosition position, TypeScope scope, OperatorType operator, Expression value) {
 		DefinitionMemberGroup members = getOrCreateGroup(operator);
-		return members.call(position, scope, value, new CallArguments(), false);
+		return members.call(position, scope, value, new CallArguments(Expression.NONE), false);
 	}
 	
 	public Expression ternary(CodePosition position, TypeScope scope, OperatorType operator, Expression a, Expression b, Expression c) {
@@ -335,8 +338,6 @@ public final class TypeMembers {
 			return true;
 		if (toType == null)
 			throw new NullPointerException();
-		if (type == BasicTypeID.ANY || toType == BasicTypeID.ANY || toType == BasicTypeID.UNDETERMINED)
-			return true;
 		
 		if (type == BasicTypeID.NULL && toType.isOptional())
 			return true;
@@ -347,12 +348,25 @@ public final class TypeMembers {
 		if (type.isOptional() && type.unwrap() == toType)
 			return true;
 		
+		return getImplicitCaster(toType) != null || extendsOrImplements(toType);
+	}
+	
+	public CasterMemberRef getImplicitCaster(ITypeID toType) {
 		for (TypeMember<CasterMemberRef> caster : casters) {
 			if (caster.member.isImplicit() && toType == caster.member.toType)
-				return true;
+				return caster.member;
+		}
+		
+		return null;
+	}
+	
+	public CasterMemberRef getCaster(ITypeID toType) {
+		for (TypeMember<CasterMemberRef> caster : casters) {
+			if (toType == caster.member.toType)
+				return caster.member;
 		}
 		
-		return extendsOrImplements(toType);
+		return null;
 	}
 	
 	public boolean canCast(ITypeID toType) {

CompilerShared/src/main/java/org/openzen/zenscript/compiler/SemanticModule.java

@@ -98,7 +98,7 @@ public class SemanticModule {
 		if (state != State.NORMALIZED)
 			throw new IllegalStateException("Module is not yet normalized");
 		
-		Validator validator = new Validator();
+		Validator validator = new Validator(compilationUnit.globalTypeRegistry, expansions, annotations);
 		for (ScriptBlock script : scripts) {
 			validator.validate(script);
 		}

Constructor/src/main/java/org/openzen/zenscript/constructor/Module.java

@@ -130,6 +130,9 @@ public class Module {
 			}
 		}
 		
+		if (failed)
+			return new SemanticModule(name, dependencies, SemanticModule.State.INVALID, rootPackage, pkg, definitions, Collections.emptyList(), registry.compilationUnit, expansions, registry.getAnnotations());
+		
 		if (failed)
 			return new SemanticModule(name, dependencies, SemanticModule.State.INVALID, rootPackage, pkg, definitions, Collections.emptyList(), registry.compilationUnit, expansions, registry.getAnnotations());
 		

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

@@ -773,10 +773,6 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 							javaWriter.invokeStatic(ARRAYS_COPY_OF_RANGE_OBJECTS);
 							javaWriter.checkCast("[Ljava/lang/String;");
 							break;
-						case ANY:
-							javaWriter.invokeStatic(ARRAYS_COPY_OF_RANGE_OBJECTS);
-							javaWriter.checkCast("[Lzsynthetic/Any;");
-							break;
 						default:
 							throw new IllegalArgumentException("Unknown basic type: " + type.elementType);
 					}
@@ -822,7 +818,6 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 							javaWriter.invokeStatic(ARRAYS_EQUALS_CHARS);
 							break;
 						case STRING:
-						case ANY:
 							javaWriter.invokeStatic(ARRAYS_EQUALS_OBJECTS);
 							break;
 						default:
@@ -1737,7 +1732,6 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 							javaWriter.invokeStatic(ARRAYS_HASHCODE_CHARS);
 							break;
 						case STRING:
-						case ANY:
 							javaWriter.invokeStatic(ARRAYS_DEEPHASHCODE);
 							break;
 						default:

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

@@ -36,8 +36,6 @@ public class JavaOptionalTypeClassVisitor implements ITypeVisitor<Class> {
 				return void.class;
 			case NULL:
 				return Object.class;
-			case ANY:
-				return Object.class; // TODO
 			case BOOL:
 				return Boolean.class;
 			case BYTE:

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

@@ -16,7 +16,6 @@ public class JavaTypeClassVisitor implements ITypeVisitor<Class> {
         switch (basic) {
             case VOID:
                 return void.class;
-            case ANY:
             case NULL:
             case UNDETERMINED:
                 return Object.class;

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/BaseMemberCompiler.java

@@ -68,6 +68,12 @@ public abstract class BaseMemberCompiler implements MemberVisitor<Void> {
 		this.currentElementType = type;
 	}
 	
+	protected void override(boolean override) {
+		if (override) {
+			output.append(indent).append("@Override\n");
+		}
+	}
+	
 	protected void modifiers(int modifiers) {
 		if (Modifiers.isPublic(modifiers))
 			output.append("public ");

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/FormattingUtils.java

@@ -64,7 +64,7 @@ public class FormattingUtils {
 			if (parameter.variadic)
 				result.append("...");
 			
-			if (!settings.showAnyInFunctionHeaders || parameter.type != BasicTypeID.ANY) {
+			if (!settings.showAnyInFunctionHeaders || parameter.type != BasicTypeID.UNDETERMINED) {
 				result.append(" as ");
 				result.append(header.returnType.accept(typeFormatter));
 			}
@@ -72,7 +72,7 @@ public class FormattingUtils {
 			parameterIndex++;
 		}
 		result.append(")");
-		if (!settings.showAnyInFunctionHeaders || header.returnType != BasicTypeID.ANY) {
+		if (!settings.showAnyInFunctionHeaders || header.returnType != BasicTypeID.UNDETERMINED) {
 			result.append(" as ");
 			result.append(header.returnType.accept(typeFormatter));
 		}

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaMemberCompiler.java

@@ -20,6 +20,7 @@ import org.openzen.zenscript.codemodel.member.DefinitionMember;
 import org.openzen.zenscript.codemodel.member.DestructorMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.member.ImplementationMember;
 import org.openzen.zenscript.codemodel.member.InnerDefinitionMember;
 import org.openzen.zenscript.codemodel.member.MethodMember;
@@ -30,6 +31,7 @@ import org.openzen.zenscript.codemodel.statement.EmptyStatement;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.javasource.scope.JavaSourceFileScope;
+import org.openzen.zenscript.javasource.tags.JavaSourceImplementation;
 import org.openzen.zenscript.javasource.tags.JavaSourceMethod;
 
 /**
@@ -67,6 +69,7 @@ public class JavaMemberCompiler extends BaseMemberCompiler {
 			
 		
 		begin(ElementType.METHOD);
+		override(member.getOverrides() != null);
 		output.append(indent);
 		if (isInterface && hasBody)
 			output.append("default ");
@@ -196,7 +199,28 @@ public class JavaMemberCompiler extends BaseMemberCompiler {
 
 	@Override
 	public Void visitImplementation(ImplementationMember member) {
-		// TODO
+		JavaSourceImplementation implementation = member.getTag(JavaSourceImplementation.class);
+		if (implementation.inline) {
+			for (IDefinitionMember m : member.members) {
+				m.accept(this);
+			}
+		} else {
+			String interfaceName = member.type.accept(new JavaSourceTypeNameVisitor());
+			String implementationName = interfaceName + "Implementation";
+			
+			begin(ElementType.FIELD);
+			output.append(indent);
+			modifiers(member.modifiers);
+			output.append("final ").append(scope.type(member.type)).append(" as").append(interfaceName).append(" = new ").append(implementationName).append("();\n");
+			
+			begin(ElementType.INNERCLASS);
+			output.append("private class ").append(implementationName).append(" implements ").append(scope.type(member.type)).append(" {\n");
+			JavaMemberCompiler memberCompiler = new JavaMemberCompiler(settings, indent + settings.indent, output, scope, isInterface, definition);
+			for (IDefinitionMember m : member.members) {
+				m.accept(memberCompiler);
+			}
+			output.append(indent).append("}\n");
+		}
 		return null;
 	}
 

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaSourceObjectTypeVisitor.java

@@ -20,7 +20,6 @@ public class JavaSourceObjectTypeVisitor extends JavaSourceTypeVisitor {
 	public String visitBasic(BasicTypeID basic) {
 		switch (basic) {
 			case VOID: return "Void";
-			case ANY: return "Any";
 			case BOOL: return "Boolean";
 			case BYTE: return "Byte";
 			case SBYTE: return "Byte";

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaSourceStatementFormatter.java

@@ -119,6 +119,8 @@ public class JavaSourceStatementFormatter implements StatementFormatter.Formatte
 	public void formatReturn(StatementFormattingTarget target, ReturnStatement statement) {
 		if (statement.value == null)
 			target.writeLine("return;");
+		else if (statement.value.aborts()) // throw or panic
+			target.writeLine(scope.expression(target, statement.value).value + ";");
 		else
 			target.writeLine("return " + scope.expression(target, statement.value).value + ";");
 	}

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaSourceTypeNameVisitor.java

@@ -29,7 +29,6 @@ public class JavaSourceTypeNameVisitor implements ITypeVisitor<String> {
 	@Override
 	public String visitBasic(BasicTypeID basic) {
 		switch (basic) {
-			case ANY: return "Any";
 			case VOID: return "Void";
 			case BOOL: return "Bool";
 			case BYTE: return "Byte";

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaSourceTypeVisitor.java

@@ -56,7 +56,6 @@ public class JavaSourceTypeVisitor implements ITypeVisitor<String>, GenericParam
 	public String visitBasic(BasicTypeID basic) {
 		switch (basic) {
 			case VOID: return "void";
-			case ANY: return "Any";
 			case BOOL: return "boolean";
 			case BYTE: return "byte";
 			case SBYTE: return "byte";

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/prepare/JavaSourcePrepareClassMethodVisitor.java

@@ -17,6 +17,7 @@ import org.openzen.zenscript.codemodel.member.DefinitionMember;
 import org.openzen.zenscript.codemodel.member.DestructorMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.member.ImplementationMember;
 import org.openzen.zenscript.codemodel.member.InnerDefinitionMember;
 import org.openzen.zenscript.codemodel.member.MemberVisitor;
@@ -27,6 +28,7 @@ import org.openzen.zenscript.codemodel.member.StaticInitializerMember;
 import org.openzen.zenscript.javasource.JavaSourceTypeNameVisitor;
 import org.openzen.zenscript.javasource.tags.JavaSourceClass;
 import org.openzen.zenscript.javasource.tags.JavaSourceField;
+import org.openzen.zenscript.javasource.tags.JavaSourceImplementation;
 import org.openzen.zenscript.javasource.tags.JavaSourceMethod;
 
 /**
@@ -64,7 +66,7 @@ public class JavaSourcePrepareClassMethodVisitor implements MemberVisitor<Void>
 
 	@Override
 	public Void visitConstructor(ConstructorMember member) {
-		visitFunctional(member, member.name);
+		visitFunctional(member, "<init>");
 		return null;
 	}
 
@@ -118,10 +120,25 @@ public class JavaSourcePrepareClassMethodVisitor implements MemberVisitor<Void>
 
 	@Override
 	public Void visitImplementation(ImplementationMember member) {
-		// TODO: implementation merge check
 		cls.empty = false;
+		if (canMergeImplementation(member)) {
+			member.setTag(JavaSourceImplementation.class, new JavaSourceImplementation(true, cls));
+			for (IDefinitionMember m : member.members)
+				m.accept(this);
+		} else {
+			JavaSourceClass implementationClass = new JavaSourceClass(cls.pkg + "." + cls.name, member.type.accept(new JavaSourceTypeNameVisitor()) + "Implementation");
+			member.setTag(JavaSourceImplementation.class, new JavaSourceImplementation(false, implementationClass));
+			
+			JavaSourcePrepareClassMethodVisitor visitor = new JavaSourcePrepareClassMethodVisitor(implementationClass, null, true);
+			for (IDefinitionMember m : member.members)
+				m.accept(visitor);
+		}
 		return null;
 	}
+	
+	private boolean canMergeImplementation(ImplementationMember member) {
+		return true; // TODO: implementation merge check
+	}
 
 	@Override
 	public Void visitInnerDefinition(InnerDefinitionMember member) {

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/prepare/JavaSourcePrepareExpansionMethodVisitor.java

@@ -117,9 +117,8 @@ public class JavaSourcePrepareExpansionMethodVisitor implements MemberVisitor<Vo
 
 	@Override
 	public Void visitImplementation(ImplementationMember member) {
-		// TODO: implementation merge check
-		//cls.empty = false; -> TODO: 
-		member.setTag(JavaSourceImplementation.class, new JavaSourceImplementation(false));
+		JavaSourceClass implementationClass = new JavaSourceClass(cls.pkg + "." + cls.name, member.type.accept(new JavaSourceTypeNameVisitor()) + "Implementation");
+		member.setTag(JavaSourceImplementation.class, new JavaSourceImplementation(false, implementationClass));
 		for (IDefinitionMember implementedMember : member.members)
 			implementedMember.accept(this);
 		

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/prepare/JavaSourceSignatureVisitor.java

@@ -0,0 +1,14 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.javasource.prepare;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class JavaSourceSignatureVisitor {
+	
+}

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/tags/JavaSourceImplementation.java

@@ -10,11 +10,11 @@ package org.openzen.zenscript.javasource.tags;
  * @author Hoofdgebruiker
  */
 public class JavaSourceImplementation {
-	public boolean inline = true;
+	public final boolean inline;
+	public final JavaSourceClass implementationClass;
 	
-	public JavaSourceImplementation() {}
-	
-	public JavaSourceImplementation(boolean inline) {
+	public JavaSourceImplementation(boolean inline, JavaSourceClass implementationClass) {
 		this.inline = inline;
+		this.implementationClass = implementationClass;
 	}
 }

Parser/src/main/java/org/openzen/zenscript/lexer/TokenParser.java

@@ -111,7 +111,8 @@ public class TokenParser<T extends Token<TT>, TT extends TokenType> implements I
 				if (reader.peek() < 0 && value.length() == 0)
 					return factory.create(eof, ""); // happens on comments at the end of files
 				
-				//value.append((char) reader.next());
+				if (value.length() == 0)
+					value.append((char) reader.next());
 				return factory.create(invalid, value.toString());
             }
         } catch (IOException ex) {

Parser/src/main/java/org/openzen/zenscript/parser/ParsedDefinition.java

@@ -76,5 +76,7 @@ public abstract class ParsedDefinition {
 	
 	public abstract void compileMembers(BaseScope scope);
 	
-	public abstract void compileCode(BaseScope scope);
+	public abstract void listMembers(BaseScope scope, PrecompilationState state);
+	
+	public abstract void compileCode(BaseScope scope, PrecompilationState state);
 }

Parser/src/main/java/org/openzen/zenscript/parser/ParsedFile.java

@@ -6,7 +6,6 @@
 package org.openzen.zenscript.parser;
 
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -189,8 +188,14 @@ public class ParsedFile {
 			List<AnnotationDefinition> annotations) {
 		FileScope scope = new FileScope(rootPackage, packageDefinitions, globalRegistry, expansions, globalSymbols, annotations);
 		loadImports(scope, rootPackage, modulePackage);
+		
+		PrecompilationState state = new PrecompilationState();
+		for (ParsedDefinition definition : this.definitions) {
+			definition.listMembers(scope, state);
+		}
+		
 		for (ParsedDefinition definition : this.definitions) {
-			definition.compileCode(scope);
+			definition.compileCode(scope, state);
 		}
 		
 		if (!statements.isEmpty() || postComment != null) {

Parser/src/main/java/org/openzen/zenscript/parser/PrecompilationState.java

@@ -0,0 +1,61 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.parser;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.scope.BaseScope;
+import org.openzen.zenscript.parser.member.ParsedDefinitionMember;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class PrecompilationState {
+	private final Map<IDefinitionMember, CompilableMember> members = new HashMap<>();
+	private final Set<ParsedDefinitionMember> compilingMembers = new HashSet<>();
+	
+	public PrecompilationState() {
+		
+	}
+	
+	public void register(BaseScope definitionScope, ParsedDefinitionMember member) {
+		members.put(member.getCompiled(), new CompilableMember(member, definitionScope));
+	}
+	
+	public boolean precompile(IDefinitionMember member) {
+		if (!members.containsKey(member))
+			return true;
+		
+		CompilableMember cMember = members.get(member);
+		if (compilingMembers.contains(cMember.member))
+			return false;
+		
+		compilingMembers.add(cMember.member);
+		if (!cMember.member.inferHeaders(cMember.definitionScope, this))
+			return false;
+		
+		compilingMembers.remove(cMember.member);
+		return true;
+	}
+	
+	public void end(ParsedDefinitionMember member) {
+		compilingMembers.remove(member);
+	}
+	
+	private class CompilableMember {
+		private final ParsedDefinitionMember member;
+		private final BaseScope definitionScope;
+		
+		public CompilableMember(ParsedDefinitionMember member, BaseScope definitionScope) {
+			this.member = member;
+			this.definitionScope = definitionScope;
+		}
+	}
+}

Parser/src/main/java/org/openzen/zenscript/parser/definitions/BaseParsedDefinition.java

@@ -12,6 +12,7 @@ import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.DefinitionScope;
 import org.openzen.zenscript.parser.ParsedAnnotation;
 import org.openzen.zenscript.parser.ParsedDefinition;
+import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.member.ParsedDefinitionMember;
 
 /**
@@ -45,11 +46,18 @@ public abstract class BaseParsedDefinition extends ParsedDefinition {
 			getCompiled().addMember(member.getCompiled());
 		}
 	}
+	
+	@Override
+	public void listMembers(BaseScope scope, PrecompilationState state) {
+		DefinitionScope innerScope = new DefinitionScope(scope, getCompiled());
+		for (ParsedDefinitionMember member : members)
+			state.register(innerScope, member);
+	}
 
 	@Override
-	public void compileCode(BaseScope scope) {
+	public void compileCode(BaseScope scope, PrecompilationState state) {
 		DefinitionScope innerScope = new DefinitionScope(scope, getCompiled());
 		for (ParsedDefinitionMember member : members)
-			member.compile(innerScope);
+			member.compile(innerScope, state);
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedAlias.java

@@ -17,6 +17,7 @@ import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.DefinitionScope;
 import org.openzen.zenscript.parser.ParsedAnnotation;
 import org.openzen.zenscript.parser.ParsedDefinition;
+import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.type.IParsedType;
 
 /**
@@ -73,9 +74,14 @@ public class ParsedAlias extends ParsedDefinition {
 		
 		compiled.setType(type.compile(innerScope));
 	}
+	
+	@Override
+	public void listMembers(BaseScope scope, PrecompilationState state) {
+		// nothing to do
+	}
 
 	@Override
-	public void compileCode(BaseScope scope) {
+	public void compileCode(BaseScope scope, PrecompilationState state) {
 		// nothing to do
 	}
 

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedClass.java

@@ -36,7 +36,7 @@ public class ParsedClass extends BaseParsedDefinition {
 		
 		ParsedClass result = new ParsedClass(pkg, position, modifiers, annotations, name, genericParameters, superclass, outerDefinition);
 		while (tokens.optional(ZSTokenType.T_ACLOSE) == null) {
-			result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled));
+			result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled, null));
 		}
 		return result;
 	}

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedEnum.java

@@ -18,6 +18,7 @@ import org.openzen.zenscript.lexer.ZSTokenType;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.parser.ParsedAnnotation;
+import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.member.ParsedDefinitionMember;
 
 /**
@@ -39,7 +40,7 @@ public class ParsedEnum extends BaseParsedDefinition {
 		
 		if (tokens.optional(ZSTokenType.T_SEMICOLON) != null) {
 			while (tokens.optional(ZSTokenType.T_ACLOSE) == null) {
-				result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled));
+				result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled, null));
 			}
 		} else {
 			tokens.required(ZSTokenType.T_ACLOSE, "} expected");
@@ -76,8 +77,8 @@ public class ParsedEnum extends BaseParsedDefinition {
 	}
 
 	@Override
-	public void compileCode(BaseScope scope) {
-		super.compileCode(scope);
+	public void compileCode(BaseScope scope, PrecompilationState state) {
+		super.compileCode(scope, state);
 		
 		DefinitionTypeID type = new DefinitionTypeID(compiled, new ITypeID[0]);
 		ExpressionScope evalScope = new ExpressionScope(scope);

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedExpansion.java

@@ -30,7 +30,7 @@ public class ParsedExpansion extends BaseParsedDefinition {
 		
 		ParsedExpansion result = new ParsedExpansion(pkg, position, modifiers, annotations, parameters, target, outerDefinition);
 		while (tokens.optional(ZSTokenType.T_ACLOSE) == null) {
-			result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled));
+			result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled, null));
 		}
 		return result;
 	}

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedFunction.java

@@ -14,8 +14,10 @@ import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.lexer.ZSTokenParser;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.FunctionScope;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.parser.ParsedAnnotation;
 import org.openzen.zenscript.parser.ParsedDefinition;
+import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.statements.ParsedFunctionBody;
 import org.openzen.zenscript.parser.statements.ParsedStatement;
 
@@ -59,10 +61,18 @@ public class ParsedFunction extends ParsedDefinition {
 	public void compileMembers(BaseScope scope) {
 		compiled.setHeader(header.compile(scope));
 	}
+	
+	@Override
+	public void listMembers(BaseScope scope, PrecompilationState state) {
+		
+	}
 
 	@Override
-	public void compileCode(BaseScope scope) {
+	public void compileCode(BaseScope scope, PrecompilationState state) {
 		FunctionScope innerScope = new FunctionScope(scope, compiled.header);
 		compiled.setCode(body.compile(innerScope, compiled.header));
+		
+		if (compiled.header.returnType == BasicTypeID.UNDETERMINED)
+			compiled.header = compiled.header.withReturnType(body.precompileForResultType(new FunctionScope(scope, compiled.header), state));
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedFunctionHeader.java

@@ -47,7 +47,7 @@ public class ParsedFunctionHeader {
 				ZSToken argName = tokens.required(T_IDENTIFIER, "identifier expected");
 				boolean variadic = tokens.optional(T_DOT3) != null;
 				
-				IParsedType type = ParsedTypeBasic.ANY;
+				IParsedType type = ParsedTypeBasic.UNDETERMINED;
 				if (tokens.optional(K_AS) != null) {
 					type = IParsedType.parse(tokens);
 				}
@@ -60,7 +60,7 @@ public class ParsedFunctionHeader {
 			tokens.required(T_BRCLOSE, ") expected");
 		}
 
-		IParsedType returnType = ParsedTypeBasic.ANY;
+		IParsedType returnType = ParsedTypeBasic.UNDETERMINED;
 		if (tokens.optional(K_AS) != null) {
 			returnType = IParsedType.parse(tokens);
 		}

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedInterface.java

@@ -39,7 +39,7 @@ public class ParsedInterface extends BaseParsedDefinition {
 		
 		ParsedInterface result = new ParsedInterface(pkg, position, modifiers, annotations, name, genericParameters, superInterfaces, outerDefinition);
 		while (tokens.optional(ZSTokenType.T_ACLOSE) == null) {
-			result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled));
+			result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled, null));
 		}
 		return result;
 	}

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedStruct.java

@@ -29,7 +29,7 @@ public class ParsedStruct extends BaseParsedDefinition {
 		
 		ParsedStruct result = new ParsedStruct(pkg, position, modifiers, annotations, name, parameters, outerDefinition);
 		while (tokens.optional(ZSTokenType.T_ACLOSE) == null) {
-			result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled));
+			result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled, null));
 		}
 		return result;
 	}

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedVariant.java

@@ -48,7 +48,7 @@ public class ParsedVariant extends BaseParsedDefinition {
 		
 		if (tokens.optional(ZSTokenType.T_SEMICOLON) != null) {
 			while (tokens.optional(ZSTokenType.T_ACLOSE) == null) {
-				result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled));
+				result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled, null));
 			}
 		} else {
 			tokens.required(ZSTokenType.T_ACLOSE, "} expected");

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

@@ -12,6 +12,8 @@ import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -35,4 +37,13 @@ public class ParsedDollarExpression extends ParsedExpression {
 	public boolean hasStrongType() {
 		return true;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		Function<CodePosition, Expression> dollar = scope.getDollar();
+		if (dollar == null)
+			return null;
+		
+		return dollar.apply(position).type;
+	}
 }

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

@@ -27,6 +27,7 @@ import org.openzen.zenscript.lexer.ZSToken;
 import org.openzen.zenscript.lexer.ZSTokenParser;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.parser.ParseException;
+import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionParameter;
 import org.openzen.zenscript.parser.statements.ParsedFunctionBody;
@@ -595,4 +596,6 @@ public abstract class ParsedExpression {
 	}
 	
 	public abstract boolean hasStrongType();
+	
+	public abstract ITypeID precompileForType(ExpressionScope scope, PrecompilationState state);
 }

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

@@ -14,6 +14,7 @@ import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -52,4 +53,14 @@ public class ParsedExpressionAndAnd extends ParsedExpression {
 	public boolean hasStrongType() {
 		return left.hasStrongType() && right.hasStrongType();
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		ITypeID leftType = left.precompileForType(scope, state);
+		ITypeID rightType = right.precompileForType(scope, state);
+		if (leftType == null || rightType == null)
+			return null;
+		
+		return scope.getTypeMembers(leftType).union(rightType);
+	}
 }

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

@@ -8,13 +8,15 @@ package org.openzen.zenscript.parser.expression;
 
 import java.util.List;
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.CompileException;
+import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.expression.ArrayExpression;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
-import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -31,8 +33,8 @@ public class ParsedExpressionArray extends ParsedExpression {
 
 	@Override
 	public IPartialExpression compile(ExpressionScope scope) {
-		ITypeID asBaseType = BasicTypeID.ANY;
-		ArrayTypeID asType = scope.getTypeRegistry().getArray(asBaseType, 1);
+		ITypeID asBaseType = null;
+		ArrayTypeID asType = null;
 		boolean couldHintType = false;
 		
 		for (ITypeID hint : scope.hints) {
@@ -53,7 +55,7 @@ public class ParsedExpressionArray extends ParsedExpression {
 			for (int i = 0; i < contents.size(); i++)
 				cContents[i] = contents.get(i).compile(contentScope).eval().castImplicit(position, scope, asBaseType);
 		} else if (contents.isEmpty()) {
-			return new ArrayExpression(position, cContents, asType);
+			throw new CompileException(position, CompileExceptionCode.UNTYPED_EMPTY_ARRAY, "Empty array with unknown type");
 		} else {
 			ExpressionScope contentScope = scope.withoutHints();
 			ITypeID resultType = null;
@@ -81,4 +83,20 @@ public class ParsedExpressionArray extends ParsedExpression {
 	public boolean hasStrongType() {
 		return false;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		if (contents.isEmpty())
+			return null;
+		
+		ITypeID type = contents.get(0).precompileForType(scope, state);
+		if (type == null)
+			return null;
+		
+		for (int i = 1; i < contents.size(); i++) {
+			ITypeID itemType = contents.get(i).precompileForType(scope, state);
+			type = scope.getTypeMembers(type).union(itemType);
+		}
+		return type;
+	}
 }

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

@@ -12,6 +12,7 @@ import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -41,4 +42,9 @@ public class ParsedExpressionAssign extends ParsedExpression {
 	public boolean hasStrongType() {
 		return right.hasStrongType();
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		return left.precompileForType(scope, state);
+	}
 }

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

@@ -10,9 +10,12 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -44,4 +47,20 @@ public class ParsedExpressionBinary extends ParsedExpression {
 	public boolean hasStrongType() {
 		return left.hasStrongType() && right.hasStrongType();
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		ITypeID leftType = left.precompileForType(scope, state);
+		if (leftType == null)
+			return null;
+		
+		DefinitionMemberGroup members = scope.getTypeMembers(leftType).getOrCreateGroup(this.operator);
+		ExpressionScope innerScope = scope.withHints(members.predictCallTypes(scope, scope.getResultTypeHints(), 1)[0]);
+		ITypeID rightType = right.precompileForType(innerScope, state);
+		FunctionalMemberRef method = members.selectMethod(position, scope, new CallArguments(rightType), true, false);
+		if (!state.precompile(method.getTarget()))
+			return null;
+		
+		return method.getTarget().header.returnType; // TODO: this will not work properly for methods with type parameters
+	}
 }

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

@@ -10,6 +10,9 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.expression.ConstantBoolExpression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -33,4 +36,9 @@ public class ParsedExpressionBool extends ParsedExpression {
 	public boolean hasStrongType() {
 		return true;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		return BasicTypeID.BOOL;
+	}
 }

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

@@ -12,6 +12,8 @@ import org.openzen.zencode.shared.CompileException;
 import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionParameter;
 import org.openzen.zenscript.parser.type.ParsedTypeBasic;
@@ -44,11 +46,19 @@ public class ParsedExpressionBracket extends ParsedExpression {
 		for (ParsedExpression expression : expressions)
 			parameters.add(expression.toLambdaParameter());
 		
-		return new ParsedFunctionHeader(parameters, ParsedTypeBasic.ANY, null);
+		return new ParsedFunctionHeader(parameters, ParsedTypeBasic.UNDETERMINED, null);
 	}
 
 	@Override
 	public boolean hasStrongType() {
 		return expressions.get(0).hasStrongType();
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		if (expressions.size() != 1)
+			return null;
+		
+		return expressions.get(0).precompileForType(scope, state);
+	}
 }

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

@@ -27,6 +27,7 @@ import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionParameter;
 
 /**
@@ -120,4 +121,9 @@ public class ParsedExpressionCall extends ParsedExpression {
 	public boolean hasStrongType() {
 		return true;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		return null; // TODO: add support for this...
+	}
 }

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

@@ -13,6 +13,7 @@ import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.parser.ParsedAnnotation;
+import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionParameter;
 import org.openzen.zenscript.parser.type.IParsedType;
@@ -49,7 +50,7 @@ public class ParsedExpressionCast extends ParsedExpression {
 			throw new CompileException(position, CompileExceptionCode.LAMBDA_HEADER_INVALID, "Not a valid lambda header");
 		
 		ParsedFunctionHeader header = value.toLambdaHeader();
-		if (header.returnType != ParsedTypeBasic.ANY)
+		if (header.returnType != ParsedTypeBasic.UNDETERMINED)
 			throw new CompileException(position, CompileExceptionCode.LAMBDA_HEADER_INVALID, "Lambda parameter already has a return type");
 		
 		return new ParsedFunctionHeader(header.genericParameters, header.parameters, type, null);
@@ -61,7 +62,7 @@ public class ParsedExpressionCast extends ParsedExpression {
 			throw new CompileException(position, CompileExceptionCode.LAMBDA_HEADER_INVALID, "Not a valid lambda header");
 		
 		ParsedFunctionParameter parameter = value.toLambdaParameter();
-		if (parameter.type != ParsedTypeBasic.ANY)
+		if (parameter.type != ParsedTypeBasic.UNDETERMINED)
 			throw new CompileException(position, CompileExceptionCode.LAMBDA_HEADER_INVALID, "Lambda parameter already has a type");
 		
 		return new ParsedFunctionParameter(ParsedAnnotation.NONE, parameter.name, type, null, false);
@@ -71,4 +72,9 @@ public class ParsedExpressionCast extends ParsedExpression {
 	public boolean hasStrongType() {
 		return true;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		return type.compile(scope);
+	}
 }

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

@@ -14,6 +14,7 @@ import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -52,4 +53,17 @@ public class ParsedExpressionCoalesce extends ParsedExpression {
 	public boolean hasStrongType() {
 		return left.hasStrongType();
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		ITypeID leftType = left.precompileForType(scope, state);
+		if (leftType == null)
+			return null;
+		
+		ITypeID resultType = leftType.getOptionalBase();
+		ITypeID rightType = right.precompileForType(scope.withHint(resultType), state);
+		
+		TypeMembers resultTypeMembers = scope.getTypeMembers(resultType);
+		return resultTypeMembers.union(rightType);
+	}
 }

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

@@ -11,6 +11,9 @@ import org.openzen.zenscript.codemodel.CompareType;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -44,4 +47,9 @@ public class ParsedExpressionCompare extends ParsedExpression {
 	public boolean hasStrongType() {
 		return true;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		return BasicTypeID.BOOL;
+	}
 }

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

@@ -16,6 +16,7 @@ import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -72,4 +73,14 @@ public class ParsedExpressionConditional extends ParsedExpression {
 	public boolean hasStrongType() {
 		return ifThen.hasStrongType() && ifElse.hasStrongType();
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		ITypeID thenType = ifThen.precompileForType(scope, state);
+		ITypeID elseType = ifElse.precompileForType(scope, state);
+		if (thenType == null || elseType == null)
+			return null;
+		
+		return scope.getTypeMembers(thenType).union(elseType);
+	}
 }

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

@@ -14,6 +14,7 @@ import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -55,4 +56,16 @@ public class ParsedExpressionFloat extends ParsedExpression {
 	public boolean hasStrongType() {
 		return false;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		for (ITypeID hint : scope.hints) {
+			if (hint == BasicTypeID.DOUBLE)
+				return hint;
+			else if (hint == BasicTypeID.FLOAT)
+				return hint;
+		}
+		
+		return BasicTypeID.DOUBLE;
+	}
 }

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

@@ -24,6 +24,7 @@ import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.codemodel.scope.LambdaScope;
 import org.openzen.zenscript.codemodel.scope.StatementScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
 import org.openzen.zenscript.parser.statements.ParsedFunctionBody;
 
@@ -96,4 +97,9 @@ public class ParsedExpressionFunction extends ParsedExpression {
 	public boolean hasStrongType() {
 		return false;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		return null; // TODO: meh...
+	}
 }

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

@@ -12,12 +12,14 @@ import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -43,6 +45,29 @@ public class ParsedExpressionIndex extends ParsedExpression {
 	public boolean hasStrongType() {
 		return true;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		ITypeID target = value.precompileForType(scope, state);
+		if (target == null)
+			return null;
+		
+		DefinitionMemberGroup members = scope.getTypeMembers(target).getOrCreateGroup(OperatorType.INDEXGET);
+		List<ITypeID>[] predicted = members.predictCallTypes(scope, scope.getResultTypeHints(), indexes.size());
+		
+		ITypeID[] indexTypes = new ITypeID[indexes.size()];
+		for (int i = 0; i < indexTypes.length; i++) {
+			indexTypes[i] = indexes.get(i).precompileForType(scope.withHints(predicted[i]), state);
+			if (indexTypes[i] == null)
+				return null;
+		}
+		
+		FunctionalMemberRef method = members.selectMethod(position, scope, new CallArguments(indexTypes), true, false);
+		if (!state.precompile(method.getTarget()))
+			return null;
+		
+		return method.getTarget().header.returnType; // TODO: this will not work properly for methods with type parameters
+	}
 	
 	private class PartialIndexedExpression implements IPartialExpression {
 		private final ExpressionScope scope;

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

@@ -23,6 +23,7 @@ import org.openzen.zenscript.codemodel.expression.switchvalue.SwitchValue;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -83,4 +84,30 @@ public class ParsedExpressionInt extends ParsedExpression {
 	public boolean hasStrongType() {
 		return false;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		for (ITypeID hint : scope.hints) {
+			if (hint instanceof BasicTypeID) {
+				switch ((BasicTypeID) hint) {
+					case SBYTE:
+					case BYTE:
+					case SHORT:
+					case USHORT:
+					case INT:
+					case UINT:
+					case LONG:
+					case ULONG:
+					case CHAR:
+						return hint;
+					default:
+				}
+			}
+		}
+		
+		if (value <= Integer.MAX_VALUE && value >= Integer.MIN_VALUE)
+			return BasicTypeID.INT;
+		else
+			return BasicTypeID.LONG;
+	}
 }

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

@@ -11,6 +11,8 @@ import org.openzen.zenscript.codemodel.expression.IsExpression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.type.IParsedType;
 
 /**
@@ -39,4 +41,9 @@ public class ParsedExpressionIs extends ParsedExpression {
 	public boolean hasStrongType() {
 		return true;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		return BasicTypeID.BOOL;
+	}
 }

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

@@ -19,10 +19,10 @@ import org.openzen.zenscript.codemodel.expression.NewExpression;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.AssocTypeID;
-import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GenericMapTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -75,7 +75,7 @@ public class ParsedExpressionMap extends ParsedExpression {
 				return new NewExpression(position, assocHint, constructor, CallArguments.EMPTY);
 		}
 		
-		if (!hasAssocHint && scope.hints.size() == 1 && scope.hints.get(0) != BasicTypeID.ANY) {
+		if (!hasAssocHint && scope.hints.size() == 1) {
 			// compile as constructor call
 			ITypeID hint = scope.hints.get(0);
 			for (int i = 0; i < keys.size(); i++) {
@@ -109,7 +109,8 @@ public class ParsedExpressionMap extends ParsedExpression {
 			}
 		}
 		if (keyType == null)
-			keyType = BasicTypeID.ANY;
+			throw new CompileException(position, CompileExceptionCode.UNTYPED_EMPTY_MAP, "Empty map without known type");
+		
 		for (int i = 0; i < cKeys.length; i++)
 			cKeys[i] = cKeys[i].castImplicit(position, scope, keyType);
 		
@@ -125,7 +126,8 @@ public class ParsedExpressionMap extends ParsedExpression {
 			}
 		}
 		if (valueType == null)
-			valueType = BasicTypeID.ANY;
+			throw new CompileException(position, CompileExceptionCode.UNTYPED_EMPTY_MAP, "Empty map without known type");
+		
 		for (int i = 0; i < cValues.length; i++)
 			cValues[i] = cValues[i].castImplicit(position, scope, valueType);
 		
@@ -137,4 +139,9 @@ public class ParsedExpressionMap extends ParsedExpression {
 	public boolean hasStrongType() {
 		return false;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		return null; // TODO: fill this later
+	}
 }

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

@@ -14,6 +14,7 @@ import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.type.IParsedType;
 
 /**
@@ -51,4 +52,20 @@ public class ParsedExpressionMember extends ParsedExpression {
 	public boolean hasStrongType() {
 		return true;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		IPartialExpression cValue = value.compile(scope.withoutHints());
+		ITypeID[] typeParameters = IParsedType.compileList(genericParameters, scope);
+		// TODO: proper precompilation
+		IPartialExpression member = cValue.getMember(
+				position,
+				scope,
+				scope.hints,
+				new GenericName(this.member, typeParameters));
+		if (member == null)
+			return null;
+		
+		return member.eval().type;
+	}
 }

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

@@ -10,6 +10,9 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.expression.NullExpression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -29,4 +32,9 @@ public class ParsedExpressionNull extends ParsedExpression {
 	public boolean hasStrongType() {
 		return false;
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		return BasicTypeID.BOOL;
+	}
 }

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

@@ -14,6 +14,8 @@ import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -52,4 +54,9 @@ public class ParsedExpressionOpAssign extends ParsedExpression {
 	public boolean hasStrongType() {
 		return right.hasStrongType();
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		return left.precompileForType(scope, state);
+	}
 }

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

@@ -12,6 +12,8 @@ import org.openzen.zenscript.codemodel.expression.OrOrExpression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -39,4 +41,14 @@ public class ParsedExpressionOrOr extends ParsedExpression {
 	public boolean hasStrongType() {
 		return left.hasStrongType() && right.hasStrongType();
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		ITypeID leftType = left.precompileForType(scope, state);
+		ITypeID rightType = right.precompileForType(scope, state);
+		if (leftType == null || rightType == null)
+			return null;
+		
+		return scope.getTypeMembers(leftType).union(rightType);
+	}
 }

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

@@ -12,6 +12,7 @@ import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -39,4 +40,9 @@ public class ParsedExpressionOuter extends ParsedExpression {
 	public boolean hasStrongType() {
 		return value.hasStrongType();
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		return null; // TODO: how will this be handled?
+	}
 }

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

@@ -11,6 +11,8 @@ import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.parser.PrecompilationState;
 
 /**
  *
@@ -37,4 +39,9 @@ public class ParsedExpressionPostCall extends ParsedExpression {
 	public boolean hasStrongType() {
 		return value.hasStrongType();
 	}
+
+	@Override
+	public ITypeID precompileForType(ExpressionScope scope, PrecompilationState state) {
+		return value.precompileForType(scope, state);
+	}
 }