Initial commit.

.gitignore

@@ -0,0 +1,3 @@
+.gradle
+.nb-gradle
+build

CodeModel/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(':Shared')
+}

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

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

@@ -0,0 +1,17 @@
+package org.openzen.zenscript.codemodel;
+
+/**
+ * Used to indicate comparison types.
+ * 
+ * @author Stan Hebben
+ */
+public enum CompareType {
+	LT,
+	GT,
+	EQ,
+	NE,
+	LE,
+	GE,
+	SAME,
+	NOTSAME
+}

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

@@ -0,0 +1,218 @@
+/*
+ * 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;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.openzen.zenscript.codemodel.expression.CallArguments;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class FunctionHeader {
+	private static final TypeParameter[] NO_GENERIC_PARAMETERS = new TypeParameter[0];
+	private static final FunctionParameter[] NO_PARAMETERS = new FunctionParameter[0];
+	
+	public final TypeParameter[] typeParameters;
+	public final ITypeID returnType;
+	public final FunctionParameter[] parameters;
+	
+	public FunctionHeader(ITypeID returnType) {
+		this.typeParameters = NO_GENERIC_PARAMETERS;
+		this.returnType = returnType;
+		this.parameters = NO_PARAMETERS;
+	}
+	
+	public FunctionHeader(ITypeID returnType, FunctionParameter... parameters) {
+		this.typeParameters = NO_GENERIC_PARAMETERS;
+		this.returnType = returnType;
+		this.parameters = parameters;
+	}
+	
+	public FunctionHeader(TypeParameter[] genericParameters, ITypeID returnType, FunctionParameter[] parameters) {
+		this.typeParameters = genericParameters;
+		this.returnType = returnType;
+		this.parameters = parameters;
+	}
+	
+	public FunctionHeader instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
+		TypeParameter[] genericParameters = new TypeParameter[this.typeParameters.length];
+		for (int i = 0; i < genericParameters.length; i++)
+			genericParameters[i] = this.typeParameters[i].withGenericArguments(registry, mapping);
+		ITypeID returnType = this.returnType.withGenericArguments(registry, mapping);
+		FunctionParameter[] parameters = new FunctionParameter[this.parameters.length];
+		for (int i = 0; i < parameters.length; i++)
+			parameters[i] = this.parameters[i].withGenericArguments(registry, mapping);
+		
+		return new FunctionHeader(genericParameters, returnType, parameters);
+	}
+	
+	public ITypeID[] inferTypes(CallArguments arguments, List<ITypeID> resultHint) {
+		if (arguments.arguments.length != this.parameters.length)
+			return null;
+		
+		Map<TypeParameter, ITypeID> mapping = new HashMap<>();
+		if (!resultHint.isEmpty()) {
+			Map<TypeParameter, ITypeID> temp = new HashMap<>();
+			for (ITypeID hint : resultHint) {
+				if (returnType.inferTypeParameters(hint, temp)) {
+					mapping = temp;
+					break;
+				}
+			}
+		}
+		
+		// TODO: lambda header inference
+		for (int i = 0; i < parameters.length; i++)
+			if (!parameters[i].type.inferTypeParameters(arguments.arguments[i].type, mapping))
+				return null;
+		
+		if (mapping.size() > typeParameters.length)
+			return null;
+		
+		ITypeID[] result = new ITypeID[typeParameters.length];
+		for (int i = 0; i < typeParameters.length; i++) {
+			TypeParameter typeParameter = typeParameters[i];
+			if (!mapping.containsKey(typeParameter)) {
+				return null;
+			} else {
+				result[i] = mapping.get(typeParameter);
+			}
+		}
+		
+		return result;
+	}
+	
+	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {
+		for (int i = 0; i < this.parameters.length; i++)
+			if (this.parameters[i].type.hasInferenceBlockingTypeParameters(parameters))
+				return true;
+		
+		return false;
+	}
+	
+	public boolean canCastTo(TypeScope scope, FunctionHeader header) {
+		if (parameters.length != header.parameters.length)
+			return false;
+		
+		if (!scope.getTypeMembers(returnType).canCastImplicit(header.returnType))
+			return false;
+		
+		for (int i = 0; i < parameters.length; i++) {
+			if (!scope.getTypeMembers(header.parameters[i].type).canCastImplicit(parameters[i].type))
+				return false;
+		}
+		
+		return true;
+	}
+	
+	public boolean accepts(TypeScope scope, Expression... arguments) {
+		if (parameters.length != arguments.length)
+			return false;
+		
+		for (int i = 0; i < arguments.length; i++) {
+			if (!scope.getTypeMembers(arguments[i].type).canCastImplicit(parameters[i].type))
+				return false;
+		}
+		
+		return true;
+	}
+	
+	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])
+				return false;
+		}
+		
+		return true;
+	}
+	
+	public FunctionHeader withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
+		ITypeID returnType = this.returnType.withGenericArguments(registry, arguments);
+		FunctionParameter[] parameters = new FunctionParameter[this.parameters.length];
+		for (int i = 0; i < parameters.length; i++) {
+			ITypeID modified = this.parameters[i].type.withGenericArguments(registry, arguments);
+			parameters[i] = modified == this.parameters[i].type ? this.parameters[i] : new FunctionParameter(modified, this.parameters[i].name);
+		}
+		return new FunctionHeader(typeParameters, returnType, parameters);
+	}
+	
+	public FunctionHeader withGenericArguments(GlobalTypeRegistry registry, ITypeID[] arguments) {
+		Map<TypeParameter, ITypeID> typeArguments = new HashMap<>();
+		for (int i = 0; i < typeParameters.length; i++)
+			typeArguments.put(typeParameters[i], arguments[i]);
+		
+		ITypeID returnType = this.returnType.withGenericArguments(registry, typeArguments);
+		FunctionParameter[] parameters = new FunctionParameter[this.parameters.length];
+		for (int i = 0; i < parameters.length; i++) {
+			ITypeID modified = this.parameters[i].type.withGenericArguments(registry, typeArguments);
+			parameters[i] = modified == this.parameters[i].type ? this.parameters[i] : new FunctionParameter(modified, this.parameters[i].name);
+		}
+		return new FunctionHeader(returnType, parameters);
+	}
+	
+	public FunctionHeader forTypeParameterInference() {
+		return new FunctionHeader(BasicTypeID.UNDETERMINED, parameters);
+	}
+	
+	public FunctionHeader forLambda(FunctionHeader lambdaHeader) {
+		FunctionParameter[] parameters = new FunctionParameter[lambdaHeader.parameters.length];
+		for (int i = 0; i < lambdaHeader.parameters.length; i++)
+			parameters[i] = new FunctionParameter(this.parameters[i].type, lambdaHeader.parameters[i].name);
+		
+		return new FunctionHeader(typeParameters, returnType, parameters);
+		//return this;
+	}
+	
+	public String explainWhyIncompatible(TypeScope scope, CallArguments arguments) {
+		if (this.parameters.length != arguments.arguments.length)
+			return parameters.length + " parameters expected but " + arguments.arguments.length + " given.";
+		
+		if (typeParameters.length != arguments.typeArguments.length)
+			return typeParameters.length + " type parameters expected but " + arguments.typeArguments.length + " given.";
+		
+		for (int i = 0; i < parameters.length; i++) {
+			if (!scope.getTypeMembers(arguments.arguments[i].getType()).canCastImplicit(parameters[i].type)) {
+				return "Parameter " + i + ": cannot cast " + arguments.arguments[i].getType() + " to " + parameters[i].type;
+			}
+		}
+		
+		return "Method should be compatible";
+	}
+	
+	@Override
+	public String toString() {
+		StringBuilder result = new StringBuilder();
+		if (typeParameters.length > 0) {
+			result.append("<");
+			for (int i = 0; i < typeParameters.length; i++) {
+				if (i > 0)
+					result.append(", ");
+				result.append(typeParameters[i].toString());
+			}
+			result.append(">");
+		}
+		result.append("(");
+		for (int i = 0; i < parameters.length; i++) {
+			if (i > 0)
+				result.append(", ");
+			result.append(parameters[i].toString());
+		}
+		result.append(")");
+		return result.toString();
+	}
+}

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

@@ -0,0 +1,83 @@
+/*
+ * 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;
+
+import java.util.Map;
+import java.util.Objects;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class FunctionParameter {
+	public final ITypeID type;
+	public final String name;
+	public final Expression defaultValue;
+	public final boolean variadic;
+	
+	public FunctionParameter(ITypeID type) {
+		this.type = type;
+		this.name = "";
+		this.defaultValue = null;
+		this.variadic = false;
+	}
+	
+	public FunctionParameter(ITypeID type, String name) {
+		this.type = type;
+		this.name = name;
+		this.defaultValue = null;
+		this.variadic = false;
+	}
+	
+	public FunctionParameter(ITypeID type, String name, Expression defaultValue, boolean variadic) {
+		this.type = type;
+		this.name = name;
+		this.defaultValue = defaultValue;
+		this.variadic = variadic;
+	}
+	
+	public FunctionParameter withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
+		return new FunctionParameter(type.withGenericArguments(registry, arguments), name, defaultValue, variadic);
+	}
+	
+	@Override
+	public String toString() {
+		return name + " as " + type.toString();
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 5;
+		hash = 17 * hash + Objects.hashCode(this.type);
+		hash = 17 * hash + (this.variadic ? 1 : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		final FunctionParameter other = (FunctionParameter) obj;
+		if (this.variadic != other.variadic) {
+			return false;
+		}
+		if (!Objects.equals(this.type, other.type)) {
+			return false;
+		}
+		return true;
+	}
+}

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

@@ -0,0 +1,65 @@
+/*
+ * 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;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.openzen.zenscript.codemodel.definition.DefinitionVisitor;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.member.FieldMember;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public abstract class HighLevelDefinition {
+	public final String name;
+	public final int modifiers;
+	public final List<IDefinitionMember> members = new ArrayList<>();
+	public final List<TypeParameter> genericParameters = new ArrayList<>();
+	
+	public HighLevelDefinition outerDefinition;
+	public ITypeID superType;
+	
+	public HighLevelDefinition(String name, int modifiers, HighLevelDefinition outerDefinition) {
+		this.name = name;
+		this.modifiers = modifiers;
+		this.outerDefinition = outerDefinition;
+	}
+	
+	public void setOuterDefinition(HighLevelDefinition outerDefinition) {
+		this.outerDefinition = outerDefinition;
+	}
+	
+	public boolean isInnerDefinition() {
+		return outerDefinition != null;
+	}
+	
+	public void addMember(IDefinitionMember member) {
+		if (!members.contains(member))
+			members.add(member);
+	}
+	
+	public void addGenericParameter(TypeParameter parameter) {
+		genericParameters.add(parameter);
+	}
+	
+	public List<FieldMember> getFields() {
+		List<FieldMember> fields = new ArrayList<>();
+		for (IDefinitionMember member : members)
+			if (member instanceof FieldMember)
+				fields.add((FieldMember)member);
+		return fields;
+	}
+	
+	public boolean isStatic() {
+		return (modifiers & Modifiers.MODIFIER_STATIC) > 0;
+	}
+	
+	public abstract <T> T accept(DefinitionVisitor<T> visitor);
+}

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

@@ -0,0 +1,43 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class Modifiers {
+	public static final int MODIFIER_PUBLIC = 1;
+	public static final int MODIFIER_EXPORT = 2;
+	public static final int MODIFIER_PRIVATE = 4;
+	public static final int MODIFIER_ABSTRACT = 8;
+	public static final int MODIFIER_FINAL = 16;
+	public static final int MODIFIER_CONST = 32;
+	public static final int MODIFIER_CONST_OPTIONAL = 64;
+	public static final int MODIFIER_STATIC = 128;
+	public static final int MODIFIER_PROTECTED = 256;
+	public static final int MODIFIER_IMPLICIT = 512;
+	
+	public static boolean isAbstract(int modifiers) {
+		return (modifiers & MODIFIER_ABSTRACT) > 0;
+	}
+	
+	public static boolean isFinal(int modifiers) {
+		return (modifiers & MODIFIER_FINAL) > 0;
+	}
+	
+	public static boolean isConst(int modifiers) {
+		return (modifiers & MODIFIER_CONST) > 0;
+	}
+	
+	public static boolean isStatic(int modifiers) {
+		return (modifiers & MODIFIER_STATIC) > 0;
+	}
+	
+	public static boolean isImplicit(int modifiers) {
+		return (modifiers & MODIFIER_IMPLICIT) > 0;
+	}
+}

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

@@ -0,0 +1,62 @@
+package org.openzen.zenscript.codemodel;
+
+/**
+ * Enum used to indicate operator type.
+ * 
+ * @author Stan Hebben
+ */
+public enum OperatorType {
+	ADD("+", "add"),
+	SUB("-", "subtract"),
+	MUL("*", "multiply"),
+	DIV("/", "divide"),
+	MOD("%", "modulo"),
+	CAT("~", "concat"),
+	OR("|", "or"),
+	AND("&", "and"),
+	XOR("^", "xor"),
+	NEG("-", "negate"),
+	NOT("!", "not"),
+	INDEXSET("[]=", "setElement"),
+	INDEXGET("[]", "getElement"),
+	CONTAINS("in", "contains"),
+	COMPARE("compare", "compareTo"),
+	MEMBERGETTER(".", "getMember"),
+	MEMBERSETTER(".=", "setMember"),
+	EQUALS("==", "equals"),
+	
+	ADDASSIGN("+=", "addAssign", ADD),
+	SUBASSIGN("-=", "subAssign", SUB),
+	MULASSIGN("*=", "mulAssign", MUL),
+	DIVASSIGN("/=", "divAssign", DIV),
+	MODASSIGN("%=", "modAssign", MOD),
+	CATASSIGN("~=", "concatAssign", CAT),
+	ORASSIGN("|=", "orAssign", OR),
+	ANDASSIGN("&=", "andAssign", AND),
+	XORASSIGN("^=", "xorAssign", XOR),
+	
+	POST_INCREMENT("x++", "postIncrement"),
+	POST_DECREMENT("x--", "postDecrement"),
+	PRE_INCREMENT("++x", "preIncrement"),
+	PRE_DECREMENT("--x", "preDecrement"),
+	
+	CONSTRUCTOR("this", "construct"),
+	CALL("()", "call"),
+	CAST("as", "cast");
+	
+	public final OperatorType assignOperatorFor;
+	public final String operator;
+	public final String compiledName;
+	
+	private OperatorType(String operator, String compiledName) {
+		this.operator = operator;
+		this.compiledName = compiledName;
+		assignOperatorFor = null;
+	}
+	
+	private OperatorType(String operator, String compiledName, OperatorType assignOperatorFor) {
+		this.operator = operator;
+		this.compiledName = compiledName;
+		this.assignOperatorFor = assignOperatorFor;
+	}
+}

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

@@ -0,0 +1,48 @@
+/*
+ * 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;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
+import org.openzen.zenscript.codemodel.definition.ZSPackage;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class PackageDefinitions {
+	private final List<HighLevelDefinition> definitions = new ArrayList<>();
+	private final Map<String, HighLevelDefinition> definitionsByName = new HashMap<>();
+	
+	public List<HighLevelDefinition> getAll() {
+		return definitions;
+	}
+	
+	public void add(HighLevelDefinition definition) {
+		definitions.add(definition);
+		definitionsByName.put(definition.name, definition);
+	}
+	
+	public HighLevelDefinition getDefinition(String name) {
+		return definitionsByName.get(name);
+	}
+	
+	public void registerTo(ZSPackage pkg) {
+		for (HighLevelDefinition definition : definitions) {
+			pkg.register(definition);
+		}
+	}
+	
+	public void registerExpansionsTo(List<ExpansionDefinition> expansions) {
+		for (HighLevelDefinition definition : definitions) {
+			if (definition instanceof ExpansionDefinition)
+				expansions.add((ExpansionDefinition) definition);
+		}
+	}
+}

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

@@ -0,0 +1,21 @@
+/*
+ * 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;
+
+import java.util.List;
+import org.openzen.zenscript.codemodel.statement.Statement;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ScriptBlock {
+	public final List<Statement> statements;
+	
+	public ScriptBlock(List<Statement> statements) {
+		this.statements = statements;
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.definition;
+
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class AliasDefinition extends HighLevelDefinition {
+	public ITypeID type;
+	
+	public AliasDefinition(String name, int modifiers, HighLevelDefinition outerDefinition) {
+		super(name, modifiers, outerDefinition);
+	}
+	
+	public void setType(ITypeID type) {
+		this.type = type;
+	}
+
+	@Override
+	public <T> T accept(DefinitionVisitor<T> visitor) {
+		return visitor.visitAlias(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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.definition;
+
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ClassDefinition extends HighLevelDefinition {
+	public ClassDefinition(String name, int modifiers, HighLevelDefinition outerDefinition) {
+		super(name, modifiers, outerDefinition);
+	}
+	
+	public void setSuperclass(ITypeID superclass) {
+		this.superType = superclass;
+	}
+
+	@Override
+	public <T> T accept(DefinitionVisitor<T> visitor) {
+		return visitor.visitClass(this);
+	}
+}

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

@@ -0,0 +1,26 @@
+/*
+ * 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.definition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface DefinitionVisitor<T> {
+	public T visitClass(ClassDefinition definition);
+	
+	public T visitInterface(InterfaceDefinition definition);
+	
+	public T visitEnum(EnumDefinition definition);
+	
+	public T visitStruct(StructDefinition definition);
+	
+	public T visitFunction(FunctionDefinition definition);
+	
+	public T visitExpansion(ExpansionDefinition definition);
+	
+	public T visitAlias(AliasDefinition definition);
+}

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

@@ -0,0 +1,23 @@
+/*
+ * 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.definition;
+
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class EnumDefinition extends HighLevelDefinition {
+	public EnumDefinition(String name, int modifiers, HighLevelDefinition outerDefinition) {
+		super(name, modifiers, outerDefinition);
+	}
+
+	@Override
+	public <T> T accept(DefinitionVisitor<T> visitor) {
+		return visitor.visitEnum(this);
+	}
+}

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

@@ -0,0 +1,26 @@
+/*
+ * 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.definition;
+
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ExpansionDefinition extends HighLevelDefinition {
+	public ITypeID target;
+	
+	public ExpansionDefinition(int modifiers, HighLevelDefinition outerDefinition) {
+		super(null, modifiers, outerDefinition);
+	}
+
+	@Override
+	public <T> T accept(DefinitionVisitor<T> visitor) {
+		return visitor.visitExpansion(this);
+	}
+}

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

@@ -0,0 +1,37 @@
+/*
+ * 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.definition;
+
+import java.util.List;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.statement.Statement;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class FunctionDefinition extends HighLevelDefinition {
+	public FunctionHeader header;
+	public List<Statement> statements;
+	
+	public FunctionDefinition(String name, int modifiers, HighLevelDefinition outerDefinition) {
+		super(name, modifiers, outerDefinition);
+	}
+	
+	public void setHeader(FunctionHeader header) {
+		this.header = header;
+	}
+	
+	public void setCode(List<Statement> statements) {
+		this.statements = statements;
+	}
+
+	@Override
+	public <T> T accept(DefinitionVisitor<T> visitor) {
+		return visitor.visitFunction(this);
+	}
+}

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

@@ -0,0 +1,32 @@
+/*
+ * 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.definition;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class InterfaceDefinition extends HighLevelDefinition {
+	private final List<ITypeID> baseInterfaces = new ArrayList<>();
+	
+	public InterfaceDefinition(String name, int modifiers, HighLevelDefinition outerDefinition) {
+		super(name, modifiers, outerDefinition);
+	}
+	
+	public void addBaseInterface(ITypeID baseInterface) {
+		baseInterfaces.add(baseInterface);
+	}
+
+	@Override
+	public <T> T accept(DefinitionVisitor<T> visitor) {
+		return visitor.visitInterface(this);
+	}
+}

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

@@ -0,0 +1,23 @@
+/*
+ * 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.definition;
+
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class StructDefinition extends HighLevelDefinition {
+	public StructDefinition(String name, int modifiers, HighLevelDefinition outerDefinition) {
+		super(name, modifiers, outerDefinition);
+	}
+
+	@Override
+	public <T> T accept(DefinitionVisitor<T> visitor) {
+		return visitor.visitStruct(this);
+	}
+}

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

@@ -0,0 +1,94 @@
+/*
+ * 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.definition;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.openzen.zenscript.shared.CompileException;
+import org.openzen.zenscript.shared.CompileExceptionCode;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.partial.IPartialExpression;
+import org.openzen.zenscript.codemodel.partial.PartialPackageExpression;
+import org.openzen.zenscript.codemodel.partial.PartialTypeExpression;
+import org.openzen.zenscript.codemodel.type.GenericName;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ZSPackage {
+	private final Map<String, ZSPackage> subPackages = new HashMap<>();
+	private final Map<String, HighLevelDefinition> types = new HashMap<>();
+	
+	public IPartialExpression getMember(CodePosition position, GlobalTypeRegistry registry, GenericName name) {
+		if (subPackages.containsKey(name.name) && name.arguments.isEmpty())
+			return new PartialPackageExpression(position, subPackages.get(name.name));
+		
+		if (types.containsKey(name.name)) {
+			if (types.get(name.name).genericParameters.size() != 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));
+		}
+		
+		return null;
+	}
+	
+	public HighLevelDefinition getImport(List<String> name, int depth) {
+		if (depth >= name.size())
+			return null;
+		
+		if (subPackages.containsKey(name.get(depth)))
+			return subPackages.get(name.get(depth)).getImport(name, depth + 1);
+		
+		if (depth == name.size() - 1 && types.containsKey(name.get(depth)))
+			return types.get(name.get(depth));
+		
+		return null;
+	}
+	
+	public ITypeID getType(CodePosition position, TypeScope scope, List<GenericName> nameParts, int depth) {
+		if (depth >= nameParts.size())
+			return null;
+		
+		GenericName name = nameParts.get(depth);
+		if (subPackages.containsKey(name.name) && name.arguments.isEmpty())
+			return subPackages.get(name.name).getType(position, scope, nameParts, depth + 1);
+		
+		if (types.containsKey(name.name)) {
+			ITypeID type = scope.getTypeRegistry().getForDefinition(types.get(name.name), name.arguments);
+			depth++;
+			while (depth < nameParts.size()) {
+				GenericName innerName = nameParts.get(depth++);
+				type = scope.getTypeMembers(type).getInnerType(position, innerName);
+				if (type == null)
+					return null;
+			}
+			
+			return type;
+		}
+		
+		return null;
+	}
+	
+	public ZSPackage getOrCreatePackage(String name) {
+		if (subPackages.containsKey(name))
+			return subPackages.get(name);
+		
+		ZSPackage result = new ZSPackage();
+		subPackages.put(name, result);
+		return result;
+	}
+	
+	public void register(HighLevelDefinition definition) {
+		types.put(definition.name, definition);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class AndAndExpression extends Expression {
+	public final Expression left;
+	public final Expression right;
+	
+	public AndAndExpression(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.visitAndAnd(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ArrayExpression extends Expression {
+	public final Expression[] expressions;
+	
+	public ArrayExpression(CodePosition position, Expression[] expressions, ITypeID type) {
+		super(position, type);
+		
+		this.expressions = expressions;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitArray(this);
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/BasicCompareExpression.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.codemodel.expression;
+
+import org.openzen.zenscript.codemodel.CompareType;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ * Compare expression for basic types. Left and right MUST be of the same type,
+ * and MUST be a basic type. (any integer or floating point type, char, string)
+ * 
+ * @author Hoofdgebruiker
+ */
+public class BasicCompareExpression extends Expression {
+	public final Expression left;
+	public final Expression right;
+	public final CompareType operator;
+	
+	public BasicCompareExpression(CodePosition position, Expression left, Expression right, CompareType operator) {
+		super(position, BasicTypeID.BOOL);
+		
+		this.left = left;
+		this.right = right;
+		this.operator = operator;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitCompare(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.ITypeID;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class CallArguments {
+	public static final CallArguments EMPTY = new CallArguments(new Expression[0]);
+	public static final ITypeID[] NO_TYPE_ARGUMENTS = new ITypeID[0];
+	
+	public final ITypeID[] typeArguments;
+	public final Expression[] arguments;
+	
+	public CallArguments(Expression... arguments) {
+		this.typeArguments = NO_TYPE_ARGUMENTS;
+		this.arguments = arguments;
+	}
+	
+	public CallArguments(ITypeID[] typeArguments, Expression[] arguments) {
+		this.typeArguments = typeArguments;
+		this.arguments = arguments;
+	}
+}

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

@@ -0,0 +1,33 @@
+/*
+ * 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.FunctionHeader;
+import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class CallExpression extends Expression {
+	public final Expression target;
+	public final FunctionalMember member;
+	public final CallArguments arguments;
+	
+	public CallExpression(CodePosition position, Expression target, FunctionalMember member, FunctionHeader instancedHeader, CallArguments arguments) {
+		super(position, instancedHeader.returnType);
+		
+		this.target = target;
+		this.member = member;
+		this.arguments = arguments;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitCall(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.member.FunctionalMember;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class CallStaticExpression extends Expression {
+	public final FunctionalMember member;
+	public final CallArguments arguments;
+	
+	public CallStaticExpression(CodePosition position, FunctionalMember member, CallArguments arguments) {
+		super(position, member.header.returnType);
+		
+		this.member = member;
+		this.arguments = arguments;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitCallStatic(this);
+	}
+}

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

@@ -0,0 +1,27 @@
+/*
+ * 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 CapturedClosureExpression extends CapturedExpression {
+	public final CapturedExpression value;
+	
+	public CapturedClosureExpression(CodePosition position, CapturedExpression value, LambdaClosure closure) {
+		super(position, value.type, closure);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitCapturedClosure(this);
+	}
+}

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

@@ -0,0 +1,26 @@
+/*
+ * 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 CapturedDirectExpression extends CapturedExpression {
+	public final Expression value;
+	
+	public CapturedDirectExpression(CodePosition position, LambdaClosure closure, Expression value) {
+		super(position, value.type, closure);
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitCapturedDirect(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public abstract class CapturedExpression extends Expression {
+	public final LambdaClosure closure;
+	
+	public CapturedExpression(CodePosition position, ITypeID type, LambdaClosure closure) {
+		super(position, type);
+		
+		this.closure = closure;
+	}
+	
+	@Override
+	public CapturedExpression capture(CodePosition position, LambdaClosure closure) {
+		CapturedExpression result = new CapturedClosureExpression(position, this, closure);
+		closure.add(result);
+		return result;
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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.statement.VarStatement;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class CapturedLocalVariableExpression extends CapturedExpression {
+	public final VarStatement variable;
+	
+	public CapturedLocalVariableExpression(CodePosition position, VarStatement variable, LambdaClosure closure) {
+		super(position, variable.type, closure);
+		
+		this.variable = variable;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitCapturedLocalVariable(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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.FunctionParameter;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class CapturedParameterExpression extends CapturedExpression {
+	public final FunctionParameter parameter;
+	
+	public CapturedParameterExpression(CodePosition position, FunctionParameter parameter, LambdaClosure closure) {
+		super(position, parameter.type, closure);
+		
+		this.parameter = parameter;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitCapturedParameter(this);
+	}
+}

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

@@ -0,0 +1,24 @@
+/*
+ * 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.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class CapturedThisExpression extends CapturedExpression {
+	public CapturedThisExpression(CodePosition position, ITypeID type, LambdaClosure closure) {
+		super(position, type, closure);
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitCapturedThis(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ * Converts a value from X? to X. Throws a NullPointerException if the value is null.
+ * 
+ * @author Hoofdgebruiker
+ */
+public class CheckNullExpression extends Expression {
+	public final Expression value;
+	
+	public CheckNullExpression(CodePosition position, Expression value) {
+		super(position, value.type.unwrap());
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitCheckNull(this);
+	}
+}

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

@@ -0,0 +1,29 @@
+/*
+ * 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 CoalesceExpression extends Expression {
+	public final Expression left;
+	public final Expression right;
+	
+	public CoalesceExpression(CodePosition position, Expression left, Expression right) {
+		super(position, right.type);
+		
+		this.left = left;
+		this.right = right;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitCoalesce(this);
+	}
+}

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

@@ -0,0 +1,40 @@
+/*
+ * 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.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConditionalExpression extends Expression {
+	public final Expression condition;
+	public final Expression ifThen;
+	public final Expression ifElse;
+	
+	public ConditionalExpression(
+			CodePosition position,
+			Expression condition,
+			Expression ifThen,
+			Expression ifElse,
+			ITypeID type) {
+		super(position, ifThen.type);
+		
+		if (ifThen.type != ifElse.type)
+			throw new AssertionError();
+		
+		this.condition = condition;
+		this.ifThen = ifThen;
+		this.ifElse = ifElse;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConditional(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantBoolExpression extends Expression {
+	public final boolean value;
+	
+	public ConstantBoolExpression(CodePosition position, boolean value) {
+		super(position, BasicTypeID.BOOL);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantBool(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantByteExpression extends Expression {
+	public final byte value;
+	
+	public ConstantByteExpression(CodePosition position, byte value) {
+		super(position, BasicTypeID.BYTE);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantByte(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantCharExpression extends Expression {
+	public final char value;
+	
+	public ConstantCharExpression(CodePosition position, char value) {
+		super(position, BasicTypeID.CHAR);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantChar(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantDoubleExpression extends Expression {
+	public final double value;
+	
+	public ConstantDoubleExpression(CodePosition position, double value) {
+		super(position, BasicTypeID.DOUBLE);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantDouble(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantFloatExpression extends Expression {
+	public final float value;
+	
+	public ConstantFloatExpression(CodePosition position, float value) {
+		super(position, BasicTypeID.FLOAT);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantFloat(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantIntExpression extends Expression {
+	public final int value;
+	
+	public ConstantIntExpression(CodePosition position, int value) {
+		super(position, BasicTypeID.INT);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantInt(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantLongExpression extends Expression {
+	public final long value;
+	
+	public ConstantLongExpression(CodePosition position, long value) {
+		super(position, BasicTypeID.LONG);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantLong(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantSByteExpression extends Expression {
+	public final byte value;
+	
+	public ConstantSByteExpression(CodePosition position, byte value) {
+		super(position, BasicTypeID.SBYTE);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantSByte(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantShortExpression extends Expression {
+	public final short value;
+	
+	public ConstantShortExpression(CodePosition position, short value) {
+		super(position, BasicTypeID.SHORT);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantShort(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantStringExpression extends Expression {
+	public final String value;
+	
+	public ConstantStringExpression(CodePosition position, String value) {
+		super(position, BasicTypeID.STRING);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantString(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantUIntExpression extends Expression {
+	public final int value;
+	
+	public ConstantUIntExpression(CodePosition position, int value) {
+		super(position, BasicTypeID.UINT);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantUInt(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantULongExpression extends Expression {
+	public final long value;
+	
+	public ConstantULongExpression(CodePosition position, long value) {
+		super(position, BasicTypeID.ULONG);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantULong(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstantUShortExpression extends Expression {
+	public final short value;
+	
+	public ConstantUShortExpression(CodePosition position, short value) {
+		super(position, BasicTypeID.USHORT);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstantUShort(this);
+	}
+}

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

@@ -0,0 +1,34 @@
+/*
+ * 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.member.ConstructorMember;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstructorCallExpression extends Expression {
+	public final ITypeID objectType;
+	public final ConstructorMember constructor;
+	public final CallArguments arguments;
+	
+	public ConstructorCallExpression(CodePosition position, ITypeID type, ConstructorMember constructor, CallArguments arguments) {
+		super(position, BasicTypeID.VOID);
+		
+		this.objectType = type;
+		this.constructor = constructor;
+		this.arguments = arguments;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstructorCall(this);
+	}
+}

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

@@ -0,0 +1,38 @@
+/*
+ * 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 java.util.Collections;
+import org.openzen.zenscript.codemodel.definition.EnumDefinition;
+import org.openzen.zenscript.codemodel.member.EnumConstantMember;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class EnumConstantExpression extends Expression {
+	public final EnumConstantMember value;
+	
+	public EnumConstantExpression(CodePosition position, ITypeID type, EnumConstantMember value) {
+		super(position, type);
+		
+		this.value = value;
+	}
+	
+	public EnumConstantExpression(CodePosition position, GlobalTypeRegistry registry, EnumDefinition type, EnumConstantMember value) {
+		super(position, registry.getForDefinition(type, Collections.emptyList()));
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitEnumConstant(this);
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/EqualsExpression.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.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/Expression.java

@@ -0,0 +1,82 @@
+/*
+ * 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 java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.OperatorType;
+import org.openzen.zenscript.codemodel.partial.IPartialExpression;
+import org.openzen.zenscript.codemodel.type.GenericName;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public abstract class Expression implements IPartialExpression {
+	public final CodePosition position;
+	public final ITypeID type;
+	
+	public Expression(CodePosition position, ITypeID type) {
+		this.position = position;
+		this.type = type;
+	}
+	
+	public ITypeID getType() {
+		return type;
+	}
+	
+	public abstract <T> T accept(ExpressionVisitor<T> visitor);
+	
+	@Override
+	public List<ITypeID> getAssignHints() {
+		return Collections.singletonList(type);
+	}
+	
+	@Override
+	public Expression eval() {
+		return this;
+	}
+	
+	public Expression castExplicit(CodePosition position, TypeScope scope, ITypeID asType, boolean optional) {
+		return scope.getTypeMembers(type).castExplicit(position, this, asType, optional);
+	}
+	
+	public Expression castImplicit(CodePosition position, TypeScope scope, ITypeID asType) {
+		return scope.getTypeMembers(type).castImplicit(position, this, asType);
+	}
+	
+	@Override
+	public List<ITypeID>[] predictCallTypes(TypeScope scope, List<ITypeID> hints, int arguments) {
+		return scope.getTypeMembers(type).getOrCreateGroup(OperatorType.CALL).predictCallTypes(scope, hints, arguments);
+	}
+	
+	@Override
+	public List<FunctionHeader> getPossibleFunctionHeaders(TypeScope scope, List<ITypeID> hints, int arguments) {
+		return scope.getTypeMembers(type)
+				.getOrCreateGroup(OperatorType.CALL)
+				.getMethodMembers().stream()
+				.filter(method -> method.member.getHeader().parameters.length == arguments && !method.member.isStatic())
+				.map(method -> method.member.getHeader())
+				.collect(Collectors.toList());
+	}
+	
+	@Override
+	public Expression call(CodePosition position, TypeScope scope, List<ITypeID> hints, CallArguments arguments) {
+		return scope.getTypeMembers(type).getOrCreateGroup(OperatorType.CALL).call(position, scope, this, arguments, false);
+	}
+	
+	@Override
+	public IPartialExpression getMember(CodePosition position, TypeScope scope, List<ITypeID> hints, GenericName name) {
+		TypeMembers members = scope.getTypeMembers(type);
+		return members.getMemberExpression(position, this, name, false);
+	}
+}

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

@@ -0,0 +1,124 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface ExpressionVisitor<T> {
+	public T visitAndAnd(AndAndExpression expression);
+	
+	public T visitArray(ArrayExpression expression);
+	
+	public T visitCompare(BasicCompareExpression expression);
+	
+	public T visitCall(CallExpression expression);
+	
+	public T visitCallStatic(CallStaticExpression expression);
+	
+	public T visitCapturedClosure(CapturedClosureExpression expression);
+	
+	public T visitCapturedDirect(CapturedDirectExpression expression);
+	
+	public T visitCapturedLocalVariable(CapturedLocalVariableExpression expression);
+	
+	public T visitCapturedParameter(CapturedParameterExpression expression);
+	
+	public T visitCapturedThis(CapturedThisExpression expression);
+	
+	public T visitCheckNull(CheckNullExpression expression);
+	
+	public T visitCoalesce(CoalesceExpression expression);
+	
+	public T visitConditional(ConditionalExpression expression);
+	
+	public T visitConstantBool(ConstantBoolExpression expression);
+	
+	public T visitConstantByte(ConstantByteExpression expression);
+	
+	public T visitConstantChar(ConstantCharExpression expression);
+	
+	public T visitConstantDouble(ConstantDoubleExpression expression);
+	
+	public T visitConstantFloat(ConstantFloatExpression expression);
+	
+	public T visitConstantInt(ConstantIntExpression expression);
+	
+	public T visitConstantLong(ConstantLongExpression expression);
+	
+	public T visitConstantSByte(ConstantSByteExpression expression);
+	
+	public T visitConstantShort(ConstantShortExpression expression);
+	
+	public T visitConstantString(ConstantStringExpression expression);
+	
+	public T visitConstantUInt(ConstantUIntExpression expression);
+	
+	public T visitConstantULong(ConstantULongExpression expression);
+	
+	public T visitConstantUShort(ConstantUShortExpression expression);
+	
+	public T visitConstructorCall(ConstructorCallExpression expression);
+	
+	public T visitEnumConstant(EnumConstantExpression expression);
+	
+	public T visitEquals(EqualsExpression expression);
+	
+	public T visitFunction(FunctionExpression expression);
+	
+	public T visitGenericCompare(GenericCompareExpression expression);
+	
+	public T visitGetField(GetFieldExpression expression);
+	
+	public T visitGetFunctionParameter(GetFunctionParameterExpression expression);
+	
+	public T visitGetLocalVariable(GetLocalVariableExpression expression);
+	
+	public T visitGetStaticField(GetStaticFieldExpression expression);
+	
+	public T visitGetter(GetterExpression expression);
+	
+	public T visitInterfaceCast(InterfaceCastExpression expression);
+	
+	public T visitIs(IsExpression expression);
+	
+	public T visitMakeConst(MakeConstExpression expression);
+	
+	public T visitMap(MapExpression expression);
+	
+	public T visitNew(NewExpression expression);
+	
+	public T visitNot(NotExpression expression);
+	
+	public T visitNull(NullExpression expression);
+	
+	public T visitOrOr(OrOrExpression expression);
+	
+	public T visitRange(RangeExpression expression);
+	
+	public T visitSetField(SetFieldExpression expression);
+	
+	public T visitSetFunctionParameter(SetFunctionParameterExpression expression);
+	
+	public T visitSetLocalVariable(SetLocalVariableExpression expression);
+	
+	public T visitSetStaticField(SetStaticFieldExpression expression);
+	
+	public T visitSetter(SetterExpression expression);
+	
+	public T visitStaticGetter(StaticGetterExpression expression);
+	
+	public T visitStaticSetter(StaticSetterExpression expression);
+	
+	public T visitStringConcat(StringConcatExpression expression);
+	
+	public T visitSubstring(SubstringExpression expression);
+	
+	public T visitThis(ThisExpression expression);
+	
+	public T visitWrapOptional(WrapOptionalExpression expression);
+}

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

@@ -0,0 +1,39 @@
+/*
+ * 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 java.util.List;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.type.FunctionTypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class FunctionExpression extends Expression {
+	public final FunctionHeader header;
+	public final LambdaClosure closure;
+	public final List<Statement> statements;
+	
+	public FunctionExpression(
+			CodePosition position,
+			FunctionTypeID type,
+			LambdaClosure closure,
+			List<Statement> statements) {
+		super(position, type);
+		
+		this.header = type.header;
+		this.closure = closure;
+		this.statements = statements;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitFunction(this);
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/GenericCompareExpression.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.codemodel.CompareType;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class GenericCompareExpression extends Expression {
+	public final Expression value;
+	public final CompareType operator;
+	
+	public GenericCompareExpression(CodePosition position, Expression value, CompareType operator) {
+		super(position, BasicTypeID.BOOL);
+		
+		this.value = value;
+		this.operator = operator;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitGenericCompare(this);
+	}
+}

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

@@ -0,0 +1,43 @@
+/*
+ * 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 java.util.Collections;
+import java.util.List;
+import org.openzen.zenscript.codemodel.member.FieldMember;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class GetFieldExpression extends Expression {
+	public final Expression target;
+	public final FieldMember field;
+	
+	public GetFieldExpression(CodePosition position, Expression target, FieldMember field) {
+		super(position, field.type);
+		
+		this.target = target;
+		this.field = field;
+	}
+	
+	@Override
+	public List<ITypeID> getAssignHints() {
+		return Collections.singletonList(type);
+	}
+	
+	@Override
+	public CapturedExpression capture(CodePosition position, LambdaClosure closure) {
+		return new CapturedDirectExpression(position, closure, this);
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitGetField(this);
+	}
+}

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

@@ -0,0 +1,41 @@
+/*
+ * 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.FunctionParameter;
+import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class GetFunctionParameterExpression extends Expression {
+	public final FunctionParameter parameter;
+	
+	public GetFunctionParameterExpression(CodePosition position, FunctionParameter parameter) {
+		super(position, parameter.type);
+		
+		this.parameter = parameter;
+	}
+	
+	@Override
+	public Expression assign(CodePosition position, TypeScope scope, Expression value) {
+		return new SetFunctionParameterExpression(position, parameter, value.castImplicit(position, scope, type));
+	}
+	
+	@Override
+	public CapturedExpression capture(CodePosition position, LambdaClosure closure) {
+		CapturedExpression result = new CapturedParameterExpression(position, parameter, closure);
+		closure.add(result);
+		return result;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitGetFunctionParameter(this);
+	}
+}

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

@@ -0,0 +1,41 @@
+/*
+ * 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.statement.VarStatement;
+import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class GetLocalVariableExpression extends Expression {
+	public final VarStatement variable;
+	
+	public GetLocalVariableExpression(CodePosition position, VarStatement variable) {
+		super(position, variable.type);
+		
+		this.variable = variable;
+	}
+	
+	@Override
+	public Expression assign(CodePosition position, TypeScope scope, Expression value) {
+		return new SetLocalVariableExpression(position, variable, value.castImplicit(position, scope, type));
+	}
+	
+	@Override
+	public CapturedExpression capture(CodePosition position, LambdaClosure closure) {
+		CapturedExpression result = new CapturedLocalVariableExpression(position, variable, closure);
+		closure.add(result);
+		return result;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitGetLocalVariable(this);
+	}
+}

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

@@ -0,0 +1,41 @@
+/*
+ * 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 java.util.Collections;
+import java.util.List;
+import org.openzen.zenscript.codemodel.member.FieldMember;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class GetStaticFieldExpression extends Expression {
+	public final FieldMember field;
+	
+	public GetStaticFieldExpression(CodePosition position, FieldMember field) {
+		super(position, field.type);
+		
+		this.field = field;
+	}
+	
+	@Override
+	public List<ITypeID> getAssignHints() {
+		return Collections.singletonList(field.type);
+	}
+	
+	@Override
+	public CapturedExpression capture(CodePosition position, LambdaClosure closure) {
+		return new CapturedDirectExpression(position, closure, this);
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitGetStaticField(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.member.GetterMember;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class GetterExpression extends Expression {
+	public final Expression target;
+	public final GetterMember getter;
+	
+	public GetterExpression(CodePosition position, Expression target, GetterMember getter) {
+		super(position, getter.type);
+		
+		this.target = target;
+		this.getter = getter;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitGetter(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class InterfaceCastExpression extends Expression {
+	public final Expression value;
+	
+	public InterfaceCastExpression(CodePosition position, Expression value, ITypeID toType) {
+		super(position, toType);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitInterfaceCast(this);
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/IsExpression.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.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class IsExpression extends Expression {
+	public final Expression value;
+	public final ITypeID isType;
+	
+	public IsExpression(CodePosition position, Expression value, ITypeID type) {
+		super(position, BasicTypeID.BOOL);
+		
+		this.value = value;
+		this.isType = type;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitIs(this);
+	}
+}

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

@@ -0,0 +1,16 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class LambdaClosure {
+	public void add(CapturedExpression capture) {
+		
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class MakeConstExpression extends Expression {
+	public final Expression value;
+	
+	public MakeConstExpression(CodePosition position, Expression value, ITypeID constType) {
+		super(position, constType);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitMakeConst(this);
+	}
+}

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

@@ -0,0 +1,34 @@
+/*
+ * 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.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class MapExpression extends Expression {
+	public final Expression[] keys;
+	public final Expression[] values;
+	
+	public MapExpression(
+			CodePosition position,
+			Expression[] keys,
+			Expression[] values,
+			ITypeID type) {
+		super(position, type);
+		
+		this.keys = keys;
+		this.values = values;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitMap(this);
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/NewExpression.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.codemodel.member.ConstructorMember;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class NewExpression extends Expression {
+	public final ConstructorMember constructor;
+	public final CallArguments arguments;
+	
+	public NewExpression(CodePosition position, ITypeID type, ConstructorMember constructor, CallArguments arguments) {
+		super(position, type);
+		
+		this.constructor = constructor;
+		this.arguments = arguments;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitNew(this);
+	}
+}

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

@@ -0,0 +1,27 @@
+/*
+ * 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 NotExpression extends Expression {
+	public final Expression value;
+	
+	public NotExpression(CodePosition position, Expression value) {
+		super(position, value.type);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitNot(this);
+	}
+}

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

@@ -0,0 +1,29 @@
+/*
+ * 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.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class NullExpression extends Expression {
+	public NullExpression(CodePosition position) {
+		super(position, BasicTypeID.NULL);
+	}
+	
+	public NullExpression(CodePosition position, ITypeID optionalType) {
+		super(position, optionalType);
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitNull(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class OrOrExpression extends Expression {
+	public final Expression left;
+	public final Expression right;
+	
+	public OrOrExpression(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.visitOrOr(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.GlobalTypeRegistry;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class RangeExpression extends Expression {
+	public final Expression from;
+	public final Expression to;
+	
+	public RangeExpression(CodePosition position, GlobalTypeRegistry registry, Expression from, Expression to) {
+		super(position, registry.getRange(from.getType(), to.getType()));
+	
+		this.from = from;
+		this.to = to;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitRange(this);
+	}
+}

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

@@ -0,0 +1,32 @@
+/*
+ * 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.member.FieldMember;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class SetFieldExpression extends Expression {
+	public final Expression target;
+	public final FieldMember field;
+	public final Expression value;
+	
+	public SetFieldExpression(CodePosition position, Expression target, FieldMember field, Expression value) {
+		super(position, field.type);
+		
+		this.target = target;
+		this.field = field;
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitSetField(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.FunctionParameter;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class SetFunctionParameterExpression extends Expression {
+	public final FunctionParameter parameter;
+	public final Expression value;
+	
+	public SetFunctionParameterExpression(CodePosition position, FunctionParameter parameter, Expression value) {
+		super(position, parameter.type);
+		
+		this.parameter = parameter;
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitSetFunctionParameter(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.statement.VarStatement;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class SetLocalVariableExpression extends Expression {
+	public final VarStatement variable;
+	public final Expression value;
+	
+	public SetLocalVariableExpression(CodePosition position, VarStatement variable, Expression value) {
+		super(position, variable.type);
+		
+		this.variable = variable;
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitSetLocalVariable(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.member.FieldMember;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class SetStaticFieldExpression extends Expression {
+	public final FieldMember field;
+	public final Expression value;
+	
+	public SetStaticFieldExpression(CodePosition position, FieldMember field, Expression value) {
+		super(position, field.type);
+		
+		this.field = field;
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitSetStaticField(this);
+	}
+}

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

@@ -0,0 +1,32 @@
+/*
+ * 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.member.SetterMember;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class SetterExpression extends Expression {
+	public final Expression target;
+	public final SetterMember setter;
+	public final Expression value;
+	
+	public SetterExpression(CodePosition position, Expression target, SetterMember setter, Expression value) {
+		super(position, setter.type);
+		
+		this.target = target;
+		this.setter = setter;
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitSetter(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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.member.GetterMember;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class StaticGetterExpression extends Expression {
+	public final GetterMember getter;
+	
+	public StaticGetterExpression(CodePosition position, GetterMember getter) {
+		super(position, getter.type);
+		
+		this.getter = getter;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitStaticGetter(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.member.SetterMember;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class StaticSetterExpression extends Expression {
+	public final SetterMember setter;
+	public final Expression value;
+	
+	public StaticSetterExpression(CodePosition position, SetterMember setter, Expression value) {
+		super(position, setter.type);
+		
+		this.setter = setter;
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitStaticSetter(this);
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/StringConcatExpression.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.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class StringConcatExpression extends Expression {
+	// either of these must be a basic type
+	public final Expression left;
+	public final Expression right;
+	
+	public StringConcatExpression(CodePosition position, Expression left, Expression right) {
+		super(position, BasicTypeID.STRING);
+		
+		this.left = left;
+		this.right = right;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitStringConcat(this);
+	}
+}

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

@@ -0,0 +1,29 @@
+/*
+ * 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 SubstringExpression extends Expression {
+	public final Expression value;
+	public final Expression range;
+	
+	public SubstringExpression(CodePosition position, Expression value, Expression range) {
+		super(position, value.type);
+		
+		this.value = value;
+		this.range = range;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitSubstring(this);
+	}
+}

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

@@ -0,0 +1,32 @@
+/*
+ * 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.partial.IPartialExpression;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ThisExpression extends Expression {
+	public ThisExpression(CodePosition position, ITypeID type) {
+		super(position, type);
+	}
+	
+	@Override
+	public IPartialExpression capture(CodePosition position, LambdaClosure closure) {
+		CapturedExpression result = new CapturedThisExpression(position, type, closure);
+		closure.add(result);
+		return result;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitThis(this);
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class WrapOptionalExpression extends Expression {
+	public final Expression value;
+	
+	public WrapOptionalExpression(CodePosition position, Expression value, ITypeID optionalType) {
+		super(position, optionalType);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitWrapOptional(this);
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/generic/GenericParameterBound.java

@@ -0,0 +1,24 @@
+/*
+ * 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.generic;
+
+import java.util.Map;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public abstract class GenericParameterBound {
+	public abstract void registerMembers(LocalMemberCache cache, TypeMembers type);
+	
+	public abstract boolean matches(ITypeID type);
+	
+	public abstract GenericParameterBound withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments);
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/generic/ParameterSuperBound.java

@@ -0,0 +1,39 @@
+/*
+ * 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.generic;
+
+import java.util.Map;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ParameterSuperBound extends GenericParameterBound {
+	public final ITypeID type;
+	
+	public ParameterSuperBound(ITypeID type) {
+		this.type = type;
+	}
+
+	@Override
+	public void registerMembers(LocalMemberCache cache, TypeMembers type) {
+		// TODO: nothing?
+	}
+
+	@Override
+	public boolean matches(ITypeID type) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public GenericParameterBound withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/generic/ParameterTypeBound.java

@@ -0,0 +1,43 @@
+/*
+ * 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.generic;
+
+import java.util.Map;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ParameterTypeBound extends GenericParameterBound {
+	public final CodePosition position;
+	public final ITypeID type;
+	
+	public ParameterTypeBound(CodePosition position, ITypeID type) {
+		this.position = position;
+		this.type = type;
+	}
+
+	@Override
+	public void registerMembers(LocalMemberCache cache, TypeMembers type) {
+		cache.get(this.type).copyMembersTo(position, type, TypeMemberPriority.SPECIFIED);
+	}
+
+	@Override
+	public boolean matches(ITypeID type) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public GenericParameterBound withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
+		return new ParameterTypeBound(position, type.withGenericArguments(registry, arguments));
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/generic/TypeParameter.java

@@ -0,0 +1,60 @@
+/*
+ * 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.generic;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class TypeParameter {
+	public final CodePosition position;
+	public final String name;
+	public final List<GenericParameterBound> bounds = new ArrayList<>();
+	
+	public TypeParameter(CodePosition position, String name) {
+		this.position = position;
+		this.name = name;
+	}
+	
+	private TypeParameter(CodePosition position, String name, List<GenericParameterBound> bounds) {
+		this.position = position;
+		this.name = name;
+		bounds.addAll(bounds);
+	}
+	
+	public void addBound(GenericParameterBound bound) {
+		bounds.add(bound);
+	}
+	
+	public boolean matches(ITypeID type) {
+		for (GenericParameterBound bound : bounds) {
+			if (!bound.matches(type))
+				return false;
+		}
+		
+		return true;
+	}
+	
+	public TypeParameter withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
+		// TODO: think about this...
+		//List<GenericParameterBound> bounds = new ArrayList<>();
+		//for (GenericParameterBound bound : this.bounds)
+		//	bounds.add(bound.withGenericArguments(registry, arguments));
+		//return new TypeParameter(name, bounds);
+		return this;
+	}
+	
+	public String toString() {
+		return name + "[" + position.toShortString() + "]";
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/iterator/ForeachIteratorVisitor.java

@@ -0,0 +1,20 @@
+/*
+ * 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.iterator;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface ForeachIteratorVisitor<T> {
+	T visitIntRange();
+	
+	T visitArrayValueIterator();
+	
+	T visitArrayKeyValueIterator();
+	
+	T visitCustomIterator();
+}

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

@@ -0,0 +1,45 @@
+/*
+ * 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.member;
+
+import java.util.Map;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+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);
+	}
+
+	@Override
+	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
+		type.addCaller(this, priority);
+	}
+
+	@Override
+	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public String describe() {
+		return "caller " + header.toString();
+	}
+
+	@Override
+	public <T> T accept(MemberVisitor<T> visitor) {
+		return visitor.visitCaller(this);
+	}
+}

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

@@ -0,0 +1,68 @@
+/*
+ * 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.member;
+
+import java.util.Map;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.expression.CallArguments;
+import org.openzen.zenscript.codemodel.expression.CallExpression;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class CasterMember extends FunctionalMember implements ICasterMember {
+	public final ITypeID toType;
+	
+	public CasterMember(CodePosition position, int modifiers, ITypeID toType) {
+		super(position, modifiers, new FunctionHeader(toType));
+		
+		this.toType = toType;
+	}
+
+	@Override
+	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
+		type.addCaster(this, priority);
+	}
+
+	@Override
+	public String describe() {
+		return "caster to " + toType.toString();
+	}
+
+	@Override
+	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
+		return new CasterMember(position, modifiers, toType.withGenericArguments(registry, mapping));
+	}
+	
+	@Override
+	public ITypeID getTargetType() {
+		return toType;
+	}
+
+	@Override
+	public Expression cast(CodePosition position, Expression value, ITypeID toType) {
+		return new CallExpression(position, value, this, header, CallArguments.EMPTY);
+	}
+	
+	@Override
+	public boolean isImplicit() {
+		return Modifiers.isImplicit(modifiers);
+	}
+
+	@Override
+	public <T> T accept(MemberVisitor<T> visitor) {
+		return visitor.visitCaster(this);
+	}
+}

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

@@ -0,0 +1,47 @@
+/*
+ * 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.member;
+
+import java.util.Map;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstructorMember extends FunctionalMember {
+	public ConstructorMember(CodePosition position, int modifiers, FunctionHeader header) {
+		super(position, modifiers, new FunctionHeader(header.typeParameters, BasicTypeID.VOID, header.parameters));
+	}
+
+	@Override
+	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
+		if (priority == TypeMemberPriority.SPECIFIED)
+			type.addConstructor(this, priority);
+	}
+
+	@Override
+	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
+		return new ConstructorMember(position, modifiers, header.instance(registry, mapping));
+	}
+
+	@Override
+	public String describe() {
+		return "constructor " + header.toString();
+	}
+
+	@Override
+	public <T> T accept(MemberVisitor<T> visitor) {
+		return visitor.visitConstructor(this);
+	}
+}

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

@@ -0,0 +1,74 @@
+/*
+ * 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.member;
+
+import java.util.List;
+import java.util.Map;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class CustomIteratorMember extends DefinitionMember implements IIteratorMember {
+	private final ITypeID[] iteratorTypes;
+	private List<Statement> content;
+	
+	public CustomIteratorMember(CodePosition position, int modifiers, ITypeID[] iteratorTypes) {
+		super(position, modifiers);
+		
+		this.iteratorTypes = iteratorTypes;
+	}
+	
+	public void setContent(List<Statement> content) {
+		this.content = content;
+	}
+
+	@Override
+	public int getLoopVariableCount() {
+		return iteratorTypes.length;
+	}
+
+	@Override
+	public ITypeID[] getLoopVariableTypes() {
+		return iteratorTypes;
+	}
+
+	@Override
+	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
+		type.addIterator(this, priority);
+	}
+
+	@Override
+	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
+		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);
+	}
+
+	@Override
+	public String describe() {
+		return "iterator with " + iteratorTypes.length + " variables";
+	}
+
+	@Override
+	public <T> T accept(MemberVisitor<T> visitor) {
+		return visitor.visitCustomIterator(this);
+	}
+
+	@Override
+	public <T> T acceptForIterator(ForeachIteratorVisitor<T> visitor) {
+		return visitor.visitCustomIterator();
+	}
+}

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

@@ -0,0 +1,32 @@
+/*
+ * 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.member;
+
+import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public abstract class DefinitionMember implements IDefinitionMember {
+	public final CodePosition position;
+	public final int modifiers;
+	
+	public DefinitionMember(CodePosition position, int modifiers) {
+		this.position = position;
+		this.modifiers = modifiers;
+	}
+	
+	@Override
+	public final CodePosition getPosition() {
+		return position;
+	}
+	
+	public boolean isStatic() {
+		return Modifiers.isStatic(modifiers);
+	}
+}

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

@@ -0,0 +1,49 @@
+/*
+ * 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.member;
+
+import java.util.Map;
+import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class EnumConstantMember extends DefinitionMember {
+	public final String name;
+	
+	public EnumConstantMember(CodePosition position, String name) {
+		super(position, Modifiers.MODIFIER_STATIC);
+		
+		this.name = name;
+	}
+
+	@Override
+	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
+		type.addEnumMember(this, priority);
+	}
+
+	@Override
+	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
+		throw new UnsupportedOperationException("Enums can't have type parameters");
+	}
+
+	@Override
+	public String describe() {
+		return "enum member " + name;
+	}
+
+	@Override
+	public <T> T accept(MemberVisitor<T> visitor) {
+		return visitor.visitEnumConstant(this);
+	}
+}

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

@@ -0,0 +1,92 @@
+/*
+ * 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.member;
+
+import java.util.Map;
+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.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;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class EqualsMember implements ICallableMember {
+	private final ITypeID type;
+	private final FunctionHeader header;
+	
+	public EqualsMember(ITypeID type) {
+		this.type = type;
+		this.header = new FunctionHeader(BasicTypeID.BOOL, new FunctionParameter(type));
+	}
+	
+	@Override
+	public boolean isStatic() {
+		return false;
+	}
+
+	@Override
+	public FunctionHeader getHeader() {
+		return header;
+	}
+
+	@Override
+	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
+		return new EqualsExpression(position, target, arguments.arguments[0]);
+	}
+
+	@Override
+	public Expression callWithComparator(CodePosition position, CompareType operator, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
+		throw new UnsupportedOperationException("Comparator not supported here");
+	}
+
+	@Override
+	public Expression callStatic(CodePosition position, FunctionHeader instancedHeader, CallArguments arguments) {
+		throw new UnsupportedOperationException("Cannot be called statically");
+	}
+
+	@Override
+	public Expression callStaticWithComparator(CodePosition position, CompareType operator, FunctionHeader instancedHeader, CallArguments arguments) {
+		throw new UnsupportedOperationException("Cannot be called statically");
+	}
+
+	@Override
+	public CodePosition getPosition() {
+		return CodePosition.BUILTIN;
+	}
+
+	@Override
+	public String describe() {
+		return "equals operator";
+	}
+
+	@Override
+	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
+		type.addOperator(OperatorType.EQUALS, this, priority);
+	}
+
+	@Override
+	public IDefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
+		ITypeID instanced = type.withGenericArguments(registry, mapping);
+		return instanced == type ? this : new EqualsMember(instanced);
+	}
+
+	@Override
+	public <T> T accept(MemberVisitor<T> visitor) {
+		throw new UnsupportedOperationException("Not yet supported");
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/FieldMember.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.member;
+
+import java.util.Map;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class FieldMember extends DefinitionMember {
+	public final String name;
+	public final ITypeID type;
+	public final boolean isFinal;
+	public Expression initializer;
+	
+	public FieldMember(CodePosition position, int modifiers, String name, ITypeID type, boolean isFinal) {
+		super(position, modifiers);
+		
+		this.name = name;
+		this.type = type;
+		this.isFinal = isFinal;
+	}
+	
+	public void setInitializer(Expression initializer) {
+		this.initializer = initializer;
+	}
+
+	@Override
+	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
+		type.addField(this, priority);
+	}
+
+	@Override
+	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
+		return new FieldMember(position, modifiers, name, type.withGenericArguments(registry, mapping), isFinal);
+	}
+
+	@Override
+	public String describe() {
+		return "field " + name;
+	}
+
+	@Override
+	public <T> T accept(MemberVisitor<T> visitor) {
+		return visitor.visitField(this);
+	}
+}

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

@@ -0,0 +1,61 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.codemodel.member;
+
+import java.util.List;
+import org.openzen.zenscript.codemodel.CompareType;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+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.Expression;
+import org.openzen.zenscript.codemodel.expression.GenericCompareExpression;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public abstract class FunctionalMember extends DefinitionMember implements ICallableMember {
+	public final FunctionHeader header;
+	public List<Statement> body;
+	
+	public FunctionalMember(CodePosition position, int modifiers, FunctionHeader header) {
+		super(position, modifiers);
+		
+		this.header = header;
+	}
+	
+	public void setBody(List<Statement> body) {
+		this.body = body;
+	}
+	
+	@Override
+	public FunctionHeader getHeader() {
+		return header;
+	}
+
+	@Override
+	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
+		return new CallExpression(position, target, this, instancedHeader, arguments);
+	}
+	
+	@Override
+	public Expression callWithComparator(CodePosition position, CompareType operator, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
+		return new GenericCompareExpression(position, call(position, target, instancedHeader, arguments), operator);
+	}
+	
+	@Override
+	public Expression callStatic(CodePosition position, FunctionHeader instancedHeader, CallArguments arguments) {
+		return new CallStaticExpression(position, this, arguments);
+	}
+	
+	@Override
+	public Expression callStaticWithComparator(CodePosition position, CompareType operator, FunctionHeader instancedHeader, CallArguments arguments) {
+		return new GenericCompareExpression(position, callStatic(position, instancedHeader, arguments), operator);
+	}
+}

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

@@ -0,0 +1,76 @@
+/*
+ * 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.member;
+
+import java.util.Map;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.expression.GetterExpression;
+import org.openzen.zenscript.codemodel.expression.StaticGetterExpression;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+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, new FunctionHeader(type));
+		
+		this.name = name;
+		this.type = type;
+	}
+	
+	@Override
+	public String getName() {
+		return name;
+	}
+	
+	@Override
+	public ITypeID getType() {
+		return type;
+	}
+	
+	@Override
+	public Expression get(CodePosition position, Expression target) {
+		return new GetterExpression(position, target, this);
+	}
+	
+	@Override
+	public Expression getStatic(CodePosition position) {
+		return new StaticGetterExpression(position, this);
+	}
+
+	@Override
+	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
+		type.addGetter(this, priority);
+	}
+
+	@Override
+	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
+		return new GetterMember(position, modifiers, name, type.withGenericArguments(registry, mapping));
+	}
+
+	@Override
+	public String describe() {
+		return "getter " + name;
+	}
+
+	@Override
+	public <T> T accept(MemberVisitor<T> visitor) {
+		return visitor.visitGetter(this);
+	}
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.member;
+
+import org.openzen.zenscript.codemodel.CompareType;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.expression.CallArguments;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface ICallableMember extends IDefinitionMember {
+	public boolean isStatic();
+	
+	public FunctionHeader getHeader();
+	
+	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments);
+	
+	public Expression callWithComparator(CodePosition position, CompareType operator, Expression target, FunctionHeader instancedHeader, CallArguments arguments);
+	
+	public Expression callStatic(CodePosition position, FunctionHeader instancedHeader, CallArguments arguments);
+	
+	public Expression callStaticWithComparator(CodePosition position, CompareType operator, FunctionHeader instancedHeader, CallArguments arguments);
+}

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

@@ -0,0 +1,22 @@
+/*
+ * 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.member;
+
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface ICasterMember extends IDefinitionMember {
+	public ITypeID getTargetType();
+	
+	public Expression cast(CodePosition position, Expression value, ITypeID toType);
+	
+	public boolean isImplicit();
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.member;
+
+import java.util.Map;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface IDefinitionMember {
+	public CodePosition getPosition();
+	
+	public String describe();
+	
+	public void registerTo(TypeMembers type, TypeMemberPriority priority);
+	
+	public IDefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping);
+	
+	public <T> T accept(MemberVisitor<T> visitor);
+}