Merge remote-tracking branch 'Stan/development' into development

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

@@ -36,7 +36,6 @@ import org.openzen.zenscript.codemodel.expression.ConstantUShortExpression;
 import org.openzen.zenscript.codemodel.expression.ConstructorSuperCallExpression;
 import org.openzen.zenscript.codemodel.expression.ConstructorThisCallExpression;
 import org.openzen.zenscript.codemodel.expression.EnumConstantExpression;
-import org.openzen.zenscript.codemodel.expression.EqualsExpression;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionVisitor;
 import org.openzen.zenscript.codemodel.expression.FunctionExpression;
@@ -46,12 +45,13 @@ import org.openzen.zenscript.codemodel.expression.GetFunctionParameterExpression
 import org.openzen.zenscript.codemodel.expression.GetLocalVariableExpression;
 import org.openzen.zenscript.codemodel.expression.GetStaticFieldExpression;
 import org.openzen.zenscript.codemodel.expression.GetterExpression;
+import org.openzen.zenscript.codemodel.expression.GlobalCallExpression;
+import org.openzen.zenscript.codemodel.expression.GlobalExpression;
 import org.openzen.zenscript.codemodel.expression.InterfaceCastExpression;
 import org.openzen.zenscript.codemodel.expression.IsExpression;
 import org.openzen.zenscript.codemodel.expression.MakeConstExpression;
 import org.openzen.zenscript.codemodel.expression.MapExpression;
 import org.openzen.zenscript.codemodel.expression.NewExpression;
-import org.openzen.zenscript.codemodel.expression.NotExpression;
 import org.openzen.zenscript.codemodel.expression.NullExpression;
 import org.openzen.zenscript.codemodel.expression.OrOrExpression;
 import org.openzen.zenscript.codemodel.expression.RangeExpression;
@@ -427,11 +427,6 @@ public class ExpressionFormatter implements ExpressionVisitor<ExpressionString>
 		return new ExpressionString(expression.type.accept(typeFormatter) + "." + expression.value.name, OperatorPriority.MEMBER);
 	}
 
-	@Override
-	public ExpressionString visitEquals(EqualsExpression expression) {
-		return binary(expression.left, expression.right, OperatorPriority.COMPARE, " === ");
-	}
-
 	@Override
 	public ExpressionString visitFunction(FunctionExpression expression) {
 		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
@@ -478,6 +473,19 @@ public class ExpressionFormatter implements ExpressionVisitor<ExpressionString>
 		result.append(expression.getter.name);
 		return new ExpressionString(result.toString(), OperatorPriority.MEMBER);
 	}
+	
+	@Override
+	public ExpressionString visitGlobal(GlobalExpression expression) {
+		return new ExpressionString(expression.name, OperatorPriority.PRIMARY);
+	}
+	
+	@Override
+	public ExpressionString visitGlobalCall(GlobalCallExpression expression) {
+		StringBuilder result = new StringBuilder();
+		result.append(expression.name);
+		format(result, expression.arguments);
+		return new ExpressionString(result.toString(), OperatorPriority.PRIMARY);
+	}
 
 	@Override
 	public ExpressionString visitInterfaceCast(InterfaceCastExpression expression) {
@@ -526,11 +534,6 @@ public class ExpressionFormatter implements ExpressionVisitor<ExpressionString>
 		return new ExpressionString(result.toString(), OperatorPriority.PRIMARY);
 	}
 
-	@Override
-	public ExpressionString visitNot(NotExpression expression) {
-		return unaryPrefix(expression.value, OperatorPriority.NOT, "!");
-	}
-
 	@Override
 	public ExpressionString visitNull(NullExpression expression) {
 		return new ExpressionString("null", OperatorPriority.PRIMARY);

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

@@ -189,10 +189,10 @@ public class StatementFormatter implements StatementVisitor<Void> {
 	public Void visitTryCatch(TryCatchStatement statement) {
 		beginSingleLine();
 		result.append("try");
-		if (statement.resourceName != null) {
-			result.append(' ').append(statement.resourceName);
+		if (statement.resource != null) {
+			result.append(' ').append(statement.resource.name);
 			result.append(" = ");
-			result.append(statement.resourceInitializer.accept(expressionFormatter).value);
+			result.append(statement.resource.initializer.accept(expressionFormatter).value);
 		}
 		
 		format(ParentStatementType.TRY, statement.content);

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

@@ -133,7 +133,7 @@ public class TypeFormatter implements ITypeVisitor<String>, GenericParameterBoun
 
 	@Override
 	public String visitOptional(OptionalTypeID optional) {
-		return optional.accept(this) + "?";
+		return optional.baseType.accept(this) + "?";
 	}
 	
 	private void formatTypeParameters(StringBuilder result, TypeParameter[] parameters) {

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

@@ -135,12 +135,51 @@ public class FunctionHeader {
 		return true;
 	}
 	
+	/**
+	 * Checks if two function headers are equivalent. Functions headers are
+	 * equivalent if their types are the same.
+	 * 
+	 * @param other
+	 * @return 
+	 */
 	public boolean isEquivalentTo(FunctionHeader other) {
 		if (parameters.length != other.parameters.length)
 			return false;
 		
 		for (int i = 0; i < parameters.length; i++) {
-			if (parameters[i] != other.parameters[i])
+			if (parameters[i].type != other.parameters[i].type)
+				return false;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Checks if two function headers are similar. "similar" means that there
+	 * exists a set of parameters for which there is no way to determine which
+	 * one to call.
+	 * 
+	 * Note that this does not mean that there is never confusion about which
+	 * method to call. There can be confusion due to implicit conversions. This
+	 * can be resolved by performing the conversions explicitly.
+	 * 
+	 * It is illegal to have two similar methods with the same name.
+	 * 
+	 * @param other
+	 * @return 
+	 */
+	public boolean isSimilarTo(FunctionHeader other) {
+		int common = Math.min(parameters.length, other.parameters.length);
+		for (int i = 0; i < common; i++) {
+			if (parameters[i].type != other.parameters[i].type)
+				return false;
+		}
+		for (int i = common; i < parameters.length; i++) {
+			if (parameters[i].defaultValue == null)
+				return false;
+		}
+		for (int i = common; i < other.parameters.length; i++) {
+			if (other.parameters[i].defaultValue == null)
 				return false;
 		}
 		
@@ -184,6 +223,15 @@ public class FunctionHeader {
 		//return this;
 	}
 	
+	public FunctionParameter getVariadicParameter() {
+		if (parameters.length == 0)
+			return null;
+		if (parameters[parameters.length - 1].variadic)
+			return parameters[parameters.length - 1];
+		
+		return null;
+	}
+	
 	public String explainWhyIncompatible(TypeScope scope, CallArguments arguments) {
 		if (this.parameters.length != arguments.arguments.length)
 			return parameters.length + " parameters expected but " + arguments.arguments.length + " given.";

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

@@ -21,12 +21,14 @@ import org.openzen.zenscript.shared.Taggable;
  * @author Hoofdgebruiker
  */
 public abstract class HighLevelDefinition extends Taggable {
+	private static final TypeParameter[] NO_PARAMETERS = new TypeParameter[0];
+	
 	public final CodePosition position;
 	public final ZSPackage pkg;
 	public final String name;
 	public final int modifiers;
 	public final List<IDefinitionMember> members = new ArrayList<>();
-	public final List<TypeParameter> genericParameters = new ArrayList<>();
+	public TypeParameter[] genericParameters = NO_PARAMETERS;
 	
 	public HighLevelDefinition outerDefinition;
 	public ITypeID superType;
@@ -52,8 +54,8 @@ public abstract class HighLevelDefinition extends Taggable {
 			members.add(member);
 	}
 	
-	public void addGenericParameter(TypeParameter parameter) {
-		genericParameters.add(parameter);
+	public void setTypeParameters(TypeParameter[] typeParameters) {
+		this.genericParameters = typeParameters;
 	}
 	
 	public List<FieldMember> getFields() {

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

@@ -22,6 +22,24 @@ public class Modifiers {
 	public static final int STATIC = 128;
 	public static final int PROTECTED = 256;
 	public static final int IMPLICIT = 512;
+	public static final int VIRTUAL = 1024;
+	public static final int EXTERN = 2048;
+	
+	public static boolean isPublic(int modifiers) {
+		return (modifiers & PUBLIC) > 0;
+	}
+	
+	public static boolean isExport(int modifiers) {
+		return (modifiers & EXPORT) > 0;
+	}
+	
+	public static boolean isProtected(int modifiers) {
+		return (modifiers & PROTECTED) > 0;
+	}
+	
+	public static boolean isPrivate(int modifiers) {
+		return (modifiers & PRIVATE) > 0;
+	}
 	
 	public static boolean isAbstract(int modifiers) {
 		return (modifiers & ABSTRACT) > 0;
@@ -35,6 +53,10 @@ public class Modifiers {
 		return (modifiers & CONST) > 0;
 	}
 	
+	public static boolean isConstOptional(int modifiers) {
+		return (modifiers & CONST_OPTIONAL) > 0;
+	}
+	
 	public static boolean isStatic(int modifiers) {
 		return (modifiers & STATIC) > 0;
 	}
@@ -42,4 +64,12 @@ public class Modifiers {
 	public static boolean isImplicit(int modifiers) {
 		return (modifiers & IMPLICIT) > 0;
 	}
+	
+	public static boolean isVirtual(int modifiers) {
+		return (modifiers & VIRTUAL) > 0;
+	}
+	
+	public static boolean isExtern(int modifiers) {
+		return (modifiers & EXTERN) > 0;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/definition/FunctionDefinition.java

@@ -37,7 +37,7 @@ public class FunctionDefinition extends HighLevelDefinition {
 	
 	public void setHeader(FunctionHeader header) {
 		this.header = header;
-		addMember(caller = new OperatorMember(position, modifiers | Modifiers.STATIC, OperatorType.CALL, header));
+		addMember(caller = new OperatorMember(position, this, modifiers | Modifiers.STATIC, OperatorType.CALL, header));
 		callerGroup.addMethod(caller, TypeMemberPriority.SPECIFIED);
 	}
 	

CodeModel/src/main/java/org/openzen/zenscript/codemodel/definition/ZSPackage.java

@@ -39,7 +39,7 @@ public class ZSPackage {
 			return new PartialPackageExpression(position, subPackages.get(name.name));
 		
 		if (types.containsKey(name.name)) {
-			if (types.get(name.name).genericParameters.size() != name.arguments.size())
+			if (types.get(name.name).genericParameters.length != name.arguments.size())
 				throw new CompileException(position, CompileExceptionCode.TYPE_ARGUMENTS_INVALID_NUMBER, "Invalid number of type arguments");
 			
 			return new PartialTypeExpression(position, registry.getForDefinition(types.get(name.name), name.arguments));

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

@@ -5,7 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
-import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.shared.CodePosition;
 
 /**
@@ -14,11 +14,13 @@ import org.openzen.zenscript.shared.CodePosition;
  */
 public class ArrayExpression extends Expression {
 	public final Expression[] expressions;
+	public final ArrayTypeID arrayType;
 	
-	public ArrayExpression(CodePosition position, Expression[] expressions, ITypeID type) {
+	public ArrayExpression(CodePosition position, Expression[] expressions, ArrayTypeID type) {
 		super(position, type);
 		
 		this.expressions = expressions;
+		this.arrayType = type;
 	}
 
 	@Override

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

@@ -1,31 +0,0 @@
-/*
- * 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.codemodel.expression;
-
-import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
-
-/**
- * Checks if two values are identical (===).
- * 
- * @author Hoofdgebruiker
- */
-public class EqualsExpression extends Expression {
-	public final Expression left;
-	public final Expression right;
-	
-	public EqualsExpression(CodePosition position, Expression left, Expression right) {
-		super(position, BasicTypeID.BOOL);
-		
-		this.left = left;
-		this.right = right;
-	}
-
-	@Override
-	public <T> T accept(ExpressionVisitor<T> visitor) {
-		return visitor.visitEquals(this);
-	}
-}

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

@@ -70,8 +70,6 @@ public interface ExpressionVisitor<T> {
 	
 	public T visitEnumConstant(EnumConstantExpression expression);
 	
-	public T visitEquals(EqualsExpression expression);
-	
 	public T visitFunction(FunctionExpression expression);
 	
 	public T visitGenericCompare(GenericCompareExpression expression);
@@ -86,6 +84,10 @@ public interface ExpressionVisitor<T> {
 	
 	public T visitGetter(GetterExpression expression);
 	
+	public T visitGlobal(GlobalExpression expression);
+	
+	public T visitGlobalCall(GlobalCallExpression expression);
+	
 	public T visitInterfaceCast(InterfaceCastExpression expression);
 	
 	public T visitIs(IsExpression expression);
@@ -96,8 +98,6 @@ public interface ExpressionVisitor<T> {
 	
 	public T visitNew(NewExpression expression);
 	
-	public T visitNot(NotExpression expression);
-	
 	public T visitNull(NullExpression expression);
 	
 	public T visitOrOr(OrOrExpression expression);

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

@@ -0,0 +1,31 @@
+/*
+ * 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.codemodel.expression;
+
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class GlobalCallExpression extends Expression {
+	public final String name;
+	public final CallArguments arguments;
+	public final Expression resolution;
+	
+	public GlobalCallExpression(CodePosition position, String name, CallArguments arguments, Expression resolution) {
+		super(position, resolution.type);
+		
+		this.name = name;
+		this.arguments = arguments;
+		this.resolution = resolution;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitGlobalCall(this);
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/NotExpression.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/GlobalExpression.java

@@ -11,17 +11,19 @@ import org.openzen.zenscript.shared.CodePosition;
  *
  * @author Hoofdgebruiker
  */
-public class NotExpression extends Expression {
-	public final Expression value;
+public class GlobalExpression extends Expression {
+	public final String name;
+	public final Expression resolution;
 	
-	public NotExpression(CodePosition position, Expression value) {
-		super(position, value.type);
+	public GlobalExpression(CodePosition position, String name, Expression resolution) {
+		super(position, resolution.type);
 		
-		this.value = value;
+		this.name = name;
+		this.resolution = resolution;
 	}
 
 	@Override
 	public <T> T accept(ExpressionVisitor<T> visitor) {
-		return visitor.visitNot(this);
+		return visitor.visitGlobal(this);
 	}
 }

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.member;
 
 import java.util.Map;
 import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -19,8 +20,8 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class CallerMember extends FunctionalMember {
-	public CallerMember(CodePosition position, int modifiers, FunctionHeader header) {
-		super(position, modifiers, "()", header);
+	public CallerMember(CodePosition position, HighLevelDefinition definition, int modifiers, FunctionHeader header) {
+		super(position, definition, modifiers, "()", header);
 	}
 
 	@Override

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.member;
 
 import java.util.Map;
 import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.CastExpression;
@@ -25,8 +26,8 @@ import org.openzen.zenscript.shared.CodePosition;
 public class CasterMember extends FunctionalMember implements ICasterMember {
 	public final ITypeID toType;
 	
-	public CasterMember(CodePosition position, int modifiers, ITypeID toType) {
-		super(position, modifiers, "as", new FunctionHeader(toType));
+	public CasterMember(CodePosition position, HighLevelDefinition definition, int modifiers, ITypeID toType) {
+		super(position, definition, modifiers, "as", new FunctionHeader(toType));
 		
 		this.toType = toType;
 	}
@@ -43,7 +44,7 @@ public class CasterMember extends FunctionalMember implements ICasterMember {
 
 	@Override
 	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
-		return new CasterMember(position, modifiers, toType.withGenericArguments(registry, mapping));
+		return new CasterMember(position, definition, modifiers, toType.withGenericArguments(registry, mapping));
 	}
 	
 	@Override

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.member;
 
 import java.util.Map;
 import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
@@ -20,8 +21,8 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class ConstructorMember extends FunctionalMember {
-	public ConstructorMember(CodePosition position, int modifiers, FunctionHeader header) {
-		super(position, modifiers, "this", new FunctionHeader(header.typeParameters, BasicTypeID.VOID, header.parameters));
+	public ConstructorMember(CodePosition position, HighLevelDefinition definition, int modifiers, FunctionHeader header) {
+		super(position, definition, modifiers, "this", new FunctionHeader(header.typeParameters, BasicTypeID.VOID, header.parameters));
 	}
 
 	@Override
@@ -32,7 +33,7 @@ public class ConstructorMember extends FunctionalMember {
 
 	@Override
 	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
-		return new ConstructorMember(position, modifiers, header.instance(registry, mapping));
+		return new ConstructorMember(position, definition, modifiers, header.instance(registry, mapping));
 	}
 
 	@Override

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.member;
 
 import java.util.List;
 import java.util.Map;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
 import org.openzen.zenscript.codemodel.statement.Statement;
@@ -24,8 +25,8 @@ public class CustomIteratorMember extends DefinitionMember implements IIteratorM
 	private final ITypeID[] iteratorTypes;
 	private List<Statement> content;
 	
-	public CustomIteratorMember(CodePosition position, int modifiers, ITypeID[] iteratorTypes) {
-		super(position, modifiers);
+	public CustomIteratorMember(CodePosition position, HighLevelDefinition definition, int modifiers, ITypeID[] iteratorTypes) {
+		super(position, definition, modifiers);
 		
 		this.iteratorTypes = iteratorTypes;
 	}
@@ -54,7 +55,7 @@ public class CustomIteratorMember extends DefinitionMember implements IIteratorM
 		ITypeID[] newIteratorTypes = new ITypeID[iteratorTypes.length];
 		for (int i = 0; i < newIteratorTypes.length; i++)
 			newIteratorTypes[i] = iteratorTypes[i].withGenericArguments(registry, mapping);
-		return new CustomIteratorMember(position, modifiers, newIteratorTypes);
+		return new CustomIteratorMember(position, definition, modifiers, newIteratorTypes);
 	}
 
 	@Override

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.member;
 
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.shared.Taggable;
@@ -15,10 +16,12 @@ import org.openzen.zenscript.shared.Taggable;
  */
 public abstract class DefinitionMember extends Taggable implements IDefinitionMember {
 	public final CodePosition position;
+	public final HighLevelDefinition definition;
 	public final int modifiers;
 	
-	public DefinitionMember(CodePosition position, int modifiers) {
+	public DefinitionMember(CodePosition position, HighLevelDefinition definition, int modifiers) {
 		this.position = position;
+		this.definition = definition;
 		this.modifiers = modifiers;
 	}
 	
@@ -34,4 +37,8 @@ public abstract class DefinitionMember extends Taggable implements IDefinitionMe
 	public boolean isFinal() {
 		return Modifiers.isFinal(modifiers);
 	}
+	
+	public boolean isExtern() {
+		return Modifiers.isExtern(modifiers);
+	}
 }

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

@@ -6,8 +6,8 @@
 package org.openzen.zenscript.codemodel.member;
 
 import java.util.Map;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
-import org.openzen.zenscript.codemodel.expression.CallExpression;
 import org.openzen.zenscript.codemodel.expression.NewExpression;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
@@ -26,8 +26,8 @@ public class EnumConstantMember extends DefinitionMember {
 	
 	public NewExpression constructor;
 	
-	public EnumConstantMember(CodePosition position, String name, int value) {
-		super(position, Modifiers.STATIC);
+	public EnumConstantMember(CodePosition position, HighLevelDefinition definition, String name, int value) {
+		super(position, definition, Modifiers.STATIC);
 		
 		this.name = name;
 		this.value = value;

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

@@ -10,8 +10,8 @@ import org.openzen.zenscript.codemodel.CompareType;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.OperatorType;
+import org.openzen.zenscript.codemodel.expression.BasicCompareExpression;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
-import org.openzen.zenscript.codemodel.expression.EqualsExpression;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
@@ -47,7 +47,7 @@ public class EqualsMember extends Taggable implements ICallableMember {
 
 	@Override
 	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
-		return new EqualsExpression(position, target, arguments.arguments[0]);
+		return new BasicCompareExpression(position, target, arguments.arguments[0], CompareType.EQ);
 	}
 
 	@Override

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

@@ -6,7 +6,7 @@
 package org.openzen.zenscript.codemodel.member;
 
 import java.util.Map;
-import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
@@ -24,8 +24,8 @@ public class FieldMember extends DefinitionMember {
 	public final ITypeID type;
 	public Expression initializer;
 	
-	public FieldMember(CodePosition position, int modifiers, String name, ITypeID type) {
-		super(position, modifiers);
+	public FieldMember(CodePosition position, HighLevelDefinition definition, int modifiers, String name, ITypeID type) {
+		super(position, definition, modifiers);
 		
 		this.name = name;
 		this.type = type;
@@ -42,7 +42,7 @@ public class FieldMember extends DefinitionMember {
 
 	@Override
 	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
-		return new FieldMember(position, modifiers, name, type.withGenericArguments(registry, mapping));
+		return new FieldMember(position, definition, modifiers, name, type.withGenericArguments(registry, mapping));
 	}
 
 	@Override

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

@@ -8,6 +8,7 @@ package org.openzen.zenscript.codemodel.member;
 import java.util.List;
 import org.openzen.zenscript.codemodel.CompareType;
 import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.CallExpression;
 import org.openzen.zenscript.codemodel.expression.CallStaticExpression;
@@ -25,8 +26,8 @@ public abstract class FunctionalMember extends DefinitionMember implements ICall
 	public final String name;
 	public List<Statement> body;
 	
-	public FunctionalMember(CodePosition position, int modifiers, String name, FunctionHeader header) {
-		super(position, modifiers);
+	public FunctionalMember(CodePosition position, HighLevelDefinition definition, int modifiers, String name, FunctionHeader header) {
+		super(position, definition, modifiers);
 		
 		this.name = name;
 		this.header = header;

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.member;
 
 import java.util.Map;
 import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.GetterExpression;
 import org.openzen.zenscript.codemodel.expression.StaticGetterExpression;
@@ -25,10 +26,8 @@ public class GetterMember extends FunctionalMember implements IGettableMember {
 	public final String name;
 	public final ITypeID type;
 	
-	public String compiledName;
-	
-	public GetterMember(CodePosition position, int modifiers, String name, ITypeID type) {
-		super(position, modifiers, name, new FunctionHeader(type));
+	public GetterMember(CodePosition position, HighLevelDefinition definition, int modifiers, String name, ITypeID type) {
+		super(position, definition, modifiers, name, new FunctionHeader(type));
 		
 		this.name = name;
 		this.type = type;
@@ -61,7 +60,7 @@ public class GetterMember extends FunctionalMember implements IGettableMember {
 
 	@Override
 	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
-		return new GetterMember(position, modifiers, name, type.withGenericArguments(registry, mapping));
+		return new GetterMember(position, definition, modifiers, name, type.withGenericArguments(registry, mapping));
 	}
 
 	@Override

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

@@ -8,6 +8,7 @@ package org.openzen.zenscript.codemodel.member;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
@@ -23,8 +24,8 @@ public class ImplementationMember extends DefinitionMember {
 	public final ITypeID type;
 	public final List<IDefinitionMember> members = new ArrayList<>();
 	
-	public ImplementationMember(CodePosition position, int modifiers, ITypeID type) {
-		super(position, modifiers);
+	public ImplementationMember(CodePosition position, HighLevelDefinition definition, int modifiers, ITypeID type) {
+		super(position, definition, modifiers);
 		
 		this.type = type;
 	}
@@ -44,7 +45,7 @@ public class ImplementationMember extends DefinitionMember {
 	@Override
 	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
 		ITypeID instancedType = type.withGenericArguments(registry, mapping);
-		ImplementationMember result = new ImplementationMember(position, modifiers, instancedType);
+		ImplementationMember result = new ImplementationMember(position, definition, modifiers, instancedType);
 		for (IDefinitionMember member : members)
 			result.addMember(member.instance(registry, mapping));
 		return result;

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

@@ -19,17 +19,17 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class InnerDefinitionMember extends DefinitionMember {
-	private final HighLevelDefinition definition;
+	public final HighLevelDefinition innerDefinition;
 	
-	public InnerDefinitionMember(CodePosition position, int modifiers, HighLevelDefinition definition) {
-		super(position, modifiers);
+	public InnerDefinitionMember(CodePosition position, HighLevelDefinition outer, int modifiers, HighLevelDefinition definition) {
+		super(position, outer, modifiers);
 		
-		this.definition = definition;
+		this.innerDefinition = definition;
 	}
 
 	@Override
 	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
-		type.addInnerType(definition.name, new InnerDefinition(definition));
+		type.addInnerType(innerDefinition.name, new InnerDefinition(innerDefinition));
 	}
 
 	@Override
@@ -37,13 +37,13 @@ public class InnerDefinitionMember extends DefinitionMember {
 		if (this.isStatic()) {
 			return this;
 		} else {
-			return new InstancedInnerDefinitionMember(position, modifiers, definition, mapping);
+			return new InstancedInnerDefinitionMember(position, definition, modifiers, innerDefinition, mapping);
 		}
 	}
 
 	@Override
 	public String describe() {
-		return "inner type " + definition.name;
+		return "inner type " + innerDefinition.name;
 	}
 
 	@Override

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

@@ -27,8 +27,14 @@ public class InstancedInnerDefinitionMember extends DefinitionMember {
 	public final HighLevelDefinition definition;
 	public final Map<TypeParameter, ITypeID> outerMapping;
 	
-	public InstancedInnerDefinitionMember(CodePosition position, int modifiers, HighLevelDefinition definition, Map<TypeParameter, ITypeID> outerMapping) {
-		super(position, modifiers);
+	public InstancedInnerDefinitionMember(
+			CodePosition position,
+			HighLevelDefinition outer,
+			int modifiers,
+			HighLevelDefinition definition,
+			Map<TypeParameter, ITypeID> outerMapping)
+	{
+		super(position, outer, modifiers);
 		this.definition = definition;
 		this.outerMapping = outerMapping;
 	}
@@ -49,7 +55,7 @@ public class InstancedInnerDefinitionMember extends DefinitionMember {
 			for (Map.Entry<TypeParameter, ITypeID> entry : mapping.entrySet())
 				totalMap.put(entry.getKey(), entry.getValue());
 			
-			return new InstancedInnerDefinitionMember(position, modifiers, definition, totalMap);
+			return new InstancedInnerDefinitionMember(position, definition, modifiers, definition, totalMap);
 		}
 	}
 

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.member;
 
 import java.util.Map;
 import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -19,8 +20,8 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class MethodMember extends FunctionalMember {
-	public MethodMember(CodePosition position, int modifiers, String name, FunctionHeader header) {
-		super(position, modifiers, name, header);
+	public MethodMember(CodePosition position, HighLevelDefinition definition, int modifiers, String name, FunctionHeader header) {
+		super(position, definition, modifiers, name, header);
 	}
 
 	@Override
@@ -30,7 +31,7 @@ public class MethodMember extends FunctionalMember {
 
 	@Override
 	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
-		return new MethodMember(position, modifiers, name, header.instance(registry, mapping));
+		return new MethodMember(position, definition, modifiers, name, header.instance(registry, mapping));
 	}
 
 	@Override

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.member;
 
 import java.util.Map;
 import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
@@ -22,8 +23,8 @@ import org.openzen.zenscript.shared.CodePosition;
 public class OperatorMember extends FunctionalMember {
 	public final OperatorType operator;
 	
-	public OperatorMember(CodePosition position, int modifiers, OperatorType operator, FunctionHeader header) {
-		super(position, modifiers, operator.operator, header);
+	public OperatorMember(CodePosition position, HighLevelDefinition definition, int modifiers, OperatorType operator, FunctionHeader header) {
+		super(position, definition, modifiers, operator.operator, header);
 		
 		this.operator = operator;
 	}
@@ -35,7 +36,7 @@ public class OperatorMember extends FunctionalMember {
 
 	@Override
 	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
-		return new OperatorMember(position, modifiers, operator, header.instance(registry, mapping));
+		return new OperatorMember(position, definition, modifiers, operator, header.instance(registry, mapping));
 	}
 
 	@Override

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

@@ -8,6 +8,7 @@ package org.openzen.zenscript.codemodel.member;
 import java.util.Map;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
@@ -24,8 +25,8 @@ public class SetterMember extends FunctionalMember {
 	public final String name;
 	public final ITypeID type;
 	
-	public SetterMember(CodePosition position, int modifiers, String name, ITypeID type) {
-		super(position, modifiers, name, new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(type, "$")));
+	public SetterMember(CodePosition position, HighLevelDefinition definition, int modifiers, String name, ITypeID type) {
+		super(position, definition, modifiers, name, new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(type, "$")));
 		
 		this.name = name;
 		this.type = type;
@@ -38,7 +39,7 @@ public class SetterMember extends FunctionalMember {
 
 	@Override
 	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
-		return new SetterMember(position, modifiers, name, type.withGenericArguments(registry, mapping));
+		return new SetterMember(position, definition, modifiers, name, type.withGenericArguments(registry, mapping));
 	}
 
 	@Override

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.codemodel.member;
 
 import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.CallTranslator;
@@ -19,8 +20,8 @@ import org.openzen.zenscript.shared.CodePosition;
 public class TranslatedOperatorMember extends OperatorMember {
 	private final CallTranslator translator;
 	
-	public TranslatedOperatorMember(CodePosition position, int modifiers, OperatorType operator, FunctionHeader header, CallTranslator translator) {
-		super(position, modifiers, operator, header);
+	public TranslatedOperatorMember(CodePosition position, HighLevelDefinition definition, int modifiers, OperatorType operator, FunctionHeader header, CallTranslator translator) {
+		super(position, definition, modifiers, operator, header);
 		
 		this.translator = translator;
 	}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/partial/PartialGlobalExpression.java

@@ -0,0 +1,58 @@
+/*
+ * 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.codemodel.partial;
+
+import java.util.List;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.expression.CallArguments;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.expression.GlobalCallExpression;
+import org.openzen.zenscript.codemodel.expression.GlobalExpression;
+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.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class PartialGlobalExpression implements IPartialExpression {
+	private final CodePosition position;
+	private final String name;
+	private final IPartialExpression resolution;
+	
+	public PartialGlobalExpression(CodePosition position, String name, IPartialExpression resolution) {
+		this.position = position;
+		this.name = name;
+		this.resolution = resolution;
+	}
+	
+	@Override
+	public Expression eval() {
+		return new GlobalExpression(position, name, resolution.eval());
+	}
+
+	@Override
+	public List<ITypeID>[] predictCallTypes(TypeScope scope, List<ITypeID> hints, int arguments) {
+		return resolution.predictCallTypes(scope, hints, arguments);
+	}
+
+	@Override
+	public List<FunctionHeader> getPossibleFunctionHeaders(TypeScope scope, List<ITypeID> hints, int arguments) {
+		return resolution.getPossibleFunctionHeaders(scope, hints, arguments);
+	}
+
+	@Override
+	public IPartialExpression getMember(CodePosition position, TypeScope scope, List<ITypeID> hints, GenericName name) {
+		return eval().getMember(position, scope, hints, name);
+	}
+
+	@Override
+	public Expression call(CodePosition position, TypeScope scope, List<ITypeID> hints, CallArguments arguments) {
+		return new GlobalCallExpression(position, name, arguments, resolution.call(position, scope, hints, arguments));
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/TryCatchStatement.java

@@ -6,7 +6,6 @@
 package org.openzen.zenscript.codemodel.statement;
 
 import java.util.List;
-import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.shared.CodePosition;
 
 /**
@@ -14,23 +13,20 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class TryCatchStatement extends Statement {
-	public final String resourceName;
-	public final Expression resourceInitializer;
+	public final VarStatement resource;
 	public final Statement content;
 	public final List<CatchClause> catchClauses;
 	public final Statement finallyClause;
 	
 	public TryCatchStatement(
 			CodePosition position,
-			String resourceName,
-			Expression resourceInitializer,
+			VarStatement resource,
 			Statement content,
 			List<CatchClause> catchClauses,
 			Statement finallyClause) {
 		super(position);
 		
-		this.resourceName = resourceName;
-		this.resourceInitializer = resourceInitializer;
+		this.resource = resource;
 		this.content = content;
 		this.catchClauses = catchClauses;
 		this.finallyClause = finallyClause;

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

@@ -51,11 +51,6 @@ public class ArrayTypeID implements ITypeID {
 		return elementType.hasInferenceBlockingTypeParameters(parameters);
 	}
 
-	@Override
-	public String toCamelCaseName() {
-		return elementType.toCamelCaseName() + "Array";
-	}
-
 	@Override
 	public int hashCode() {
 		int hash = 7;

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

@@ -53,11 +53,6 @@ public class AssocTypeID implements ITypeID {
 		return keyType.hasInferenceBlockingTypeParameters(parameters) || valueType.hasInferenceBlockingTypeParameters(parameters);
 	}
 
-	@Override
-	public String toCamelCaseName() {
-		return keyType.toCamelCaseName() + valueType.toCamelCaseName() + "Map";
-	}
-
 	@Override
 	public int hashCode() {
 		int hash = 7;

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

@@ -15,33 +15,31 @@ import org.openzen.zenscript.codemodel.generic.TypeParameter;
  * @author Hoofdgebruiker
  */
 public enum BasicTypeID implements ITypeID {
-	VOID("void", "Void"),
-	NULL("null", "Null"),
-	ANY("any", "Any"),
-	BOOL("bool", "Bool"),
-	BYTE("byte", "Byte"),
-	SBYTE("sbyte", "SByte"),
-	SHORT("short", "Short"),
-	USHORT("ushort", "UShort"),
-	INT("int", "Int"),
-	UINT("uint", "UInt"),
-	LONG("long", "Long"),
-	ULONG("ulong", "ULong"),
-	FLOAT("float", "Float"),
-	DOUBLE("double", "Double"),
-	CHAR("char", "Char"),
-	STRING("string", "String"),
+	VOID("void"),
+	NULL("null"),
+	ANY("any"),
+	BOOL("bool"),
+	BYTE("byte"),
+	SBYTE("sbyte"),
+	SHORT("short"),
+	USHORT("ushort"),
+	INT("int"),
+	UINT("uint"),
+	LONG("long"),
+	ULONG("ulong"),
+	FLOAT("float"),
+	DOUBLE("double"),
+	CHAR("char"),
+	STRING("string"),
 	
-	UNDETERMINED("undetermined", "Undetermined");
+	UNDETERMINED("undetermined");
 	
 	public static final List<ITypeID> HINT_BOOL = Collections.singletonList(BOOL);
 	
 	public final String name;
-	public final String camelCaseName;
 	
-	BasicTypeID(String name, String camelCaseName) {
+	BasicTypeID(String name) {
 		this.name = name;
-		this.camelCaseName = camelCaseName;
 	}
 	
 	@Override
@@ -78,9 +76,4 @@ public enum BasicTypeID implements ITypeID {
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {
 		return false;
 	}
-
-	@Override
-	public String toCamelCaseName() {
-		return camelCaseName;
-	}
 }

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

@@ -56,11 +56,6 @@ public class ConstTypeID implements ITypeID {
 		return baseType.hasInferenceBlockingTypeParameters(parameters);
 	}
 
-	@Override
-	public String toCamelCaseName() {
-		return "Const" + baseType.toCamelCaseName();
-	}
-
 	@Override
 	public int hashCode() {
 		int hash = 3;

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

@@ -21,7 +21,7 @@ import org.openzen.zenscript.codemodel.generic.TypeParameter;
  */
 public class DefinitionTypeID implements ITypeID {
 	public static DefinitionTypeID forType(HighLevelDefinition definition) {
-		if (!definition.genericParameters.isEmpty())
+		if (definition.genericParameters.length > 0)
 			throw new IllegalArgumentException("Definition has type arguments!");
 		
 		return new DefinitionTypeID(definition, NO_TYPE_PARAMETERS);
@@ -57,7 +57,7 @@ public class DefinitionTypeID implements ITypeID {
 			Arrays.sort(outerTypeEntries, (a, b) -> a.parameter.name.compareTo(b.parameter.name));
 		}
 		
-		if (typeParameters.length != definition.genericParameters.size())
+		if (typeParameters.length != definition.genericParameters.length)
 			throw new RuntimeException("Invalid number of type parameters");
 	}
 	
@@ -66,7 +66,7 @@ public class DefinitionTypeID implements ITypeID {
 		if (superType != null && typeParameters.length > 0) {
 			Map<TypeParameter, ITypeID> genericSuperArguments = new HashMap<>();
 			for (int i = 0; i < typeParameters.length; i++)
-				genericSuperArguments.put(definition.genericParameters.get(i), typeParameters[i]);
+				genericSuperArguments.put(definition.genericParameters[i], typeParameters[i]);
 			
 			superType = definition.superType.withGenericArguments(registry, genericSuperArguments);
 		}
@@ -81,11 +81,6 @@ public class DefinitionTypeID implements ITypeID {
 		this.outerTypeParameters = Collections.emptyMap();
 		this.outerTypeEntries = NO_OUTER_ENTRIES;
 	}
-
-	@Override
-	public String toCamelCaseName() {
-		return definition.name;
-	}
 	
 	@Override
 	public ITypeID withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
@@ -94,7 +89,7 @@ public class DefinitionTypeID implements ITypeID {
 		
 		List<ITypeID> instancedArguments = new ArrayList<>();
 		for (int i = 0; i < typeParameters.length; i++) {
-			instancedArguments.add(arguments.containsKey(definition.genericParameters.get(i)) ? arguments.get(definition.genericParameters.get(i)) : typeParameters[i].withGenericArguments(registry, arguments));
+			instancedArguments.add(arguments.containsKey(definition.genericParameters[i]) ? arguments.get(definition.genericParameters[i]) : typeParameters[i].withGenericArguments(registry, arguments));
 		}
 		Map<TypeParameter, ITypeID> instancedOuter;
 		if (outerTypeParameters.isEmpty()) {

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

@@ -52,11 +52,6 @@ public class FunctionTypeID implements ITypeID {
 		return header.hasInferenceBlockingTypeParameters(parameters);
 	}
 
-	@Override
-	public String toCamelCaseName() {
-		return "Function"; // not unique, though
-	}
-
 	@Override
 	public int hashCode() {
 		int hash = 5;

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

@@ -48,11 +48,6 @@ public class GenericTypeID implements ITypeID {
 		return false;
 	}
 
-	@Override
-	public String toCamelCaseName() {
-		return parameter.name;
-	}
-
 	@Override
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {
 		for (TypeParameter parameter : parameters)

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

@@ -99,7 +99,7 @@ public class GlobalTypeRegistry {
 	
 	public DefinitionTypeID getForDefinition(HighLevelDefinition definition, List<ITypeID> typeParameters, Map<TypeParameter, ITypeID> outerInstance) {
 		DefinitionTypeID id;
-		if (definition.genericParameters.size() > 0 && typeParameters.isEmpty() && outerInstance.isEmpty()) {
+		if (definition.genericParameters.length > 0 && typeParameters.isEmpty() && outerInstance.isEmpty()) {
 			// make it a static one
 			id = new StaticDefinitionTypeID(definition);
 		} else {

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

@@ -33,8 +33,6 @@ public interface ITypeID {
 		return this;
 	}
 	
-	public String toCamelCaseName();
-	
 	public ITypeID withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments);
 	
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters);

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

@@ -58,11 +58,6 @@ public class IteratorTypeID implements ITypeID {
 		return false;
 	}
 
-	@Override
-	public String toCamelCaseName() {
-		return "Iterator" + (iteratorTypes.length == 1 ? "" : iteratorTypes.length);
-	}
-
 	@Override
 	public int hashCode() {
 		int hash = 5;

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

@@ -61,11 +61,6 @@ public class OptionalTypeID implements ITypeID {
 		return baseType.hasInferenceBlockingTypeParameters(parameters);
 	}
 
-	@Override
-	public String toCamelCaseName() {
-		return "Optional" + baseType.toCamelCaseName();
-	}
-
 	@Override
 	public int hashCode() {
 		int hash = 7;

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

@@ -53,17 +53,6 @@ public class RangeTypeID implements ITypeID {
 		return from.hasInferenceBlockingTypeParameters(parameters) || to.hasInferenceBlockingTypeParameters(parameters);
 	}
 
-	@Override
-	public String toCamelCaseName() {
-		if (from == BasicTypeID.INT && to == BasicTypeID.INT) {
-			return "Range";
-		} else if (from == to) {
-			return from.toCamelCaseName() + "Range";
-		} else {
-			return from.toCamelCaseName() + to.toCamelCaseName() + "Range";
-		}
-	}
-
 	@Override
 	public int hashCode() {
 		int hash = 5;

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

@@ -9,6 +9,7 @@ import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.OperatorType;
+import org.openzen.zenscript.codemodel.definition.ClassDefinition;
 import org.openzen.zenscript.codemodel.expression.ConstantIntExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantLongExpression;
 import org.openzen.zenscript.codemodel.member.CasterMember;
@@ -34,144 +35,154 @@ public class BuiltinTypeMembers {
 	public static final ConstantGetterMember LONG_GET_MIN_VALUE = new ConstantGetterMember("MIN_VALUE", position -> new ConstantLongExpression(position, Long.MIN_VALUE));
 	public static final ConstantGetterMember LONG_GET_MAX_VALUE = new ConstantGetterMember("MAX_VALUE", position -> new ConstantLongExpression(position, Long.MAX_VALUE));
 	
-	public static final OperatorMember BOOL_NOT = not(BOOL);
-	
-	public static final OperatorMember BYTE_NOT = not(BYTE);
-	public static final OperatorMember SBYTE_NOT = not(SBYTE);
-	public static final OperatorMember SHORT_NOT = not(SHORT);
-	public static final OperatorMember USHORT_NOT = not(USHORT);
-	public static final OperatorMember INT_NOT = not(INT);
-	public static final OperatorMember UINT_NOT = not(UINT);
-	public static final OperatorMember LONG_NOT = not(LONG);
-	public static final OperatorMember ULONG_NOT = not(ULONG);
-	
-	public static final OperatorMember BYTE_NEG = neg(BYTE);
-	public static final OperatorMember SBYTE_NEG = neg(SBYTE);
-	public static final OperatorMember SHORT_NEG = neg(SHORT);
-	public static final OperatorMember USHORT_NEG = neg(USHORT);
-	public static final OperatorMember INT_NEG = neg(INT);
-	public static final OperatorMember UINT_NEG = neg(UINT);
-	public static final OperatorMember LONG_NEG = neg(LONG);
-	public static final OperatorMember ULONG_NEG = neg(ULONG);
-	public static final OperatorMember FLOAT_NEG = neg(FLOAT);
-	public static final OperatorMember DOUBLE_NEG = neg(DOUBLE);
-	
-	public static final OperatorMember BYTE_ADD_BYTE = add(BYTE, BYTE);
-	public static final OperatorMember SBYTE_ADD_SBYTE = add(SBYTE, SBYTE);
-	public static final OperatorMember SHORT_ADD_SHORT = add(SHORT, SHORT);
-	public static final OperatorMember USHORT_ADD_USHORT = add(USHORT, USHORT);
-	public static final OperatorMember INT_ADD_INT = add(INT, INT);
-	public static final OperatorMember UINT_ADD_UINT = add(UINT, UINT);
-	public static final OperatorMember LONG_ADD_LONG = add(LONG, LONG);
-	public static final OperatorMember ULONG_ADD_ULONG = add(ULONG, ULONG);
-	public static final OperatorMember FLOAT_ADD_FLOAT = add(FLOAT, FLOAT);
-	public static final OperatorMember DOUBLE_ADD_DOUBLE = add(DOUBLE, DOUBLE);
-	public static final OperatorMember STRING_ADD_STRING = add(STRING, STRING);
-	
-	public static final OperatorMember BYTE_SUB_BYTE = sub(BYTE, BYTE);
-	public static final OperatorMember SBYTE_SUB_SBYTE = sub(SBYTE, SBYTE);
-	public static final OperatorMember SHORT_SUB_SHORT = sub(SHORT, SHORT);
-	public static final OperatorMember USHORT_SUB_USHORT = sub(USHORT, USHORT);
-	public static final OperatorMember INT_SUB_INT = sub(INT, INT);
-	public static final OperatorMember UINT_SUB_UINT = sub(UINT, UINT);
-	public static final OperatorMember LONG_SUB_LONG = sub(LONG, LONG);
-	public static final OperatorMember ULONG_SUB_ULONG = sub(ULONG, ULONG);
-	public static final OperatorMember FLOAT_SUB_FLOAT = sub(FLOAT, FLOAT);
-	public static final OperatorMember DOUBLE_SUB_DOUBLE = sub(DOUBLE, DOUBLE);
-	
-	public static final OperatorMember BYTE_MUL_BYTE = mul(BYTE, BYTE);
-	public static final OperatorMember SBYTE_MUL_SBYTE = mul(SBYTE, SBYTE);
-	public static final OperatorMember SHORT_MUL_SHORT = mul(SHORT, SHORT);
-	public static final OperatorMember USHORT_MUL_USHORT = mul(USHORT, USHORT);
-	public static final OperatorMember INT_MUL_INT = mul(INT, INT);
-	public static final OperatorMember UINT_MUL_UINT = mul(UINT, UINT);
-	public static final OperatorMember LONG_MUL_LONG = mul(LONG, LONG);
-	public static final OperatorMember ULONG_MUL_ULONG = mul(ULONG, ULONG);
-	public static final OperatorMember FLOAT_MUL_FLOAT = mul(FLOAT, FLOAT);
-	public static final OperatorMember DOUBLE_MUL_DOUBLE = mul(DOUBLE, DOUBLE);
-	
-	public static final OperatorMember BYTE_DIV_BYTE = div(BYTE, BYTE);
-	public static final OperatorMember SBYTE_DIV_SBYTE = div(SBYTE, SBYTE);
-	public static final OperatorMember SHORT_DIV_SHORT = div(SHORT, SHORT);
-	public static final OperatorMember USHORT_DIV_USHORT = div(USHORT, USHORT);
-	public static final OperatorMember INT_DIV_INT = div(INT, INT);
-	public static final OperatorMember UINT_DIV_UINT = div(UINT, UINT);
-	public static final OperatorMember LONG_DIV_LONG = div(LONG, LONG);
-	public static final OperatorMember ULONG_DIV_ULONG = div(ULONG, ULONG);
-	public static final OperatorMember FLOAT_DIV_FLOAT = div(FLOAT, FLOAT);
-	public static final OperatorMember DOUBLE_DIV_DOUBLE = div(DOUBLE, DOUBLE);
-	
-	public static final OperatorMember BYTE_MOD_BYTE = mod(BYTE, BYTE);
-	public static final OperatorMember SBYTE_MOD_SBYTE = mod(SBYTE, SBYTE);
-	public static final OperatorMember SHORT_MOD_SHORT = mod(SHORT, SHORT);
-	public static final OperatorMember USHORT_MOD_USHORT = mod(USHORT, USHORT);
-	public static final OperatorMember INT_MOD_INT = mod(INT, INT);
-	public static final OperatorMember UINT_MOD_UINT = mod(UINT, UINT);
-	public static final OperatorMember LONG_MOD_LONG = mod(LONG, LONG);
-	public static final OperatorMember ULONG_MOD_ULONG = mod(ULONG, ULONG);
-	
-	public static final CasterMember INT_TO_BYTE = castExplicit(BYTE);
-	public static final CasterMember INT_TO_SBYTE = castExplicit(SBYTE);
-	public static final CasterMember INT_TO_SHORT = castExplicit(SHORT);
-	public static final CasterMember INT_TO_USHORT = castExplicit(USHORT);
-	public static final CasterMember INT_TO_UINT = castImplicit(UINT);
-	public static final CasterMember INT_TO_LONG = castImplicit(LONG);
-	public static final CasterMember INT_TO_ULONG = castImplicit(ULONG);
-	public static final CasterMember INT_TO_FLOAT = castImplicit(FLOAT);
-	public static final CasterMember INT_TO_DOUBLE = castImplicit(DOUBLE);
-	public static final CasterMember INT_TO_CHAR = castExplicit(CHAR);
-	public static final CasterMember INT_TO_STRING = castImplicit(STRING);
-	
-	public static final CasterMember LONG_TO_BYTE = castExplicit(BYTE);
-	public static final CasterMember LONG_TO_SBYTE = castExplicit(SBYTE);
-	public static final CasterMember LONG_TO_SHORT = castExplicit(SHORT);
-	public static final CasterMember LONG_TO_USHORT = castExplicit(USHORT);
-	public static final CasterMember LONG_TO_INT = castExplicit(INT);
-	public static final CasterMember LONG_TO_UINT = castExplicit(UINT);
-	public static final CasterMember LONG_TO_ULONG = castImplicit(ULONG);
-	public static final CasterMember LONG_TO_FLOAT = castImplicit(FLOAT);
-	public static final CasterMember LONG_TO_DOUBLE = castImplicit(DOUBLE);
-	public static final CasterMember LONG_TO_CHAR = castExplicit(CHAR);
-	public static final CasterMember LONG_TO_STRING = castImplicit(STRING);
-	
-	public static final GetterMember FLOAT_BITS = new GetterMember(BUILTIN, 0, "bits", UINT);
-	public static final GetterMember DOUBLE_BITS = new GetterMember(BUILTIN, 0, "bits", ULONG);
-	public static final MethodMember FLOAT_FROMBITS = new MethodMember(BUILTIN, Modifiers.STATIC, "fromBits", new FunctionHeader(FLOAT, new FunctionParameter(UINT)));
-	public static final MethodMember DOUBLE_FROMBITS = new MethodMember(BUILTIN, Modifiers.STATIC, "fromBits", new FunctionHeader(DOUBLE, new FunctionParameter(ULONG)));
-	
-	private static OperatorMember not(ITypeID result) {
-		return new OperatorMember(BUILTIN, 0, OperatorType.NOT, new FunctionHeader(result));
+	public static final ClassDefinition T_BOOL = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	public static final ClassDefinition T_BYTE = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	public static final ClassDefinition T_SBYTE = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	public static final ClassDefinition T_SHORT = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	public static final ClassDefinition T_USHORT = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	public static final ClassDefinition T_INT = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	public static final ClassDefinition T_UINT = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	public static final ClassDefinition T_LONG = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	public static final ClassDefinition T_ULONG = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	public static final ClassDefinition T_FLOAT = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	public static final ClassDefinition T_DOUBLE = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	public static final ClassDefinition T_CHAR = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	public static final ClassDefinition T_STRING = new ClassDefinition(BUILTIN, null, "not", Modifiers.EXPORT);
+	
+	public static final OperatorMember BOOL_NOT = not(T_BOOL, BOOL);
+	
+	public static final OperatorMember BYTE_NOT = not(T_BYTE, BYTE);
+	public static final OperatorMember SBYTE_NOT = not(T_SBYTE, SBYTE);
+	public static final OperatorMember SHORT_NOT = not(T_SHORT, SHORT);
+	public static final OperatorMember USHORT_NOT = not(T_USHORT, USHORT);
+	public static final OperatorMember INT_NOT = not(T_INT, INT);
+	public static final OperatorMember UINT_NOT = not(T_UINT, UINT);
+	public static final OperatorMember LONG_NOT = not(T_LONG, LONG);
+	public static final OperatorMember ULONG_NOT = not(T_ULONG, ULONG);
+	
+	public static final OperatorMember SBYTE_NEG = neg(T_SBYTE, SBYTE);
+	public static final OperatorMember SHORT_NEG = neg(T_SHORT, SHORT);
+	public static final OperatorMember INT_NEG = neg(T_INT, INT);
+	public static final OperatorMember LONG_NEG = neg(T_LONG, LONG);
+	public static final OperatorMember FLOAT_NEG = neg(T_FLOAT, FLOAT);
+	public static final OperatorMember DOUBLE_NEG = neg(T_DOUBLE, DOUBLE);
+	
+	public static final OperatorMember BYTE_ADD_BYTE = add(T_BYTE, BYTE, BYTE);
+	public static final OperatorMember SBYTE_ADD_SBYTE = add(T_SBYTE, SBYTE, SBYTE);
+	public static final OperatorMember SHORT_ADD_SHORT = add(T_SHORT, SHORT, SHORT);
+	public static final OperatorMember USHORT_ADD_USHORT = add(T_USHORT, USHORT, USHORT);
+	public static final OperatorMember INT_ADD_INT = add(T_INT, INT, INT);
+	public static final OperatorMember UINT_ADD_UINT = add(T_UINT, UINT, UINT);
+	public static final OperatorMember LONG_ADD_LONG = add(T_LONG, LONG, LONG);
+	public static final OperatorMember ULONG_ADD_ULONG = add(T_ULONG, ULONG, ULONG);
+	public static final OperatorMember FLOAT_ADD_FLOAT = add(T_FLOAT, FLOAT, FLOAT);
+	public static final OperatorMember DOUBLE_ADD_DOUBLE = add(T_DOUBLE, DOUBLE, DOUBLE);
+	public static final OperatorMember STRING_ADD_STRING = add(T_STRING, STRING, STRING);
+	
+	public static final OperatorMember BYTE_SUB_BYTE = sub(T_BYTE, BYTE, BYTE);
+	public static final OperatorMember SBYTE_SUB_SBYTE = sub(T_SBYTE, SBYTE, SBYTE);
+	public static final OperatorMember SHORT_SUB_SHORT = sub(T_SHORT, SHORT, SHORT);
+	public static final OperatorMember USHORT_SUB_USHORT = sub(T_USHORT, USHORT, USHORT);
+	public static final OperatorMember INT_SUB_INT = sub(T_INT, INT, INT);
+	public static final OperatorMember UINT_SUB_UINT = sub(T_UINT, UINT, UINT);
+	public static final OperatorMember LONG_SUB_LONG = sub(T_LONG, LONG, LONG);
+	public static final OperatorMember ULONG_SUB_ULONG = sub(T_ULONG, ULONG, ULONG);
+	public static final OperatorMember FLOAT_SUB_FLOAT = sub(T_FLOAT, FLOAT, FLOAT);
+	public static final OperatorMember DOUBLE_SUB_DOUBLE = sub(T_DOUBLE, DOUBLE, DOUBLE);
+	
+	public static final OperatorMember BYTE_MUL_BYTE = mul(T_BYTE, BYTE, BYTE);
+	public static final OperatorMember SBYTE_MUL_SBYTE = mul(T_SBYTE, SBYTE, SBYTE);
+	public static final OperatorMember SHORT_MUL_SHORT = mul(T_SHORT, SHORT, SHORT);
+	public static final OperatorMember USHORT_MUL_USHORT = mul(T_USHORT, USHORT, USHORT);
+	public static final OperatorMember INT_MUL_INT = mul(T_INT, INT, INT);
+	public static final OperatorMember UINT_MUL_UINT = mul(T_UINT, UINT, UINT);
+	public static final OperatorMember LONG_MUL_LONG = mul(T_LONG, LONG, LONG);
+	public static final OperatorMember ULONG_MUL_ULONG = mul(T_ULONG, ULONG, ULONG);
+	public static final OperatorMember FLOAT_MUL_FLOAT = mul(T_FLOAT, FLOAT, FLOAT);
+	public static final OperatorMember DOUBLE_MUL_DOUBLE = mul(T_DOUBLE, DOUBLE, DOUBLE);
+	
+	public static final OperatorMember BYTE_DIV_BYTE = div(T_BYTE, BYTE, BYTE);
+	public static final OperatorMember SBYTE_DIV_SBYTE = div(T_SBYTE, SBYTE, SBYTE);
+	public static final OperatorMember SHORT_DIV_SHORT = div(T_SHORT, SHORT, SHORT);
+	public static final OperatorMember USHORT_DIV_USHORT = div(T_USHORT, USHORT, USHORT);
+	public static final OperatorMember INT_DIV_INT = div(T_INT, INT, INT);
+	public static final OperatorMember UINT_DIV_UINT = div(T_UINT, UINT, UINT);
+	public static final OperatorMember LONG_DIV_LONG = div(T_LONG, LONG, LONG);
+	public static final OperatorMember ULONG_DIV_ULONG = div(T_ULONG, ULONG, ULONG);
+	public static final OperatorMember FLOAT_DIV_FLOAT = div(T_FLOAT, FLOAT, FLOAT);
+	public static final OperatorMember DOUBLE_DIV_DOUBLE = div(T_DOUBLE, DOUBLE, DOUBLE);
+	
+	public static final OperatorMember BYTE_MOD_BYTE = mod(T_BYTE, BYTE, BYTE);
+	public static final OperatorMember SBYTE_MOD_SBYTE = mod(T_SBYTE, SBYTE, SBYTE);
+	public static final OperatorMember SHORT_MOD_SHORT = mod(T_SHORT, SHORT, SHORT);
+	public static final OperatorMember USHORT_MOD_USHORT = mod(T_USHORT, USHORT, USHORT);
+	public static final OperatorMember INT_MOD_INT = mod(T_INT, INT, INT);
+	public static final OperatorMember UINT_MOD_UINT = mod(T_UINT, UINT, UINT);
+	public static final OperatorMember LONG_MOD_LONG = mod(T_LONG, LONG, LONG);
+	public static final OperatorMember ULONG_MOD_ULONG = mod(T_ULONG, ULONG, ULONG);
+	
+	public static final CasterMember INT_TO_BYTE = castExplicit(T_BYTE, BYTE);
+	public static final CasterMember INT_TO_SBYTE = castExplicit(T_SBYTE, SBYTE);
+	public static final CasterMember INT_TO_SHORT = castExplicit(T_SHORT, SHORT);
+	public static final CasterMember INT_TO_USHORT = castExplicit(T_USHORT, USHORT);
+	public static final CasterMember INT_TO_UINT = castImplicit(T_UINT, UINT);
+	public static final CasterMember INT_TO_LONG = castImplicit(T_LONG, LONG);
+	public static final CasterMember INT_TO_ULONG = castImplicit(T_ULONG, ULONG);
+	public static final CasterMember INT_TO_FLOAT = castImplicit(T_FLOAT, FLOAT);
+	public static final CasterMember INT_TO_DOUBLE = castImplicit(T_DOUBLE, DOUBLE);
+	public static final CasterMember INT_TO_CHAR = castExplicit(T_CHAR, CHAR);
+	public static final CasterMember INT_TO_STRING = castImplicit(T_STRING, STRING);
+	
+	public static final CasterMember LONG_TO_BYTE = castExplicit(T_BYTE, BYTE);
+	public static final CasterMember LONG_TO_SBYTE = castExplicit(T_SBYTE, SBYTE);
+	public static final CasterMember LONG_TO_SHORT = castExplicit(T_SHORT, SHORT);
+	public static final CasterMember LONG_TO_USHORT = castExplicit(T_USHORT, USHORT);
+	public static final CasterMember LONG_TO_INT = castExplicit(T_INT, INT);
+	public static final CasterMember LONG_TO_UINT = castExplicit(T_UINT, UINT);
+	public static final CasterMember LONG_TO_ULONG = castImplicit(T_ULONG, ULONG);
+	public static final CasterMember LONG_TO_FLOAT = castImplicit(T_FLOAT, FLOAT);
+	public static final CasterMember LONG_TO_DOUBLE = castImplicit(T_DOUBLE, DOUBLE);
+	public static final CasterMember LONG_TO_CHAR = castExplicit(T_CHAR, CHAR);
+	public static final CasterMember LONG_TO_STRING = castImplicit(T_STRING, STRING);
+	
+	public static final GetterMember FLOAT_BITS = new GetterMember(BUILTIN, T_FLOAT, 0, "bits", UINT);
+	public static final GetterMember DOUBLE_BITS = new GetterMember(BUILTIN, T_DOUBLE, 0, "bits", ULONG);
+	public static final MethodMember FLOAT_FROMBITS = new MethodMember(BUILTIN, T_FLOAT, Modifiers.STATIC, "fromBits", new FunctionHeader(FLOAT, new FunctionParameter(UINT)));
+	public static final MethodMember DOUBLE_FROMBITS = new MethodMember(BUILTIN, T_FLOAT, Modifiers.STATIC, "fromBits", new FunctionHeader(DOUBLE, new FunctionParameter(ULONG)));
+	
+	private static OperatorMember not(ClassDefinition cls, ITypeID result) {
+		return new OperatorMember(BUILTIN, cls, 0, OperatorType.NOT, new FunctionHeader(result));
 	}
 	
-	private static OperatorMember neg(ITypeID result) {
-		return new OperatorMember(BUILTIN, 0, OperatorType.NEG, new FunctionHeader(result));
+	private static OperatorMember neg(ClassDefinition cls, ITypeID result) {
+		return new OperatorMember(BUILTIN, cls, 0, OperatorType.NEG, new FunctionHeader(result));
 	}
 	
-	private static OperatorMember add(ITypeID operand, ITypeID result) {
-		return new OperatorMember(BUILTIN, 0, OperatorType.ADD, new FunctionHeader(result, new FunctionParameter(operand)));
+	private static OperatorMember add(ClassDefinition cls, ITypeID operand, ITypeID result) {
+		return new OperatorMember(BUILTIN, cls, 0, OperatorType.ADD, new FunctionHeader(result, new FunctionParameter(operand)));
 	}
 	
-	private static OperatorMember sub(ITypeID operand, ITypeID result) {
-		return new OperatorMember(BUILTIN, 0, OperatorType.SUB, new FunctionHeader(result, new FunctionParameter(operand)));
+	private static OperatorMember sub(ClassDefinition cls, ITypeID operand, ITypeID result) {
+		return new OperatorMember(BUILTIN, cls, 0, OperatorType.SUB, new FunctionHeader(result, new FunctionParameter(operand)));
 	}
 	
-	private static OperatorMember mul(ITypeID operand, ITypeID result) {
-		return new OperatorMember(BUILTIN, 0, OperatorType.MUL, new FunctionHeader(result, new FunctionParameter(operand)));
+	private static OperatorMember mul(ClassDefinition cls, ITypeID operand, ITypeID result) {
+		return new OperatorMember(BUILTIN, cls, 0, OperatorType.MUL, new FunctionHeader(result, new FunctionParameter(operand)));
 	}
 	
-	private static OperatorMember div(ITypeID operand, ITypeID result) {
-		return new OperatorMember(BUILTIN, 0, OperatorType.DIV, new FunctionHeader(result, new FunctionParameter(operand)));
+	private static OperatorMember div(ClassDefinition cls, ITypeID operand, ITypeID result) {
+		return new OperatorMember(BUILTIN, cls, 0, OperatorType.DIV, new FunctionHeader(result, new FunctionParameter(operand)));
 	}
 	
-	private static OperatorMember mod(ITypeID operand, ITypeID result) {
-		return new OperatorMember(BUILTIN, 0, OperatorType.MOD, new FunctionHeader(result, new FunctionParameter(operand)));
+	private static OperatorMember mod(ClassDefinition cls, ITypeID operand, ITypeID result) {
+		return new OperatorMember(BUILTIN, cls, 0, OperatorType.MOD, new FunctionHeader(result, new FunctionParameter(operand)));
 	}
 	
-	private static CasterMember castExplicit(ITypeID result) {
-		return new CasterMember(CodePosition.BUILTIN, 0, result);
+	private static CasterMember castExplicit(ClassDefinition cls, ITypeID result) {
+		return new CasterMember(CodePosition.BUILTIN, cls, 0, result);
 	}
 	
-	private static CasterMember castImplicit(ITypeID result) {
-		return new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, result);
+	private static CasterMember castImplicit(ClassDefinition cls, ITypeID result) {
+		return new CasterMember(CodePosition.BUILTIN, cls, Modifiers.IMPLICIT, result);
 	}
 }

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

@@ -15,6 +15,7 @@ import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.definition.ClassDefinition;
 import org.openzen.zenscript.codemodel.definition.EnumDefinition;
+import org.openzen.zenscript.codemodel.definition.FunctionDefinition;
 import org.openzen.zenscript.codemodel.definition.StructDefinition;
 import org.openzen.zenscript.codemodel.expression.CallTranslator;
 import org.openzen.zenscript.codemodel.expression.ConstantCharExpression;
@@ -51,7 +52,6 @@ import org.openzen.zenscript.codemodel.type.IteratorTypeID;
 import org.openzen.zenscript.codemodel.type.OptionalTypeID;
 import org.openzen.zenscript.codemodel.type.RangeTypeID;
 import static org.openzen.zenscript.codemodel.type.member.BuiltinTypeMembers.*;
-import org.openzen.zenscript.shared.CodePosition;
 import static org.openzen.zenscript.shared.CodePosition.BUILTIN;
 
 /**
@@ -101,6 +101,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 
 	@Override
 	public Void visitArray(ArrayTypeID array) {
+		HighLevelDefinition definition = new ClassDefinition(BUILTIN, null, "", Modifiers.EXPORT);
 		ITypeID baseType = array.elementType;
 		int dimension = array.dimension;
 
@@ -109,16 +110,16 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 			indexGetParameters[i] = new FunctionParameter(INT, null);
 
 		FunctionHeader indexGetHeader = new FunctionHeader(baseType, indexGetParameters);
-		members.addOperator(new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.INDEXGET, indexGetHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.INDEXGET, indexGetHeader), TypeMemberPriority.SPECIFIED);
 		
-		FunctionHeader sliceHeader = new FunctionHeader(array, new FunctionParameter(cache.getRegistry().getRange(BasicTypeID.INT, BasicTypeID.INT), "range"));
-		members.addOperator(new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.INDEXGET, sliceHeader), TypeMemberPriority.SPECIFIED);
+		FunctionHeader sliceHeader = new FunctionHeader(array, new FunctionParameter(cache.getRegistry().getRange(INT, INT), "range"));
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.INDEXGET, sliceHeader), TypeMemberPriority.SPECIFIED);
 		
 		FunctionHeader containsHeader = new FunctionHeader(BOOL, new FunctionParameter(baseType, "value"));
-		members.addOperator(new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.CONTAINS, containsHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.CONTAINS, containsHeader), TypeMemberPriority.SPECIFIED);
 		
 		FunctionHeader sizedConstructorHeader = new FunctionHeader(VOID, indexGetParameters);
-		members.addConstructor(new ConstructorMember(CodePosition.BUILTIN, 0, sizedConstructorHeader), TypeMemberPriority.SPECIFIED);
+		members.addConstructor(new ConstructorMember(BUILTIN, definition, 0, sizedConstructorHeader), TypeMemberPriority.SPECIFIED);
 
 		FunctionParameter[] lambdaConstructorParameters = new FunctionParameter[dimension + 1];
 		for (int i = 0; i < dimension; i++)
@@ -127,7 +128,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		FunctionHeader lambdaConstructorFunction = new FunctionHeader(baseType, indexGetParameters);
 		lambdaConstructorParameters[dimension] = new FunctionParameter(cache.getRegistry().getFunction(lambdaConstructorFunction), null);
 		FunctionHeader lambdaConstructorHeader = new FunctionHeader(VOID, lambdaConstructorParameters);
-		members.addConstructor(new ConstructorMember(CodePosition.BUILTIN, 0, lambdaConstructorHeader), TypeMemberPriority.SPECIFIED);
+		members.addConstructor(new ConstructorMember(BUILTIN, definition, 0, lambdaConstructorHeader), TypeMemberPriority.SPECIFIED);
 		
 		FunctionParameter[] indexSetParameters = new FunctionParameter[dimension + 1];
 		for (int i = 0; i < dimension; i++)
@@ -135,21 +136,21 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		indexSetParameters[dimension] = new FunctionParameter(baseType, null);
 
 		FunctionHeader indexSetHeader = new FunctionHeader(VOID, indexSetParameters);
-		members.addOperator(new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.INDEXSET, indexSetHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.INDEXSET, indexSetHeader), TypeMemberPriority.SPECIFIED);
 
 		if (dimension == 1) {
-			members.addConstructor(new ConstructorMember(CodePosition.BUILTIN, 0, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
+			members.addConstructor(new ConstructorMember(BUILTIN, definition, 0, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
 			
 			FunctionHeader addHeader = new FunctionHeader(VOID, new FunctionParameter(baseType, "value"));
-			members.addMethod(new MethodMember(CodePosition.BUILTIN, 0, "add", addHeader), TypeMemberPriority.SPECIFIED);
+			members.addMethod(new MethodMember(BUILTIN, definition, 0, "add", addHeader), TypeMemberPriority.SPECIFIED);
 
-			members.addField(new FieldMember(CodePosition.BUILTIN, Modifiers.FINAL, "length", INT), TypeMemberPriority.SPECIFIED);
+			members.addField(new FieldMember(BUILTIN, definition, Modifiers.FINAL, "length", INT), TypeMemberPriority.SPECIFIED);
 		}
 
-		members.addGetter(new GetterMember(CodePosition.BUILTIN, 0, "empty", BOOL), TypeMemberPriority.SPECIFIED);
+		members.addGetter(new GetterMember(BUILTIN, definition, 0, "empty", BOOL), TypeMemberPriority.SPECIFIED);
 		members.addIterator(new ArrayIteratorKeyValues(array), TypeMemberPriority.SPECIFIED);
 		members.addIterator(new ArrayIteratorValues(array), TypeMemberPriority.SPECIFIED);
-		members.addMethod(new MethodMember(CodePosition.BUILTIN, 0, "clear", new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
+		members.addMethod(new MethodMember(BUILTIN, definition, 0, "clear", new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
 		return null;
 	}
 
@@ -158,22 +159,24 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		ITypeID keyType = assoc.keyType;
 		ITypeID valueType = assoc.valueType;
 		
-		members.addConstructor(new ConstructorMember(BUILTIN, 0, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
+		ClassDefinition definition = new ClassDefinition(BUILTIN, null, "", Modifiers.EXPORT);
+		
+		members.addConstructor(new ConstructorMember(BUILTIN, definition, 0, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
 
 		FunctionHeader indexGetHeader = new FunctionHeader(valueType, new FunctionParameter(keyType, "key"));
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.INDEXGET, indexGetHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.INDEXGET, indexGetHeader), TypeMemberPriority.SPECIFIED);
 
 		FunctionHeader indexSetHeader = new FunctionHeader(VOID, new FunctionParameter(keyType, "key"), new FunctionParameter(valueType, "value"));
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.INDEXSET, indexSetHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.INDEXSET, indexSetHeader), TypeMemberPriority.SPECIFIED);
 		
 		FunctionHeader getOrDefaultHeader = new FunctionHeader(valueType, new FunctionParameter(keyType, "key"), new FunctionParameter(valueType, "defaultValue"));
-		members.addMethod(new MethodMember(BUILTIN, 0, "getOrDefault", getOrDefaultHeader), TypeMemberPriority.SPECIFIED);
+		members.addMethod(new MethodMember(BUILTIN, definition, 0, "getOrDefault", getOrDefaultHeader), TypeMemberPriority.SPECIFIED);
 		
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.CONTAINS, new FunctionHeader(BOOL, new FunctionParameter(keyType, "key"))), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.CONTAINS, new FunctionHeader(BOOL, new FunctionParameter(keyType, "key"))), TypeMemberPriority.SPECIFIED);
 
-		members.addField(new FieldMember(BUILTIN, Modifiers.FINAL, "length", INT), TypeMemberPriority.SPECIFIED);
-		members.addGetter(new GetterMember(BUILTIN, 0, "empty", BOOL), TypeMemberPriority.SPECIFIED);
-		members.addGetter(new GetterMember(BUILTIN, 0, "keys", cache.getRegistry().getArray(keyType, 1)), TypeMemberPriority.SPECIFIED);
+		members.addField(new FieldMember(BUILTIN, definition, Modifiers.FINAL, "length", INT), TypeMemberPriority.SPECIFIED);
+		members.addGetter(new GetterMember(BUILTIN, definition, 0, "empty", BOOL), TypeMemberPriority.SPECIFIED);
+		members.addGetter(new GetterMember(BUILTIN, definition, 0, "keys", cache.getRegistry().getArray(keyType, 1)), TypeMemberPriority.SPECIFIED);
 		return null;
 	}
 	
@@ -184,7 +187,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 
 	@Override
 	public Void visitFunction(FunctionTypeID function) {
-		members.addCaller(new CallerMember(BUILTIN, 0, function.header), TypeMemberPriority.SPECIFIED);
+		FunctionDefinition definition = new FunctionDefinition(BUILTIN, null, "", Modifiers.EXPORT, function.header);
+		members.addCaller(new CallerMember(BUILTIN, definition, 0, function.header), TypeMemberPriority.SPECIFIED);
 		return null;
 	}
 
@@ -194,7 +198,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		if (type.typeParameters.length > 0 || !type.outerTypeParameters.isEmpty()) {
 			Map<TypeParameter, ITypeID> mapping = new HashMap<>();
 			for (int i = 0; i < type.typeParameters.length; i++)
-				mapping.put(definition.genericParameters.get(i), type.typeParameters[i]);
+				mapping.put(definition.genericParameters[i], type.typeParameters[i]);
 			for (Map.Entry<TypeParameter, ITypeID> entry : type.outerTypeParameters.entrySet())
 				mapping.put(entry.getKey(), entry.getValue());
 			
@@ -211,10 +215,10 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		if (constructors.getMethodMembers().isEmpty()) {
 			if (definition instanceof ClassDefinition) {
 				// add default constructor
-				constructors.addMethod(new ConstructorMember(BUILTIN, Modifiers.PUBLIC, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
+				constructors.addMethod(new ConstructorMember(BUILTIN, definition, Modifiers.PUBLIC, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
 			} else if (definition instanceof StructDefinition) {
 				// add default struct constructors
-				constructors.addMethod(new ConstructorMember(BUILTIN, Modifiers.PUBLIC, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
+				constructors.addMethod(new ConstructorMember(BUILTIN, definition, Modifiers.PUBLIC, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
 				
 				List<FieldMember> fields = ((StructDefinition)definition).getFields();
 				if (!fields.isEmpty()) {
@@ -223,17 +227,17 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 						FieldMember field = fields.get(i);
 						parameters[i] = new FunctionParameter(field.type, field.name, field.initializer, false);
 					}
-					constructors.addMethod(new ConstructorMember(BUILTIN, 0, new FunctionHeader(VOID, parameters)), TypeMemberPriority.SPECIFIED);
+					constructors.addMethod(new ConstructorMember(BUILTIN, definition, 0, new FunctionHeader(VOID, parameters)), TypeMemberPriority.SPECIFIED);
 				}
 			} else if (definition instanceof EnumDefinition) {
 				// add default constructor
-				constructors.addMethod(new ConstructorMember(BUILTIN, Modifiers.PRIVATE, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
+				constructors.addMethod(new ConstructorMember(BUILTIN, definition, Modifiers.PRIVATE, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
 			}
 		}
 		
 		if (definition instanceof EnumDefinition) {
-			members.addGetter(new GetterMember(BUILTIN, 0, "name", BasicTypeID.STRING), TypeMemberPriority.SPECIFIED);
-			members.addGetter(new GetterMember(BUILTIN, 0, "ordinal", BasicTypeID.INT), TypeMemberPriority.SPECIFIED);
+			members.addGetter(new GetterMember(BUILTIN, definition, 0, "name", BasicTypeID.STRING), TypeMemberPriority.SPECIFIED);
+			members.addGetter(new GetterMember(BUILTIN, definition, 0, "ordinal", BasicTypeID.INT), TypeMemberPriority.SPECIFIED);
 		}
 		
 		return null;
@@ -254,8 +258,9 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		ITypeID fromType = range.from;
 		ITypeID toType = range.to;
 
-		members.addField(new FieldMember(BUILTIN, Modifiers.FINAL, "from", fromType), TypeMemberPriority.SPECIFIED);
-		members.addField(new FieldMember(BUILTIN, Modifiers.FINAL, "to", toType), TypeMemberPriority.SPECIFIED);
+		ClassDefinition definition = new ClassDefinition(BUILTIN, null, "", Modifiers.EXPORT);
+		members.addField(new FieldMember(BUILTIN, definition, Modifiers.FINAL, "from", fromType), TypeMemberPriority.SPECIFIED);
+		members.addField(new FieldMember(BUILTIN, definition, Modifiers.FINAL, "to", toType), TypeMemberPriority.SPECIFIED);
 		members.addIterator(new RangeIterator(range), TypeMemberPriority.SPECIFIED);
 		return null;
 	}
@@ -290,27 +295,27 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addOperator(OperatorType.COMPARE, new ComparatorMember(members.type), TypeMemberPriority.SPECIFIED);
 		
 		members.addOperator(INT_ADD_INT);
-		members.addOperator(add(LONG, LONG, castedTargetCall(LONG_ADD_LONG, INT_TO_LONG)));
-		members.addOperator(add(FLOAT, FLOAT, castedTargetCall(FLOAT_ADD_FLOAT, INT_TO_FLOAT)));
-		members.addOperator(add(DOUBLE, DOUBLE, castedTargetCall(DOUBLE_ADD_DOUBLE, INT_TO_DOUBLE)));
+		members.addOperator(add(T_INT, LONG, LONG, castedTargetCall(LONG_ADD_LONG, INT_TO_LONG)));
+		members.addOperator(add(T_INT, FLOAT, FLOAT, castedTargetCall(FLOAT_ADD_FLOAT, INT_TO_FLOAT)));
+		members.addOperator(add(T_INT, DOUBLE, DOUBLE, castedTargetCall(DOUBLE_ADD_DOUBLE, INT_TO_DOUBLE)));
 		
 		members.addOperator(INT_SUB_INT);
-		members.addOperator(sub(LONG, LONG, castedTargetCall(LONG_SUB_LONG, INT_TO_LONG)));
-		members.addOperator(sub(FLOAT, FLOAT, castedTargetCall(FLOAT_SUB_FLOAT, INT_TO_FLOAT)));
-		members.addOperator(sub(DOUBLE, DOUBLE, castedTargetCall(DOUBLE_SUB_DOUBLE, INT_TO_DOUBLE)));
+		members.addOperator(sub(T_INT, LONG, LONG, castedTargetCall(LONG_SUB_LONG, INT_TO_LONG)));
+		members.addOperator(sub(T_INT, FLOAT, FLOAT, castedTargetCall(FLOAT_SUB_FLOAT, INT_TO_FLOAT)));
+		members.addOperator(sub(T_INT, DOUBLE, DOUBLE, castedTargetCall(DOUBLE_SUB_DOUBLE, INT_TO_DOUBLE)));
 		
 		members.addOperator(INT_MUL_INT);
-		members.addOperator(mul(LONG, LONG, castedTargetCall(LONG_MUL_LONG, INT_TO_LONG)));
-		members.addOperator(mul(FLOAT, FLOAT, castedTargetCall(FLOAT_MUL_FLOAT, INT_TO_FLOAT)));
-		members.addOperator(mul(DOUBLE, DOUBLE, castedTargetCall(DOUBLE_MUL_DOUBLE, INT_TO_DOUBLE)));
+		members.addOperator(mul(T_INT, LONG, LONG, castedTargetCall(LONG_MUL_LONG, INT_TO_LONG)));
+		members.addOperator(mul(T_INT, FLOAT, FLOAT, castedTargetCall(FLOAT_MUL_FLOAT, INT_TO_FLOAT)));
+		members.addOperator(mul(T_INT, DOUBLE, DOUBLE, castedTargetCall(DOUBLE_MUL_DOUBLE, INT_TO_DOUBLE)));
 		
 		members.addOperator(INT_DIV_INT);
-		members.addOperator(div(LONG, LONG, castedTargetCall(LONG_DIV_LONG, INT_TO_LONG)));
-		members.addOperator(div(FLOAT, FLOAT, castedTargetCall(FLOAT_DIV_FLOAT, INT_TO_FLOAT)));
-		members.addOperator(div(DOUBLE, DOUBLE, castedTargetCall(DOUBLE_DIV_DOUBLE, INT_TO_DOUBLE)));
+		members.addOperator(div(T_INT, LONG, LONG, castedTargetCall(LONG_DIV_LONG, INT_TO_LONG)));
+		members.addOperator(div(T_INT, FLOAT, FLOAT, castedTargetCall(FLOAT_DIV_FLOAT, INT_TO_FLOAT)));
+		members.addOperator(div(T_INT, DOUBLE, DOUBLE, castedTargetCall(DOUBLE_DIV_DOUBLE, INT_TO_DOUBLE)));
 		
 		members.addOperator(INT_MOD_INT);
-		members.addOperator(mod(LONG, LONG, castedTargetCall(LONG_MOD_LONG, INT_TO_LONG)));
+		members.addOperator(mod(T_INT, LONG, LONG, castedTargetCall(LONG_MOD_LONG, INT_TO_LONG)));
 		
 		members.addGetter(INT_GET_MIN_VALUE);
 		members.addGetter(INT_GET_MAX_VALUE);
@@ -329,11 +334,11 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 	}
 
 	private void visitUInt() {
-		registerUnaryOperations();
-		registerArithmeticOperations(UINT, UINT);
-		registerArithmeticOperations(ULONG, ULONG);
-		registerArithmeticOperations(FLOAT, FLOAT);
-		registerArithmeticOperations(DOUBLE, DOUBLE);
+		registerUnaryOperations(T_UINT);
+		registerArithmeticOperations(T_UINT, UINT, UINT);
+		registerArithmeticOperations(T_UINT, ULONG, ULONG);
+		registerArithmeticOperations(T_UINT, FLOAT, FLOAT);
+		registerArithmeticOperations(T_UINT, DOUBLE, DOUBLE);
 		members.addGetter(new ConstantGetterMember("MIN_VALUE", position -> new ConstantUIntExpression(position, 0)), TypeMemberPriority.SPECIFIED);
 		members.addGetter(new ConstantGetterMember("MAX_VALUE", position -> new ConstantUIntExpression(position, 0xFFFFFFFF)), TypeMemberPriority.SPECIFIED);
 	}
@@ -350,20 +355,20 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addOperator(OperatorType.COMPARE, new ComparatorMember(members.type), TypeMemberPriority.SPECIFIED);
 		
 		members.addOperator(LONG_ADD_LONG);
-		members.addOperator(add(FLOAT, FLOAT, castedTargetCall(FLOAT_ADD_FLOAT, LONG_TO_FLOAT)));
-		members.addOperator(add(DOUBLE, DOUBLE, castedTargetCall(DOUBLE_ADD_DOUBLE, LONG_TO_DOUBLE)));
+		members.addOperator(add(T_LONG, FLOAT, FLOAT, castedTargetCall(FLOAT_ADD_FLOAT, LONG_TO_FLOAT)));
+		members.addOperator(add(T_LONG, DOUBLE, DOUBLE, castedTargetCall(DOUBLE_ADD_DOUBLE, LONG_TO_DOUBLE)));
 		
 		members.addOperator(LONG_SUB_LONG);
-		members.addOperator(sub(FLOAT, FLOAT, castedTargetCall(FLOAT_SUB_FLOAT, LONG_TO_FLOAT)));
-		members.addOperator(sub(DOUBLE, DOUBLE, castedTargetCall(DOUBLE_SUB_DOUBLE, LONG_TO_DOUBLE)));
+		members.addOperator(sub(T_LONG, FLOAT, FLOAT, castedTargetCall(FLOAT_SUB_FLOAT, LONG_TO_FLOAT)));
+		members.addOperator(sub(T_LONG, DOUBLE, DOUBLE, castedTargetCall(DOUBLE_SUB_DOUBLE, LONG_TO_DOUBLE)));
 		
 		members.addOperator(LONG_MUL_LONG);
-		members.addOperator(mul(FLOAT, FLOAT, castedTargetCall(FLOAT_MUL_FLOAT, LONG_TO_FLOAT)));
-		members.addOperator(mul(DOUBLE, DOUBLE, castedTargetCall(DOUBLE_MUL_DOUBLE, LONG_TO_DOUBLE)));
+		members.addOperator(mul(T_LONG, FLOAT, FLOAT, castedTargetCall(FLOAT_MUL_FLOAT, LONG_TO_FLOAT)));
+		members.addOperator(mul(T_LONG, DOUBLE, DOUBLE, castedTargetCall(DOUBLE_MUL_DOUBLE, LONG_TO_DOUBLE)));
 		
 		members.addOperator(LONG_DIV_LONG);
-		members.addOperator(div(FLOAT, FLOAT, castedTargetCall(FLOAT_DIV_FLOAT, LONG_TO_FLOAT)));
-		members.addOperator(div(DOUBLE, DOUBLE, castedTargetCall(DOUBLE_DIV_DOUBLE, LONG_TO_DOUBLE)));
+		members.addOperator(div(T_FLOAT, FLOAT, FLOAT, castedTargetCall(FLOAT_DIV_FLOAT, LONG_TO_FLOAT)));
+		members.addOperator(div(T_FLOAT, DOUBLE, DOUBLE, castedTargetCall(DOUBLE_DIV_DOUBLE, LONG_TO_DOUBLE)));
 		
 		members.addOperator(LONG_MOD_LONG);
 		
@@ -384,38 +389,38 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 	}
 
 	private void visitChar() {
-		registerUnaryOperations();
-		registerArithmeticOperations(CHAR, CHAR);
-		registerArithmeticOperations(INT, INT);
-		registerArithmeticOperations(LONG, LONG);
-		registerArithmeticOperations(FLOAT, FLOAT);
-		registerArithmeticOperations(DOUBLE, DOUBLE);
+		registerUnaryOperations(T_CHAR);
+		registerArithmeticOperations(T_CHAR, CHAR, CHAR);
+		registerArithmeticOperations(T_CHAR, INT, INT);
+		registerArithmeticOperations(T_CHAR, LONG, LONG);
+		registerArithmeticOperations(T_CHAR, FLOAT, FLOAT);
+		registerArithmeticOperations(T_CHAR, DOUBLE, DOUBLE);
 		members.addGetter(new ConstantGetterMember("MIN_VALUE", position -> new ConstantCharExpression(position, (char)0)), TypeMemberPriority.SPECIFIED);
 		members.addGetter(new ConstantGetterMember("MAX_VALUE", position -> new ConstantCharExpression(position, (char)0xFFFF)), TypeMemberPriority.SPECIFIED);
 		
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, 0, BasicTypeID.BYTE), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, 0, BasicTypeID.SBYTE), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.SHORT), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.USHORT), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.INT), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.UINT), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.LONG), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.ULONG), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.FLOAT), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.DOUBLE), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.STRING), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(BUILTIN, T_CHAR, 0, BasicTypeID.BYTE), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(BUILTIN, T_CHAR, 0, BasicTypeID.SBYTE), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(BUILTIN, T_CHAR, Modifiers.IMPLICIT, BasicTypeID.SHORT), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(BUILTIN, T_CHAR, Modifiers.IMPLICIT, BasicTypeID.USHORT), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(BUILTIN, T_CHAR, Modifiers.IMPLICIT, BasicTypeID.INT), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(BUILTIN, T_CHAR, Modifiers.IMPLICIT, BasicTypeID.UINT), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(BUILTIN, T_CHAR, Modifiers.IMPLICIT, BasicTypeID.LONG), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(BUILTIN, T_CHAR, Modifiers.IMPLICIT, BasicTypeID.ULONG), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(BUILTIN, T_CHAR, Modifiers.IMPLICIT, BasicTypeID.FLOAT), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(BUILTIN, T_CHAR, Modifiers.IMPLICIT, BasicTypeID.DOUBLE), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(BUILTIN, T_CHAR, Modifiers.IMPLICIT, BasicTypeID.STRING), TypeMemberPriority.SPECIFIED);
 	}
 
 	private void visitString() {
 		FunctionHeader getIndexHeader = new FunctionHeader(CHAR, new FunctionParameter(INT));
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.INDEXGET, getIndexHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, T_STRING, 0, OperatorType.INDEXGET, getIndexHeader), TypeMemberPriority.SPECIFIED);
 
-		members.addGetter(new GetterMember(BUILTIN, 0, "length", INT), TypeMemberPriority.SPECIFIED);
+		members.addGetter(new GetterMember(BUILTIN, T_STRING, 0, "length", INT), TypeMemberPriority.SPECIFIED);
 
 		//FunctionHeader substringHeader = new FunctionHeader(STRING, new FunctionParameter(cache.getRegistry().getRange(INT, INT)));
 		//members.addOperator(OperatorType.INDEXGET, new SubstringMember(substringHeader), TypeMemberPriority.SPECIFIED);
 		
-		members.addConstructor(new ConstructorMember(BUILTIN, 0, new FunctionHeader(VOID, new FunctionParameter(cache.getRegistry().getArray(CHAR, 1), "characters"))), TypeMemberPriority.SPECIFIED);
+		members.addConstructor(new ConstructorMember(BUILTIN, T_STRING, 0, new FunctionHeader(VOID, new FunctionParameter(cache.getRegistry().getArray(CHAR, 1), "characters"))), TypeMemberPriority.SPECIFIED);
 		
 		members.addOperator(STRING_ADD_STRING);
 
@@ -439,44 +444,44 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addOperator(STRING_ADD_STRING);
 	}
 
-	private void registerUnaryOperations() {
+	private void registerUnaryOperations(ClassDefinition definition) {
 		FunctionHeader unaryHeader = new FunctionHeader(members.type);
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.NEG, unaryHeader), TypeMemberPriority.SPECIFIED);
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.PRE_INCREMENT, unaryHeader), TypeMemberPriority.SPECIFIED);
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.PRE_DECREMENT, unaryHeader), TypeMemberPriority.SPECIFIED);
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.POST_INCREMENT, unaryHeader), TypeMemberPriority.SPECIFIED);
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.POST_DECREMENT, unaryHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.NEG, unaryHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.PRE_INCREMENT, unaryHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.PRE_DECREMENT, unaryHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.POST_INCREMENT, unaryHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.POST_DECREMENT, unaryHeader), TypeMemberPriority.SPECIFIED);
 
 		members.addOperator(OperatorType.COMPARE, new ComparatorMember(members.type), TypeMemberPriority.SPECIFIED);
 	}
 
-	private void registerArithmeticOperations(ITypeID otherType, ITypeID resultType) {
+	private void registerArithmeticOperations(ClassDefinition definition, ITypeID otherType, ITypeID resultType) {
 		FunctionHeader binaryHeader = new FunctionHeader(resultType, new FunctionParameter(otherType));
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.ADD, binaryHeader), TypeMemberPriority.SPECIFIED);
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.SUB, binaryHeader), TypeMemberPriority.SPECIFIED);
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.MUL, binaryHeader), TypeMemberPriority.SPECIFIED);
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.DIV, binaryHeader), TypeMemberPriority.SPECIFIED);
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.MOD, binaryHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.ADD, binaryHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.SUB, binaryHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.MUL, binaryHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.DIV, binaryHeader), TypeMemberPriority.SPECIFIED);
+		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.MOD, binaryHeader), TypeMemberPriority.SPECIFIED);
 	}
 	
-	private static OperatorMember add(ITypeID operand, ITypeID result, CallTranslator translator) {
-		return new TranslatedOperatorMember(BUILTIN, 0, OperatorType.ADD, new FunctionHeader(result, new FunctionParameter(operand)), translator);
+	private static OperatorMember add(ClassDefinition definition, ITypeID operand, ITypeID result, CallTranslator translator) {
+		return new TranslatedOperatorMember(BUILTIN, definition, 0, OperatorType.ADD, new FunctionHeader(result, new FunctionParameter(operand)), translator);
 	}
 	
-	private static OperatorMember sub(ITypeID operand, ITypeID result, CallTranslator translator) {
-		return new TranslatedOperatorMember(BUILTIN, 0, OperatorType.SUB, new FunctionHeader(result, new FunctionParameter(operand)), translator);
+	private static OperatorMember sub(ClassDefinition definition, ITypeID operand, ITypeID result, CallTranslator translator) {
+		return new TranslatedOperatorMember(BUILTIN, definition, 0, OperatorType.SUB, new FunctionHeader(result, new FunctionParameter(operand)), translator);
 	}
 	
-	private static OperatorMember mul(ITypeID operand, ITypeID result, CallTranslator translator) {
-		return new TranslatedOperatorMember(BUILTIN, 0, OperatorType.MUL, new FunctionHeader(result, new FunctionParameter(operand)), translator);
+	private static OperatorMember mul(ClassDefinition definition, ITypeID operand, ITypeID result, CallTranslator translator) {
+		return new TranslatedOperatorMember(BUILTIN, definition, 0, OperatorType.MUL, new FunctionHeader(result, new FunctionParameter(operand)), translator);
 	}
 	
-	private static OperatorMember div(ITypeID operand, ITypeID result, CallTranslator translator) {
-		return new TranslatedOperatorMember(BUILTIN, 0, OperatorType.DIV, new FunctionHeader(result, new FunctionParameter(operand)), translator);
+	private static OperatorMember div(ClassDefinition definition, ITypeID operand, ITypeID result, CallTranslator translator) {
+		return new TranslatedOperatorMember(BUILTIN, definition, 0, OperatorType.DIV, new FunctionHeader(result, new FunctionParameter(operand)), translator);
 	}
 	
-	private static OperatorMember mod(ITypeID operand, ITypeID result, CallTranslator translator) {
-		return new TranslatedOperatorMember(BUILTIN, 0, OperatorType.MOD, new FunctionHeader(result, new FunctionParameter(operand)), translator);
+	private static OperatorMember mod(ClassDefinition definition, ITypeID operand, ITypeID result, CallTranslator translator) {
+		return new TranslatedOperatorMember(BUILTIN, definition, 0, OperatorType.MOD, new FunctionHeader(result, new FunctionParameter(operand)), translator);
 	}
 	
 	private static CallTranslator castedTargetCall(FunctionalMember member, CasterMember caster) {

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

@@ -12,11 +12,11 @@ import java.util.Map;
 import org.openzen.zenscript.codemodel.CompareType;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
+import org.openzen.zenscript.codemodel.expression.CallExpression;
 import org.openzen.zenscript.codemodel.expression.CheckNullExpression;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.InterfaceCastExpression;
 import org.openzen.zenscript.codemodel.expression.MakeConstExpression;
-import org.openzen.zenscript.codemodel.expression.NotExpression;
 import org.openzen.zenscript.codemodel.expression.NullExpression;
 import org.openzen.zenscript.codemodel.expression.WrapOptionalExpression;
 import org.openzen.zenscript.codemodel.member.CallerMember;
@@ -241,8 +241,10 @@ public final class TypeMembers {
 		} else if (operator == CompareType.NE) {
 			DefinitionMemberGroup equal = getOrCreateGroup(OperatorType.EQUALS);
 			for (TypeMember<ICallableMember> member : equal.getMethodMembers()) {
-				if (member.member.getHeader().accepts(scope, right))
-					return new NotExpression(position, equal.call(position, scope, left, new CallArguments(right), false));
+				if (member.member.getHeader().accepts(scope, right)) {
+					Expression equalExpression = equal.call(position, scope, left, new CallArguments(right), false);
+					return new CallExpression(position, equalExpression, BuiltinTypeMembers.BOOL_NOT, BuiltinTypeMembers.BOOL_NOT.header, CallArguments.EMPTY);
+				}
 			}
 		}
 		

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/JavaCompiler.java

@@ -48,14 +48,10 @@ public class JavaCompiler {
 		implement(LONG_NOT, JavaWriter::lNot);
 		implement(ULONG_NOT, JavaWriter::lNot);
 		
-		implement(BYTE_NEG, JavaWriter::iNeg);
 		implement(SBYTE_NEG, JavaWriter::iNeg);
 		implement(SHORT_NEG, JavaWriter::iNeg);
-		implement(USHORT_NEG, JavaWriter::iNeg);
 		implement(INT_NEG, JavaWriter::iNeg);
-		implement(UINT_NEG, JavaWriter::iNeg);
 		implement(LONG_NEG, JavaWriter::lNeg);
-		implement(ULONG_NEG, JavaWriter::lNeg);
 		implement(FLOAT_NEG, JavaWriter::fNeg);
 		implement(DOUBLE_NEG, JavaWriter::dNeg);
 		
@@ -160,6 +156,7 @@ public class JavaCompiler {
 			methodName = "generatedBlock" + (generatedScriptBlockCounter++);
 		} else {
 			// TODO: remove special characters
+			System.out.println("Writing script: " + sourceFile.filename);
 			methodName = sourceFile.filename.substring(0, sourceFile.filename.lastIndexOf('.')).replace("/", "_");
 		}
 

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

@@ -2,7 +2,6 @@ package org.openzen.zenscript.javabytecode.compiler;
 
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Type;
-import org.openzen.zenscript.codemodel.CompareType;
 import org.openzen.zenscript.codemodel.expression.*;
 import org.openzen.zenscript.codemodel.member.DefinitionMember;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
@@ -295,16 +294,6 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
         return null;
     }
 
-    @Override
-    public Void visitEquals(EqualsExpression expression) {
-        expression.left.accept(this);
-        expression.right.accept(this);
-        javaWriter.constant(CompareType.EQ.name());
-        javaWriter.invokeStatic(ZenUtils.class, "compare", boolean.class, getForEquals(expression.left.type), getForEquals(expression.right.type), String.class);
-
-        return null;
-    }
-
     @Override
     public Void visitFunction(FunctionExpression expression) {
         return null;
@@ -352,6 +341,16 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
         return null;
     }
 
+    @Override
+    public Void visitGlobal(GlobalExpression expression) {
+        return expression.resolution.accept(this);
+    }
+
+    @Override
+    public Void visitGlobalCall(GlobalCallExpression expression) {
+        return expression.resolution.accept(this);
+    }
+
     @Override
     public Void visitInterfaceCast(InterfaceCastExpression expression) {
         expression.value.accept(this);
@@ -408,13 +407,6 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
         return null;
     }
 
-    @Override
-    public Void visitNot(NotExpression expression) {
-        expression.value.accept(this);
-        javaWriter.iNeg();
-        return null;
-    }
-
     @Override
     public Void visitNull(NullExpression expression) {
         javaWriter.aConstNull();

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

@@ -0,0 +1,111 @@
+/*
+ * 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.javabytecode.compiler;
+
+import org.openzen.zenscript.codemodel.type.ArrayTypeID;
+import org.openzen.zenscript.codemodel.type.AssocTypeID;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.ConstTypeID;
+import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
+import org.openzen.zenscript.codemodel.type.FunctionTypeID;
+import org.openzen.zenscript.codemodel.type.GenericTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeVisitor;
+import org.openzen.zenscript.codemodel.type.IteratorTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
+import org.openzen.zenscript.codemodel.type.RangeTypeID;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class JavaOptionalTypeClassVisitor implements ITypeVisitor<Class> {
+	private final JavaTypeClassVisitor base;
+	
+	public JavaOptionalTypeClassVisitor(JavaTypeClassVisitor base) {
+		this.base = base;
+	}
+
+	@Override
+	public Class visitBasic(BasicTypeID basic) {
+		switch (basic) {
+			case VOID:
+				return void.class;
+			case NULL:
+				return Object.class;
+			case ANY:
+				return Object.class; // TODO
+			case BOOL:
+				return Boolean.class;
+			case BYTE:
+			case SBYTE:
+				return Byte.class;
+			case SHORT:
+			case USHORT:
+				return Short.class;
+			case INT:
+			case UINT:
+				return Integer.class;
+			case LONG:
+			case ULONG:
+				return Long.class;
+			case FLOAT:
+				return Float.class;
+			case DOUBLE:
+				return Double.class;
+			case CHAR:
+				return Character.class;
+			case STRING:
+				return String.class;
+			default:
+				throw new IllegalArgumentException("Invalid type: " + basic);
+		}
+	}
+
+	@Override
+	public Class visitArray(ArrayTypeID array) {
+		return base.visitArray(array);
+	}
+
+	@Override
+	public Class visitAssoc(AssocTypeID assoc) {
+		return base.visitAssoc(assoc);
+	}
+
+	@Override
+	public Class visitIterator(IteratorTypeID iterator) {
+		return base.visitIterator(iterator);
+	}
+
+	@Override
+	public Class visitFunction(FunctionTypeID function) {
+		return base.visitFunction(function);
+	}
+
+	@Override
+	public Class visitDefinition(DefinitionTypeID definition) {
+		return base.visitDefinition(definition);
+	}
+
+	@Override
+	public Class visitGeneric(GenericTypeID generic) {
+		return base.visitGeneric(generic);
+	}
+
+	@Override
+	public Class visitRange(RangeTypeID range) {
+		return base.visitRange(range);
+	}
+
+	@Override
+	public Class visitConst(ConstTypeID type) {
+		return base.visitConst(type);
+	}
+
+	@Override
+	public Class visitOptional(OptionalTypeID optional) {
+		return base.visitOptional(optional);
+	}
+}

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

@@ -9,6 +9,7 @@ import java.util.Map;
 public class JavaTypeClassVisitor implements ITypeVisitor<Class> {
 
     public static final JavaTypeClassVisitor INSTANCE = new JavaTypeClassVisitor();
+	private final JavaOptionalTypeClassVisitor optional = new JavaOptionalTypeClassVisitor(this);
 
     @Override
     public Class visitBasic(BasicTypeID basic) {
@@ -87,6 +88,6 @@ public class JavaTypeClassVisitor implements ITypeVisitor<Class> {
 
     @Override
     public Class visitOptional(OptionalTypeID optional) {
-        return optional.baseType.accept(this);
+        return optional.baseType.accept(this.optional);
     }
 }

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

@@ -16,7 +16,7 @@ import static org.objectweb.asm.Opcodes.*;
 public class JavaWriter {
     private final LocalVariablesSorter visitor;
     private final List<JavaLocalVariableInfo> localVariableInfos = new ArrayList<>();
-    private boolean debug = true;
+    private boolean debug = false;
     private boolean nameVariables = true;
     private int labelIndex = 1;
     private Map<Label, String> labelNames = new HashMap<>();

Linker/src/main/java/org/openzen/zenscript/linker/FileScope.java

@@ -17,6 +17,7 @@ import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
+import org.openzen.zenscript.codemodel.partial.PartialGlobalExpression;
 import org.openzen.zenscript.codemodel.partial.PartialTypeExpression;
 import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
@@ -74,8 +75,10 @@ public class FileScope extends BaseScope {
 		if (localDefinition != null)
 			return new PartialTypeExpression(position, globalRegistry.getForDefinition(localDefinition, name.arguments));
 		
-		if (globalSymbols.containsKey(name.name))
-			return globalSymbols.get(name.name).getExpression(position, globalRegistry, name.arguments);
+		if (globalSymbols.containsKey(name.name)) {
+			IPartialExpression resolution = globalSymbols.get(name.name).getExpression(position, globalRegistry, name.arguments);
+			return new PartialGlobalExpression(position, name.name, resolution);
+		}
 		
 		return rootPackage.getMember(position, globalRegistry, name);
 	}
@@ -100,7 +103,7 @@ public class FileScope extends BaseScope {
 			}
 			
 			// TODO: take care of non-static inner classes in generic classes!
-			if (type != null && name.get(name.size() - 1).arguments.size() != type.definition.genericParameters.size())
+			if (type != null && name.get(name.size() - 1).arguments.size() != type.definition.genericParameters.length)
 				throw new CompileException(position, CompileExceptionCode.TYPE_ARGUMENTS_INVALID_NUMBER, "Invalid number of type arguments");
 			
 			if (type != null)

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

@@ -44,6 +44,8 @@ public class ZSTokenStream extends TokenStream<ZSToken, ZSTokenType> {
 		KEYWORDS.put("static", K_STATIC);
 		KEYWORDS.put("protected", K_PROTECTED);
 		KEYWORDS.put("implicit", K_IMPLICIT);
+		KEYWORDS.put("virtual", K_VIRTUAL);
+		KEYWORDS.put("extern", K_EXTERN);
 		
 		KEYWORDS.put("val", K_VAL);
 		KEYWORDS.put("var", K_VAR);

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

@@ -90,6 +90,8 @@ public enum ZSTokenType implements TokenType {
 	K_STATIC,
 	K_PROTECTED,
 	K_IMPLICIT,
+	K_VIRTUAL,
+	K_EXTERN,
 	
 	K_VAL,
 	K_VAR,

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

@@ -62,24 +62,36 @@ public class ParsedFile {
 		while (true) {
 			CodePosition position = tokens.peek().position;
 			int modifiers = 0;
-			while (true) {
-				if (tokens.optional(K_PUBLIC) != null) {
-					modifiers |= Modifiers.PUBLIC;
-				} else if (tokens.optional(K_PRIVATE) != null) {
-					modifiers |= Modifiers.PRIVATE;
-				} else if (tokens.optional(K_EXPORT) != null) {
-					modifiers |= Modifiers.EXPORT;
-				} else if (tokens.optional(K_ABSTRACT) != null) {
-					modifiers |= Modifiers.ABSTRACT;
-				} else if (tokens.optional(K_FINAL) != null) {
-					modifiers |= Modifiers.FINAL;
-				} else if (tokens.optional(K_PROTECTED) != null) {
-					modifiers |= Modifiers.PROTECTED;
-				} else if (tokens.optional(K_IMPLICIT) != null) {
-					modifiers |= Modifiers.IMPLICIT;
-				} else {
-					break;
+			outer: while (true) {
+				switch (tokens.peek().type) {
+					case K_PUBLIC:
+						modifiers |= Modifiers.PUBLIC;
+						break;
+					case K_PRIVATE:
+						modifiers |= Modifiers.PRIVATE;
+						break;
+					case K_EXPORT:
+						modifiers |= Modifiers.EXPORT;
+						break;
+					case K_ABSTRACT:
+						modifiers |= Modifiers.ABSTRACT;
+						break;
+					case K_FINAL:
+						modifiers |= Modifiers.FINAL;
+						break;
+					case K_PROTECTED:
+						modifiers |= Modifiers.PROTECTED;
+						break;
+					case K_IMPLICIT:
+						modifiers |= Modifiers.IMPLICIT;
+						break;
+					case K_VIRTUAL:
+						modifiers |= Modifiers.VIRTUAL;
+						break;
+					default:
+						break outer;
 				}
+				tokens.next();
 			}
 
 			if (tokens.optional(K_IMPORT) != null) {

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

@@ -31,7 +31,7 @@ public abstract class BaseParsedDefinition extends ParsedDefinition {
 	@Override
 	public void linkInnerTypes() {
 		for (ParsedDefinitionMember member : members)
-			member.linkInnerTypes(getCompiled());
+			member.linkInnerTypes();
 	}
 
 	@Override

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

@@ -53,13 +53,17 @@ public class ParsedAlias extends ParsedDefinition {
 
 	@Override
 	public void compileMembers(BaseScope scope) {
-		for (ParsedGenericParameter parameter : this.parameters) {
-			compiled.addGenericParameter(parameter.compiled);
+		if (parameters.size() > 0) {
+			TypeParameter[] typeParameters = new TypeParameter[parameters.size()];
+			for (int i = 0; i < parameters.size(); i++) {
+				typeParameters[i] = parameters.get(i).compiled;
+			}
+			compiled.setTypeParameters(typeParameters);
 		}
 		
 		DefinitionScope innerScope = new DefinitionScope(scope, compiled);
-		for (int i = 0; i < compiled.genericParameters.size(); i++) {
-			TypeParameter output = compiled.genericParameters.get(i);
+		for (int i = 0; i < compiled.genericParameters.length; i++) {
+			TypeParameter output = compiled.genericParameters[i];
 			ParsedGenericParameter input = this.parameters.get(i);
 			for (ParsedGenericBound bound : input.bounds) {
 				output.addBound(bound.compile(innerScope));

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

@@ -9,7 +9,6 @@ import java.util.List;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.definition.ClassDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
-import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.lexer.ZSTokenStream;
 import org.openzen.zenscript.lexer.ZSTokenType;
 import org.openzen.zenscript.linker.BaseScope;
@@ -53,8 +52,7 @@ public class ParsedClass extends BaseParsedDefinition {
 		this.superclass = superclass;
 		
 		compiled = new ClassDefinition(position, pkg, name, modifiers, outerDefinition);
-		for (ParsedGenericParameter parameter : genericParameters)
-			compiled.addGenericParameter(parameter.compiled);
+		compiled.setTypeParameters(ParsedGenericParameter.getCompiled(genericParameters));
 	}
 
 	@Override
@@ -64,9 +62,9 @@ public class ParsedClass extends BaseParsedDefinition {
 
 	@Override
 	public void compileMembers(BaseScope scope) {
-		TypeParameter[] parameters = ParsedGenericParameter.compile(scope, genericParameters);
+		ParsedGenericParameter.compile(scope, compiled.genericParameters, genericParameters);
 		if (superclass != null)
-			compiled.setSuperclass(superclass.compile(new GenericFunctionScope(scope, parameters)));
+			compiled.setSuperclass(superclass.compile(new GenericFunctionScope(scope, compiled.genericParameters)));
 		
 		super.compileMembers(scope);
 	}

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

@@ -28,14 +28,14 @@ public class ParsedEnum extends BaseParsedDefinition {
 		String name = tokens.required(ZSTokenType.T_IDENTIFIER, "identifier expected").content;
 		tokens.required(ZSTokenType.T_AOPEN, "{ expected");
 		
-		List<ParsedEnumConstant> enumValues = new ArrayList<>();
+		ParsedEnum result = new ParsedEnum(pkg, position, modifiers, name, outerDefinition);
+		
 		while (!tokens.isNext(ZSTokenType.T_ACLOSE) && !tokens.isNext(ZSTokenType.T_SEMICOLON)) {
-			enumValues.add(ParsedEnumConstant.parse(tokens, enumValues.size()));
+			result.addEnumValue(ParsedEnumConstant.parse(tokens, result.compiled, result.enumValues.size()));
 			if (tokens.optional(ZSTokenType.T_COMMA) == null)
 				break;
 		}
 		
-		ParsedEnum result = new ParsedEnum(pkg, position, modifiers, name, enumValues, outerDefinition);
 		if (tokens.optional(ZSTokenType.T_SEMICOLON) != null) {
 			while (tokens.optional(ZSTokenType.T_ACLOSE) == null) {
 				result.addMember(ParsedDefinitionMember.parse(tokens, result.compiled));
@@ -46,17 +46,19 @@ public class ParsedEnum extends BaseParsedDefinition {
 		return result;
 	}
 	
-	private final List<ParsedEnumConstant> enumValues;
+	private final List<ParsedEnumConstant> enumValues = new ArrayList<>();
 	
 	private final EnumDefinition compiled;
 	
-	public ParsedEnum(ZSPackage pkg, CodePosition position, int modifiers, String name, List<ParsedEnumConstant> enumValues, HighLevelDefinition outerDefinition) {
+	public ParsedEnum(ZSPackage pkg, CodePosition position, int modifiers, String name, HighLevelDefinition outerDefinition) {
 		super(position, modifiers);
 		
-		this.enumValues = enumValues;
-		
 		compiled = new EnumDefinition(position, pkg, name, modifiers, outerDefinition);
 	}
+	
+	public void addEnumValue(ParsedEnumConstant value) {
+		enumValues.add(value);
+	}
 
 	@Override
 	public HighLevelDefinition getCompiled() {

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

@@ -7,6 +7,8 @@ package org.openzen.zenscript.parser.definitions;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.definition.EnumDefinition;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.lexer.ZSToken;
@@ -23,7 +25,7 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class ParsedEnumConstant {
-	public static ParsedEnumConstant parse(ZSTokenStream tokens, int value) {
+	public static ParsedEnumConstant parse(ZSTokenStream tokens, EnumDefinition definition, int value) {
 		ZSToken name = tokens.required(ZSTokenType.T_IDENTIFIER, "identifier expected");
 		List<ParsedExpression> arguments = new ArrayList<>();
 		if (tokens.optional(ZSTokenType.T_BROPEN) != null) {
@@ -33,7 +35,7 @@ public class ParsedEnumConstant {
 			tokens.required(ZSTokenType.T_BRCLOSE, ") expected");
 		}
 		
-		return new ParsedEnumConstant(name.position, name.content, value, arguments);
+		return new ParsedEnumConstant(name.position, definition, name.content, value, arguments);
 	}
 	
 	public final CodePosition position;
@@ -42,12 +44,12 @@ public class ParsedEnumConstant {
 	
 	private final EnumConstantMember compiled;
 	
-	public ParsedEnumConstant(CodePosition position, String name, int value, List<ParsedExpression> arguments) {
+	public ParsedEnumConstant(CodePosition position, HighLevelDefinition definition, String name, int value, List<ParsedExpression> arguments) {
 		this.position = position;
 		this.name = name;
 		this.arguments = arguments;
 		
-		compiled = new EnumConstantMember(position, name, value);
+		compiled = new EnumConstantMember(position, definition, name, value);
 	}
 	
 	public EnumConstantMember getCompiled() {

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

@@ -9,7 +9,6 @@ import java.util.List;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
-import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.lexer.ZSTokenStream;
 import org.openzen.zenscript.lexer.ZSTokenType;
 import org.openzen.zenscript.linker.BaseScope;
@@ -39,15 +38,14 @@ public class ParsedExpansion extends BaseParsedDefinition {
 	private final IParsedType target;
 	private final ExpansionDefinition compiled;
 	
-	public ParsedExpansion(ZSPackage pkg, CodePosition position, int modifiers, List<ParsedGenericParameter> parameters, IParsedType target, HighLevelDefinition outerDefinition) {
+	public ParsedExpansion(ZSPackage pkg, CodePosition position, int modifiers, List<ParsedGenericParameter> genericParameters, IParsedType target, HighLevelDefinition outerDefinition) {
 		super(position, modifiers);
 		
-		this.parameters = parameters;
+		this.parameters = genericParameters;
 		this.target = target;
 		
-		this.compiled = new ExpansionDefinition(position, pkg, modifiers, outerDefinition);
-		for (ParsedGenericParameter parameter : parameters)
-			compiled.addGenericParameter(parameter.compiled);
+		compiled = new ExpansionDefinition(position, pkg, modifiers, outerDefinition);
+		compiled.setTypeParameters(ParsedGenericParameter.getCompiled(genericParameters));
 	}
 	
 	@Override
@@ -57,8 +55,8 @@ public class ParsedExpansion extends BaseParsedDefinition {
 
 	@Override
 	public void compileMembers(BaseScope scope) {
-		TypeParameter[] parameters = ParsedGenericParameter.compile(scope, this.parameters);
-		compiled.target = target.compile(new GenericFunctionScope(scope, parameters));
+		ParsedGenericParameter.compile(scope, compiled.genericParameters, this.parameters);
+		compiled.target = target.compile(new GenericFunctionScope(scope, compiled.genericParameters));
 		
 		super.compileMembers(scope);
 	}

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

@@ -87,8 +87,10 @@ public class ParsedFunctionHeader {
 	}
 	
 	public FunctionHeader compile(BaseScope scope) {
-		TypeParameter[] genericParameters = ParsedGenericParameter.compile(scope, this.genericParameters);
+		TypeParameter[] genericParameters = ParsedGenericParameter.getCompiled(this.genericParameters);
+		ParsedGenericParameter.compile(scope, genericParameters, this.genericParameters);
 		GenericFunctionScope innerScope = new GenericFunctionScope(scope, genericParameters);
+		
 		ITypeID returnType = this.returnType.compile(innerScope);
 		FunctionParameter[] parameters = new FunctionParameter[this.parameters.size()];
 		for (int i = 0; i < parameters.length; i++)

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

@@ -45,17 +45,25 @@ public class ParsedGenericParameter {
 		return genericParameters;
 	}
 	
-	public static TypeParameter[] compile(BaseScope scope, List<ParsedGenericParameter> parameters) {
-		TypeParameter[] result = new TypeParameter[parameters.size()];
-		for (int i = 0; i < result.length; i++)
-			result[i] = parameters.get(i).compiled;
+	public static void compile(BaseScope scope, TypeParameter[] compiled, List<ParsedGenericParameter> parameters) {
+		if (compiled.length == 0)
+			return;
 		
-		GenericFunctionScope innerScope = new GenericFunctionScope(scope, result);
-		for (int i = 0; i < result.length; i++) {
+		GenericFunctionScope innerScope = new GenericFunctionScope(scope, compiled);
+		for (int i = 0; i < compiled.length; i++) {
 			for (ParsedGenericBound bound : parameters.get(i).bounds)
-				result[i].addBound(bound.compile(innerScope));
+				compiled[i].addBound(bound.compile(innerScope));
 		}
+	}
+	
+	private static TypeParameter[] NO_TYPE_PARAMETERS = new TypeParameter[0];
+	public static TypeParameter[] getCompiled(List<ParsedGenericParameter> parameters) {
+		if (parameters.isEmpty())
+			return NO_TYPE_PARAMETERS;
 		
+		TypeParameter[] result = new TypeParameter[parameters.size()];
+		for (int i = 0; i < result.length; i++)
+			result[i] = parameters.get(i).compiled;
 		return result;
 	}
 	

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

@@ -37,14 +37,13 @@ public class ParsedStruct extends BaseParsedDefinition {
 	
 	private final StructDefinition compiled;
 	
-	public ParsedStruct(ZSPackage pkg, CodePosition position, int modifiers, String name, List<ParsedGenericParameter> parameters, HighLevelDefinition outerDefinition) {
+	public ParsedStruct(ZSPackage pkg, CodePosition position, int modifiers, String name, List<ParsedGenericParameter> genericParameters, HighLevelDefinition outerDefinition) {
 		super(position, modifiers);
 		
-		this.parameters = parameters;
+		this.parameters = genericParameters;
 		
 		compiled = new StructDefinition(position, pkg, name, modifiers, outerDefinition);
-		for (ParsedGenericParameter parameter : parameters)
-			compiled.addGenericParameter(parameter.compiled);
+		compiled.setTypeParameters(ParsedGenericParameter.getCompiled(genericParameters));
 	}
 
 	@Override
@@ -54,8 +53,7 @@ public class ParsedStruct extends BaseParsedDefinition {
 
 	@Override
 	public void compileMembers(BaseScope scope) {
-		ParsedGenericParameter.compile(scope, parameters);
-		
+		ParsedGenericParameter.compile(scope, compiled.genericParameters, parameters);
 		super.compileMembers(scope);
 	}
 }

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

@@ -457,7 +457,7 @@ public abstract class ParsedExpression {
 	}
 	
 	public final CodePosition position;
-
+	
 	public ParsedExpression(CodePosition position) {
 		this.position = position;
 	}

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedCaller.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.parser.member;
 
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.linker.BaseScope;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
@@ -18,14 +19,14 @@ import org.openzen.zenscript.shared.CodePosition;
 public class ParsedCaller extends ParsedFunctionalMember {
 	private final ParsedFunctionHeader header;
 	
-	public ParsedCaller(CodePosition position, int modifiers, ParsedFunctionHeader header, ParsedFunctionBody body) {
-		super(position, modifiers, body);
+	public ParsedCaller(CodePosition position, HighLevelDefinition definition, int modifiers, ParsedFunctionHeader header, ParsedFunctionBody body) {
+		super(position, definition, modifiers, body);
 		
 		this.header = header;
 	}
 
 	@Override
 	public void linkTypes(BaseScope scope) {
-		compiled = new CallerMember(position, modifiers, header.compile(scope));
+		compiled = new CallerMember(position, definition, modifiers, header.compile(scope));
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedCaster.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.parser.member;
 
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.linker.BaseScope;
 import org.openzen.zenscript.parser.statements.ParsedFunctionBody;
@@ -18,14 +19,14 @@ import org.openzen.zenscript.shared.CodePosition;
 public class ParsedCaster extends ParsedFunctionalMember {
 	private final IParsedType type;
 	
-	public ParsedCaster(CodePosition position, int modifiers, IParsedType type, ParsedFunctionBody body) {
-		super(position, modifiers, body);
+	public ParsedCaster(CodePosition position, HighLevelDefinition definition, int modifiers, IParsedType type, ParsedFunctionBody body) {
+		super(position, definition, modifiers, body);
 		
 		this.type = type;
 	}
 
 	@Override
 	public void linkTypes(BaseScope scope) {
-		compiled = new CasterMember(position, modifiers, type.compile(scope));
+		compiled = new CasterMember(position, definition, modifiers, type.compile(scope));
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedConstructor.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.parser.member;
 
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
 import org.openzen.zenscript.linker.BaseScope;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
@@ -18,14 +19,14 @@ import org.openzen.zenscript.shared.CodePosition;
 public class ParsedConstructor extends ParsedFunctionalMember {
 	private final ParsedFunctionHeader header;
 	
-	public ParsedConstructor(CodePosition position, int modifiers, ParsedFunctionHeader header, ParsedFunctionBody body) {
-		super(position, modifiers, body);
+	public ParsedConstructor(CodePosition position, HighLevelDefinition definition, int modifiers, ParsedFunctionHeader header, ParsedFunctionBody body) {
+		super(position, definition, modifiers, body);
 		
 		this.header = header;
 	}
 
 	@Override
 	public void linkTypes(BaseScope scope) {
-		compiled = new ConstructorMember(position, modifiers, header.compile(scope));
+		compiled = new ConstructorMember(position, definition, modifiers, header.compile(scope));
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedDefinitionMember.java

@@ -15,7 +15,6 @@ import org.openzen.zenscript.parser.statements.ParsedFunctionBody;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.OperatorType;
-import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.lexer.ZSToken;
 import org.openzen.zenscript.lexer.ZSTokenStream;
@@ -77,7 +76,7 @@ public abstract class ParsedDefinitionMember {
 					initializer = ParsedExpression.parse(tokens);
 				}
 				tokens.required(ZSTokenType.T_SEMICOLON, "; expected");
-				return new ParsedField(start, modifiers, name, type, initializer, t.type == ZSTokenType.K_VAL);
+				return new ParsedField(start, forDefinition, modifiers, name, type, initializer, t.type == ZSTokenType.K_VAL);
 			}
 			case K_THIS: {
 				tokens.next();
@@ -86,13 +85,13 @@ public abstract class ParsedDefinitionMember {
 				if (body == null)
 					throw new CompileException(start, CompileExceptionCode.METHOD_BODY_REQUIRED, "Function body is required for constructors");
 				
-				return new ParsedConstructor(start, modifiers, header, body);
+				return new ParsedConstructor(start, forDefinition, modifiers, header, body);
 			}
 			case T_IDENTIFIER: {
 				String name = tokens.next().content;
 				ParsedFunctionHeader header = ParsedFunctionHeader.parse(tokens);
 				ParsedFunctionBody body = ParsedStatement.parseFunctionBody(tokens);
-				return new ParsedMethod(start, modifiers, name, header, body);
+				return new ParsedMethod(start, forDefinition, modifiers, name, header, body);
 			}
 			case K_SET: {
 				tokens.next();
@@ -102,7 +101,7 @@ public abstract class ParsedDefinitionMember {
 					type = IParsedType.parse(tokens);
 				}
 				ParsedFunctionBody body = ParsedStatement.parseFunctionBody(tokens);
-				return new ParsedSetter(start, modifiers, name, type, body);
+				return new ParsedSetter(start, forDefinition, modifiers, name, type, body);
 			}
 			case K_GET: {
 				tokens.next();
@@ -112,7 +111,7 @@ public abstract class ParsedDefinitionMember {
 					type = IParsedType.parse(tokens);
 				}
 				ParsedFunctionBody statements = ParsedStatement.parseFunctionBody(tokens);
-				return new ParsedGetter(start, modifiers, name, type, statements);
+				return new ParsedGetter(start, forDefinition, modifiers, name, type, statements);
 			}
 			case K_IMPLEMENTS: {
 				tokens.next();
@@ -124,12 +123,12 @@ public abstract class ParsedDefinitionMember {
 						members.add(ParsedDefinitionMember.parse(tokens, forDefinition));
 					}
 				}
-				return new ParsedImplementation(start, modifiers, type, members);
+				return new ParsedImplementation(start, forDefinition, modifiers, type, members);
 			}
 			case T_BROPEN: {
 				ParsedFunctionHeader header = ParsedFunctionHeader.parse(tokens);
 				ParsedFunctionBody body = ParsedStatement.parseFunctionBody(tokens);
-				return new ParsedCaller(start, modifiers, header, body);
+				return new ParsedCaller(start, forDefinition, modifiers, header, body);
 			}
 			case T_SQOPEN: {
 				tokens.required(ZSTokenType.T_SQCLOSE, "] expected");
@@ -139,7 +138,7 @@ public abstract class ParsedDefinitionMember {
 				}
 				ParsedFunctionHeader header = ParsedFunctionHeader.parse(tokens);
 				ParsedFunctionBody body = ParsedStatement.parseFunctionBody(tokens);
-				return new ParsedOperator(start, modifiers, operator, header, body);
+				return new ParsedOperator(start, forDefinition, modifiers, operator, header, body);
 			}
 			case T_ADD:
 			case T_SUB:
@@ -165,37 +164,37 @@ public abstract class ParsedDefinitionMember {
 				ZSToken token = tokens.next();
 				ParsedFunctionHeader header = ParsedFunctionHeader.parse(tokens);
 				ParsedFunctionBody body = ParsedStatement.parseFunctionBody(tokens);
-				return new ParsedOperator(start, modifiers, getOperator(token.type), header, body);
+				return new ParsedOperator(start, forDefinition, modifiers, getOperator(token.type), header, body);
 			}
 			case T_EQUAL2: {
 				tokens.next();
 				ParsedFunctionHeader header = ParsedFunctionHeader.parse(tokens);
 				ParsedFunctionBody body = ParsedStatement.parseFunctionBody(tokens);
-				return new ParsedOperator(start, modifiers, OperatorType.EQUALS, header, body);
+				return new ParsedOperator(start, forDefinition, modifiers, OperatorType.EQUALS, header, body);
 			}
 			case K_AS: {
 				tokens.next();
 				IParsedType type = IParsedType.parse(tokens);
 				ParsedFunctionBody body = ParsedStatement.parseFunctionBody(tokens);
-				return new ParsedCaster(start, modifiers, type, body);
+				return new ParsedCaster(start, forDefinition, modifiers, type, body);
 			}
 			case K_IN: {
 				tokens.next();
 				ParsedFunctionHeader header = ParsedFunctionHeader.parse(tokens);
 				ParsedFunctionBody body = ParsedStatement.parseFunctionBody(tokens);
-				return new ParsedOperator(start, modifiers, OperatorType.CONTAINS, header, body);
+				return new ParsedOperator(start, forDefinition, modifiers, OperatorType.CONTAINS, header, body);
 			}
 			case K_CLASS:
 			case K_INTERFACE:
 			case K_ALIAS:
 			case K_STRUCT:
 			case K_ENUM:
-				return new ParsedInnerDefinition(ParsedDefinition.parse(forDefinition.pkg, start, modifiers, tokens, forDefinition));
+				return new ParsedInnerDefinition(forDefinition, ParsedDefinition.parse(forDefinition.pkg, start, modifiers, tokens, forDefinition));
 			case K_FOR: {
 				tokens.next();
 				ParsedFunctionHeader header = ParsedFunctionHeader.parse(tokens);
 				ParsedFunctionBody body = ParsedStatement.parseFunctionBody(tokens);
-				return new ParsedIterator(start, modifiers, header, body);
+				return new ParsedIterator(start, forDefinition, modifiers, header, body);
 			}
 			default:
 				throw new CompileException(tokens.peek().position, CompileExceptionCode.UNEXPECTED_TOKEN, "Unexpected token: " + tokens.peek().content);
@@ -230,7 +229,13 @@ public abstract class ParsedDefinitionMember {
 		}
 	}
 	
-	public abstract void linkInnerTypes(HighLevelDefinition definition);
+	public final HighLevelDefinition definition;
+	
+	public ParsedDefinitionMember(HighLevelDefinition definition) {
+		this.definition = definition;
+	}
+	
+	public abstract void linkInnerTypes();
 	
 	public abstract void linkTypes(BaseScope scope);
 	

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedField.java

@@ -29,7 +29,17 @@ public class ParsedField extends ParsedDefinitionMember {
 	
 	private FieldMember compiled;
 	
-	public ParsedField(CodePosition position, int modifiers, String name, IParsedType type, ParsedExpression expression, boolean isFinal) {
+	public ParsedField(
+			CodePosition position,
+			HighLevelDefinition definition,
+			int modifiers,
+			String name,
+			IParsedType type,
+			ParsedExpression expression,
+			boolean isFinal)
+	{
+		super(definition);
+		
 		this.position = position;
 		this.modifiers = modifiers;
 		this.name = name;
@@ -39,13 +49,18 @@ public class ParsedField extends ParsedDefinitionMember {
 	}
 	
 	@Override
-	public void linkInnerTypes(HighLevelDefinition definition) {
+	public void linkInnerTypes() {
 		
 	}
 
 	@Override
 	public void linkTypes(BaseScope scope) {
-		compiled = new FieldMember(position, modifiers | (isFinal ? Modifiers.FINAL : 0), name, type.compile(scope));
+		compiled = new FieldMember(
+				position,
+				definition,
+				modifiers | (isFinal ? Modifiers.FINAL : 0),
+				name,
+				type.compile(scope));
 	}
 
 	@Override

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedFunctionalMember.java

@@ -23,14 +23,16 @@ public abstract class ParsedFunctionalMember extends ParsedDefinitionMember {
 	
 	protected FunctionalMember compiled;
 	
-	public ParsedFunctionalMember(CodePosition position, int modifiers, ParsedFunctionBody body) {
+	public ParsedFunctionalMember(CodePosition position, HighLevelDefinition definition, int modifiers, ParsedFunctionBody body) {
+		super(definition);
+		
 		this.position = position;
 		this.modifiers = modifiers;
 		this.body = body;
 	}
 	
 	@Override
-	public void linkInnerTypes(HighLevelDefinition definition) {
+	public void linkInnerTypes() {
 		
 	}
 

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedGetter.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.parser.member;
 
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.linker.BaseScope;
 import org.openzen.zenscript.parser.statements.ParsedFunctionBody;
@@ -19,14 +20,15 @@ public class ParsedGetter extends ParsedFunctionalMember {
 	private final String name;
 	private final IParsedType type;
 	
-	public ParsedGetter(CodePosition position, int modifiers, String name, IParsedType type, ParsedFunctionBody body) {
-		super(position, modifiers, body);
+	public ParsedGetter(CodePosition position, HighLevelDefinition definition, int modifiers, String name, IParsedType type, ParsedFunctionBody body) {
+		super(position, definition, modifiers, body);
+		
 		this.name = name;
 		this.type = type;
 	}
 
 	@Override
 	public void linkTypes(BaseScope scope) {
-		compiled = new GetterMember(position, modifiers, name, type.compile(scope));
+		compiled = new GetterMember(position, definition, modifiers, name, type.compile(scope));
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedImplementation.java

@@ -25,7 +25,15 @@ public class ParsedImplementation extends ParsedDefinitionMember {
 	
 	private ImplementationMember compiled;
 	
-	public ParsedImplementation(CodePosition position, int modifiers, IParsedType type, List<ParsedDefinitionMember> members) {
+	public ParsedImplementation(
+			CodePosition position,
+			HighLevelDefinition definition,
+			int modifiers,
+			IParsedType type,
+			List<ParsedDefinitionMember> members)
+	{
+		super(definition);
+		
 		this.position = position;
 		this.modifiers = modifiers;
 		this.type = type;
@@ -33,13 +41,13 @@ public class ParsedImplementation extends ParsedDefinitionMember {
 	}
 	
 	@Override
-	public void linkInnerTypes(HighLevelDefinition definition) {
+	public void linkInnerTypes() {
 		
 	}
 
 	@Override
 	public void linkTypes(BaseScope scope) {
-		compiled = new ImplementationMember(position, modifiers, type.compile(scope));
+		compiled = new ImplementationMember(position, definition, modifiers, type.compile(scope));
 		
 		for (ParsedDefinitionMember member : members) {
 			member.linkTypes(scope);

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedInnerDefinition.java

@@ -15,26 +15,27 @@ import org.openzen.zenscript.parser.ParsedDefinition;
  * @author Hoofdgebruiker
  */
 public class ParsedInnerDefinition extends ParsedDefinitionMember {
-	private final ParsedDefinition definition;
+	private final ParsedDefinition innerDefinition;
+	private final InnerDefinitionMember member;
 	
-	private InnerDefinitionMember member;
-	
-	public ParsedInnerDefinition(ParsedDefinition definition) {
-		this.definition = definition;
+	public ParsedInnerDefinition(HighLevelDefinition outer, ParsedDefinition definition) {
+		super(outer);
+		
+		this.innerDefinition = definition;
 		
-		member = new InnerDefinitionMember(definition.getPosition(), definition.getModifiers(), definition.getCompiled());
+		member = new InnerDefinitionMember(definition.getPosition(), outer, definition.getModifiers(), definition.getCompiled());
 	}
 	
 	@Override
-	public void linkInnerTypes(HighLevelDefinition definition) {
+	public void linkInnerTypes() {
 		definition.addMember(member);
 		
-		this.definition.linkInnerTypes();
+		this.innerDefinition.linkInnerTypes();
 	}
 
 	@Override
 	public void linkTypes(BaseScope scope) {
-		definition.compileMembers(scope);
+		this.innerDefinition.compileMembers(scope);
 	}
 
 	@Override
@@ -44,6 +45,6 @@ public class ParsedInnerDefinition extends ParsedDefinitionMember {
 
 	@Override
 	public void compile(BaseScope scope) {
-		definition.compileCode(scope);
+		innerDefinition.compileCode(scope);
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedIterator.java

@@ -28,7 +28,15 @@ public class ParsedIterator extends ParsedDefinitionMember {
 	
 	private CustomIteratorMember compiled;
 	
-	public ParsedIterator(CodePosition position, int modifiers, ParsedFunctionHeader header, ParsedFunctionBody body) {
+	public ParsedIterator(
+			CodePosition position,
+			HighLevelDefinition definition,
+			int modifiers,
+			ParsedFunctionHeader header,
+			ParsedFunctionBody body)
+	{
+		super(definition);
+		
 		this.position = position;
 		this.modifiers = modifiers;
 		this.header = header;
@@ -36,7 +44,7 @@ public class ParsedIterator extends ParsedDefinitionMember {
 	}
 
 	@Override
-	public void linkInnerTypes(HighLevelDefinition definition) {
+	public void linkInnerTypes() {
 		// nothing to do
 	}
 
@@ -46,7 +54,7 @@ public class ParsedIterator extends ParsedDefinitionMember {
 		for (int i = 0; i < loopVariableTypes.length; i++)
 			loopVariableTypes[i] = header.parameters.get(i).type.compile(scope);
 		
-		compiled = new CustomIteratorMember(position, modifiers, loopVariableTypes);
+		compiled = new CustomIteratorMember(position, definition, modifiers, loopVariableTypes);
 	}
 
 	@Override

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedMethod.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.parser.member;
 
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.member.MethodMember;
 import org.openzen.zenscript.linker.BaseScope;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
@@ -19,8 +20,8 @@ public class ParsedMethod extends ParsedFunctionalMember {
 	private final String name;
 	private final ParsedFunctionHeader header;
 	
-	public ParsedMethod(CodePosition position, int modifiers, String name, ParsedFunctionHeader header, ParsedFunctionBody body) {
-		super(position, modifiers, body);
+	public ParsedMethod(CodePosition position, HighLevelDefinition definition, int modifiers, String name, ParsedFunctionHeader header, ParsedFunctionBody body) {
+		super(position, definition, modifiers, body);
 		
 		this.name = name;
 		this.header = header;
@@ -28,6 +29,6 @@ public class ParsedMethod extends ParsedFunctionalMember {
 
 	@Override
 	public void linkTypes(BaseScope scope) {
-		compiled = new MethodMember(position, modifiers, name, header.compile(scope));
+		compiled = new MethodMember(position, definition, modifiers, name, header.compile(scope));
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedOperator.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.parser.member;
 
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.linker.BaseScope;
@@ -20,8 +21,8 @@ public class ParsedOperator extends ParsedFunctionalMember {
 	private final OperatorType operator;
 	private final ParsedFunctionHeader header;
 	
-	public ParsedOperator(CodePosition position, int modifiers, OperatorType operator, ParsedFunctionHeader header, ParsedFunctionBody body) {
-		super(position, modifiers, body);
+	public ParsedOperator(CodePosition position, HighLevelDefinition definition, int modifiers, OperatorType operator, ParsedFunctionHeader header, ParsedFunctionBody body) {
+		super(position, definition, modifiers, body);
 		
 		this.operator = operator;
 		this.header = header;
@@ -29,6 +30,6 @@ public class ParsedOperator extends ParsedFunctionalMember {
 
 	@Override
 	public void linkTypes(BaseScope scope) {
-		compiled = new OperatorMember(position, modifiers, operator, header.compile(scope));
+		compiled = new OperatorMember(position, definition, modifiers, operator, header.compile(scope));
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedSetter.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.parser.member;
 
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.linker.BaseScope;
 import org.openzen.zenscript.parser.statements.ParsedFunctionBody;
@@ -19,8 +20,8 @@ public class ParsedSetter extends ParsedFunctionalMember {
 	private final String name;
 	private final IParsedType type;
 	
-	public ParsedSetter(CodePosition position, int modifiers, String name, IParsedType type, ParsedFunctionBody body) {
-		super(position, modifiers, body);
+	public ParsedSetter(CodePosition position, HighLevelDefinition definition, int modifiers, String name, IParsedType type, ParsedFunctionBody body) {
+		super(position, definition, modifiers, body);
 		
 		this.name = name;
 		this.type = type;
@@ -28,6 +29,6 @@ public class ParsedSetter extends ParsedFunctionalMember {
 
 	@Override
 	public void linkTypes(BaseScope scope) {
-		compiled = new SetterMember(position, modifiers, name, type.compile(scope));
+		compiled = new SetterMember(position, definition, modifiers, name, type.compile(scope));
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/statements/ParsedStatementTryCatch.java

@@ -11,6 +11,7 @@ import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.statement.CatchClause;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.statement.TryCatchStatement;
+import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.linker.ExpressionScope;
 import org.openzen.zenscript.linker.StatementScope;
 import org.openzen.zenscript.parser.expression.ParsedExpression;
@@ -52,6 +53,10 @@ public class ParsedStatementTryCatch extends ParsedStatement {
 			catches.add(catchClause.compile(scope));
 		
 		Statement finallyClause = this.finallyClause == null ? null : this.finallyClause.compile(scope);
-		return new TryCatchStatement(position, resourceName, resourceInitializer, statement, catches, finallyClause);
+		VarStatement resource = null;
+		if (resourceName != null) {
+			resource = new VarStatement(position, resourceName, resourceInitializer.type, resourceInitializer, true);
+		}
+		return new TryCatchStatement(position, resource, statement, catches, finallyClause);
 	}
 }

ScriptingExample/build.gradle

@@ -17,4 +17,5 @@ dependencies {
 	compile project(':Parser')
 	compile project(':JavaBytecodeCompiler')
 	compile project(':CodeFormatter')
+	compile project(':Validator')
 }

ScriptingExample/scripts/enums.zs

@@ -1,15 +0,0 @@
-enum TestEnum {
-	HELLO,
-	WORLD
-}
-
-enum TestEnum2 {
-	HELLO("Hello"),
-	WORLD("World");
-	
-	val value as string;
-	
-	this(value as string) {
-		this.value = value;
-	}
-}

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/GlobalRegistry.java

@@ -67,7 +67,7 @@ public class GlobalRegistry {
 			ClassDefinition myClassDefinition = new ClassDefinition(CodePosition.NATIVE, packageMyPackage, "MyClass", Modifiers.PUBLIC, null);
 			JavaClassInfo myClassInfo = new JavaClassInfo("my/test/MyClass");
 			
-			MethodMember member = new MethodMember(CodePosition.NATIVE, Modifiers.PUBLIC, "test", new FunctionHeader(BasicTypeID.STRING));
+			MethodMember member = new MethodMember(CodePosition.NATIVE, myClassDefinition, Modifiers.PUBLIC, "test", new FunctionHeader(BasicTypeID.STRING));
 			member.setTag(JavaMethodInfo.class, new JavaMethodInfo(myClassInfo, "test", "()Ljava/lang/String;"));
 			myClassDefinition.addMember(member);
 			
@@ -96,12 +96,14 @@ public class GlobalRegistry {
 	private final ClassDefinition SYSTEM = new ClassDefinition(CodePosition.NATIVE, javaLang, "System", Modifiers.EXPORT);
 	private final MethodMember PRINTSTREAM_PRINTLN = new MethodMember(
 			CodePosition.NATIVE,
+			PRINTSTREAM,
 			Modifiers.EXPORT,
 			"println",
 			new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(BasicTypeID.STRING)));
 	
 	private final FieldMember SYSTEM_OUT = new FieldMember(
 			CodePosition.NATIVE,
+			SYSTEM,
 			Modifiers.EXPORT | Modifiers.FINAL,
 			"out",
 			DefinitionTypeID.forType(SYSTEM));

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/Main.java

@@ -21,6 +21,8 @@ import org.openzen.zenscript.javabytecode.JavaModule;
 import org.openzen.zenscript.linker.symbol.ISymbol;
 import org.openzen.zenscript.parser.ParsedFile;
 import org.openzen.zenscript.shared.SourceFile;
+import org.openzen.zenscript.validator.ValidationLogEntry;
+import org.openzen.zenscript.validator.Validator;
 
 public class Main {
     /**
@@ -38,15 +40,19 @@ public class Main {
 		GlobalRegistry registry = new GlobalRegistry(global);
 		SemanticModule module = compileSyntaxToSemantic(parsedFiles, registry);
 		
-		/*FormattingSettings settings = new FormattingSettings.Builder().build();
+		FormattingSettings settings = new FormattingSettings.Builder().build();
 		for (ScriptBlock block : module.scripts) {
 			FileFormatter formatter = new FileFormatter(settings);
 			System.out.println("== " + block.getTag(SourceFile.class).filename + " ==");
 			System.out.println(formatter.format(pkg, block, Collections.emptyList()));
-		}*/
+		}
 		
-		JavaModule javaModule = compileSemanticToJava(module);
-		javaModule.execute();
+		if (module.isValid) {
+			JavaModule javaModule = compileSemanticToJava(module);
+			javaModule.execute();
+		} else {
+			System.out.println("There were compilation errors");
+		}
     }
 	
 	private static ParsedFile[] parse(ZSPackage pkg, File[] files) throws IOException {
@@ -90,7 +96,20 @@ public class Main {
 			file.compileCode(rootPackage, definitions, globalRegistry, expansions, scripts, globals);
 		}
 		
-		return new SemanticModule(definitions, scripts);
+		Validator validator = new Validator();
+		boolean isValid = true;
+		for (ScriptBlock script : scripts) {
+			isValid &= validator.validate(script);
+		}
+		for (HighLevelDefinition definition : definitions.getAll()) {
+			isValid &= validator.validate(definition);
+		}
+		
+		for (ValidationLogEntry entry : validator.getLog()) {
+			System.out.println(entry.kind + " " + entry.position.toString() + ": " + entry.message);
+		}
+		
+		return new SemanticModule(isValid, definitions, scripts);
 	}
 	
 	private static JavaModule compileSemanticToJava(SemanticModule module) {

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/SemanticModule.java

@@ -14,10 +14,12 @@ import org.openzen.zenscript.codemodel.ScriptBlock;
  * @author Hoofdgebruiker
  */
 public class SemanticModule {
+	public final boolean isValid;
 	public final PackageDefinitions definitions;
 	public final List<ScriptBlock> scripts;
 
-	public SemanticModule(PackageDefinitions definitions, List<ScriptBlock> scripts) {
+	public SemanticModule(boolean isValid, PackageDefinitions definitions, List<ScriptBlock> scripts) {
+		this.isValid = isValid;
 		this.definitions = definitions;
 		this.scripts = scripts;
 	}

Validator/build.gradle

@@ -0,0 +1,18 @@
+// Note: "common.gradle" in the root project contains additional initialization
+//   for this project. This initialization is applied in the "build.gradle"
+//   of the root project.
+
+// NetBeans will automatically add "run" and "debug" tasks relying on the
+// "mainClass" property. You may however define the property prior executing
+// tasks by passing a "-PmainClass=<QUALIFIED_CLASS_NAME>" argument.
+//
+// Note however, that you may define your own "run" and "debug" task if you
+// prefer. In this case NetBeans will not add these tasks but you may rely on
+// your own implementation.
+if (!hasProperty('mainClass')) {
+    ext.mainClass = ''
+}
+
+dependencies {
+	compile project(':CodeModel')
+}

Validator/src/main/java/org/openzen/zenscript/validator/ValidationLogEntry.java

@@ -0,0 +1,64 @@
+/*
+ * 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.validator;
+
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ValidationLogEntry {
+	public final Kind kind;
+	public final Code code;
+	public final CodePosition position;
+	public final String message;
+	
+	public ValidationLogEntry(Kind kind, Code code, CodePosition position, String message) {
+		this.kind = kind;
+		this.code = code;
+		this.position = position;
+		this.message = message;
+	}
+	
+	public static enum Kind {
+		ERROR,
+		WARNING
+	}
+	
+	public static enum Code {
+		SUPERCLASS_NOT_A_CLASS,
+		SUPERCLASS_NOT_VIRTUAL,
+		INVALID_MODIFIER,
+		INVALID_IDENTIFIER,
+		DUPLICATE_FIELD_NAME,
+		DUPLICATE_MEMBER_NAME,
+		INVALID_TYPE,
+		DUPLICATE_PARAMETER_NAME,
+		INVALID_OPERAND_TYPE,
+		INVALID_TYPE_ARGUMENT,
+		INVALID_CALL_ARGUMENT,
+		VARIADIC_PARAMETER_MUST_BE_LAST,
+		CONSTRUCTOR_FORWARD_OUTSIDE_CONSTRUCTOR,
+		CONSTRUCTOR_FORWARD_NOT_FIRST_STATEMENT,
+		DUPLICATE_CONSTRUCTOR,
+		DUPLICATE_METHOD,
+		BODY_REQUIRED,
+		INVALID_CONDITION_TYPE,
+		DUPLICATE_VARIABLE_NAME,
+		SCRIPT_CANNOT_RETURN,
+		INVALID_RETURN_TYPE,
+		TRY_CATCH_RESOURCE_REQUIRES_INITIALIZER,
+		TYPE_ALREADY_IMPLEMENTED,
+		THIS_IN_STATIC_SCOPE,
+		ENUM_CONSTANT_NOT_YET_INITIALIZED,
+		FIELD_NOT_YET_INITIALIZED,
+		LOCAL_VARIABLE_NOT_YET_INITIALIZED,
+		INVALID_SOURCE_TYPE,
+		SETTING_FINAL_FIELD,
+		SETTING_FINAL_VARIABLE
+	}
+}

Validator/src/main/java/org/openzen/zenscript/validator/ValidationSettings.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.validator;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ValidationSettings {
+	
+}

Validator/src/main/java/org/openzen/zenscript/validator/Validator.java

@@ -0,0 +1,87 @@
+/*
+ * 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.validator;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.ScriptBlock;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.validator.analysis.StatementScope;
+import org.openzen.zenscript.validator.visitors.DefinitionValidator;
+import org.openzen.zenscript.validator.visitors.StatementValidator;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class Validator {
+	private final List<ValidationLogEntry> log = new ArrayList<>();
+	private boolean hasErrors = false;
+	
+	private final DefinitionValidator definitionValidator = new DefinitionValidator(this);
+	
+	public List<ValidationLogEntry> getLog() {
+		return Collections.unmodifiableList(log);
+	}
+	
+	public boolean validate(ScriptBlock script) {
+		StatementValidator statementValidator = new StatementValidator(this, new ScriptScope());
+		boolean isValid = true;
+		for (Statement statement : script.statements) {
+			isValid &= statement.accept(statementValidator);
+		}
+		return isValid;
+	}
+	
+	public boolean validate(HighLevelDefinition definition) {
+		return definition.accept(definitionValidator);
+	}
+	
+	public boolean hasErrors() {
+		return hasErrors;
+	}
+	
+	public void logError(ValidationLogEntry.Code code, CodePosition position, String message) {
+		log.add(new ValidationLogEntry(ValidationLogEntry.Kind.ERROR, code, position, message));
+		hasErrors = true;
+	}
+	
+	public void logWarning(ValidationLogEntry.Code code, CodePosition position, String message) {
+		log.add(new ValidationLogEntry(ValidationLogEntry.Kind.WARNING, code, position, message));
+	}
+	
+	private class ScriptScope implements StatementScope {
+
+		@Override
+		public boolean isConstructor() {
+			return false;
+		}
+
+		@Override
+		public boolean isStatic() {
+			return true;
+		}
+
+		@Override
+		public FunctionHeader getFunctionHeader() {
+			return null;
+		}
+
+		@Override
+		public boolean isStaticInitializer() {
+			return false;
+		}
+
+		@Override
+		public HighLevelDefinition getDefinition() {
+			return null;
+		}
+	}
+}

Validator/src/main/java/org/openzen/zenscript/validator/analysis/ExpressionScope.java

@@ -0,0 +1,35 @@
+/*
+ * 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.validator.analysis;
+
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.member.EnumConstantMember;
+import org.openzen.zenscript.codemodel.member.FieldMember;
+import org.openzen.zenscript.codemodel.statement.VarStatement;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface ExpressionScope {
+	public boolean isConstructor();
+	
+	public boolean isFirstStatement();
+	
+	public boolean hasThis();
+	
+	public boolean isFieldInitialized(FieldMember field);
+	
+	public boolean isEnumConstantInitialized(EnumConstantMember member);
+	
+	public boolean isLocalVariableInitialized(VarStatement variable);
+	
+	public void markConstructorForwarded();
+	
+	public boolean isStaticInitializer();
+	
+	public HighLevelDefinition getDefinition();
+}

Validator/src/main/java/org/openzen/zenscript/validator/analysis/StatementScope.java

@@ -0,0 +1,25 @@
+/*
+ * 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.validator.analysis;
+
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface StatementScope {
+	public boolean isConstructor();
+	
+	public boolean isStatic();
+	
+	public FunctionHeader getFunctionHeader();
+	
+	public boolean isStaticInitializer();
+	
+	public HighLevelDefinition getDefinition();
+}

Validator/src/main/java/org/openzen/zenscript/validator/visitors/DefinitionMemberValidator.java

@@ -0,0 +1,390 @@
+/*
+ * 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.validator.visitors;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.member.CallerMember;
+import org.openzen.zenscript.codemodel.member.CasterMember;
+import org.openzen.zenscript.codemodel.member.ConstructorMember;
+import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.member.EnumConstantMember;
+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;
+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.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.VarStatement;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.validator.ValidationLogEntry;
+import org.openzen.zenscript.validator.Validator;
+import org.openzen.zenscript.validator.analysis.ExpressionScope;
+import org.openzen.zenscript.validator.analysis.StatementScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DefinitionMemberValidator implements MemberVisitor<Boolean> {
+	private final Validator validator;
+	private final Set<String> fieldNames = new HashSet<>();
+	private final Set<String> members = new HashSet<>();
+	private final Set<FieldMember> initializedFields = new HashSet<>();
+	private final List<FunctionHeader> constructors = new ArrayList<>();
+	private final HighLevelDefinition definition;
+	private final Set<EnumConstantMember> initializedEnumConstants = new HashSet<>();
+	private final Set<ITypeID> implementedTypes = new HashSet<>();
+	
+	public DefinitionMemberValidator(Validator validator, HighLevelDefinition definition) {
+		this.validator = validator;
+		this.definition = definition;
+	}
+	
+	@Override
+	public Boolean visitField(FieldMember member) {
+		boolean isValid = true;
+		if (fieldNames.contains(member.name)) {
+			validator.logError(
+					ValidationLogEntry.Code.DUPLICATE_FIELD_NAME,
+					member.position,
+					"Duplicate field name: " + member.name);
+			isValid = false;
+		}
+		fieldNames.add(member.name);
+		
+		isValid &= member.type.accept(new TypeValidator(validator, member.position));
+		
+		if (member.initializer != null) {
+			isValid &= member.initializer.accept(new ExpressionValidator(validator, new FieldInitializerScope(member)));
+		}
+		
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitConstructor(ConstructorMember member) {
+		boolean isValid = true;
+		for (FunctionHeader existing : constructors) {
+			if (existing.isSimilarTo(member.header)) {
+				validator.logError(ValidationLogEntry.Code.DUPLICATE_CONSTRUCTOR, member.position, "Duplicate constructor, conflicts with this" + existing.toString());
+				isValid = false;
+			}
+		}
+		constructors.add(member.header);
+		isValid &= ValidationUtils.validateHeader(validator, member.position, member.header);
+		
+		if (member.body == null && !member.isExtern()) {
+			validator.logError(ValidationLogEntry.Code.BODY_REQUIRED, member.position, "Constructors must have a body");
+		} else {
+			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
+			for (Statement statement : member.body) {
+				isValid &= statement.accept(statementValidator);
+			}
+			
+			if (!statementValidator.constructorForwarded) {
+				// TODO: does this type have a supertype with no-argument constructor?
+			}
+		}
+		
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitMethod(MethodMember member) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateIdentifier(validator, member.position, member.name);
+		isValid &= ValidationUtils.validateHeader(validator, member.position, member.header);
+		
+		if (member.body != null) {
+			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
+			for (Statement statement : member.body) {
+				isValid &= statement.accept(statementValidator);
+			}
+		}
+		
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitGetter(GetterMember member) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateIdentifier(validator, member.position, member.name);
+		isValid &= member.type.accept(new TypeValidator(validator, member.position));
+		
+		if (member.body != null) {
+			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
+			for (Statement statement : member.body) {
+				isValid &= statement.accept(statementValidator);
+			}
+		}
+		
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitSetter(SetterMember member) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateIdentifier(validator, member.position, member.name);
+		isValid &= member.type.accept(new TypeValidator(validator, member.position));
+		
+		if (member.body != null) {
+			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
+			for (Statement statement : member.body) {
+				isValid &= statement.accept(statementValidator);
+			}
+		}
+		
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitEnumConstant(EnumConstantMember member) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateIdentifier(validator, member.position, member.name);
+		if (member.constructor != null) {
+			isValid &= member.constructor.accept(new ExpressionValidator(validator, new EnumConstantInitializerScope()));
+		}
+		if (members.contains(member.name)) {
+			validator.logError(ValidationLogEntry.Code.INVALID_TYPE, member.position, "Duplicate enum value: " + member.name);
+			isValid = false;
+		}
+		
+		initializedEnumConstants.add(member);
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitOperator(OperatorMember member) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateHeader(validator, member.position, member.header);
+		
+		if (member.body != null) {
+			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
+			for (Statement statement : member.body) {
+				isValid &= statement.accept(statementValidator);
+			}
+		}
+		
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitCaster(CasterMember member) {
+		boolean isValid = true;
+		isValid &= member.toType.accept(new TypeValidator(validator, member.position));
+		
+		if (member.body != null) {
+			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
+			for (Statement statement : member.body) {
+				isValid &= statement.accept(statementValidator);
+			}
+		}
+		
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitCustomIterator(CustomIteratorMember member) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Boolean visitCaller(CallerMember member) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateHeader(validator, member.position, member.header);
+		
+		if (member.body != null) {
+			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
+			for (Statement statement : member.body) {
+				isValid &= statement.accept(statementValidator);
+			}
+		}
+		
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitImplementation(ImplementationMember implementation) {
+		boolean isValid = true;
+		if (implementedTypes.contains(implementation.type)) {
+			validator.logError(
+					ValidationLogEntry.Code.TYPE_ALREADY_IMPLEMENTED,
+					implementation.position,
+					"Type is already implemented: " + implementation.type);
+			isValid = false;
+		}
+		implementedTypes.add(implementation.type);
+		
+		DefinitionMemberValidator memberValidator = new DefinitionMemberValidator(validator, definition);
+		for (IDefinitionMember member : implementation.members) {
+			isValid &= member.accept(memberValidator);
+		}
+		
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitInnerDefinition(InnerDefinitionMember innerDefinition) {
+		boolean isValid = true;
+		if (members.contains(innerDefinition.innerDefinition.name)) {
+			validator.logError(
+					ValidationLogEntry.Code.DUPLICATE_MEMBER_NAME,
+					innerDefinition.position,
+					"Duplicate member name: " + innerDefinition.innerDefinition.name);
+			isValid = false;
+		}
+		
+		isValid &= innerDefinition.innerDefinition.accept(new DefinitionValidator(validator));
+		return isValid;
+	}
+	
+	private class FieldInitializerScope implements ExpressionScope {
+		private final FieldMember field;
+		
+		public FieldInitializerScope(FieldMember field) {
+			this.field = field;
+		}
+		
+		@Override
+		public boolean isConstructor() {
+			return false;
+		}
+
+		@Override
+		public boolean isFirstStatement() {
+			return true;
+		}
+
+		@Override
+		public boolean hasThis() {
+			return !field.isStatic();
+		}
+
+		@Override
+		public boolean isFieldInitialized(FieldMember field) {
+			return initializedFields.contains(field);
+		}
+
+		@Override
+		public void markConstructorForwarded() {
+			
+		}
+
+		@Override
+		public boolean isEnumConstantInitialized(EnumConstantMember member) {
+			return true;
+		}
+
+		@Override
+		public boolean isLocalVariableInitialized(VarStatement variable) {
+			return true; // TODO
+		}
+
+		@Override
+		public boolean isStaticInitializer() {
+			return false;
+		}
+
+		@Override
+		public HighLevelDefinition getDefinition() {
+			return definition;
+		}
+	}
+	
+	private class ConstructorStatementScope implements StatementScope {
+		private final FunctionHeader header;
+		
+		public ConstructorStatementScope(FunctionHeader header) {
+			this.header = header;
+		}
+
+		@Override
+		public boolean isConstructor() {
+			return true;
+		}
+
+		@Override
+		public boolean isStatic() {
+			return false;
+		}
+
+		@Override
+		public FunctionHeader getFunctionHeader() {
+			return header;
+		}
+
+		@Override
+		public boolean isStaticInitializer() {
+			return false;
+		}
+
+		@Override
+		public HighLevelDefinition getDefinition() {
+			return definition;
+		}
+	}
+	
+	private class EnumConstantInitializerScope implements ExpressionScope {
+
+		@Override
+		public boolean isConstructor() {
+			return false;
+		}
+
+		@Override
+		public boolean isFirstStatement() {
+			return false;
+		}
+
+		@Override
+		public boolean hasThis() {
+			return false;
+		}
+
+		@Override
+		public boolean isFieldInitialized(FieldMember field) {
+			return false;
+		}
+
+		@Override
+		public void markConstructorForwarded() {
+			
+		}
+
+		@Override
+		public boolean isEnumConstantInitialized(EnumConstantMember member) {
+			if (member.definition == definition) {
+				return initializedEnumConstants.contains(member);
+			} else {
+				return true;
+			}
+		}
+
+		@Override
+		public boolean isLocalVariableInitialized(VarStatement variable) {
+			return false;
+		}
+
+		@Override
+		public boolean isStaticInitializer() {
+			return false;
+		}
+
+		@Override
+		public HighLevelDefinition getDefinition() {
+			return definition;
+		}
+	}
+}

Validator/src/main/java/org/openzen/zenscript/validator/visitors/DefinitionValidator.java

@@ -0,0 +1,208 @@
+/*
+ * 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.validator.visitors;
+
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import static org.openzen.zenscript.codemodel.Modifiers.*;
+import org.openzen.zenscript.codemodel.definition.AliasDefinition;
+import org.openzen.zenscript.codemodel.definition.ClassDefinition;
+import org.openzen.zenscript.codemodel.definition.DefinitionVisitor;
+import org.openzen.zenscript.codemodel.definition.EnumDefinition;
+import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
+import org.openzen.zenscript.codemodel.definition.FunctionDefinition;
+import org.openzen.zenscript.codemodel.definition.InterfaceDefinition;
+import org.openzen.zenscript.codemodel.definition.StructDefinition;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.validator.Validator;
+import org.openzen.zenscript.validator.analysis.StatementScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DefinitionValidator implements DefinitionVisitor<Boolean> {
+	private final Validator validator;
+	
+	public DefinitionValidator(Validator validator) {
+		this.validator = validator;
+	}
+
+	@Override
+	public Boolean visitClass(ClassDefinition definition) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateModifiers(
+				validator,
+				definition.modifiers,
+				PUBLIC | EXPORT | PRIVATE | ABSTRACT | STATIC | PROTECTED | VIRTUAL,
+				definition.position,
+				"Invalid class modifier");
+		isValid &= ValidationUtils.validateIdentifier(
+				validator,
+				definition.position,
+				definition.name);
+		
+		if (definition.superType != null)
+			isValid &= definition.superType.accept(new SupertypeValidator(validator, definition.position));
+		
+		isValid &= validateMembers(definition);
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitInterface(InterfaceDefinition definition) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateModifiers(
+				validator,
+				definition.modifiers,
+				PUBLIC | EXPORT | PROTECTED | PRIVATE,
+				definition.position,
+				"Invalid interface modifier");
+		isValid &= ValidationUtils.validateIdentifier(
+				validator,
+				definition.position,
+				definition.name);
+		
+		isValid &= validateMembers(definition);
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitEnum(EnumDefinition definition) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateModifiers(
+				validator,
+				definition.modifiers,
+				PUBLIC | EXPORT | PROTECTED | PRIVATE,
+				definition.position,
+				"Invalid enum modifier");
+		isValid &= ValidationUtils.validateIdentifier(
+				validator,
+				definition.position,
+				definition.name);
+		
+		isValid &= validateMembers(definition);
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitStruct(StructDefinition definition) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateModifiers(
+				validator,
+				definition.modifiers,
+				PUBLIC | EXPORT | PROTECTED | PRIVATE,
+				definition.position,
+				"Invalid struct modifier");
+		isValid &= ValidationUtils.validateIdentifier(
+				validator,
+				definition.position,
+				definition.name);
+		
+		isValid &= validateMembers(definition);
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitFunction(FunctionDefinition definition) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateModifiers(
+				validator,
+				definition.modifiers,
+				PUBLIC | EXPORT | PROTECTED | PRIVATE,
+				definition.position,
+				"Invalid function modifier");
+		isValid &= ValidationUtils.validateIdentifier(
+				validator,
+				definition.position,
+				definition.name);
+				
+		StatementValidator statementValidator = new StatementValidator(validator, new FunctionStatementScope(definition.header));
+		for (Statement statement : definition.statements) {
+			isValid &= statement.accept(statementValidator);
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitExpansion(ExpansionDefinition definition) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateModifiers(
+				validator,
+				definition.modifiers,
+				PUBLIC | EXPORT | PROTECTED | PRIVATE,
+				definition.position,
+				"Invalid expansion modifier");
+		isValid &= ValidationUtils.validateIdentifier(
+				validator,
+				definition.position,
+				definition.name);
+		
+		isValid &= definition.target.accept(new TypeValidator(validator, definition.position));
+		isValid &= validateMembers(definition);
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitAlias(AliasDefinition definition) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateModifiers(
+				validator,
+				definition.modifiers,
+				PUBLIC | EXPORT | PROTECTED | PRIVATE,
+				definition.position,
+				"Invalid alias modifier");
+		isValid &= ValidationUtils.validateIdentifier(
+				validator,
+				definition.position,
+				definition.name);
+		
+		return isValid;
+	}
+	
+	private boolean validateMembers(HighLevelDefinition definition) {
+		DefinitionMemberValidator memberValidator = new DefinitionMemberValidator(validator, definition);
+		boolean isValid = true;
+		for (IDefinitionMember member : definition.members) {
+			isValid &= member.accept(memberValidator);
+		}
+		return isValid;
+	}
+	
+	private class FunctionStatementScope implements StatementScope {
+		private final FunctionHeader header;
+		
+		public FunctionStatementScope(FunctionHeader header) {
+			this.header = header;
+		}
+
+		@Override
+		public boolean isConstructor() {
+			return false;
+		}
+
+		@Override
+		public boolean isStatic() {
+			return true;
+		}
+
+		@Override
+		public FunctionHeader getFunctionHeader() {
+			return header;
+		}
+
+		@Override
+		public boolean isStaticInitializer() {
+			return false;
+		}
+
+		@Override
+		public HighLevelDefinition getDefinition() {
+			return null;
+		}
+	}
+}

Validator/src/main/java/org/openzen/zenscript/validator/visitors/ExpressionValidator.java

@@ -0,0 +1,663 @@
+/*
+ * 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.validator.visitors;
+
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.expression.AndAndExpression;
+import org.openzen.zenscript.codemodel.expression.ArrayExpression;
+import org.openzen.zenscript.codemodel.expression.BasicCompareExpression;
+import org.openzen.zenscript.codemodel.expression.CallArguments;
+import org.openzen.zenscript.codemodel.expression.CallExpression;
+import org.openzen.zenscript.codemodel.expression.CallStaticExpression;
+import org.openzen.zenscript.codemodel.expression.CapturedClosureExpression;
+import org.openzen.zenscript.codemodel.expression.CapturedDirectExpression;
+import org.openzen.zenscript.codemodel.expression.CapturedLocalVariableExpression;
+import org.openzen.zenscript.codemodel.expression.CapturedParameterExpression;
+import org.openzen.zenscript.codemodel.expression.CapturedThisExpression;
+import org.openzen.zenscript.codemodel.expression.CastExpression;
+import org.openzen.zenscript.codemodel.expression.CheckNullExpression;
+import org.openzen.zenscript.codemodel.expression.CoalesceExpression;
+import org.openzen.zenscript.codemodel.expression.ConditionalExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantBoolExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantByteExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantCharExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantDoubleExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantFloatExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantIntExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantLongExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantSByteExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantShortExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantStringExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantUIntExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantULongExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantUShortExpression;
+import org.openzen.zenscript.codemodel.expression.ConstructorSuperCallExpression;
+import org.openzen.zenscript.codemodel.expression.ConstructorThisCallExpression;
+import org.openzen.zenscript.codemodel.expression.EnumConstantExpression;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.expression.ExpressionVisitor;
+import org.openzen.zenscript.codemodel.expression.FunctionExpression;
+import org.openzen.zenscript.codemodel.expression.GenericCompareExpression;
+import org.openzen.zenscript.codemodel.expression.GetFieldExpression;
+import org.openzen.zenscript.codemodel.expression.GetFunctionParameterExpression;
+import org.openzen.zenscript.codemodel.expression.GetLocalVariableExpression;
+import org.openzen.zenscript.codemodel.expression.GetStaticFieldExpression;
+import org.openzen.zenscript.codemodel.expression.GetterExpression;
+import org.openzen.zenscript.codemodel.expression.GlobalCallExpression;
+import org.openzen.zenscript.codemodel.expression.GlobalExpression;
+import org.openzen.zenscript.codemodel.expression.InterfaceCastExpression;
+import org.openzen.zenscript.codemodel.expression.IsExpression;
+import org.openzen.zenscript.codemodel.expression.MakeConstExpression;
+import org.openzen.zenscript.codemodel.expression.MapExpression;
+import org.openzen.zenscript.codemodel.expression.NewExpression;
+import org.openzen.zenscript.codemodel.expression.NullExpression;
+import org.openzen.zenscript.codemodel.expression.OrOrExpression;
+import org.openzen.zenscript.codemodel.expression.RangeExpression;
+import org.openzen.zenscript.codemodel.expression.SetFieldExpression;
+import org.openzen.zenscript.codemodel.expression.SetFunctionParameterExpression;
+import org.openzen.zenscript.codemodel.expression.SetLocalVariableExpression;
+import org.openzen.zenscript.codemodel.expression.SetStaticFieldExpression;
+import org.openzen.zenscript.codemodel.expression.SetterExpression;
+import org.openzen.zenscript.codemodel.expression.StaticGetterExpression;
+import org.openzen.zenscript.codemodel.expression.StaticSetterExpression;
+import org.openzen.zenscript.codemodel.expression.ThisExpression;
+import org.openzen.zenscript.codemodel.expression.WrapOptionalExpression;
+import org.openzen.zenscript.codemodel.type.ArrayTypeID;
+import org.openzen.zenscript.codemodel.type.AssocTypeID;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.RangeTypeID;
+import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.validator.ValidationLogEntry;
+import org.openzen.zenscript.validator.Validator;
+import org.openzen.zenscript.validator.analysis.ExpressionScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ExpressionValidator implements ExpressionVisitor<Boolean> {
+	private final Validator validator;
+	private final ExpressionScope scope;
+	
+	public ExpressionValidator(Validator validator, ExpressionScope scope) {
+		this.validator = validator;
+		this.scope = scope;
+	}
+
+	@Override
+	public Boolean visitAndAnd(AndAndExpression expression) {
+		boolean isValid =
+				expression.left.accept(this)
+				& expression.right.accept(this);
+		
+		if (expression.left.type != BasicTypeID.BOOL) {
+			validator.logError(
+					ValidationLogEntry.Code.INVALID_OPERAND_TYPE,
+					expression.position,
+					"left hand side operand of && must be a bool");
+			isValid = false;
+		}
+		if (expression.right.type != BasicTypeID.BOOL) {
+			validator.logError(
+					ValidationLogEntry.Code.INVALID_OPERAND_TYPE,
+					expression.position,
+					"right hand side operand of && must be a bool");
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitArray(ArrayExpression expression) {
+		boolean isValid = true;
+		for (Expression element : expression.expressions) {
+			if (element.type != expression.arrayType.elementType) {
+				validator.logError(
+					ValidationLogEntry.Code.INVALID_OPERAND_TYPE,
+					expression.position,
+					"array element expression type doesn't match array type");
+				isValid = false;
+			}
+			isValid &= element.accept(this);
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitCompare(BasicCompareExpression expression) {
+		boolean isValid = true;
+		if (expression.left.type != expression.right.type) {
+			validator.logError(ValidationLogEntry.Code.INVALID_OPERAND_TYPE, expression.position, "comparison must be between the same types");
+			isValid = false;
+		}
+		isValid &= expression.left.accept(this);
+		isValid &= expression.right.accept(this);
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitCall(CallExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.target.accept(this);
+		isValid &= checkCallArguments(expression.position, expression.member.header, expression.arguments);
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitCallStatic(CallStaticExpression expression) {
+		return checkCallArguments(expression.position, expression.member.header, expression.arguments);
+	}
+
+	@Override
+	public Boolean visitCapturedClosure(CapturedClosureExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitCapturedDirect(CapturedDirectExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitCapturedLocalVariable(CapturedLocalVariableExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitCapturedParameter(CapturedParameterExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitCapturedThis(CapturedThisExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitCast(CastExpression expression) {
+		return expression.target.accept(this);
+	}
+
+	@Override
+	public Boolean visitCheckNull(CheckNullExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.value.accept(this);
+		if (!expression.value.type.isOptional()) {
+			validator.logError(ValidationLogEntry.Code.INVALID_OPERAND_TYPE, expression.position, "target of a null check is not optional");
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitCoalesce(CoalesceExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.left.accept(this);
+		isValid &= expression.right.accept(this);
+		if (!expression.left.type.isOptional()) {
+			validator.logError(ValidationLogEntry.Code.INVALID_OPERAND_TYPE, expression.position, "target of a null coalesce is not optional");
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitConditional(ConditionalExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.condition.accept(this);
+		isValid &= expression.ifThen.accept(this);
+		isValid &= expression.ifElse.accept(this);
+		if (expression.condition.type != BasicTypeID.BOOL) {
+			validator.logError(ValidationLogEntry.Code.INVALID_OPERAND_TYPE, expression.position, "conditional expression condition must be a bool");
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitConstantBool(ConstantBoolExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstantByte(ConstantByteExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstantChar(ConstantCharExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstantDouble(ConstantDoubleExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstantFloat(ConstantFloatExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstantInt(ConstantIntExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstantLong(ConstantLongExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstantSByte(ConstantSByteExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstantShort(ConstantShortExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstantString(ConstantStringExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstantUInt(ConstantUIntExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstantULong(ConstantULongExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstantUShort(ConstantUShortExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitConstructorThisCall(ConstructorThisCallExpression expression) {
+		boolean isValid = true;
+		if (!scope.isConstructor()) {
+			validator.logError(ValidationLogEntry.Code.CONSTRUCTOR_FORWARD_OUTSIDE_CONSTRUCTOR, expression.position, "Can only forward constructors inside constructors");
+			isValid = false;
+		}
+		if (!scope.isFirstStatement()) {
+			validator.logError(ValidationLogEntry.Code.CONSTRUCTOR_FORWARD_NOT_FIRST_STATEMENT, expression.position, "Constructor forwarder must be first expression");
+			isValid = false;
+		}
+		scope.markConstructorForwarded();
+		isValid &= checkCallArguments(expression.position, expression.constructor.header, expression.arguments);
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitConstructorSuperCall(ConstructorSuperCallExpression expression) {
+		boolean isValid = true;
+		if (!scope.isConstructor()) {
+			validator.logError(ValidationLogEntry.Code.CONSTRUCTOR_FORWARD_OUTSIDE_CONSTRUCTOR, expression.position, "Can only forward constructors inside constructors");
+			isValid = false;
+		}
+		if (!scope.isFirstStatement()) {
+			validator.logError(ValidationLogEntry.Code.CONSTRUCTOR_FORWARD_NOT_FIRST_STATEMENT, expression.position, "Constructor forwarder must be first expression");
+			isValid = false;
+		}
+		scope.markConstructorForwarded();
+		isValid &= checkCallArguments(expression.position, expression.constructor.header, expression.arguments);
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitEnumConstant(EnumConstantExpression expression) {
+		if (!scope.isEnumConstantInitialized(expression.value)) {
+			validator.logError(
+					ValidationLogEntry.Code.ENUM_CONSTANT_NOT_YET_INITIALIZED,
+					expression.position,
+					"Using an enum constant that is not yet initialized: " + expression.value.name);
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public Boolean visitFunction(FunctionExpression expression) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Boolean visitGenericCompare(GenericCompareExpression expression) {
+		boolean isValid = expression.value.accept(this);
+		if (expression.value.type != BasicTypeID.INT) {
+			validator.logError(
+					ValidationLogEntry.Code.INVALID_OPERAND_TYPE,
+					expression.position,
+					"Generic compare expression must be an int");
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitGetField(GetFieldExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.target.accept(this);
+		if (expression.target instanceof ThisExpression && !scope.isFieldInitialized(expression.field)) {
+			validator.logError(
+					ValidationLogEntry.Code.FIELD_NOT_YET_INITIALIZED,
+					expression.position,
+					"Using a field that was not yet initialized");
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitGetFunctionParameter(GetFunctionParameterExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitGetLocalVariable(GetLocalVariableExpression expression) {
+		boolean isValid = true;
+		if (!scope.isLocalVariableInitialized(expression.variable)) {
+			validator.logError(ValidationLogEntry.Code.LOCAL_VARIABLE_NOT_YET_INITIALIZED, expression.position, "Local variable not yet initialized");
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitGetStaticField(GetStaticFieldExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitGetter(GetterExpression expression) {
+		return expression.target.accept(this);
+	}
+	
+	@Override
+	public Boolean visitGlobal(GlobalExpression expression) {
+		return expression.resolution.accept(this);
+	}
+	
+	@Override
+	public Boolean visitGlobalCall(GlobalCallExpression expression) {
+		return expression.resolution.accept(this);
+	}
+
+	@Override
+	public Boolean visitInterfaceCast(InterfaceCastExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.value.accept(this);
+		isValid &= expression.type.accept(new TypeValidator(validator, expression.position));
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitIs(IsExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.value.accept(this);
+		isValid &= expression.isType.accept(new TypeValidator(validator, expression.position));
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitMakeConst(MakeConstExpression expression) {
+		return expression.value.accept(this);
+	}
+
+	@Override
+	public Boolean visitMap(MapExpression expression) {
+		boolean isValid = true;
+		AssocTypeID type = (AssocTypeID) expression.type;
+		for (int i = 0; i < expression.keys.length; i++) {
+			Expression key = expression.keys[i];
+			Expression value = expression.values[i];
+			
+			isValid &= key.accept(this);
+			isValid &= value.accept(this);
+			if (key.type != type.keyType) {
+				validator.logError(ValidationLogEntry.Code.INVALID_OPERAND_TYPE, key.position, "Key type must match the associative array key type");
+				isValid = false;
+			}
+			if (value.type != type.valueType) {
+				validator.logError(ValidationLogEntry.Code.INVALID_OPERAND_TYPE, key.position, "Value type must match the associative array value type");
+				isValid = false;
+			}
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitNew(NewExpression expression) {
+		boolean isValid = checkCallArguments(
+				expression.position,
+				expression.constructor.header,
+				expression.arguments);
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitNull(NullExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitOrOr(OrOrExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.left.accept(this);
+		isValid &= expression.right.accept(this);
+		if (expression.left.type != BasicTypeID.BOOL) {
+			validator.logError(ValidationLogEntry.Code.INVALID_OPERAND_TYPE, expression.position, "Left hand side of || expression is not a bool");
+			isValid = false;
+		}
+		if (expression.right.type != BasicTypeID.BOOL) {
+			validator.logError(ValidationLogEntry.Code.INVALID_OPERAND_TYPE, expression.position, "Right hand side of || expression is not a bool");
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitRange(RangeExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.from.accept(this);
+		isValid &= expression.to.accept(this);
+		
+		RangeTypeID rangeType = (RangeTypeID) expression.type;
+		if (expression.from.type != rangeType.from) {
+			validator.logError(ValidationLogEntry.Code.INVALID_OPERAND_TYPE, expression.position, "From operand is not a " + rangeType.from.toString());
+			isValid = false;
+		}
+		if (expression.to.type != rangeType.to) {
+			validator.logError(ValidationLogEntry.Code.INVALID_OPERAND_TYPE, expression.position, "To operand is not a " + rangeType.to.toString());
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitSetField(SetFieldExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.target.accept(this);
+		isValid &= expression.value.accept(this);
+		if (expression.value.type != expression.field.type) {
+			validator.logError(
+					ValidationLogEntry.Code.INVALID_SOURCE_TYPE, 
+					expression.position,
+					"Trying to set a field of type " + expression.field.type + " to a value of type " + expression.value.type);
+			isValid = false;
+		}
+		if (expression.field.isFinal()) {
+			if (!(expression.target instanceof ThisExpression && scope.isConstructor())) {
+				validator.logError(ValidationLogEntry.Code.SETTING_FINAL_FIELD, expression.position, "Cannot set a final field");
+				isValid = false;
+			}
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitSetFunctionParameter(SetFunctionParameterExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.value.accept(this);
+		if (expression.value.type != expression.parameter.type) {
+			validator.logError(
+					ValidationLogEntry.Code.INVALID_SOURCE_TYPE, 
+					expression.position,
+					"Trying to set a parameter of type " + expression.parameter.type + " to a value of type " + expression.value.type);
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitSetLocalVariable(SetLocalVariableExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.value.accept(this);
+		if (expression.value.type != expression.variable.type) {
+			validator.logError(
+					ValidationLogEntry.Code.INVALID_SOURCE_TYPE, 
+					expression.position,
+					"Trying to set a variable of type " + expression.variable.type + " to a value of type " + expression.value.type);
+			isValid = false;
+		}
+		if (expression.variable.isFinal) {
+			validator.logError(ValidationLogEntry.Code.SETTING_FINAL_VARIABLE, expression.position, "Trying to set final variable " + expression.variable.name);
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitSetStaticField(SetStaticFieldExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.value.accept(this);
+		if (expression.value.type != expression.field.type) {
+			validator.logError(
+					ValidationLogEntry.Code.INVALID_SOURCE_TYPE,
+					expression.position,
+					"Trying to set a static field of type " + expression.field.type + " to a value of type " + expression.value.type);
+			isValid = false;
+		}
+		if (expression.field.isFinal()) {
+			if (!scope.isStaticInitializer() || expression.field.definition != scope.getDefinition()) {
+				validator.logError(
+						ValidationLogEntry.Code.SETTING_FINAL_FIELD,
+						expression.position,
+						"Trying to set final field " + expression.field.name);
+				isValid = false;
+			}
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitSetter(SetterExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.target.accept(this);
+		isValid &= expression.value.accept(this);
+		if (expression.value.type != expression.setter.type) {
+			validator.logError(
+					ValidationLogEntry.Code.INVALID_SOURCE_TYPE,
+					expression.position,
+					"Trying to set a property of type " + expression.setter.type + " to a value of type " + expression.value.type);
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitStaticGetter(StaticGetterExpression expression) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitStaticSetter(StaticSetterExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.value.accept(this);
+		if (expression.value.type != expression.setter.type) {
+			validator.logError(
+					ValidationLogEntry.Code.INVALID_SOURCE_TYPE,
+					expression.position,
+					"Trying to set a static property of type " + expression.setter.type + " to a value of type " + expression.value.type);
+			isValid = false;
+		}
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitThis(ThisExpression expression) {
+		if (!scope.hasThis()) {
+			validator.logError(ValidationLogEntry.Code.THIS_IN_STATIC_SCOPE, expression.position, "Cannot use this in a static scope");
+			return false;
+		}
+		
+		return true;
+	}
+
+	@Override
+	public Boolean visitWrapOptional(WrapOptionalExpression expression) {
+		boolean isValid = expression.value.accept(this);
+		if (expression.type.isOptional()) {
+			validator.logError(ValidationLogEntry.Code.INVALID_OPERAND_TYPE, expression.position, "expression value is already optional");
+			isValid = false;
+		}
+		return isValid;
+	}
+	
+	private boolean checkCallArguments(CodePosition position, FunctionHeader header, CallArguments arguments) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateTypeArguments(validator, position, header.typeParameters, arguments.typeArguments);
+		
+		for (int i = 0; i < arguments.arguments.length; i++) {
+			Expression argument = arguments.arguments[i];
+			isValid &= argument.accept(this);
+			
+			if (i >= header.parameters.length) {
+				FunctionParameter variadic = header.getVariadicParameter();
+				if (variadic == null) {
+					validator.logError(ValidationLogEntry.Code.INVALID_CALL_ARGUMENT, position, "too many call arguments");
+					isValid = false;
+					break;
+				} else if (variadic.type instanceof ArrayTypeID) {
+					ITypeID elementType = ((ArrayTypeID)variadic.type).elementType;
+					if (elementType != argument.type) {
+						validator.logError(ValidationLogEntry.Code.INVALID_CALL_ARGUMENT, position, "invalid type for variadic call argument");
+						isValid = false;
+						break;
+					}
+				}
+			}
+			
+			FunctionParameter parameter = header.parameters[i];
+			if (parameter.type != argument.type) {
+				validator.logError(
+						ValidationLogEntry.Code.INVALID_CALL_ARGUMENT,
+						position,
+						"invalid value for parameter " + parameter.name + ": " + parameter.type.toString() + " expected but " + arguments.arguments[i].type + " given");
+				isValid = false;
+			}
+		}
+		
+		for (int i = arguments.arguments.length; i < header.parameters.length; i++) {
+			FunctionParameter parameter = header.parameters[i];
+			if (parameter.defaultValue == null && !parameter.variadic) {
+				validator.logError(ValidationLogEntry.Code.INVALID_CALL_ARGUMENT, position, "missing call argument for " + parameter.name);
+				isValid = false;
+			}
+		}
+		
+		return isValid;
+	}
+}

Validator/src/main/java/org/openzen/zenscript/validator/visitors/StatementValidator.java

@@ -0,0 +1,304 @@
+/*
+ * 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.validator.visitors;
+
+import java.util.HashSet;
+import java.util.Set;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.member.EnumConstantMember;
+import org.openzen.zenscript.codemodel.member.FieldMember;
+import org.openzen.zenscript.codemodel.statement.BlockStatement;
+import org.openzen.zenscript.codemodel.statement.BreakStatement;
+import org.openzen.zenscript.codemodel.statement.CatchClause;
+import org.openzen.zenscript.codemodel.statement.ContinueStatement;
+import org.openzen.zenscript.codemodel.statement.DoWhileStatement;
+import org.openzen.zenscript.codemodel.statement.EmptyStatement;
+import org.openzen.zenscript.codemodel.statement.ExpressionStatement;
+import org.openzen.zenscript.codemodel.statement.ForeachStatement;
+import org.openzen.zenscript.codemodel.statement.IfStatement;
+import org.openzen.zenscript.codemodel.statement.LockStatement;
+import org.openzen.zenscript.codemodel.statement.ReturnStatement;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.StatementVisitor;
+import org.openzen.zenscript.codemodel.statement.ThrowStatement;
+import org.openzen.zenscript.codemodel.statement.TryCatchStatement;
+import org.openzen.zenscript.codemodel.statement.VarStatement;
+import org.openzen.zenscript.codemodel.statement.WhileStatement;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.validator.ValidationLogEntry;
+import org.openzen.zenscript.validator.Validator;
+import org.openzen.zenscript.validator.analysis.ExpressionScope;
+import org.openzen.zenscript.validator.analysis.StatementScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class StatementValidator implements StatementVisitor<Boolean> {
+	private final Validator validator;
+	private final StatementScope scope;
+	private final Set<String> variables = new HashSet<>();
+	private boolean firstStatement = true;
+	
+	public boolean constructorForwarded = true;
+	
+	public StatementValidator(Validator validator, StatementScope scope) {
+		this.validator = validator;
+		this.scope = scope;
+	}
+	
+	@Override
+	public Boolean visitBlock(BlockStatement block) {
+		boolean isValid = true;
+		
+		StatementValidator blockValidator = new StatementValidator(validator, scope);
+		for (Statement statement : block.statements)
+			isValid &= statement.accept(blockValidator);
+		
+		firstStatement = false;
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitBreak(BreakStatement statement) {
+		firstStatement = false;
+		return true;
+	}
+
+	@Override
+	public Boolean visitContinue(ContinueStatement statement) {
+		firstStatement = false;
+		return true;
+	}
+
+	@Override
+	public Boolean visitDoWhile(DoWhileStatement statement) {
+		boolean isValid = true;
+		
+		if (statement.condition.type != BasicTypeID.BOOL) {
+			validator.logError(
+					ValidationLogEntry.Code.INVALID_CONDITION_TYPE,
+					statement.position,
+					"condition must be a boolean expression");
+			isValid = false;
+		}
+		
+		isValid &= statement.condition.accept(new ExpressionValidator(validator, new StatementExpressionScope()));
+		isValid &= statement.content.accept(this);
+		
+		firstStatement = false;
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitEmpty(EmptyStatement statement) {
+		firstStatement = false;
+		return true;
+	}
+
+	@Override
+	public Boolean visitExpression(ExpressionStatement statement) {
+		boolean isValid = statement.expression.accept(new ExpressionValidator(validator, new StatementExpressionScope()));
+		firstStatement = false;
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitForeach(ForeachStatement statement) {
+		boolean isValid = true;
+		isValid &= statement.list.accept(new ExpressionValidator(validator, new StatementExpressionScope()));
+		isValid &= statement.content.accept(this);
+		
+		for (VarStatement var : statement.loopVariables) {
+			if (variables.contains(var.name)) {
+				validator.logError(ValidationLogEntry.Code.DUPLICATE_VARIABLE_NAME, var.position, "Duplicate variable name: " + var.name);
+				isValid = false;
+			}
+		}
+		
+		firstStatement = false;
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitIf(IfStatement statement) {
+		boolean isValid = true;
+		isValid &= validateCondition(statement.condition);
+		isValid &= statement.onThen.accept(this);
+		if (statement.onElse != null)
+			isValid &= statement.onElse.accept(this);
+		
+		firstStatement = false;
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitLock(LockStatement statement) {
+		boolean isValid = true;
+		// TODO: is the object a valid lock target?
+		isValid &= statement.object.accept(new ExpressionValidator(validator, new StatementExpressionScope()));
+		isValid &= statement.content.accept(this);
+		
+		firstStatement = false;
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitReturn(ReturnStatement statement) {
+		if (scope.getFunctionHeader() == null) {
+			validator.logError(ValidationLogEntry.Code.SCRIPT_CANNOT_RETURN, statement.position, "Cannot return from a script");
+			return false;
+		}
+		
+		boolean isValid = true;
+		if (statement.value != null) {
+			isValid &= statement.value.accept(new ExpressionValidator(
+					validator,
+					new StatementExpressionScope()));
+			
+			if (statement.value.type != scope.getFunctionHeader().returnType) {
+				validator.logError(ValidationLogEntry.Code.INVALID_RETURN_TYPE, statement.position, "Invalid return type: " + statement.value.type.toString());
+				isValid = false;
+			}
+		} else if (scope.getFunctionHeader().returnType != BasicTypeID.ANY
+				&& scope.getFunctionHeader().returnType != BasicTypeID.VOID) {
+			validator.logError(ValidationLogEntry.Code.INVALID_RETURN_TYPE, statement.position, "Missing return value");
+			isValid = false;
+		}
+		
+		firstStatement = false;
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitThrow(ThrowStatement statement) {
+		boolean isValid = statement.value.accept(new ExpressionValidator(validator, new StatementExpressionScope()));
+		// TODO: does the value type extend Exception?
+		
+		firstStatement = false;
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitTryCatch(TryCatchStatement statement) {
+		boolean isValid = true;
+		if (statement.resource != null) {
+			if (variables.contains(statement.resource.name)) {
+				validator.logError(
+						ValidationLogEntry.Code.DUPLICATE_VARIABLE_NAME,
+						statement.position,
+						"Duplicate variable name: " + statement.resource.name);
+				isValid = false;
+			}
+			if (statement.resource.initializer == null) {
+				validator.logError(
+						ValidationLogEntry.Code.TRY_CATCH_RESOURCE_REQUIRES_INITIALIZER,
+						statement.position,
+						"try with resource requires initializer");
+				isValid = false;
+			}
+		}
+		
+		isValid &= statement.content.accept(this);
+		for (CatchClause catchClause : statement.catchClauses) {
+			isValid &= catchClause.content.accept(this);
+		}
+		
+		firstStatement = false;
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitVar(VarStatement statement) {
+		boolean isValid = true;
+		if (variables.contains(statement.name)) {
+			validator.logError(
+						ValidationLogEntry.Code.DUPLICATE_VARIABLE_NAME,
+						statement.position,
+						"Duplicate variable name: " + statement.name);
+			isValid = false;
+		}
+		variables.add(statement.name);
+		if (statement.initializer != null) {
+			isValid &= statement.initializer.accept(new ExpressionValidator(validator, new StatementExpressionScope()));
+		}
+		
+		firstStatement = false;
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitWhile(WhileStatement statement) {
+		boolean isValid = true;
+		isValid &= validateCondition(statement.condition);
+		isValid &= statement.content.accept(this);
+		
+		firstStatement = false;
+		return isValid;
+	}
+	
+	private boolean validateCondition(Expression condition) {
+		boolean isValid = condition.accept(new ExpressionValidator(validator, new StatementExpressionScope()));
+		
+		if (condition.type != BasicTypeID.BOOL) {
+			validator.logError(
+					ValidationLogEntry.Code.INVALID_CONDITION_TYPE,
+					condition.position,
+					"condition must be a boolean expression");
+			isValid = false;
+		}
+		
+		return isValid;
+	}
+	
+	private class StatementExpressionScope implements ExpressionScope {
+		@Override
+		public boolean isConstructor() {
+			return scope.isConstructor();
+		}
+
+		@Override
+		public boolean isFirstStatement() {
+			return firstStatement;
+		}
+
+		@Override
+		public boolean hasThis() {
+			return !scope.isStatic();
+		}
+
+		@Override
+		public boolean isFieldInitialized(FieldMember field) {
+			return true; // TODO: improve field initialization analysis
+		}
+
+		@Override
+		public void markConstructorForwarded() {
+			constructorForwarded = true;
+		}
+
+		@Override
+		public boolean isEnumConstantInitialized(EnumConstantMember member) {
+			return true;
+		}
+
+		@Override
+		public boolean isLocalVariableInitialized(VarStatement variable) {
+			return true; // TODO
+		}
+
+		@Override
+		public boolean isStaticInitializer() {
+			return scope.isStaticInitializer();
+		}
+
+		@Override
+		public HighLevelDefinition getDefinition() {
+			return scope.getDefinition();
+		}
+	}
+}

Validator/src/main/java/org/openzen/zenscript/validator/visitors/SuperclassValidator.java

@@ -0,0 +1,93 @@
+/*
+ * 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.validator.visitors;
+
+import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.definition.AliasDefinition;
+import org.openzen.zenscript.codemodel.definition.ClassDefinition;
+import org.openzen.zenscript.codemodel.definition.DefinitionVisitor;
+import org.openzen.zenscript.codemodel.definition.EnumDefinition;
+import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
+import org.openzen.zenscript.codemodel.definition.FunctionDefinition;
+import org.openzen.zenscript.codemodel.definition.InterfaceDefinition;
+import org.openzen.zenscript.codemodel.definition.StructDefinition;
+import org.openzen.zenscript.validator.ValidationLogEntry;
+import org.openzen.zenscript.validator.Validator;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class SuperclassValidator implements DefinitionVisitor<Boolean> {
+	private final Validator validator;
+	
+	public SuperclassValidator(Validator validator) {
+		this.validator = validator;
+	}
+
+	@Override
+	public Boolean visitClass(ClassDefinition definition) {
+		if (!Modifiers.isVirtual(definition.modifiers)) {
+			validator.logError(
+					ValidationLogEntry.Code.SUPERCLASS_NOT_VIRTUAL,
+					definition.position,
+					"Superclass is not virtual");
+			return false;
+		}
+		
+		return true;
+	}
+
+	@Override
+	public Boolean visitInterface(InterfaceDefinition definition) {
+		validator.logError(
+				ValidationLogEntry.Code.SUPERCLASS_NOT_A_CLASS,
+				definition.position,
+				"Superclass cannot be an interface");
+		
+		return false;
+	}
+
+	@Override
+	public Boolean visitEnum(EnumDefinition definition) {
+		validator.logError(
+				ValidationLogEntry.Code.SUPERCLASS_NOT_A_CLASS,
+				definition.position,
+				"Superclass cannot be an enum");
+		
+		return false;
+	}
+
+	@Override
+	public Boolean visitStruct(StructDefinition definition) {
+		validator.logError(
+				ValidationLogEntry.Code.SUPERCLASS_NOT_A_CLASS,
+				definition.position,
+				"Superclass cannot be a struct");
+		
+		return false;
+	}
+
+	@Override
+	public Boolean visitFunction(FunctionDefinition definition) {
+		validator.logError(
+				ValidationLogEntry.Code.SUPERCLASS_NOT_A_CLASS,
+				definition.position,
+				"Superclass cannot be a function");
+		
+		return false;
+	}
+
+	@Override
+	public Boolean visitExpansion(ExpansionDefinition definition) {
+		throw new AssertionError();
+	}
+
+	@Override
+	public Boolean visitAlias(AliasDefinition definition) {
+		throw new AssertionError();
+	}
+}

Validator/src/main/java/org/openzen/zenscript/validator/visitors/SupertypeValidator.java

@@ -0,0 +1,90 @@
+/*
+ * 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.validator.visitors;
+
+import org.openzen.zenscript.codemodel.type.ArrayTypeID;
+import org.openzen.zenscript.codemodel.type.AssocTypeID;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.ConstTypeID;
+import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
+import org.openzen.zenscript.codemodel.type.FunctionTypeID;
+import org.openzen.zenscript.codemodel.type.GenericTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeVisitor;
+import org.openzen.zenscript.codemodel.type.IteratorTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
+import org.openzen.zenscript.codemodel.type.RangeTypeID;
+import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.validator.ValidationLogEntry;
+import org.openzen.zenscript.validator.Validator;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class SupertypeValidator implements ITypeVisitor<Boolean> {
+	private final Validator validator;
+	private final CodePosition position;
+	
+	public SupertypeValidator(
+			Validator validator,
+			CodePosition position)
+	{
+		this.validator = validator;
+		this.position = position;
+	}
+
+	@Override
+	public Boolean visitBasic(BasicTypeID basic) {
+		validator.logError(ValidationLogEntry.Code.SUPERCLASS_NOT_A_CLASS, position, "Superclass cannot be a basic type");
+		return false;
+	}
+
+	@Override
+	public Boolean visitArray(ArrayTypeID array) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Boolean visitAssoc(AssocTypeID assoc) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Boolean visitIterator(IteratorTypeID iterator) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Boolean visitFunction(FunctionTypeID function) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Boolean visitDefinition(DefinitionTypeID definition) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Boolean visitGeneric(GenericTypeID generic) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Boolean visitRange(RangeTypeID range) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Boolean visitConst(ConstTypeID type) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Boolean visitOptional(OptionalTypeID optional) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+	
+}

Validator/src/main/java/org/openzen/zenscript/validator/visitors/TypeValidator.java

@@ -0,0 +1,114 @@
+/*
+ * 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.validator.visitors;
+
+import org.openzen.zenscript.codemodel.generic.GenericParameterBound;
+import org.openzen.zenscript.codemodel.generic.GenericParameterBoundVisitor;
+import org.openzen.zenscript.codemodel.generic.ParameterSuperBound;
+import org.openzen.zenscript.codemodel.generic.ParameterTypeBound;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.ArrayTypeID;
+import org.openzen.zenscript.codemodel.type.AssocTypeID;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.ConstTypeID;
+import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
+import org.openzen.zenscript.codemodel.type.FunctionTypeID;
+import org.openzen.zenscript.codemodel.type.GenericTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.ITypeVisitor;
+import org.openzen.zenscript.codemodel.type.IteratorTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
+import org.openzen.zenscript.codemodel.type.RangeTypeID;
+import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.validator.ValidationLogEntry;
+import org.openzen.zenscript.validator.Validator;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class TypeValidator implements ITypeVisitor<Boolean> {
+	private final Validator validator;
+	private final CodePosition position;
+	
+	public TypeValidator(Validator validator, CodePosition position) {
+		this.validator = validator;
+		this.position = position;
+	}
+
+	@Override
+	public Boolean visitBasic(BasicTypeID basic) {
+		if (basic == BasicTypeID.UNDETERMINED) {
+			validator.logError(ValidationLogEntry.Code.INVALID_TYPE, position, "type could not be determined");
+			return false;
+		}
+		
+		return true;
+	}
+
+	@Override
+	public Boolean visitArray(ArrayTypeID array) {
+		boolean isValid = true;
+		if (array.dimension < 1) {
+			validator.logError(ValidationLogEntry.Code.INVALID_TYPE, position, "array dimension must be at least 1");
+			isValid = false;
+		} else if (array.dimension > 16) {
+			validator.logError(ValidationLogEntry.Code.INVALID_TYPE, position, "array dimension must be at most 16");
+			isValid = false;
+		}
+		
+		return isValid & array.elementType.accept(this);
+	}
+
+	@Override
+	public Boolean visitAssoc(AssocTypeID assoc) {
+		boolean isValid = true;
+		isValid &= assoc.keyType.accept(this);
+		isValid &= assoc.valueType.accept(this);
+		
+		// TODO: does the keytype have == and hashcode operators?
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitIterator(IteratorTypeID iterator) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Boolean visitFunction(FunctionTypeID function) {
+		return ValidationUtils.validateHeader(validator, position, function.header);
+	}
+
+	@Override
+	public Boolean visitDefinition(DefinitionTypeID definition) {
+		boolean isValid = true;
+		isValid &= ValidationUtils.validateTypeArguments(validator, position, definition.definition.genericParameters, definition.typeParameters);
+		return isValid;
+	}
+
+	@Override
+	public Boolean visitGeneric(GenericTypeID generic) {
+		return true;
+	}
+
+	@Override
+	public Boolean visitRange(RangeTypeID range) {
+		return range.from.accept(this) & range.to.accept(this);
+	}
+
+	@Override
+	public Boolean visitConst(ConstTypeID type) {
+		// TODO: detect duplicate const
+		return type.baseType.accept(this);
+	}
+
+	@Override
+	public Boolean visitOptional(OptionalTypeID optional) {
+		// TODO: detect duplicate optional
+		return optional.baseType.accept(this);
+	}
+}

Validator/src/main/java/org/openzen/zenscript/validator/visitors/ValidationUtils.java

@@ -0,0 +1,246 @@
+/*
+ * 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.validator.visitors;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.generic.GenericParameterBound;
+import org.openzen.zenscript.codemodel.generic.GenericParameterBoundVisitor;
+import org.openzen.zenscript.codemodel.generic.ParameterSuperBound;
+import org.openzen.zenscript.codemodel.generic.ParameterTypeBound;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.member.EnumConstantMember;
+import org.openzen.zenscript.codemodel.member.FieldMember;
+import org.openzen.zenscript.codemodel.statement.VarStatement;
+import org.openzen.zenscript.codemodel.type.ArrayTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.validator.ValidationLogEntry;
+import static org.openzen.zenscript.validator.ValidationLogEntry.Code.*;
+import org.openzen.zenscript.validator.Validator;
+import org.openzen.zenscript.validator.analysis.ExpressionScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ValidationUtils {
+	private static final Pattern IDENTIFIER_PATTERN = Pattern.compile("^[a-zA-Z_][a-zA-Z_0-9]*$");
+	
+	private ValidationUtils() {}
+	
+	public static boolean validateIdentifier(Validator target, CodePosition position, String identifier) { 
+		if (!IDENTIFIER_PATTERN.matcher(identifier).matches()) {
+			target.logError(INVALID_IDENTIFIER, position, "Invalid identifier: " + identifier);
+			return false;
+		}
+		
+		return true;
+	}
+	
+	public static boolean validateHeader(Validator target, CodePosition position, FunctionHeader header) {
+		boolean isValid = true;
+		
+		TypeValidator typeValidator = new TypeValidator(target, position);
+		isValid &= header.returnType.accept(typeValidator);
+		
+		Set<String> parameterNames = new HashSet<>();
+		int i = 0;
+		for (FunctionParameter parameter : header.parameters) {
+			if (parameterNames.contains(parameter.name)) {
+				target.logError(DUPLICATE_PARAMETER_NAME, position, "Duplicate parameter name: " + parameter.name);
+				isValid = false;
+			}
+			
+			parameterNames.add(parameter.name);
+			parameter.type.accept(typeValidator);
+			
+			if (parameter.defaultValue != null) {
+				isValid &= parameter.defaultValue.accept(new ExpressionValidator(target, new DefaultParameterValueExpressionScope()));
+				if (parameter.defaultValue.type != parameter.type) {
+					target.logError(INVALID_TYPE, position, "default value does not match parameter type");
+					isValid = false;
+				}
+			}
+			
+			if (parameter.variadic) {
+				if (i != header.parameters.length - 1) {
+					target.logError(VARIADIC_PARAMETER_MUST_BE_LAST, position, "variadic parameter must be the last parameter");
+					isValid = false;
+				}
+				if (!(parameter.type instanceof ArrayTypeID)) {
+					target.logError(INVALID_TYPE, position, "variadic parameter must be an array");
+					isValid = false;
+				}
+			}
+			i++;
+		}
+		
+		return isValid;
+	}
+	
+	public static boolean validateModifiers(
+			Validator target,
+			int modifiers,
+			int allowedModifiers,
+			CodePosition position,
+			String error)
+	{
+		if (Modifiers.isPublic(modifiers) && Modifiers.isExport(modifiers))
+			target.logError(INVALID_MODIFIER, position, error + ": cannot combine public and export");
+		if (Modifiers.isPublic(modifiers) && Modifiers.isPrivate(modifiers))
+			target.logError(INVALID_MODIFIER, position, error + ": cannot combine public and private");
+		if (Modifiers.isPublic(modifiers) && Modifiers.isProtected(modifiers))
+			target.logError(INVALID_MODIFIER, position, error + ": cannot combine public and protected");
+		if (Modifiers.isExport(modifiers) && Modifiers.isPrivate(modifiers))
+			target.logError(INVALID_MODIFIER, position, error + ": cannot combine export and private");
+		if (Modifiers.isExport(modifiers) && Modifiers.isProtected(modifiers))
+			target.logError(INVALID_MODIFIER, position, error + ": cannot combine export and protected");
+		if (Modifiers.isPrivate(modifiers) && Modifiers.isProtected(modifiers))
+			target.logError(INVALID_MODIFIER, position, error + ": cannot combine private and protected");
+		
+		if (Modifiers.isConst(modifiers) && Modifiers.isConstOptional(modifiers))
+			target.logError(INVALID_MODIFIER, position, error + ": cannot combine const and const?");
+		if (Modifiers.isFinal(modifiers) && Modifiers.isAbstract(modifiers))
+			target.logError(INVALID_MODIFIER, position, error + ": cannot combine abstract and final");
+		if (Modifiers.isFinal(modifiers) && Modifiers.isVirtual(modifiers))
+			target.logError(INVALID_MODIFIER, position, error + ": cannot combine final and virtual");
+		
+		int invalid = modifiers & ~allowedModifiers;
+		if (invalid == 0)
+			return true;
+		
+		if (Modifiers.isPublic(invalid))
+			target.logError(INVALID_MODIFIER, position, error + ": public");
+		if (Modifiers.isExport(invalid))
+			target.logError(INVALID_MODIFIER, position, error + ": export");
+		if (Modifiers.isProtected(invalid))
+			target.logError(INVALID_MODIFIER, position, error + ": protected");
+		if (Modifiers.isPrivate(invalid))
+			target.logError(INVALID_MODIFIER, position, error + ": private");
+		if (Modifiers.isFinal(invalid))
+			target.logError(INVALID_MODIFIER, position, error + ": final");
+		if (Modifiers.isConst(invalid))
+			target.logError(INVALID_MODIFIER, position, error + ": const");
+		if (Modifiers.isConstOptional(invalid))
+			target.logError(INVALID_MODIFIER, position, error + ": const?");
+		if (Modifiers.isStatic(invalid))
+			target.logError(INVALID_MODIFIER, position, error + ": static");
+		if (Modifiers.isImplicit(invalid))
+			target.logError(INVALID_MODIFIER, position, error + ": implicit");
+		if (Modifiers.isVirtual(invalid))
+			target.logError(INVALID_MODIFIER, position, error + ": virtual");
+		
+		return false;
+	}
+	
+	public static boolean validateTypeArguments(
+			Validator target,
+			CodePosition position,
+			TypeParameter[] typeParameters,
+			ITypeID[] typeArguments)
+	{
+		if (typeParameters.length != typeArguments.length) {
+			target.logError(
+					ValidationLogEntry.Code.INVALID_TYPE_ARGUMENT,
+					position,
+					"Invalid number of type arguments: "
+							+ typeArguments.length
+							+ " arguments given but "
+							+ typeParameters.length
+							+ " expected");
+			return false;
+		}
+		
+		boolean isValid = true;
+		for (int i = 0; i < typeParameters.length; i++) {
+			TypeParameter typeParameter = typeParameters[i];
+			for (GenericParameterBound bound : typeParameter.bounds) {
+				if (!bound.matches(typeArguments[i])) {
+					target.logError(
+							ValidationLogEntry.Code.INVALID_TYPE_ARGUMENT,
+							position,
+							bound.accept(new TypeParameterBoundErrorVisitor(typeArguments[i], target)));
+					isValid = false;
+				}
+			}
+		}
+		return isValid;
+	}
+	
+	private static class TypeParameterBoundErrorVisitor implements GenericParameterBoundVisitor<String> {
+		private final ITypeID type;
+		private final Validator target;
+		
+		public TypeParameterBoundErrorVisitor(ITypeID type, Validator target) {
+			this.type = type;
+			this.target = target;
+		}
+
+		@Override
+		public String visitSuper(ParameterSuperBound bound) {
+			return type.toString() + " is not a superclass of " + bound.type.toString();
+		}
+
+		@Override
+		public String visitType(ParameterTypeBound bound) {
+			return type.toString() + " is does not extend or implement " + bound.type.toString();
+		}
+	}
+	
+	private static class DefaultParameterValueExpressionScope implements ExpressionScope {
+		
+		@Override
+		public boolean isConstructor() {
+			return false;
+		}
+
+		@Override
+		public boolean isFirstStatement() {
+			return true;
+		}
+
+		@Override
+		public boolean hasThis() {
+			return false;
+		}
+
+		@Override
+		public boolean isFieldInitialized(FieldMember field) {
+			return false;
+		}
+
+		@Override
+		public void markConstructorForwarded() {
+			
+		}
+
+		@Override
+		public boolean isEnumConstantInitialized(EnumConstantMember member) {
+			return true;
+		}
+
+		@Override
+		public boolean isLocalVariableInitialized(VarStatement variable) {
+			return false;
+		}
+
+		@Override
+		public boolean isStaticInitializer() {
+			return false;
+		}
+
+		@Override
+		public HighLevelDefinition getDefinition() {
+			return null;
+		}
+	}
+}