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

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.formatter;
 
+import org.openzen.zencode.shared.StringExpansion;
 import org.openzen.zenscript.formattershared.ExpressionString;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.expression.AndAndExpression;
@@ -75,7 +76,6 @@ import org.openzen.zenscript.codemodel.expression.TryRethrowAsExceptionExpressio
 import org.openzen.zenscript.codemodel.expression.TryRethrowAsResultExpression;
 import org.openzen.zenscript.codemodel.expression.VariantValueExpression;
 import org.openzen.zenscript.codemodel.expression.WrapOptionalExpression;
-import org.openzen.zenscript.shared.StringUtils;
 
 /**
  *
@@ -348,7 +348,7 @@ public class ExpressionFormatter implements ExpressionVisitor<ExpressionString>
 	@Override
 	public ExpressionString visitConstantChar(ConstantCharExpression expression) {
 		return new ExpressionString(
-				StringUtils.escape(Character.toString(expression.value), '\'', true),
+				StringExpansion.escape(Character.toString(expression.value), '\'', true),
 				ZenScriptOperator.PRIMARY);
 	}
 
@@ -384,7 +384,7 @@ public class ExpressionFormatter implements ExpressionVisitor<ExpressionString>
 
 	@Override
 	public ExpressionString visitConstantString(ConstantStringExpression expression) {
-		return new ExpressionString(StringUtils.escape(
+		return new ExpressionString(StringExpansion.escape(
 				expression.value,
 				settings.useSingleQuotesForStrings ? '\'' : '"',
 				true), ZenScriptOperator.CAST);

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

@@ -5,13 +5,13 @@
  */
 package org.openzen.zenscript.formatter;
 
+import org.openzen.zencode.shared.StringExpansion;
 import org.openzen.zenscript.codemodel.expression.switchvalue.CharSwitchValue;
 import org.openzen.zenscript.codemodel.expression.switchvalue.EnumConstantSwitchValue;
 import org.openzen.zenscript.codemodel.expression.switchvalue.IntSwitchValue;
 import org.openzen.zenscript.codemodel.expression.switchvalue.StringSwitchValue;
 import org.openzen.zenscript.codemodel.expression.switchvalue.SwitchValueVisitor;
 import org.openzen.zenscript.codemodel.expression.switchvalue.VariantOptionSwitchValue;
-import org.openzen.zenscript.shared.StringUtils;
 
 /**
  *
@@ -31,12 +31,12 @@ public class SwitchValueFormatter implements SwitchValueVisitor<String> {
 
 	@Override
 	public String acceptChar(CharSwitchValue value) {
-		return StringUtils.escape(new String(new char[] { value.value }), '\'', true);
+		return StringExpansion.escape(new String(new char[] { value.value }), '\'', true);
 	}
 
 	@Override
 	public String acceptString(StringSwitchValue value) {
-		return StringUtils.escape(value.value, settings.useSingleQuotesForStrings ? '\'' : '"', true);
+		return StringExpansion.escape(value.value, settings.useSingleQuotesForStrings ? '\'' : '"', true);
 	}
 
 	@Override

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

@@ -23,7 +23,7 @@ import org.openzen.zenscript.codemodel.type.ITypeVisitor;
 import org.openzen.zenscript.codemodel.type.IteratorTypeID;
 import org.openzen.zenscript.codemodel.type.OptionalTypeID;
 import org.openzen.zenscript.codemodel.type.RangeTypeID;
-import org.openzen.zenscript.shared.StringUtils;
+import stdlib.Chars;
 
 /**
  *
@@ -49,7 +49,7 @@ public class TypeFormatter implements ITypeVisitor<String>, GenericParameterBoun
 		if (array.dimension == 1) {
 			return element + "[]";
 		} else {
-			return element + "[" + StringUtils.times(',', array.dimension - 1) + "]";
+			return element + "[" + Chars.times(',', array.dimension - 1) + "]";
 		}
 	}
 

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

@@ -5,7 +5,7 @@
  */
 package org.openzen.zenscript.formattershared;
 
-import org.openzen.zenscript.shared.StringUtils;
+import stdlib.Chars;
 
 /**
  *
@@ -25,7 +25,7 @@ public class FormattingSettings {
 		if (useTabs) {
 			indent = "\t";
 		} else {
-			indent = StringUtils.times(' ', spacesPerTab);
+			indent = Chars.times(' ', spacesPerTab);
 		}
 	}
 	

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

@@ -205,13 +205,30 @@ public class StatementFormatter implements StatementVisitor<Void>, StatementForm
 		if (!lineAfter.isEmpty())
 			output.append('\n').append(indent).append(lineAfter);
 	}
+	
+	@Override
+	public void writeInner(String lineBefore, String[] inlineContents, Statement contents, LoopStatement loop, String lineAfter) {
+		output.append('\n').append(indent).append(lineBefore);
+		StatementFormatter innerFormatter = new StatementFormatter(output, settings, formatter.forLoop(loop), indent + settings.indent, loop == null ? innerLoop : loop);
+		for (String inline : inlineContents)
+			output.append('\n').append(indent).append(settings.indent).append(inline);
+		if (contents instanceof BlockStatement) {
+			for (Statement statement : ((BlockStatement) contents).statements)
+				statement.accept(innerFormatter);
+		} else {
+			contents.accept(innerFormatter);
+		}
+		
+		if (!lineAfter.isEmpty())
+			output.append('\n').append(indent).append(lineAfter);
+	}
 
 	@Override
 	public void writeInnerMulti(String lineBefore, List<StatementFormattingSubBlock> contents, LoopStatement loop, String lineAfter) {
 		output.append('\n').append(indent).append(lineBefore);
 		
 		String newIndent = indent + settings.indent + settings.indent;
-		StatementFormatter inner = new StatementFormatter(output, settings, formatter, newIndent, innerLoop);
+		StatementFormatter inner = new StatementFormatter(output, settings, formatter.forLoop(loop), newIndent, innerLoop);
 		
 		for (StatementFormattingSubBlock subBlock : contents) {
 			output.append('\n').append(indent).append(settings.indent).append(subBlock.header);
@@ -278,6 +295,8 @@ public class StatementFormatter implements StatementVisitor<Void>, StatementForm
 	}
 	
 	public interface Formatter {
+		public Formatter forLoop(LoopStatement statement);
+		
 		public void formatBlock(StatementFormattingTarget target, BlockStatement statement);
 	
 		public void formatBreak(StatementFormattingTarget target, BreakStatement statement);

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

@@ -23,6 +23,8 @@ public interface StatementFormattingTarget {
 	
 	void writeInner(String lineBefore, Statement contents, LoopStatement loop, String lineAfter);
 	
+	void writeInner(String lineBefore, String[] inlineContents, Statement contents, LoopStatement loop, String lineAfter);
+	
 	void writeInnerMulti(String lineBefore, List<StatementFormattingSubBlock> contents, LoopStatement loop, String lineAfter);
 	
 	void writeBlock(String lineBefore, BlockStatement contents, String lineAfter);

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

@@ -29,6 +29,9 @@ public class FunctionHeader {
 	public final FunctionParameter[] parameters;
 	public final ITypeID thrownType;
 	
+	public final int minParameters;
+	public final int maxParameters;
+	
 	public FunctionHeader(ITypeID returnType) {
 		if (returnType == null)
 			throw new NullPointerException();
@@ -37,6 +40,9 @@ public class FunctionHeader {
 		this.returnType = returnType;
 		this.parameters = NO_PARAMETERS;
 		this.thrownType = null;
+		
+		minParameters = 0;
+		maxParameters = 0;
 	}
 	
 	public FunctionHeader(ITypeID returnType, ITypeID... parameterTypes) {
@@ -50,6 +56,9 @@ public class FunctionHeader {
 		
 		for (int i = 0; i < parameterTypes.length; i++)
 			parameters[i] = new FunctionParameter(parameterTypes[i], null);
+		
+		minParameters = parameterTypes.length;
+		maxParameters = parameterTypes.length;
 	}
 	
 	public FunctionHeader(ITypeID returnType, FunctionParameter... parameters) {
@@ -60,6 +69,9 @@ public class FunctionHeader {
 		this.returnType = returnType;
 		this.parameters = parameters;
 		this.thrownType = null;
+		
+		minParameters = getMinParameters(parameters);
+		maxParameters = getMaxParameters(parameters);
 	}
 	
 	public FunctionHeader(TypeParameter[] genericParameters, ITypeID returnType, ITypeID thrownType, FunctionParameter... parameters) {
@@ -70,12 +82,41 @@ public class FunctionHeader {
 		this.returnType = returnType;
 		this.parameters = parameters;
 		this.thrownType = thrownType;
+		
+		minParameters = getMinParameters(parameters);
+		maxParameters = getMaxParameters(parameters);
 	}
 	
 	public int getNumberOfTypeParameters() {
 		return typeParameters == null ? 0 : typeParameters.length;
 	}
 	
+	public boolean matchesExactly(CallArguments arguments, TypeScope scope) {
+		if (arguments.arguments.length < minParameters || arguments.arguments.length > maxParameters)
+			return false;
+		
+		FunctionHeader header = fillGenericArguments(scope.getTypeRegistry(), arguments.typeArguments);
+		for (int i = 0; i < header.parameters.length; i++) {
+			if (arguments.arguments[i].type != header.parameters[i].type)
+				return false;
+		}
+		
+		return true;
+	}
+	
+	public boolean matchesImplicitly(CallArguments arguments, TypeScope scope) {
+		if (arguments.arguments.length < minParameters || arguments.arguments.length > maxParameters)
+			return false;
+		
+		FunctionHeader header = fillGenericArguments(scope.getTypeRegistry(), arguments.typeArguments);
+		for (int i = 0; i < header.parameters.length; i++) {
+			if (!scope.getTypeMembers(arguments.arguments[i].type).canCastImplicit(header.parameters[i].type))
+				return false;
+		}
+		
+		return true;
+	}
+	
 	public String getCanonical() {
 		StringBuilder result = new StringBuilder();
 		if (getNumberOfTypeParameters() > 0) {
@@ -304,4 +345,19 @@ public class FunctionHeader {
 		result.append(")");
 		return result.toString();
 	}
+
+	private static int getMinParameters(FunctionParameter[] parameters) {
+		for (int i = 0; i < parameters.length; i++)
+			if (parameters[i].defaultValue != null || parameters[i].variadic)
+				return i;
+		
+		return parameters.length;
+	}
+	
+	private static int getMaxParameters(FunctionParameter[] parameters) {
+		if (parameters.length == 0)
+			return 0;
+		
+		return parameters[parameters.length - 1].variadic ? Integer.MAX_VALUE : parameters.length;
+	}
 }

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

@@ -7,9 +7,9 @@ package org.openzen.zenscript.codemodel;
 
 import org.openzen.zenscript.codemodel.annotations.Annotation;
 import java.util.Objects;
+import org.openzen.zencode.shared.Taggable;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.Taggable;
 
 /**
  *

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

@@ -7,6 +7,8 @@ package org.openzen.zenscript.codemodel;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.Taggable;
 import org.openzen.zenscript.codemodel.annotations.DefinitionAnnotation;
 import org.openzen.zenscript.codemodel.definition.DefinitionVisitor;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
@@ -15,8 +17,6 @@ import org.openzen.zenscript.codemodel.member.ConstructorMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
-import org.openzen.zenscript.shared.Taggable;
 
 /**
  *

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

@@ -6,8 +6,8 @@
 package org.openzen.zenscript.codemodel;
 
 import java.util.List;
+import org.openzen.zencode.shared.Taggable;
 import org.openzen.zenscript.codemodel.statement.Statement;
-import org.openzen.zenscript.shared.Taggable;
 
 /**
  *

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

@@ -7,7 +7,7 @@ package org.openzen.zenscript.codemodel;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.openzen.zenscript.shared.StringUtils;
+import stdlib.Strings;
 
 /**
  *
@@ -20,7 +20,7 @@ public class WhitespaceInfo {
 			if (c == '\n')
 				numNewLines++;
 		
-		List<String> split = StringUtils.split(whitespaceBefore, '\n');
+		String[] split = Strings.split(whitespaceBefore, '\n');
 		List<String> commentsBefore = new ArrayList<>();
 		for (String splitLine : split) {
 			String trimmed = splitLine.trim();

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

@@ -7,7 +7,7 @@ package org.openzen.zenscript.codemodel;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.openzen.zenscript.shared.StringUtils;
+import stdlib.Strings;
 
 /**
  *
@@ -16,7 +16,7 @@ import org.openzen.zenscript.shared.StringUtils;
 public class WhitespacePostComment {
 	public static WhitespacePostComment fromWhitespace(String whitespace) {
 		List<String> comments = new ArrayList<>();
-		for (String line : StringUtils.split(whitespace, '\n')) {
+		for (String line : Strings.split(whitespace, '\n')) {
 			line = line.trim();
 			if (line.isEmpty())
 				continue;

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.codemodel.annotations;
 
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
@@ -15,7 +16,6 @@ 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.statement.Statement;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.annotations;
 
 import java.util.Collections;
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
@@ -18,7 +19,6 @@ import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.codemodel.scope.StatementScope;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -8,6 +8,7 @@ package org.openzen.zenscript.codemodel.annotations;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
@@ -23,7 +24,6 @@ import org.openzen.zenscript.codemodel.scope.StatementScope;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GenericName;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -7,18 +7,19 @@ package org.openzen.zenscript.codemodel.annotations;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionBuilder;
+import org.openzen.zenscript.codemodel.expression.PanicExpression;
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
 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.statement.BlockStatement;
+import org.openzen.zenscript.codemodel.statement.ExpressionStatement;
 import org.openzen.zenscript.codemodel.statement.IfStatement;
 import org.openzen.zenscript.codemodel.statement.Statement;
-import org.openzen.zenscript.codemodel.statement.ThrowStatement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *
@@ -55,8 +56,8 @@ public class PreconditionForMethod implements MemberAnnotation {
 		List<Statement> statements = new ArrayList<>();
 		ExpressionBuilder expressionBuilder = new ExpressionBuilder(position, expressionScope);
 		Expression inverseCondition = expressionBuilder.not(condition);
-		Statement throwStatement = new ThrowStatement(CodePosition.BUILTIN, expressionBuilder.constructNew("stdlib.IllegalArgumentException", message));
-		statements.add(new IfStatement(CodePosition.BUILTIN, inverseCondition, throwStatement, null));
+		Statement throwStatement = new ExpressionStatement(position, new PanicExpression(position, BasicTypeID.VOID, message));
+		statements.add(new IfStatement(position, inverseCondition, throwStatement, null));
 		if (member.body instanceof BlockStatement) {
 			statements.addAll(((BlockStatement)member.body).statements);
 		} else {

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

@@ -5,9 +5,9 @@
  */
 package org.openzen.zenscript.codemodel.definition;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,9 +5,9 @@
  */
 package org.openzen.zenscript.codemodel.definition;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -7,9 +7,9 @@ package org.openzen.zenscript.codemodel.definition;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,9 +5,9 @@
  */
 package org.openzen.zenscript.codemodel.definition;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.definition;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
@@ -13,7 +14,6 @@ import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -7,9 +7,9 @@ package org.openzen.zenscript.codemodel.definition;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.definition;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -7,12 +7,12 @@ package org.openzen.zenscript.codemodel.definition;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.Taggable;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.member.ref.VariantOptionRef;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
-import org.openzen.zenscript.shared.Taggable;
 
 /**
  *

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

@@ -8,8 +8,9 @@ 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.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.CompileException;
+import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.partial.PartialPackageExpression;
@@ -17,7 +18,6 @@ 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;
 
 /**

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -6,12 +6,12 @@
 package org.openzen.zenscript.codemodel.expression;
 
 import java.util.Arrays;
+import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.CompileException;
+import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
-import org.openzen.zenscript.shared.CompileException;
-import org.openzen.zenscript.shared.CompileExceptionCode;
 
 /**
  *

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

@@ -5,10 +5,10 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,11 +5,11 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,9 +5,9 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,7 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
-import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zencode.shared.CodePosition;
 
 /**
  *

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

@@ -5,9 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
-import java.util.Map;
-import org.openzen.zenscript.codemodel.FunctionParameter;
-import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zencode.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionParameter;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.ref.CasterMemberRef;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,7 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
-import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zencode.shared.CodePosition;
 
 /**
  * Converts a value from X? to X. Throws a NullPointerException if the value is null.

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

@@ -5,7 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
-import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zencode.shared.CodePosition;
 
 /**
  *

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

@@ -5,11 +5,11 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.CompareType;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 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,

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,9 +5,9 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
 import org.openzen.zenscript.codemodel.member.ref.ConstMemberRef;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,11 +5,11 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,12 +5,11 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
-import org.openzen.zenscript.codemodel.member.ConstructorMember;
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,11 +5,11 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 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;
 
 /**
  *

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

@@ -9,6 +9,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.CompileException;
+import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
@@ -16,13 +19,10 @@ 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;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.statement.StatementTransformer;
 import org.openzen.zenscript.codemodel.type.FunctionTypeID;
-import org.openzen.zenscript.shared.CompileException;
-import org.openzen.zenscript.shared.CompileExceptionCode;
 
 /**
  *

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

@@ -7,18 +7,17 @@ package org.openzen.zenscript.codemodel.expression;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.CompileException;
+import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.OperatorType;
-import org.openzen.zenscript.codemodel.member.ConstructorMember;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
-import org.openzen.zenscript.shared.CodePosition;
-import org.openzen.zenscript.shared.CompileException;
-import org.openzen.zenscript.shared.CompileExceptionCode;
-import org.openzen.zenscript.shared.StringUtils;
+import stdlib.Strings;
 
 /**
  *
@@ -34,7 +33,7 @@ public class ExpressionBuilder {
 	}
 	
 	public Expression constructNew(String typename, Expression... arguments) {
-		List<String> nameParts = StringUtils.split(typename, '.');
+		String[] nameParts = Strings.split(typename, '.');
 		List<GenericName> name = new ArrayList<>();
 		for (String namePart : nameParts)
 			name.add(new GenericName(namePart));

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

@@ -8,14 +8,15 @@ package org.openzen.zenscript.codemodel.expression;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
+import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.ConcatMap;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.statement.ExpressionStatement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.statement.ReturnStatement;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.FunctionTypeID;
-import org.openzen.zenscript.shared.CodePosition;
-import org.openzen.zenscript.shared.ConcatMap;
 
 /**
  *
@@ -45,7 +46,7 @@ public class FunctionExpression extends Expression {
 
 	@Override
 	public FunctionExpression transform(ExpressionTransformer transformer) {
-		Statement tBody = body.transform(transformer, ConcatMap.empty());
+		Statement tBody = body.transform(transformer, ConcatMap.empty(LoopStatement.class, LoopStatement.class));
 		return tBody == body ? this : new FunctionExpression(position, (FunctionTypeID)type, closure, tBody);
 	}
 	

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

@@ -7,10 +7,10 @@ package org.openzen.zenscript.codemodel.expression;
 
 import java.util.Collections;
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.ref.FieldMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionParameter;
-import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 
 /**

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
-import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 
 /**

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

@@ -7,9 +7,9 @@ package org.openzen.zenscript.codemodel.expression;
 
 import java.util.Collections;
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.ref.FieldMemberRef;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.ref.GetterMemberRef;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,7 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
-import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zencode.shared.CodePosition;
 
 /**
  *

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

@@ -5,7 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
-import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zencode.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,9 +5,9 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -6,9 +6,9 @@
 package org.openzen.zenscript.codemodel.expression;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.expression.switchvalue.SwitchValue;
 import org.openzen.zenscript.codemodel.statement.BreakStatement;
 import org.openzen.zenscript.codemodel.statement.ExpressionStatement;
@@ -18,7 +18,6 @@ import org.openzen.zenscript.codemodel.statement.SwitchStatement;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,12 +5,11 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
-import org.openzen.zenscript.codemodel.member.ConstructorMember;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,9 +5,9 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,10 +5,10 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  * Used for post-increment and post-decrement.

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

@@ -5,9 +5,9 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.ref.FieldMemberRef;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionParameter;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.ref.FieldMemberRef;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.ref.SetterMemberRef;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.ref.GetterMemberRef;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.ref.SetterMemberRef;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  * Using to cast a class type to a base type.

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

@@ -5,9 +5,9 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -6,10 +6,10 @@
 package org.openzen.zenscript.codemodel.expression;
 
 import java.util.List;
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.member.ref.VariantOptionRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -5,12 +5,12 @@
  */
 package org.openzen.zenscript.codemodel.generic;
 
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.GenericMapper;
 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;
 
 /**
  *

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

@@ -8,10 +8,10 @@ package org.openzen.zenscript.codemodel.generic;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
-import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *

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

@@ -16,6 +16,10 @@ public interface ForeachIteratorVisitor<T> {
 	
 	T visitArrayKeyValueIterator();
 	
+	T visitAssocKeyIterator();
+	
+	T visitAssocKeyValueIterator();
+	
 	T visitStringCharacterIterator();
 	
 	T visitCustomIterator();