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

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

@@ -40,7 +40,7 @@ public class DefinitionFormatter implements DefinitionVisitor<Void> {
 		FormattingUtils.formatModifiers(output, definition.modifiers);
 		output.append("class ");
 		output.append(definition.name);
-		FormattingUtils.formatTypeParameters(output, definition.genericParameters, typeFormatter);
+		FormattingUtils.formatTypeParameters(output, definition.typeParameters, typeFormatter);
 		output.append(" ");
 		if (definition.getSuperType() != null) {
 			output.append("extends ");
@@ -69,7 +69,7 @@ public class DefinitionFormatter implements DefinitionVisitor<Void> {
 		FormattingUtils.formatModifiers(output, definition.modifiers);
 		output.append("class ");
 		output.append(definition.name);
-		FormattingUtils.formatTypeParameters(output, definition.genericParameters, typeFormatter);
+		FormattingUtils.formatTypeParameters(output, definition.typeParameters, typeFormatter);
 		output.append(" ");
 		
 		if (settings.classBracketOnSameLine) {
@@ -94,7 +94,7 @@ public class DefinitionFormatter implements DefinitionVisitor<Void> {
 		FormattingUtils.formatModifiers(output, definition.modifiers);
 		output.append("enum ");
 		output.append(definition.name);
-		FormattingUtils.formatTypeParameters(output, definition.genericParameters, typeFormatter);
+		FormattingUtils.formatTypeParameters(output, definition.typeParameters, typeFormatter);
 		output.append(" ");
 		
 		if (settings.classBracketOnSameLine) {
@@ -170,7 +170,7 @@ public class DefinitionFormatter implements DefinitionVisitor<Void> {
 		FormattingUtils.formatModifiers(output, variant.modifiers);
 		output.append("variant ");
 		output.append(variant.name);
-		FormattingUtils.formatTypeParameters(output, variant.genericParameters, typeFormatter);
+		FormattingUtils.formatTypeParameters(output, variant.typeParameters, typeFormatter);
 		output.append(" ");
 		
 		if (settings.classBracketOnSameLine) {

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

@@ -19,16 +19,16 @@ import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericMapTypeID;
 import org.openzen.zenscript.codemodel.type.GenericTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.codemodel.type.ITypeVisitor;
 import org.openzen.zenscript.codemodel.type.IteratorTypeID;
 import org.openzen.zenscript.codemodel.type.RangeTypeID;
 import stdlib.Chars;
+import org.openzen.zenscript.codemodel.type.TypeVisitor;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class TypeFormatter implements ITypeVisitor<String>, GenericParameterBoundVisitor<String> {
+public class TypeFormatter implements TypeVisitor<String>, GenericParameterBoundVisitor<String> {
 	private final ScriptFormattingSettings settings;
 	private final Importer importer;
 	

CodeFormatterShared/src/main/java/org/openzen/zenscript/formattershared/StatementFormattingSubBlock.java

@@ -15,9 +15,9 @@ import org.openzen.zenscript.codemodel.statement.Statement;
 public class StatementFormattingSubBlock {
 	public final String header;
 	public final List<String> literalStatements;
-	public final List<Statement> statements;
+	public final Statement[] statements;
 	
-	public StatementFormattingSubBlock(String header, List<String> literalStatements, List<Statement> statements) {
+	public StatementFormattingSubBlock(String header, List<String> literalStatements, Statement[] statements) {
 		this.header = header;
 		this.literalStatements = literalStatements;
 		this.statements = statements;

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

@@ -6,7 +6,6 @@
 package org.openzen.zenscript.codemodel;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -131,6 +130,14 @@ public class FunctionHeader {
 		return typeParameters.length;
 	}
 	
+	public boolean hasAnyDefaultValues() {
+		for (FunctionParameter parameter : parameters)
+			if (parameter.defaultValue != null)
+				return true;
+		
+		return false;
+	}
+	
 	public FunctionHeader withReturnType(ITypeID returnType) {
 		return new FunctionHeader(typeParameters, returnType, thrownType, parameters);
 	}
@@ -332,6 +339,20 @@ public class FunctionHeader {
 		return true;
 	}
 	
+	public FunctionHeader instanceForCall(GlobalTypeRegistry registry, CallArguments arguments) {
+		if (arguments.getNumberOfTypeArguments() > 0) {
+			Map<TypeParameter, ITypeID> typeParameters = new HashMap<>();
+			for (int i = 0; i < this.typeParameters.length; i++) {
+				typeParameters.put(this.typeParameters[i], arguments.typeArguments[i]);
+			}
+			return withGenericArguments(
+					registry,
+					new GenericMapper(registry, typeParameters));
+		} else {
+			return this;
+		}
+	}
+	
 	public FunctionHeader withGenericArguments(GlobalTypeRegistry registry, GenericMapper mapper) {
 		if (typeParameters.length > 0) {
 			Map<TypeParameter, ITypeID> innerMap = new HashMap<>();

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

@@ -12,6 +12,7 @@ import org.openzen.zencode.shared.Taggable;
 import org.openzen.zenscript.codemodel.annotations.DefinitionAnnotation;
 import org.openzen.zenscript.codemodel.definition.AliasDefinition;
 import org.openzen.zenscript.codemodel.definition.DefinitionVisitor;
+import org.openzen.zenscript.codemodel.definition.DefinitionVisitorWithContext;
 import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.definition.InterfaceDefinition;
 import org.openzen.zenscript.codemodel.definition.MemberCollector;
@@ -37,7 +38,7 @@ public abstract class HighLevelDefinition extends Taggable {
 	public final String name;
 	public final int modifiers;
 	public final List<IDefinitionMember> members = new ArrayList<>();
-	public TypeParameter[] genericParameters = TypeParameter.NONE;
+	public TypeParameter[] typeParameters = TypeParameter.NONE;
 	public DefinitionAnnotation[] annotations = DefinitionAnnotation.NONE;
 	
 	public HighLevelDefinition outerDefinition;
@@ -82,7 +83,7 @@ public abstract class HighLevelDefinition extends Taggable {
 	}
 	
 	public int getNumberOfGenericParameters() {
-		return genericParameters == null ? 0 : genericParameters.length;
+		return typeParameters == null ? 0 : typeParameters.length;
 	}
 	
 	public void setOuterDefinition(HighLevelDefinition outerDefinition) {
@@ -125,7 +126,7 @@ public abstract class HighLevelDefinition extends Taggable {
 	}
 	
 	public void setTypeParameters(TypeParameter[] typeParameters) {
-		this.genericParameters = typeParameters;
+		this.typeParameters = typeParameters;
 	}
 	
 	public List<FieldMember> getFields() {
@@ -180,7 +181,9 @@ public abstract class HighLevelDefinition extends Taggable {
 	}
 	
 	public abstract <T> T accept(DefinitionVisitor<T> visitor);
-
+	
+	public abstract <C, R> R accept(C context, DefinitionVisitorWithContext<C, R> visitor);
+	
 	public HighLevelDefinition getInnerType(String name) {
 		for (IDefinitionMember member : members) {
 			if (member instanceof InnerDefinitionMember) {

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

@@ -12,5 +12,7 @@ package org.openzen.zenscript.codemodel.annotations;
 public interface Annotation {
 	public static final Annotation[] NONE = new Annotation[0];
 	
+	public AnnotationDefinition getDefinition();
+	
 	public void apply();
 }

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

@@ -10,11 +10,14 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.context.StatementContext;
+import org.openzen.zenscript.codemodel.context.TypeContext;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.codemodel.scope.StatementScope;
+import org.openzen.zenscript.codemodel.serialization.CodeSerializationInput;
 import org.openzen.zenscript.codemodel.statement.Statement;
 
 /**
@@ -41,4 +44,12 @@ public interface AnnotationDefinition {
 	public StatementAnnotation createForStatement(CodePosition position, CallArguments arguments);
 	
 	public Annotation createForParameter(CodePosition position, CallArguments arguments);
+	
+	public MemberAnnotation deserializeForMember(CodeSerializationInput input, TypeContext context, IDefinitionMember member);
+	
+	public DefinitionAnnotation deserializeForDefinition(CodeSerializationInput input, TypeContext context);
+	
+	public StatementAnnotation deserializeForStatement(CodeSerializationInput input, StatementContext context);
+	
+	public Annotation deserializeForParameter(CodeSerializationInput input, TypeContext context);
 }

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

@@ -6,7 +6,9 @@
 package org.openzen.zenscript.codemodel.annotations;
 
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.context.TypeContext;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
+import org.openzen.zenscript.codemodel.serialization.CodeSerializationOutput;
 
 /**
  *
@@ -15,7 +17,11 @@ import org.openzen.zenscript.codemodel.scope.BaseScope;
 public interface DefinitionAnnotation {
 	public static final DefinitionAnnotation[] NONE = new DefinitionAnnotation[0];
 	
+	public AnnotationDefinition getDefinition();
+	
 	public void apply(HighLevelDefinition definition, BaseScope scope);
 	
 	public void applyOnSubtype(HighLevelDefinition definition, BaseScope scope);
+	
+	public void serialize(CodeSerializationOutput output, HighLevelDefinition definition, TypeContext context);
 }

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

@@ -5,11 +5,13 @@
  */
 package org.openzen.zenscript.codemodel.annotations;
 
+import org.openzen.zenscript.codemodel.context.TypeContext;
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
+import org.openzen.zenscript.codemodel.serialization.CodeSerializationOutput;
 
 /**
  *
@@ -18,6 +20,8 @@ import org.openzen.zenscript.codemodel.scope.BaseScope;
 public interface MemberAnnotation {
 	public static final MemberAnnotation[] NONE = new MemberAnnotation[0];
 	
+	public AnnotationDefinition getDefinition();
+	
 	public void apply(IDefinitionMember member, BaseScope scope);
 	
 	public void applyOnOverridingMethod(FunctionalMember member, BaseScope scope);
@@ -25,4 +29,6 @@ public interface MemberAnnotation {
 	public void applyOnOverridingGetter(GetterMember member, BaseScope scope);
 	
 	public void applyOnOverridingSetter(SetterMember member, BaseScope scope);
+	
+	public void serialize(CodeSerializationOutput output, IDefinitionMember member, TypeContext context);
 }

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

@@ -11,12 +11,15 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.context.StatementContext;
+import org.openzen.zenscript.codemodel.context.TypeContext;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.codemodel.scope.StatementScope;
+import org.openzen.zenscript.codemodel.serialization.CodeSerializationInput;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 
@@ -85,4 +88,26 @@ public class NativeAnnotationDefinition implements AnnotationDefinition {
 	public Annotation createForParameter(CodePosition position, CallArguments arguments) {
 		throw new UnsupportedOperationException("Not supported");
 	}
+
+	@Override
+	public MemberAnnotation deserializeForMember(CodeSerializationInput input, TypeContext context, IDefinitionMember member) {
+		String name = input.readString();
+		return new NativeMemberAnnotation(name);
+	}
+
+	@Override
+	public DefinitionAnnotation deserializeForDefinition(CodeSerializationInput input, TypeContext context) {
+		String name = input.readString();
+		return new NativeDefinitionAnnotation(name);
+	}
+
+	@Override
+	public StatementAnnotation deserializeForStatement(CodeSerializationInput input, StatementContext context) {
+		throw new UnsupportedOperationException("Not supported");
+	}
+
+	@Override
+	public Annotation deserializeForParameter(CodeSerializationInput input, TypeContext context) {
+		throw new UnsupportedOperationException("Not supported");
+	}
 }

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

@@ -6,7 +6,9 @@
 package org.openzen.zenscript.codemodel.annotations;
 
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.context.TypeContext;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
+import org.openzen.zenscript.codemodel.serialization.CodeSerializationOutput;
 
 /**
  *
@@ -18,6 +20,11 @@ public class NativeDefinitionAnnotation implements DefinitionAnnotation {
 	public NativeDefinitionAnnotation(String identifier) {
 		this.identifier = identifier;
 	}
+
+	@Override
+	public AnnotationDefinition getDefinition() {
+		return NativeAnnotationDefinition.INSTANCE;
+	}
 	
 	@Override
 	public void apply(HighLevelDefinition definition, BaseScope scope) {
@@ -28,4 +35,9 @@ public class NativeDefinitionAnnotation implements DefinitionAnnotation {
 	public void applyOnSubtype(HighLevelDefinition definition, BaseScope scope) {
 		// this annotation is not inherited
 	}
+
+	@Override
+	public void serialize(CodeSerializationOutput output, HighLevelDefinition definition, TypeContext context) {
+		output.writeString(identifier);
+	}
 }

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

@@ -5,11 +5,13 @@
  */
 package org.openzen.zenscript.codemodel.annotations;
 
+import org.openzen.zenscript.codemodel.context.TypeContext;
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
+import org.openzen.zenscript.codemodel.serialization.CodeSerializationOutput;
 
 /**
  *
@@ -21,6 +23,11 @@ public class NativeMemberAnnotation implements MemberAnnotation {
 	public NativeMemberAnnotation(String identifier) {
 		this.identifier = identifier;
 	}
+
+	@Override
+	public AnnotationDefinition getDefinition() {
+		return NativeAnnotationDefinition.INSTANCE;
+	}
 	
 	@Override
 	public void apply(IDefinitionMember member, BaseScope scope) {
@@ -41,4 +48,9 @@ public class NativeMemberAnnotation implements MemberAnnotation {
 	public void applyOnOverridingSetter(SetterMember member, BaseScope scope) {
 		// not inherited
 	}
+
+	@Override
+	public void serialize(CodeSerializationOutput output, IDefinitionMember member, TypeContext context) {
+		output.writeString(identifier);
+	}
 }

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

@@ -12,6 +12,8 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.context.StatementContext;
+import org.openzen.zenscript.codemodel.context.TypeContext;
 import org.openzen.zenscript.codemodel.definition.FunctionDefinition;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
@@ -21,6 +23,7 @@ import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.codemodel.scope.FunctionScope;
 import org.openzen.zenscript.codemodel.scope.StatementScope;
+import org.openzen.zenscript.codemodel.serialization.CodeSerializationInput;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GenericName;
@@ -104,4 +107,29 @@ public class PreconditionAnnotationDefinition implements AnnotationDefinition {
 	public Annotation createForParameter(CodePosition position, CallArguments arguments) {
 		throw new UnsupportedOperationException("Not supported");
 	}
+
+	@Override
+	public MemberAnnotation deserializeForMember(CodeSerializationInput input, TypeContext context, IDefinitionMember member) {
+		CodePosition position = input.deserializePosition();
+		String enforcement = input.readString();
+		StatementContext statementContext = new StatementContext(context, member.getHeader());
+		Expression condition = input.deserializeExpression(statementContext);
+		Expression message = input.deserializeExpression(statementContext);
+		return new PreconditionForMethod(position, enforcement, condition, message);
+	}
+
+	@Override
+	public DefinitionAnnotation deserializeForDefinition(CodeSerializationInput input, TypeContext context) {
+		throw new UnsupportedOperationException("Not supported");
+	}
+
+	@Override
+	public StatementAnnotation deserializeForStatement(CodeSerializationInput input, StatementContext context) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Annotation deserializeForParameter(CodeSerializationInput input, TypeContext context) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
 }

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

@@ -6,8 +6,11 @@
 package org.openzen.zenscript.codemodel.annotations;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.context.StatementContext;
+import org.openzen.zenscript.codemodel.context.TypeContext;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionBuilder;
 import org.openzen.zenscript.codemodel.expression.PanicExpression;
@@ -17,6 +20,7 @@ import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.serialization.CodeSerializationOutput;
 import org.openzen.zenscript.codemodel.statement.BlockStatement;
 import org.openzen.zenscript.codemodel.statement.ExpressionStatement;
 import org.openzen.zenscript.codemodel.statement.IfStatement;
@@ -43,6 +47,11 @@ public class PreconditionForMethod implements MemberAnnotation {
 		this.condition = condition;
 		this.message = message;
 	}
+	
+	@Override
+	public AnnotationDefinition getDefinition() {
+		return PreconditionAnnotationDefinition.INSTANCE;
+	}
 
 	@Override
 	public void apply(IDefinitionMember member, BaseScope scope) {
@@ -82,10 +91,19 @@ public class PreconditionForMethod implements MemberAnnotation {
 		statements.add(new IfStatement(position, inverseCondition, throwStatement, null));
 		
 		if (body instanceof BlockStatement) {
-			statements.addAll(((BlockStatement)body).statements);
+			statements.addAll(Arrays.asList(((BlockStatement)body).statements));
 		} else {
 			statements.add(body);
 		}
-		return new BlockStatement(position, statements);
+		return new BlockStatement(position, statements.toArray(new Statement[statements.size()]));
+	}
+
+	@Override
+	public void serialize(CodeSerializationOutput output, IDefinitionMember member, TypeContext context) {
+		output.serialize(position);
+		output.writeString(enforcement);
+		StatementContext statementContext = new StatementContext(context, member.getHeader());
+		output.serialize(statementContext, condition);
+		output.serialize(statementContext, message);
 	}
 }

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

@@ -15,5 +15,7 @@ import org.openzen.zenscript.codemodel.statement.Statement;
 public interface StatementAnnotation {
 	public static final StatementAnnotation[] NONE = new StatementAnnotation[0];
 	
+	public AnnotationDefinition getDefinition();
+	
 	public Statement apply(Statement statement, StatementScope scope);
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/context/ModuleContext.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.context;
+
+import java.util.List;
+import org.openzen.zenscript.codemodel.Module;
+import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
+import org.openzen.zenscript.codemodel.definition.ZSPackage;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ModuleContext {
+	public final GlobalTypeRegistry registry;
+	public final Module module;
+	public final List<ExpansionDefinition> expansions;
+	public final ZSPackage root;
+	
+	public ModuleContext(
+			GlobalTypeRegistry registry,
+			Module module,
+			List<ExpansionDefinition> expansions,
+			ZSPackage root)
+	{
+		this.registry = registry;
+		this.module = module;
+		this.expansions = expansions;
+		this.root = root;
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/context/StatementContext.java

@@ -0,0 +1,146 @@
+/*
+ * 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.context;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.expression.LambdaClosure;
+import org.openzen.zenscript.codemodel.expression.switchvalue.VariantOptionSwitchValue;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
+import org.openzen.zenscript.codemodel.statement.VarStatement;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class StatementContext extends TypeContext {
+	private final List<VarStatement> variables = new ArrayList<>();
+	private final LoopStatement[] loops;
+	private final FunctionHeader header;
+	private final LambdaClosure closure;
+	private final StatementContext lambdaOuter;
+	
+	public VariantOptionSwitchValue variantOptionSwitchValue;
+	
+	public StatementContext(ModuleContext module, ITypeID thisType) {
+		super(module, TypeParameter.NONE, thisType);
+		
+		loops = LoopStatement.NONE;
+		header = null;
+		closure = null;
+		lambdaOuter = null;
+	}
+	
+	public StatementContext(ModuleContext module, ITypeID thisType, FunctionHeader header) {
+		super(module, header.typeParameters, thisType);
+		
+		loops = LoopStatement.NONE;
+		this.header = header;
+		this.closure = null;
+		lambdaOuter = null;
+	}
+	
+	public StatementContext(TypeContext outer) {
+		super(outer.moduleContext, outer.typeParameters, outer.thisType);
+		loops = LoopStatement.NONE;
+		header = null;
+		closure = null;
+		lambdaOuter = null;
+	}
+	
+	public StatementContext(TypeContext outer, FunctionHeader header) {
+		super(outer, outer.thisType, header == null ? TypeParameter.NONE : header.typeParameters);
+		loops = LoopStatement.NONE;
+		this.header = header;
+		closure = null;
+		lambdaOuter = null;
+	}
+	
+	public StatementContext(StatementContext outer) {
+		super(outer.moduleContext, outer.typeParameters, outer.thisType);
+		
+		variables.addAll(outer.variables);
+		loops = outer.loops;
+		header = outer.header;
+		closure = outer.closure;
+		lambdaOuter = outer.lambdaOuter;
+	}
+	
+	public StatementContext(StatementContext outer, LoopStatement loop) {
+		super(outer.moduleContext, outer.typeParameters, outer.thisType);
+		
+		variables.addAll(outer.variables);
+		loops = Arrays.copyOf(outer.loops, outer.loops.length + 1);
+		loops[loops.length - 1] = loop;
+		header = outer.header;
+		closure = outer.closure;
+		lambdaOuter = outer.lambdaOuter;
+	}
+	
+	public StatementContext(StatementContext outer, FunctionHeader lambdaHeader, LambdaClosure lambdaClosure) {
+		super(outer, outer.thisType, lambdaHeader.typeParameters);
+		
+		loops = LoopStatement.NONE;
+		header = lambdaHeader;
+		this.closure = lambdaClosure;
+		lambdaOuter = outer;
+	}
+	
+	public void add(VarStatement variable) {
+		variables.add(variable);
+	}
+	
+	public int getVariableId(VarStatement variable) {
+		int id = variables.indexOf(variable);
+		if (id < 0)
+			throw new IllegalArgumentException("Variable not in scope: " + variable.name);
+		return id;
+	}
+	
+	public int getLoopId(LoopStatement loop) {
+		for (int i = 0; i < loops.length; i++)
+			if (loops[i] == loop)
+				return i;
+		
+		throw new IllegalArgumentException("Loop@" + loop.position + " not in scope");
+	}
+	
+	public int getParameterIndex(FunctionParameter parameter) {
+		if (header == null)
+			throw new IllegalStateException("No parameters available");
+		
+		for (int i = 0; i < header.parameters.length; i++)
+			if (header.parameters[i] == parameter)
+				return i;
+		
+		throw new IllegalArgumentException("Parameter" + parameter.name + " not in scope");
+	}
+	
+	public VarStatement getVariable(int id) {
+		return variables.get(id);
+	}
+
+	public LoopStatement getLoop(int id) {
+		return loops[id];
+	}
+	
+	public FunctionParameter getParameter(int id) {
+		return header.parameters[id];
+	}
+	
+	public LambdaClosure getLambdaClosure() {
+		return closure;
+	}
+	
+	public StatementContext getLambdaOuter() {
+		return lambdaOuter;
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/context/TypeContext.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.context;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.openzen.zenscript.codemodel.GenericMapper;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class TypeContext {
+	protected final TypeParameter[] typeParameters;
+	public final ITypeID thisType;
+	private final LocalMemberCache memberCache;
+	public final ModuleContext moduleContext;
+	
+	public TypeContext(ModuleContext context, TypeParameter[] parameters, ITypeID thisType) {
+		this.typeParameters = parameters;
+		this.thisType = thisType;
+		memberCache = new LocalMemberCache(context.registry, context.expansions);
+		moduleContext = context;
+	}
+	
+	public TypeContext(TypeContext outer, ITypeID thisType, TypeParameter... inner) {
+		typeParameters = concat(outer.typeParameters, inner);
+		this.thisType = thisType;
+		moduleContext = outer.moduleContext;
+		memberCache = new LocalMemberCache(moduleContext.registry, moduleContext.expansions);
+	}
+	
+	public TypeContext(TypeContext outer, ITypeID thisType, List<TypeParameter> inner) {
+		this(outer, thisType, inner.toArray(new TypeParameter[inner.size()]));
+	}
+	
+	public int getId(TypeParameter parameter) {
+		for (int i = 0; i < typeParameters.length; i++)
+			if (typeParameters[i] == parameter)
+				return i;
+		
+		return -1;
+	}
+	
+	public TypeParameter getTypeParameter(int index) {
+		return typeParameters[index];
+	}
+	
+	public TypeMembers getTypeMembers(ITypeID type) {
+		return memberCache.get(type);
+	}
+	
+	public GenericMapper getMapper() {
+		Map<TypeParameter, ITypeID> mapper = new HashMap<>();
+		for (TypeParameter parameter : typeParameters)
+			mapper.put(parameter, moduleContext.registry.getGeneric(parameter));
+		return new GenericMapper(moduleContext.registry, mapper);
+	}
+	
+	public static <T> T[] concat(T[] first, T[] second) {
+		T[] result = Arrays.copyOf(first, first.length + second.length);
+		System.arraycopy(second, 0, result, first.length, second.length);
+		return result;
+	}
+}

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

@@ -39,6 +39,11 @@ public class AliasDefinition extends HighLevelDefinition {
 		return visitor.visitAlias(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, DefinitionVisitorWithContext<C, R> visitor) {
+		return visitor.visitAlias(context, this);
+	}
+
 	@Override
 	public void normalize(TypeScope scope) {
 		// nothing to do

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

@@ -26,4 +26,9 @@ public class ClassDefinition extends HighLevelDefinition {
 	public <T> T accept(DefinitionVisitor<T> visitor) {
 		return visitor.visitClass(this);
 	}
+
+	@Override
+	public <C, R> R accept(C context, DefinitionVisitorWithContext<C, R> visitor) {
+		return visitor.visitClass(context, this);
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/definition/DefinitionVisitorWithContext.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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface DefinitionVisitorWithContext<C, R> {
+	R visitClass(C context, ClassDefinition definition);
+	
+	R visitInterface(C context, InterfaceDefinition definition);
+	
+	R visitEnum(C context, EnumDefinition definition);
+	
+	R visitStruct(C context, StructDefinition definition);
+	
+	R visitFunction(C context, FunctionDefinition definition);
+	
+	R visitExpansion(C context, ExpansionDefinition definition);
+	
+	R visitAlias(C context, AliasDefinition definition);
+	
+	R visitVariant(C context, VariantDefinition variant);
+}

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

@@ -27,6 +27,11 @@ public class EnumDefinition extends HighLevelDefinition {
 	public <T> T accept(DefinitionVisitor<T> visitor) {
 		return visitor.visitEnum(this);
 	}
+
+	@Override
+	public <C, R> R accept(C context, DefinitionVisitorWithContext<C, R> visitor) {
+		return visitor.visitEnum(context, this);
+	}
 	
 	@Override
 	public void collectMembers(MemberCollector collector) {

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

@@ -25,4 +25,9 @@ public class ExpansionDefinition extends HighLevelDefinition {
 	public <T> T accept(DefinitionVisitor<T> visitor) {
 		return visitor.visitExpansion(this);
 	}
+
+	@Override
+	public <C, R> R accept(C context, DefinitionVisitorWithContext<C, R> visitor) {
+		return visitor.visitExpansion(context, this);
+	}
 }

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

@@ -14,6 +14,7 @@ import org.openzen.zenscript.codemodel.Module;
 import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 
@@ -32,15 +33,15 @@ public class FunctionDefinition extends HighLevelDefinition {
 		callerGroup = new DefinitionMemberGroup(true, name);
 	}
 	
-	public FunctionDefinition(CodePosition position, Module module, ZSPackage pkg, String name, int modifiers, FunctionHeader header) {
+	public FunctionDefinition(CodePosition position, Module module, ZSPackage pkg, String name, int modifiers, FunctionHeader header, GlobalTypeRegistry registry) {
 		this(position, module, pkg, name, modifiers, (HighLevelDefinition) null);
-		setHeader(header);
+		setHeader(registry, header);
 	}
 	
-	public void setHeader(FunctionHeader header) {
+	public void setHeader(GlobalTypeRegistry registry, FunctionHeader header) {
 		this.header = header;
 		addMember(caller = new CallerMember(position, this, modifiers | Modifiers.STATIC, header, null));
-		callerGroup.addMethod(new FunctionalMemberRef(caller, GenericMapper.EMPTY), TypeMemberPriority.SPECIFIED);
+		callerGroup.addMethod(new FunctionalMemberRef(caller, registry.getFunction(header), GenericMapper.EMPTY), TypeMemberPriority.SPECIFIED);
 	}
 	
 	public void setCode(Statement statement) {
@@ -52,4 +53,9 @@ public class FunctionDefinition extends HighLevelDefinition {
 	public <T> T accept(DefinitionVisitor<T> visitor) {
 		return visitor.visitFunction(this);
 	}
+
+	@Override
+	public <C, R> R accept(C context, DefinitionVisitorWithContext<C, R> visitor) {
+		return visitor.visitFunction(context, this);
+	}
 }

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

@@ -45,4 +45,9 @@ public class InterfaceDefinition extends HighLevelDefinition {
 	public <T> T accept(DefinitionVisitor<T> visitor) {
 		return visitor.visitInterface(this);
 	}
+
+	@Override
+	public <C, R> R accept(C context, DefinitionVisitorWithContext<C, R> visitor) {
+		return visitor.visitInterface(context, this);
+	}
 }

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

@@ -22,4 +22,9 @@ public class StructDefinition extends HighLevelDefinition {
 	public <T> T accept(DefinitionVisitor<T> visitor) {
 		return visitor.visitStruct(this);
 	}
+
+	@Override
+	public <C, R> R accept(C context, DefinitionVisitorWithContext<C, R> visitor) {
+		return visitor.visitStruct(context, this);
+	}
 }

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

@@ -30,6 +30,11 @@ public class VariantDefinition extends HighLevelDefinition {
 	public <T> T accept(DefinitionVisitor<T> visitor) {
 		return visitor.visitVariant(this);
 	}
+
+	@Override
+	public <C, R> R accept(C context, DefinitionVisitorWithContext<C, R> visitor) {
+		return visitor.visitVariant(context, this);
+	}
 	
 	@Override
 	public void collectMembers(MemberCollector collector) {
@@ -40,11 +45,13 @@ public class VariantDefinition extends HighLevelDefinition {
 	}
 	
 	public static class Option extends Taggable {
+		public final VariantDefinition variant;
 		public final String name;
 		public final int ordinal;
 		public final ITypeID[] types;
 		
-		public Option(String name, int ordinal, ITypeID[] types) {
+		public Option(VariantDefinition variant, String name, int ordinal, ITypeID[] types) {
+			this.variant = variant;
 			this.name = name;
 			this.ordinal = ordinal;
 			this.types = types;

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

@@ -26,6 +26,10 @@ import org.openzen.zenscript.codemodel.type.ITypeID;
  * @author Hoofdgebruiker
  */
 public class ZSPackage {
+	public static ZSPackage createRoot() {
+		return new ZSPackage(null, "");
+	}
+	
 	public final String name;
 	public final String fullName;
 	public final ZSPackage parent;
@@ -51,7 +55,7 @@ public class ZSPackage {
 			return new PartialPackageExpression(position, subPackages.get(name.name));
 		
 		if (types.containsKey(name.name)) {
-			if (types.get(name.name).genericParameters.length != name.getNumberOfArguments())
+			if (types.get(name.name).typeParameters.length != name.getNumberOfArguments())
 				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), name.arguments);
@@ -109,6 +113,14 @@ public class ZSPackage {
 		return null;
 	}
 	
+	public ZSPackage getRecursive(String name) {
+		int dot = name.indexOf('.');
+		if (dot < 0)
+			return getOrCreatePackage(name);
+		else
+			return getOrCreatePackage(name.substring(0, dot)).getRecursive(name.substring(dot + 1));
+	}
+	
 	public ZSPackage getOrCreatePackage(String name) {
 		if (subPackages.containsKey(name))
 			return subPackages.get(name);

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

@@ -29,6 +29,11 @@ public class AndAndExpression extends Expression {
 		return visitor.visitAndAnd(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitAndAnd(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tLeft = left.transform(transformer);

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

@@ -29,6 +29,11 @@ public class ArrayExpression extends Expression {
 		return visitor.visitArray(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitArray(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression[] tExpressions = Expression.transform(expressions, transformer);

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

@@ -38,6 +38,11 @@ public class CallExpression extends Expression {
 		return visitor.visitCall(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitCall(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tTarget = target.transform(transformer);

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

@@ -35,6 +35,11 @@ public class CallStaticExpression extends Expression {
 		return visitor.visitCallStatic(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitCallStatic(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		CallArguments tArguments = arguments.transform(transformer);

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

@@ -31,6 +31,11 @@ public class CapturedClosureExpression extends CapturedExpression {
 		return visitor.visitRecaptured(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitCapturedClosure(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = transformer.transform(value);

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

@@ -30,6 +30,11 @@ public class CapturedDirectExpression extends CapturedExpression {
 		return visitor.visitCapturedDirect(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitCapturedDirect(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = transformer.transform(value);

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

@@ -32,6 +32,11 @@ public class CapturedLocalVariableExpression extends CapturedExpression {
 		return visitor.visitCapturedLocal(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitCapturedLocalVariable(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -32,6 +32,11 @@ public class CapturedParameterExpression extends CapturedExpression {
 		return visitor.visitCapturedParameter(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitCapturedParameter(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -28,6 +28,11 @@ public class CapturedThisExpression extends CapturedExpression {
 		return visitor.visitCapturedThis(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitCapturedThis(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -31,6 +31,11 @@ public class CastExpression extends Expression {
 		return visitor.visitCast(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitCast(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tTarget = target.transform(transformer);

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

@@ -27,6 +27,11 @@ public class CheckNullExpression extends Expression {
 		return visitor.visitCheckNull(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitCheckNull(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = transformer.transform(value);

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

@@ -28,6 +28,11 @@ public class CoalesceExpression extends Expression {
 		return visitor.visitCoalesce(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitCoalesce(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tLeft = left.transform(transformer);

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

@@ -23,11 +23,11 @@ public class CompareExpression extends Expression {
 	public final FunctionalMemberRef operator;
 	public final CompareType comparison;
 	
-	public CompareExpression(CodePosition position, Expression left, Expression right, FunctionalMemberRef operator, CompareType comparison, TypeScope scope) {
+	public CompareExpression(CodePosition position, Expression left, Expression right, FunctionalMemberRef operator, CompareType comparison) {
 		super(position, BasicTypeID.BOOL, binaryThrow(position, left.thrownType, right.thrownType));
 		
 		this.left = left;
-		this.right = scope == null ? right : right.castImplicit(position, scope, operator.getHeader().parameters[0].type);
+		this.right = right;
 		this.operator = operator;
 		this.comparison = comparison;
 	}
@@ -37,15 +37,25 @@ public class CompareExpression extends Expression {
 		return visitor.visitCompare(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitCompare(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tLeft = left.transform(transformer);
 		Expression tRight = right.transform(transformer);
-		return left == tLeft && right == tRight ? this : new CompareExpression(position, tLeft, tRight, operator, comparison, null);
+		return left == tLeft && right == tRight ? this : new CompareExpression(position, tLeft, tRight, operator, comparison);
 	}
 
 	@Override
 	public Expression normalize(TypeScope scope) {
-		return new CompareExpression(position, left.normalize(scope), right.normalize(scope), operator, comparison, scope);
+		return new CompareExpression(
+				position,
+				left.normalize(scope),
+				right.normalize(scope).castImplicit(position, scope, operator.getHeader().parameters[0].type),
+				operator,
+				comparison);
 	}
 }

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

@@ -39,6 +39,11 @@ public class ConditionalExpression extends Expression {
 		return visitor.visitConditional(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConditional(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tCondition = transformer.transform(condition);

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

@@ -29,6 +29,11 @@ public class ConstExpression extends Expression {
 		return visitor.visitConst(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConst(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantBoolExpression extends Expression {
 		return visitor.visitConstantBool(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantBool(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantByteExpression extends Expression {
 		return visitor.visitConstantByte(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantByte(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantCharExpression extends Expression {
 		return visitor.visitConstantChar(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantChar(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantDoubleExpression extends Expression {
 		return visitor.visitConstantDouble(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantDouble(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantFloatExpression extends Expression {
 		return visitor.visitConstantFloat(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantFloat(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantIntExpression extends Expression {
 		return visitor.visitConstantInt(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantInt(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -12,6 +12,7 @@ import org.openzen.zenscript.codemodel.type.BasicTypeID;
 /**
  *
  * @author Hoofdgebruiker
+ * 
  */
 public class ConstantLongExpression extends Expression {
 	public final long value;
@@ -27,6 +28,11 @@ public class ConstantLongExpression extends Expression {
 		return visitor.visitConstantLong(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantLong(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantSByteExpression extends Expression {
 		return visitor.visitConstantSByte(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantSByte(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantShortExpression extends Expression {
 		return visitor.visitConstantShort(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantShort(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantStringExpression extends Expression {
 		return visitor.visitConstantString(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantString(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantUIntExpression extends Expression {
 		return visitor.visitConstantUInt(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantUInt(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantULongExpression extends Expression {
 		return visitor.visitConstantULong(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantULong(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantUShortExpression extends Expression {
 		return visitor.visitConstantUShort(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantUShort(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -27,6 +27,11 @@ public class ConstantUSizeExpression extends Expression {
 		return visitor.visitConstantUSize(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstantUSize(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -33,6 +33,11 @@ public class ConstructorSuperCallExpression extends Expression {
 		return visitor.visitConstructorSuperCall(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstructorSuperCall(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		CallArguments tArguments = arguments.transform(transformer);

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

@@ -36,6 +36,11 @@ public class ConstructorThisCallExpression extends Expression {
 		return visitor.visitConstructorThisCall(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitConstructorThisCall(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		CallArguments tArguments = arguments.transform(transformer);

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

@@ -28,6 +28,11 @@ public class DummyExpression extends Expression {
 		throw new UnsupportedOperationException("This is a dummy expression");
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		throw new UnsupportedOperationException("This is a dummy expression");
+	}
+
 	@Override
 	public Expression normalize(TypeScope scope) {
 		return this;

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

@@ -36,6 +36,11 @@ public class EnumConstantExpression extends Expression {
 		return visitor.visitEnumConstant(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitEnumConstant(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -49,6 +49,8 @@ public abstract class Expression implements IPartialExpression {
 	
 	public abstract <T> T accept(ExpressionVisitor<T> visitor);
 	
+	public abstract <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor);
+	
 	public abstract Expression transform(ExpressionTransformer transformer);
 	
 	public final Expression transform(StatementTransformer transformer) {

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

@@ -0,0 +1,148 @@
+/*
+ * 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 ExpressionVisitorWithContext<C, R> {
+	public R visitAndAnd(C context, AndAndExpression expression);
+	
+	public R visitArray(C context, ArrayExpression expression);
+	
+	public R visitCompare(C context, CompareExpression expression);
+	
+	public R visitCall(C context, CallExpression expression);
+	
+	public R visitCallStatic(C context, CallStaticExpression expression);
+	
+	public R visitCapturedClosure(C context, CapturedClosureExpression expression);
+	
+	public R visitCapturedDirect(C context, CapturedDirectExpression expression);
+	
+	public R visitCapturedLocalVariable(C context, CapturedLocalVariableExpression expression);
+	
+	public R visitCapturedParameter(C context, CapturedParameterExpression expression);
+	
+	public R visitCapturedThis(C context, CapturedThisExpression expression);
+	
+	public R visitCast(C context, CastExpression expression);
+	
+	public R visitCheckNull(C context, CheckNullExpression expression);
+	
+	public R visitCoalesce(C context, CoalesceExpression expression);
+	
+	public R visitConditional(C context, ConditionalExpression expression);
+	
+	public R visitConst(C context, ConstExpression expression);
+	
+	public R visitConstantBool(C context, ConstantBoolExpression expression);
+	
+	public R visitConstantByte(C context, ConstantByteExpression expression);
+	
+	public R visitConstantChar(C context, ConstantCharExpression expression);
+	
+	public R visitConstantDouble(C context, ConstantDoubleExpression expression);
+	
+	public R visitConstantFloat(C context, ConstantFloatExpression expression);
+	
+	public R visitConstantInt(C context, ConstantIntExpression expression);
+	
+	public R visitConstantLong(C context, ConstantLongExpression expression);
+	
+	public R visitConstantSByte(C context, ConstantSByteExpression expression);
+	
+	public R visitConstantShort(C context, ConstantShortExpression expression);
+	
+	public R visitConstantString(C context, ConstantStringExpression expression);
+	
+	public R visitConstantUInt(C context, ConstantUIntExpression expression);
+	
+	public R visitConstantULong(C context, ConstantULongExpression expression);
+	
+	public R visitConstantUShort(C context, ConstantUShortExpression expression);
+	
+	public R visitConstantUSize(C context, ConstantUSizeExpression expression);
+	
+	public R visitConstructorThisCall(C context, ConstructorThisCallExpression expression);
+	
+	public R visitConstructorSuperCall(C context, ConstructorSuperCallExpression expression);
+	
+	public R visitEnumConstant(C context, EnumConstantExpression expression);
+	
+	public R visitFunction(C context, FunctionExpression expression);
+	
+	public R visitGetField(C context, GetFieldExpression expression);
+	
+	public R visitGetFunctionParameter(C context, GetFunctionParameterExpression expression);
+	
+	public R visitGetLocalVariable(C context, GetLocalVariableExpression expression);
+	
+	public R visitGetMatchingVariantField(C context, GetMatchingVariantField expression);
+	
+	public R visitGetStaticField(C context, GetStaticFieldExpression expression);
+	
+	public R visitGetter(C context, GetterExpression expression);
+	
+	public R visitGlobal(C context, GlobalExpression expression);
+	
+	public R visitGlobalCall(C context, GlobalCallExpression expression);
+	
+	public R visitInterfaceCast(C context, InterfaceCastExpression expression);
+	
+	public R visitIs(C context, IsExpression expression);
+	
+	public R visitMakeConst(C context, MakeConstExpression expression);
+	
+	public R visitMap(C context, MapExpression expression);
+	
+	public R visitMatch(C context, MatchExpression expression);
+	
+	public R visitNew(C context, NewExpression expression);
+	
+	public R visitNull(C context, NullExpression expression);
+	
+	public R visitOrOr(C context, OrOrExpression expression);
+	
+	public R visitPanic(C context, PanicExpression expression);
+	
+	public R visitPostCall(C context, PostCallExpression expression);
+	
+	public R visitRange(C context, RangeExpression expression);
+	
+	public R visitSameObject(C context, SameObjectExpression expression);
+	
+	public R visitSetField(C context, SetFieldExpression expression);
+	
+	public R visitSetFunctionParameter(C context, SetFunctionParameterExpression expression);
+	
+	public R visitSetLocalVariable(C context, SetLocalVariableExpression expression);
+	
+	public R visitSetStaticField(C context, SetStaticFieldExpression expression);
+	
+	public R visitSetter(C context, SetterExpression expression);
+	
+	public R visitStaticGetter(C context, StaticGetterExpression expression);
+	
+	public R visitStaticSetter(C context, StaticSetterExpression expression);
+	
+	public R visitSupertypeCast(C context, SupertypeCastExpression expression);
+	
+	public R visitThis(C context, ThisExpression expression);
+	
+	public R visitThrow(C context, ThrowExpression expression);
+	
+	public R visitTryConvert(C context, TryConvertExpression expression);
+	
+	public R visitTryRethrowAsException(C context, TryRethrowAsExceptionExpression expression);
+	
+	public R visitTryRethrowAsResult(C context, TryRethrowAsResultExpression expression);
+	
+	public R visitVariantValue(C context, VariantValueExpression expression);
+	
+	public R visitWrapOptional(C context, WrapOptionalExpression expression);
+}

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

@@ -46,6 +46,11 @@ public class FunctionExpression extends Expression {
 		return visitor.visitFunction(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitFunction(context, this);
+	}
+
 	@Override
 	public FunctionExpression transform(ExpressionTransformer transformer) {
 		Statement tBody = body.transform(transformer, ConcatMap.empty(LoopStatement.class, LoopStatement.class));

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

@@ -48,6 +48,11 @@ public class GetFieldExpression extends Expression {
 		return visitor.visitGetField(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitGetField(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tTarget = target.transform(transformer);

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

@@ -39,6 +39,11 @@ public class GetFunctionParameterExpression extends Expression {
 		return visitor.visitGetFunctionParameter(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitGetFunctionParameter(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -39,6 +39,11 @@ public class GetLocalVariableExpression extends Expression {
 		return visitor.visitGetLocalVariable(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitGetLocalVariable(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -29,6 +29,11 @@ public class GetMatchingVariantField extends Expression {
 		return visitor.visitGetMatchingVariantField(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitGetMatchingVariantField(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -41,6 +41,11 @@ public class GetStaticFieldExpression extends Expression {
 		return visitor.visitGetStaticField(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitGetStaticField(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -29,6 +29,11 @@ public class GetterExpression extends Expression {
 		return visitor.visitGetter(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitGetter(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tTarget = target.transform(transformer);

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

@@ -30,6 +30,11 @@ public class GlobalCallExpression extends Expression {
 		return visitor.visitGlobalCall(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitGlobalCall(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		CallArguments tArguments = arguments.transform(transformer);

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

@@ -28,6 +28,11 @@ public class GlobalExpression extends Expression {
 		return visitor.visitGlobal(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitGlobal(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tResolution = resolution.transform(transformer);

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

@@ -27,6 +27,11 @@ public class InterfaceCastExpression extends Expression {
 		return visitor.visitInterfaceCast(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitInterfaceCast(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);

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

@@ -30,6 +30,11 @@ public class IsExpression extends Expression {
 		return visitor.visitIs(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitIs(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);

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

@@ -27,6 +27,11 @@ public class MakeConstExpression extends Expression {
 		return visitor.visitMakeConst(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitMakeConst(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);

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

@@ -33,6 +33,11 @@ public class MapExpression extends Expression {
 		return visitor.visitMap(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitMap(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression[] tKeys = Expression.transform(keys, transformer);

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

@@ -6,7 +6,6 @@
 package org.openzen.zenscript.codemodel.expression;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.expression.switchvalue.SwitchValue;
@@ -40,6 +39,11 @@ public class MatchExpression extends Expression {
 		return visitor.visitMatch(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitMatch(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);
@@ -77,14 +81,15 @@ public class MatchExpression extends Expression {
 			statements.add(new ExpressionStatement(matchCase.value.position, caseExpression));
 			if (reachable)
 				statements.add(new BreakStatement(matchCase.value.position, switchStatement));
-			SwitchCase switchCase = new SwitchCase(matchCase.key, statements);
+			SwitchCase switchCase = new SwitchCase(matchCase.key, statements.toArray(new Statement[statements.size()]));
 			switchStatement.cases.add(switchCase);
 			
 			if (matchCase.key == null)
 				hasDefault = true;
 		}
 		if (!hasDefault) {
-			switchStatement.cases.add(new SwitchCase(null, Collections.singletonList(new ExpressionStatement(position, new PanicExpression(position, BasicTypeID.VOID, new ConstantStringExpression(position, "Missing case"))))));
+			Statement defaultCase = new ExpressionStatement(position, new PanicExpression(position, BasicTypeID.VOID, new ConstantStringExpression(position, "Missing case")));
+			switchStatement.cases.add(new SwitchCase(null, new Statement[] { defaultCase }));
 		}
 		return new SwitchedMatch(result, switchStatement);
 	}

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

@@ -48,6 +48,11 @@ public class NewExpression extends Expression {
 		return visitor.visitNew(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitNew(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		CallArguments tArguments = arguments.transform(transformer);

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

@@ -28,6 +28,11 @@ public class NullExpression extends Expression {
 		return visitor.visitNull(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitNull(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -29,6 +29,11 @@ public class OrOrExpression extends Expression {
 		return visitor.visitOrOr(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitOrOr(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tLeft = left.transform(transformer);

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

@@ -32,6 +32,11 @@ public class PanicExpression extends Expression {
 		return visitor.visitPanic(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitPanic(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return new PanicExpression(position, type, transformer.transform(value));

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

@@ -37,6 +37,11 @@ public class PostCallExpression extends Expression {
 		return visitor.visitPostCall(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitPostCall(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tTarget = target.transform(transformer);

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

@@ -7,7 +7,6 @@ package org.openzen.zenscript.codemodel.expression;
 
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
-import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.RangeTypeID;
 
@@ -38,6 +37,11 @@ public class RangeExpression extends Expression {
 		return visitor.visitRange(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitRange(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tFrom = from.transform(transformer);

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

@@ -31,6 +31,11 @@ public class SameObjectExpression extends Expression {
 		return visitor.visitSameObject(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitSameObject(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tLeft = left.transform(transformer);

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

@@ -34,6 +34,11 @@ public class SetFieldExpression extends Expression {
 		return visitor.visitSetField(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitSetField(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tTarget = target.transform(transformer);

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

@@ -29,6 +29,11 @@ public class SetFunctionParameterExpression extends Expression {
 		return visitor.visitSetFunctionParameter(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitSetFunctionParameter(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);

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

@@ -29,6 +29,11 @@ public class SetLocalVariableExpression extends Expression {
 		return visitor.visitSetLocalVariable(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitSetLocalVariable(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);

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

@@ -29,6 +29,11 @@ public class SetStaticFieldExpression extends Expression {
 		return visitor.visitSetStaticField(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitSetStaticField(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);

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

@@ -31,6 +31,11 @@ public class SetterExpression extends Expression {
 		return visitor.visitSetter(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitSetter(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tTarget = target.transform(transformer);

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

@@ -27,6 +27,11 @@ public class StaticGetterExpression extends Expression {
 		return visitor.visitStaticGetter(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitStaticGetter(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -29,6 +29,11 @@ public class StaticSetterExpression extends Expression {
 		return visitor.visitStaticSetter(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitStaticSetter(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);

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

@@ -28,6 +28,11 @@ public class SupertypeCastExpression extends Expression {
 		return visitor.visitSupertypeCast(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitSupertypeCast(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);

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

@@ -31,6 +31,11 @@ public class ThisExpression extends Expression {
 		return visitor.visitThis(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitThis(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

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

@@ -32,6 +32,11 @@ public class ThrowExpression extends Expression {
 		return visitor.visitThrow(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitThrow(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = transformer.transform(value);

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

@@ -27,6 +27,11 @@ public class TryConvertExpression extends Expression {
 		return visitor.visitTryConvert(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitTryConvert(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);

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

@@ -27,6 +27,11 @@ public class TryRethrowAsExceptionExpression extends Expression {
 		return visitor.visitTryRethrowAsException(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitTryRethrowAsException(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);

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

@@ -27,6 +27,11 @@ public class TryRethrowAsResultExpression extends Expression {
 		return visitor.visitTryRethrowAsResult(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitTryRethrowAsResult(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);

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

@@ -47,6 +47,11 @@ public class VariantValueExpression extends Expression {
 		return visitor.visitVariantValue(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitVariantValue(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression[] tArguments = Expression.transform(arguments, transformer);

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

@@ -30,6 +30,11 @@ public class WrapOptionalExpression extends Expression {
 		return visitor.visitWrapOptional(this);
 	}
 
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitWrapOptional(context, this);
+	}
+
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = value.transform(transformer);