Fixed a large number of java source compilation bugs. (ZenCode.shared module now compiles, and so does StdLib.stdlib)

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/annotations/PreconditionForMethod.java

@@ -7,16 +7,18 @@ package org.openzen.zenscript.codemodel.annotations;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.openzen.zenscript.codemodel.expression.ConstantStringExpression;
 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 +57,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/iterator/ForeachIteratorVisitor.java

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

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

@@ -22,7 +22,7 @@ import org.openzen.zenscript.shared.CodePosition;
  */
 public class CustomIteratorMember extends DefinitionMember implements IIteratorMember {
 	private final ITypeID[] iteratorTypes;
-	private Statement content;
+	public Statement body;
 	
 	public CustomIteratorMember(CodePosition position, HighLevelDefinition definition, int modifiers, ITypeID[] iteratorTypes) {
 		super(position, definition, modifiers);
@@ -30,8 +30,8 @@ public class CustomIteratorMember extends DefinitionMember implements IIteratorM
 		this.iteratorTypes = iteratorTypes;
 	}
 	
-	public void setContent(Statement content) {
-		this.content = content;
+	public void setContent(Statement body) {
+		this.body = body;
 	}
 
 	@Override

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

@@ -19,7 +19,7 @@ import org.openzen.zenscript.shared.Taggable;
  * @author Hoofdgebruiker
  */
 public class StaticInitializerMember extends Taggable implements IDefinitionMember {
-	private final CodePosition position;
+	public final CodePosition position;
 	public Statement body;
 	public MemberAnnotation[] annotations = MemberAnnotation.NONE;
 	

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

@@ -71,6 +71,6 @@ public class AssocIterator extends Taggable implements IIteratorMember {
 
 	@Override
 	public <T> T acceptForIterator(ForeachIteratorVisitor<T> visitor) {
-		return visitor.visitArrayKeyValueIterator();
+		return visitor.visitAssocKeyValueIterator();
 	}
 }

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

@@ -69,6 +69,7 @@ public class FunctionalMemberRef implements DefinitionMemberRef {
 		return target.getKind() == FunctionalKind.OPERATOR;
 	}
 	
+	// TODO: shouldn't this be a call operator?
 	public boolean isCaller() {
 		return target.getKind() == FunctionalKind.CALLER;
 	}

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.type;
 
+import java.util.List;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 
@@ -64,6 +65,11 @@ public class ArrayTypeID implements ITypeID {
 		return false;
 	}
 
+	@Override
+	public void extractTypeParameters(List<TypeParameter> typeParameters) {
+		elementType.extractTypeParameters(typeParameters);
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 7;

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.type;
 
+import java.util.List;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 
@@ -63,6 +64,12 @@ public class AssocTypeID implements ITypeID {
 		return true;
 	}
 
+	@Override
+	public void extractTypeParameters(List<TypeParameter> typeParameters) {
+		keyType.extractTypeParameters(typeParameters);
+		valueType.extractTypeParameters(typeParameters);
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 7;

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

@@ -86,4 +86,9 @@ public enum BasicTypeID implements ITypeID {
 	public boolean hasDefaultValue() {
 		return true;
 	}
+
+	@Override
+	public void extractTypeParameters(List<TypeParameter> typeParameters) {
+		
+	}
 }

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.type;
 
+import java.util.List;
 import java.util.Objects;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
@@ -67,6 +68,16 @@ public class ConstTypeID implements ITypeID {
 		return baseType.isObjectType();
 	}
 
+	@Override
+	public boolean hasDefaultValue() {
+		return baseType.hasDefaultValue();
+	}
+
+	@Override
+	public void extractTypeParameters(List<TypeParameter> typeParameters) {
+		baseType.extractTypeParameters(typeParameters);
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 3;
@@ -93,9 +104,4 @@ public class ConstTypeID implements ITypeID {
 	public String toString() {
 		return "const " + baseType.toString();
 	}
-
-	@Override
-	public boolean hasDefaultValue() {
-		return baseType.hasDefaultValue();
-	}
 }

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

@@ -8,6 +8,7 @@ package org.openzen.zenscript.codemodel.type;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import org.openzen.zenscript.codemodel.GenericMapper;
@@ -216,6 +217,12 @@ public class DefinitionTypeID implements ITypeID {
 	public boolean hasDefaultValue() {
 		return definition.hasEmptyConstructor();
 	}
+
+	@Override
+	public void extractTypeParameters(List<TypeParameter> typeParameters) {
+		for (ITypeID type : this.typeParameters)
+			type.extractTypeParameters(typeParameters);
+	}
 	
 	private class OuterTypeEntry {
 		private final TypeParameter parameter;

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.codemodel.type;
 
 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.GenericMapper;
@@ -62,6 +63,13 @@ public class FunctionTypeID implements ITypeID {
 		return false;
 	}
 
+	@Override
+	public void extractTypeParameters(List<TypeParameter> typeParameters) {
+		header.returnType.extractTypeParameters(typeParameters);
+		for (FunctionParameter parameter : header.parameters)
+			parameter.type.extractTypeParameters(typeParameters);
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 5;

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.type;
 
+import java.util.List;
 import java.util.Objects;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
@@ -61,6 +62,12 @@ public class GenericMapTypeID implements ITypeID {
 	public boolean isObjectType() {
 		return true;
 	}
+
+	@Override
+	public void extractTypeParameters(List<TypeParameter> typeParameters) {
+		value.extractTypeParameters(typeParameters);
+		typeParameters.remove(key);
+	}
 	
 	@Override
 	public String toString() {

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.type;
 
+import java.util.List;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
@@ -68,6 +69,12 @@ public class GenericTypeID implements ITypeID {
 		return false;
 	}
 
+	@Override
+	public void extractTypeParameters(List<TypeParameter> typeParameters) {
+		if (!typeParameters.contains(parameter))
+			typeParameters.add(parameter);
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 7;

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.type;
 
+import java.util.List;
 import java.util.Map;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
@@ -64,6 +65,8 @@ public interface ITypeID {
 		return accept(new MatchingTypeVisitor(cache, targetType, mapping));
 	}
 	
+	public void extractTypeParameters(List<TypeParameter> typeParameters);
+	
 	public static class MatchingTypeVisitor implements ITypeVisitor<Boolean> {
 		private final ITypeID type;
 		private final Map<TypeParameter, ITypeID> mapping;

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.codemodel.type;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
@@ -68,6 +69,12 @@ public class IteratorTypeID implements ITypeID {
 		return false;
 	}
 
+	@Override
+	public void extractTypeParameters(List<TypeParameter> typeParameters) {
+		for (ITypeID type : iteratorTypes)
+			type.extractTypeParameters(typeParameters);
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 5;

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.type;
 
+import java.util.List;
 import java.util.Objects;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
@@ -77,6 +78,11 @@ public class OptionalTypeID implements ITypeID {
 		return true;
 	}
 
+	@Override
+	public void extractTypeParameters(List<TypeParameter> typeParameters) {
+		baseType.extractTypeParameters(typeParameters);
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 7;

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.type;
 
+import java.util.List;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 
@@ -65,6 +66,12 @@ public class RangeTypeID implements ITypeID {
 		return false;
 	}
 
+	@Override
+	public void extractTypeParameters(List<TypeParameter> typeParameters) {
+		from.extractTypeParameters(typeParameters);
+		to.extractTypeParameters(typeParameters);
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 5;

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

@@ -396,6 +396,7 @@ public enum BuiltinID {
 	GENERICMAP_GETOPTIONAL,
 	GENERICMAP_PUT,
 	GENERICMAP_CONTAINS,
+	GENERICMAP_ADDALL,
 	GENERICMAP_SIZE,
 	GENERICMAP_ISEMPTY,
 	GENERICMAP_HASHCODE,
@@ -441,5 +442,7 @@ public enum BuiltinID {
 	RANGE_FROM,
 	RANGE_TO,
 	
+	OPTIONAL_IS_NULL,
+	OPTIONAL_IS_NOT_NULL,
 	AUTOOP_NOTEQUALS
 }

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

@@ -300,48 +300,24 @@ public class DefinitionMemberGroup {
 	
 	public FunctionalMemberRef selectMethod(CodePosition position, TypeScope scope, CallArguments arguments, boolean allowNonStatic, boolean allowStatic) {
 		// try to match with exact types
-		outer: for (TypeMember<FunctionalMemberRef> method : methods) {
+		for (TypeMember<FunctionalMemberRef> method : methods) {
 			if (!(method.member.isStatic() ? allowStatic : allowNonStatic))
 				continue;
 			
 			FunctionHeader header = method.member.header;
-			if (header.parameters.length != arguments.arguments.length)
-				continue;
-			if (header.getNumberOfTypeParameters() != arguments.getNumberOfTypeArguments())
-				continue;
-			
-			if (arguments.typeArguments.length > 0) {
-				header = header.fillGenericArguments(scope.getTypeRegistry(), arguments.typeArguments);
-			}
-			
-			for (int i = 0; i < header.parameters.length; i++) {
-				if (arguments.arguments[i].type != header.parameters[i].type)
-					continue outer;
-			}
-			
-			return method.member;
+			if (header.matchesExactly(arguments, scope))
+				return method.member;
 		}
 		
 		// try to match with approximate types
 		FunctionalMemberRef selected = null;
-		outer: for (TypeMember<FunctionalMemberRef> method : methods) {
+		for (TypeMember<FunctionalMemberRef> method : methods) {
 			if (!(method.member.isStatic() ? allowStatic : allowNonStatic))
 				continue;
 			
 			FunctionHeader header = method.member.header;
-			if (header.parameters.length != arguments.arguments.length)
+			if (!header.matchesImplicitly(arguments, scope))
 				continue;
-			if (header.getNumberOfTypeParameters() != arguments.getNumberOfTypeArguments())
-				continue;
-			
-			if (arguments.typeArguments.length > 0) {
-				header = 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))
-					continue outer;
-			}
 			
 			if (selected != null) {
 				StringBuilder explanation = new StringBuilder();

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

@@ -355,6 +355,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		method(builtin, "getOptional", getOptionalHeader, GENERICMAP_GETOPTIONAL);
 		method(builtin, "put", putHeader, GENERICMAP_PUT);
 		method(builtin, "contains", containsHeader, GENERICMAP_CONTAINS);
+		method(builtin, "addAll", new FunctionHeader(VOID, map), GENERICMAP_ADDALL);
 		
 		getter(builtin, GENERICMAP_SIZE, "size", INT);
 		getter(builtin, GENERICMAP_ISEMPTY, "isEmpty", BOOL);
@@ -535,6 +536,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 	public Void visitOptional(OptionalTypeID optional) {
 		ClassDefinition builtin = new ClassDefinition(BUILTIN, null, "optional", Modifiers.EXPORT, null);
 		optional.baseType.accept(this);
+		operator(builtin, OperatorType.EQUALS, new FunctionHeader(BOOL, NULL), BuiltinID.OPTIONAL_IS_NULL);
+		operator(builtin, OperatorType.NOTEQUALS, new FunctionHeader(BOOL, NULL), BuiltinID.OPTIONAL_IS_NOT_NULL);
 		processType(builtin, optional);
 		return null;
 	}

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

@@ -87,4 +87,14 @@ public class JavaForeachVisitor implements ForeachIteratorVisitor<Void> {
     public Void visitCustomIterator() {
         return null;
     }
+
+	@Override
+	public Void visitAssocKeyIterator() {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
+
+	@Override
+	public Void visitAssocKeyValueIterator() {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
 }

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

@@ -0,0 +1,166 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.javasource;
+
+import java.util.Collections;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.member.MemberVisitor;
+import org.openzen.zenscript.codemodel.statement.BlockStatement;
+import org.openzen.zenscript.codemodel.statement.EmptyStatement;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.javasource.scope.JavaSourceFileScope;
+import org.openzen.zenscript.javasource.scope.JavaSourceStatementScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public abstract class BaseMemberCompiler implements MemberVisitor<Void> {
+	protected final String indent;
+	protected final StringBuilder output;
+	protected final JavaSourceFileScope scope;
+	protected final JavaSourceStatementScope fieldInitializerScope;
+	protected final JavaSourceFormattingSettings settings;
+	protected final ITypeID expansionTarget;
+	protected final HighLevelDefinition definition;
+	
+	private ElementType currentElementType = null;
+	
+	public BaseMemberCompiler(
+			JavaSourceFormattingSettings settings,
+			String indent,
+			StringBuilder output,
+			JavaSourceFileScope scope,
+			ITypeID expansionTarget,
+			HighLevelDefinition definition)
+	{
+		this.indent = indent;
+		this.output = output;
+		this.scope = scope;
+		this.settings = settings;
+		this.expansionTarget = expansionTarget;
+		this.definition = definition;
+		
+		fieldInitializerScope = new JavaSourceStatementScope(
+				scope,
+				settings,
+				null,
+				indent + settings.indent,
+				null,
+				null,
+				true);
+	}
+	
+	protected void begin(ElementType type) {
+		if (currentElementType != null) {
+			if (currentElementType != ElementType.FIELD || type != ElementType.FIELD)
+				output.append(indent).append('\n');
+		}
+		
+		this.currentElementType = type;
+	}
+	
+	protected void modifiers(int modifiers) {
+		if (Modifiers.isPublic(modifiers))
+			output.append("public ");
+		if (Modifiers.isProtected(modifiers))
+			output.append("protected ");
+		if (Modifiers.isPrivate(modifiers))
+			output.append("private ");
+		if (Modifiers.isStatic(modifiers))
+			output.append("static ");
+		if (Modifiers.isFinal(modifiers))
+			output.append("final ");
+	}
+	
+	protected void compileBody(Statement body, FunctionHeader header) {
+		if (body == null || body instanceof EmptyStatement) {
+			output.append(";\n");
+		} else {
+			if (!(body instanceof BlockStatement))
+				body = new BlockStatement(body.position, Collections.singletonList(body));
+			
+			JavaSourceStatementScope scope = new JavaSourceStatementScope(this.scope, settings, header, indent + settings.indent, null, null, expansionTarget != null);
+			body.accept(new JavaSourceStatementCompiler(scope, output, true, false));
+			output.append('\n');
+		}
+	}
+	
+	protected void formatParameters(boolean isStatic, FunctionHeader header) {
+		formatParameters(isStatic, null, header);
+	}
+	
+	protected void formatParameters(boolean isStatic, TypeParameter[] targetTypeParameters, FunctionHeader header) {
+		output.append("(");
+		boolean first = true;
+		if (expansionTarget != null && !isStatic) {
+			if (targetTypeParameters != null) {
+				for (TypeParameter parameter : targetTypeParameters) {
+					if (first)
+						first = false;
+					else
+						output.append(", ");
+
+					output.append("Class<").append(parameter.name).append("> typeOf").append(parameter.name);
+				}
+			}
+			if (first)
+				first = false;
+			else
+				output.append(", ");
+			
+			output.append(scope.type(expansionTarget));
+			output.append(" self");
+		}
+		if (header.typeParameters != null) {
+			for (TypeParameter typeParameter : header.typeParameters) {
+				if (first)
+					first = false;
+				else
+					output.append(", ");
+
+				output.append("Class<")
+						.append(typeParameter.name)
+						.append(">")
+						.append(" ")
+						.append("typeOf")
+						.append(typeParameter.name);
+			}
+		}
+		
+		for (int i = 0; i < header.parameters.length; i++) {
+			if (first)
+				first = false;
+			else
+				output.append(", ");
+			
+			FunctionParameter parameter = header.parameters[i];
+			output.append(scope.type(parameter.type));
+			output.append(" ").append(parameter.name);
+			if (parameter.variadic)
+				output.append("...");
+		}
+		output.append(")");
+		
+		if (header.thrownType != null) {
+			output.append(" throws ");
+			output.append(scope.type(header.thrownType));
+		}
+	}
+	
+	public enum ElementType {
+		STATICINIT,
+		FIELD,
+		CONSTRUCTOR,
+		METHOD,
+		INNERCLASS
+	}
+}

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.javasource;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.definition.AliasDefinition;
@@ -21,28 +22,57 @@ import org.openzen.zenscript.codemodel.definition.VariantDefinition;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.member.ImplementationMember;
+import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.compiler.CompileScope;
+import org.openzen.zenscript.compiler.SemanticModule;
+import org.openzen.zenscript.javasource.prepare.JavaNativeClass;
 import org.openzen.zenscript.javasource.scope.JavaSourceFileScope;
+import org.openzen.zenscript.javasource.tags.JavaSourceClass;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class JavaDefinitionVisitor implements DefinitionVisitor<Void> {
-	private final JavaSourceFileScope scope;
+	private final JavaSourceCompiler compiler;
+	private final JavaSourceClass cls;
+	private final JavaSourceFile file;
 	private final JavaSourceFormattingSettings settings;
+	private final List<ExpansionDefinition> expansions;
 	private final StringBuilder output;
+	private final Map<HighLevelDefinition, SemanticModule> modules;
 	
-	public JavaDefinitionVisitor(JavaSourceFormattingSettings settings, JavaSourceFileScope scope, StringBuilder output) {
-		this.settings = settings;
-		this.scope = scope;
+	public JavaDefinitionVisitor(
+			JavaSourceCompiler compiler,
+			JavaSourceClass cls,
+			JavaSourceFile file,
+			StringBuilder output,
+			List<ExpansionDefinition> expansions,
+			Map<HighLevelDefinition, SemanticModule> modules)
+	{
+		this.compiler = compiler;
+		this.cls = cls;
+		this.file = file;
+		this.settings = compiler.settings;
 		this.output = output;
+		this.expansions = expansions;
+		this.modules = modules;
+	}
+	
+	private JavaSourceFileScope createScope(HighLevelDefinition definition) {
+		SemanticModule module = modules.get(definition);
+		CompileScope scope = new CompileScope(definition.access, module.compilationUnit.globalTypeRegistry, module.expansions, module.annotations);
+		return new JavaSourceFileScope(file.importer, compiler.typeGenerator, compiler.helperGenerator, cls, scope, definition instanceof InterfaceDefinition);
 	}
 
 	@Override
 	public Void visitClass(ClassDefinition definition) {
+		JavaSourceFileScope scope = createScope(definition);
+		
 		convertModifiers(definition.modifiers);
 		output.append("class ").append(definition.name);
-		JavaSourceUtils.formatTypeParameters(scope, output, definition.genericParameters);
+		JavaSourceUtils.formatTypeParameters(scope.typeVisitor, output, definition.genericParameters);
 		if (definition.superType != null) {
 			output.append(" extends ");
 			output.append(scope.type(definition.superType));
@@ -67,24 +97,30 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<Void> {
 		}
 		
 		output.append(" {\n");
-		compileMembers(definition);
+		compileMembers(scope, definition);
+		compileExpansions();
 		output.append("}\n");
 		return null;
 	}
 
 	@Override
 	public Void visitInterface(InterfaceDefinition definition) {
+		JavaSourceFileScope scope = createScope(definition);
+		
 		convertModifiers(definition.modifiers | Modifiers.VIRTUAL); // to prevent 'final'
 		output.append("interface ").append(definition.name);
-		JavaSourceUtils.formatTypeParameters(scope, output, definition.genericParameters);
+		JavaSourceUtils.formatTypeParameters(scope.typeVisitor, output, definition.genericParameters);
 		output.append(" {\n");
-		compileMembers(definition);
+		compileMembers(scope, definition);
+		compileExpansions();
 		output.append("}\n");
 		return null;
 	}
 
 	@Override
 	public Void visitEnum(EnumDefinition definition) {
+		JavaSourceFileScope scope = createScope(definition);
+		
 		convertModifiers(definition.modifiers | Modifiers.VIRTUAL); // to prevent 'final'
 		output.append("enum ").append(definition.name);
 		
@@ -104,28 +140,34 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<Void> {
 		
 		if (definition.members.size() > 0) {
 			output.append(";\n");
-			compileMembers(definition);
+			compileMembers(scope, definition);
 		} else {
 			output.append("\n");
 		}
 		
+		compileExpansions();
 		output.append("}\n");
 		return null;
 	}
 
 	@Override
 	public Void visitStruct(StructDefinition definition) {
+		JavaSourceFileScope scope = createScope(definition);
+		
 		convertModifiers(definition.modifiers | Modifiers.FINAL);
 		output.append("class ").append(definition.name);
-		JavaSourceUtils.formatTypeParameters(scope, output, definition.genericParameters);
+		JavaSourceUtils.formatTypeParameters(scope.typeVisitor, output, definition.genericParameters);
 		output.append(" {\n");
-		compileMembers(definition);
+		compileMembers(scope, definition);
+		compileExpansions();
 		output.append("}\n");
 		return null;
 	}
 
 	@Override
 	public Void visitFunction(FunctionDefinition definition) {
+		JavaSourceFileScope scope = createScope(definition);
+		
 		convertModifiers(definition.modifiers | Modifiers.STATIC);
 		
 		return null;
@@ -133,17 +175,20 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<Void> {
 
 	@Override
 	public Void visitExpansion(ExpansionDefinition definition) {
+		JavaSourceFileScope scope = createScope(definition);
+		
 		convertModifiers(definition.modifiers);
 		output.append("class ");
-		output.append(scope.className);
+		output.append(cls.name);
 		output.append(" {\n");
-		output.append(settings.indent).append("private ").append(scope.className).append("() {}\n");
+		output.append(settings.indent).append("private ").append(cls.name).append("() {}\n");
 		
-		JavaExpansionMemberCompiler memberCompiler = new JavaExpansionMemberCompiler(settings, definition.target, "\t", output, scope);
+		JavaExpansionMemberCompiler memberCompiler = new JavaExpansionMemberCompiler(settings, definition.target, definition.genericParameters, "\t", output, scope, definition);
 		for (IDefinitionMember member : definition.members)
 			member.accept(memberCompiler);
 		memberCompiler.finish();
 		
+		compileExpansions();
 		output.append("}");
 		return null;
 	}
@@ -155,11 +200,13 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<Void> {
 
 	@Override
 	public Void visitVariant(VariantDefinition variant) {
+		JavaSourceFileScope scope = createScope(variant);
+		
 		convertModifiers(variant.modifiers | Modifiers.VIRTUAL | Modifiers.ABSTRACT);
 		output.append("class ").append(variant.name);
-		JavaSourceUtils.formatTypeParameters(scope, output, variant.genericParameters);
+		JavaSourceUtils.formatTypeParameters(scope.typeVisitor, output, variant.genericParameters);
 		output.append("{\n");
-		compileMembers(variant);
+		compileMembers(scope, variant);
 		output.append(settings.indent).append("public abstract Discriminant getDiscriminant();\n");
 		
 		output.append(settings.indent).append("\n");
@@ -172,7 +219,7 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<Void> {
 		for (VariantDefinition.Option option : variant.options) {
 			output.append(settings.indent).append("\n");
 			output.append(settings.indent).append("public static class ").append(option.name);
-			JavaSourceUtils.formatTypeParameters(scope, output, variant.genericParameters);
+			JavaSourceUtils.formatTypeParameters(scope.typeVisitor, output, variant.genericParameters);
 			output.append(" extends ");
 			output.append(variant.name);
 			if (variant.genericParameters != null && variant.genericParameters.length > 0) {
@@ -216,10 +263,21 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<Void> {
 			output.append(settings.indent).append("}\n");
 		}
 		
+		compileExpansions();
 		output.append("}\n");
 		return null;
 	}
 	
+	private void compileExpansions() {
+		for (ExpansionDefinition definition : expansions) {
+			JavaSourceFileScope scope = createScope(definition);
+			JavaExpansionMemberCompiler memberCompiler = new JavaExpansionMemberCompiler(settings, definition.target, definition.genericParameters, "\t", output, scope, definition);
+			for (IDefinitionMember member : definition.members)
+				member.accept(memberCompiler);
+			memberCompiler.finish();
+		}
+	}
+	
 	private void convertModifiers(int modifiers) {
 		if (Modifiers.isExport(modifiers) || Modifiers.isPublic(modifiers))
 			output.append("public ");
@@ -239,10 +297,22 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<Void> {
 		return true; // TODO: check merging conflicts
 	}
 	
-	private void compileMembers(HighLevelDefinition definition) {
-		JavaMemberCompiler memberCompiler = new JavaMemberCompiler(settings, "\t", output, scope, false, scope.isInterface);
-		for (IDefinitionMember member : definition.members)
-			member.accept(memberCompiler);
-		memberCompiler.finish();
+	private void compileMembers(JavaSourceFileScope scope, HighLevelDefinition definition) {
+		if (definition.hasTag(JavaNativeClass.class)) {
+			ITypeID[] typeParameters = new ITypeID[definition.getNumberOfGenericParameters()];
+			for (int i = 0; i < typeParameters.length; i++)
+				typeParameters[i] = scope.semanticScope.getTypeRegistry().getGeneric(definition.genericParameters[i]);
+			ITypeID targetType = new DefinitionTypeID(definition, typeParameters);
+			
+			JavaExpansionMemberCompiler memberCompiler = new JavaExpansionMemberCompiler(settings, targetType, definition.genericParameters, "\t", output, scope, definition);
+			for (IDefinitionMember member : definition.members)
+				member.accept(memberCompiler);
+			memberCompiler.finish();
+		} else {
+			JavaMemberCompiler memberCompiler = new JavaMemberCompiler(settings, "\t", output, scope, scope.isInterface, definition);
+			for (IDefinitionMember member : definition.members)
+				member.accept(memberCompiler);
+			memberCompiler.finish();
+		}
 	}
 }

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

@@ -6,77 +6,81 @@
 package org.openzen.zenscript.javasource;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
-import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.codemodel.member.ConstMember;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
 import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.member.DefinitionMember;
 import org.openzen.zenscript.codemodel.member.DestructorMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.ImplementationMember;
 import org.openzen.zenscript.codemodel.member.InnerDefinitionMember;
-import org.openzen.zenscript.codemodel.member.MemberVisitor;
 import org.openzen.zenscript.codemodel.member.MethodMember;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.member.StaticInitializerMember;
-import org.openzen.zenscript.codemodel.statement.BlockStatement;
-import org.openzen.zenscript.codemodel.statement.EmptyStatement;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.javasource.scope.JavaSourceFileScope;
-import org.openzen.zenscript.javasource.scope.JavaSourceStatementScope;
-import org.openzen.zenscript.shared.StringUtils;
+import org.openzen.zenscript.javasource.tags.JavaSourceMethod;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class JavaExpansionMemberCompiler implements MemberVisitor<Void> {
-	private final String indent;
-	private final StringBuilder output;
-	private final JavaSourceFileScope scope;
-	private final JavaSourceStatementScope fieldInitializerScope;
-	private final JavaSourceFormattingSettings settings;
+public class JavaExpansionMemberCompiler extends BaseMemberCompiler {
 	private final List<FieldMember> fields = new ArrayList<>();
-	private final ITypeID targetType;
-	private boolean first = true;
+	private final TypeParameter[] expansionTypeParameters;
 	
-	public JavaExpansionMemberCompiler(JavaSourceFormattingSettings settings, ITypeID targetType, String indent, StringBuilder output, JavaSourceFileScope scope) {
-		this.indent = indent;
-		this.output = output;
-		this.scope = scope;
-		this.settings = settings;
-		this.targetType = targetType;
+	public JavaExpansionMemberCompiler(
+			JavaSourceFormattingSettings settings,
+			ITypeID targetType,
+			TypeParameter[] expansionTypeParameters,
+			String indent,
+			StringBuilder output,
+			JavaSourceFileScope scope,
+			HighLevelDefinition definition)
+	{
+		super(settings, indent, output, scope, targetType, definition);
 		
-		fieldInitializerScope = new JavaSourceStatementScope(
-				scope,
-				settings,
-				null,
-				indent + settings.indent,
-				null,
-				null,
-				true);
+		this.expansionTypeParameters = expansionTypeParameters;
 	}
 	
-	private void addSpacing() {
-		if (first)
-			first = false;
+	private void compileMethod(DefinitionMember member, FunctionHeader header, Statement body) {
+		JavaSourceMethod method = member.getTag(JavaSourceMethod.class);
+		if (method == null)
+			throw new AssertionError();
+		if (!method.compile)
+			return;
+		
+		begin(ElementType.METHOD);
+		output.append(indent);
+		
+		modifiers(member.modifiers | Modifiers.STATIC);
+		if (member.isStatic())
+			JavaSourceUtils.formatTypeParameters(scope.typeVisitor, output, header.typeParameters);
 		else
-			output.append(indent).append("\n");
+			JavaSourceUtils.formatTypeParameters(scope.typeVisitor, output, expansionTypeParameters, header.typeParameters);
+		
+		output.append(header.returnType.accept(scope.typeVisitor));
+		output.append(" ");
+		output.append(method.name);
+		formatParameters(member.isStatic(), expansionTypeParameters, header);
+		compileBody(body, header);
 	}
 	
 	@Override
 	public Void visitConst(ConstMember member) {
+		begin(ElementType.FIELD);
 		modifiers(member.modifiers | Modifiers.STATIC | Modifiers.FINAL);
 		output.append(scope.type(member.type));
 		output.append(" ");
@@ -89,8 +93,7 @@ public class JavaExpansionMemberCompiler implements MemberVisitor<Void> {
 
 	@Override
 	public Void visitField(FieldMember member) {
-		// TODO: nonstatic fields!
-		first = false;
+		begin(ElementType.FIELD);
 		
 		output.append(indent);
 		int modifiers = 0;
@@ -120,16 +123,8 @@ public class JavaExpansionMemberCompiler implements MemberVisitor<Void> {
 
 	@Override
 	public Void visitConstructor(ConstructorMember member) {
-		// TODO: constructors
-		/*addSpacing();
-		
-		output.append(indent);
-		modifiers(member.modifiers);
-		JavaSourceUtils.formatTypeParameters(importer, output, member.header.typeParameters);
-		output.append(importer.getName());
-		formatParameters(true, member.header);
-		compileBody(member.body, member.header);*/
-		throw new UnsupportedOperationException("Expansions cannot declare constructors yet");
+		compileMethod(member, member.header, member.body);
+		return null;
 	}
 
 	@Override
@@ -139,105 +134,61 @@ public class JavaExpansionMemberCompiler implements MemberVisitor<Void> {
 
 	@Override
 	public Void visitMethod(MethodMember member) {
-		addSpacing();
-		
-		output.append(indent);
-		
-		modifiers(member.modifiers | Modifiers.STATIC);
-		JavaSourceUtils.formatTypeParameters(scope, output, member.header.typeParameters);
-		output.append(scope.type(member.header.returnType));
-		output.append(" ");
-		output.append(member.name);
-		formatParameters(member.isStatic(), member.header);
-		compileBody(member.body, member.header);
+		compileMethod(member, member.header, member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitGetter(GetterMember member) {
-		addSpacing();
-		
-		output.append(indent);
-		modifiers(member.modifiers | Modifiers.STATIC);
-		output.append(scope.type(member.type));
-		output.append(" ");
-		output.append("get").append(StringUtils.capitalize(member.name));
-		output.append("()");
-		compileBody(member.body, member.header);
+		compileMethod(member, member.header, member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitSetter(SetterMember member) {
-		addSpacing();
-		
-		output.append(indent);
-		modifiers(member.modifiers | Modifiers.STATIC);
-		output.append("void set").append(StringUtils.capitalize(member.name));
-		output.append("(");
-		output.append(scope.type(member.type));
-		output.append(" ");
-		output.append("value");
-		output.append(")");
-		compileBody(member.body, member.header);
+		compileMethod(member, new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(member.type, "value")), member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitOperator(OperatorMember member) {
-		addSpacing();
-		
-		output.append(indent);
-		modifiers(member.modifiers | Modifiers.STATIC);
-		output.append(scope.type(member.header.returnType));
-		output.append(' ');
-		output.append(getOperatorName(member.operator));
-		formatParameters(member.isStatic(), member.header);
-		compileBody(member.body, member.header);
+		compileMethod(member, member.header, member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitCaster(CasterMember member) {
-		addSpacing();
-		
-		output.append(indent);
-		modifiers(member.modifiers | Modifiers.STATIC);
-		output.append(scope.type(member.toType));
-		output.append(" ");
-		output.append("to").append(member.toType.accept(new JavaSourceTypeNameVisitor()));
-		output.append("(").append(scope.type(targetType)).append(" self)");
-		compileBody(member.body, member.header);
+		compileMethod(member, member.header, member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitCustomIterator(CustomIteratorMember member) {
-		addSpacing();
-		
+		compileMethod(member, new FunctionHeader(scope.semanticScope.getTypeRegistry().getIterator(member.getLoopVariableTypes())), member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitCaller(CallerMember member) {
-		addSpacing();
-		
+		compileMethod(member, member.header, member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitImplementation(ImplementationMember member) {
+		// TODO
 		return null;
 	}
 
 	@Override
 	public Void visitInnerDefinition(InnerDefinitionMember member) {
+		// TODO
 		return null;
 	}
 
 	@Override
 	public Void visitStaticInitializer(StaticInitializerMember member) {
-		addSpacing();
+		begin(ElementType.STATICINIT);
 		output.append(indent).append("static ");
 		compileBody(member.body, new FunctionHeader(BasicTypeID.VOID));
 		return null;
@@ -252,152 +203,4 @@ public class JavaExpansionMemberCompiler implements MemberVisitor<Void> {
 				visitSetter(field.autoSetter);
 		}
 	}
-	
-	private void modifiers(int modifiers) {
-		if (Modifiers.isPublic(modifiers))
-			output.append("public ");
-		if (Modifiers.isProtected(modifiers))
-			output.append("protected ");
-		if (Modifiers.isPrivate(modifiers))
-			output.append("private ");
-		if (Modifiers.isStatic(modifiers))
-			output.append("static ");
-		if (Modifiers.isFinal(modifiers))
-			output.append("final ");
-	}
-	
-	private void compileBody(Statement body, FunctionHeader header) {
-		if (body == null) {
-			output.append(";\n");
-		} else {
-			if (!(body instanceof BlockStatement))
-				body = new BlockStatement(body.position, Collections.singletonList(body));
-			
-			JavaSourceStatementScope scope = new JavaSourceStatementScope(this.scope, settings, header, indent + settings.indent, null, null, true);
-			body.accept(new JavaSourceStatementCompiler(scope, output, true, false));
-			output.append('\n');
-		}
-	}
-	
-	private void formatParameters(boolean isStatic, FunctionHeader header) {
-		output.append("(");
-		boolean first = true;
-		if (!isStatic) {
-			first = false;
-			output.append(scope.type(targetType));
-			output.append(" self");
-		}
-		if (header.typeParameters != null) {
-			for (TypeParameter typeParameter : header.typeParameters) {
-				if (first)
-					first = false;
-				else
-					output.append(", ");
-
-				output.append("Class<")
-						.append(typeParameter.name)
-						.append(">")
-						.append(" ")
-						.append("typeOf")
-						.append(typeParameter.name);
-			}
-		}
-		
-		for (int i = 0; i < header.parameters.length; i++) {
-			if (first)
-				first = false;
-			else
-				output.append(", ");
-			
-			FunctionParameter parameter = header.parameters[i];
-			output.append(scope.type(parameter.type));
-			output.append(" ").append(parameter.name);
-			if (parameter.variadic)
-				output.append("...");
-		}
-		output.append(")");
-	}
-	
-	private String getOperatorName(OperatorType operator) {
-		switch (operator) {
-			case NEG:
-				return "negate";
-			case NOT:
-				return "invert";
-			case ADD:
-				return "add";
-			case ADDASSIGN:
-				return "addAssign";
-			case SUB:
-				return "subtract";
-			case SUBASSIGN:
-				return "subAssign";
-			case CAT:
-				return "concat";
-			case CATASSIGN:
-				return "append";
-			case MUL:
-				return "mul";
-			case MULASSIGN:
-				return "mulAssign";
-			case DIV:
-				return "div";
-			case DIVASSIGN:
-				return "divAssign";
-			case MOD:
-				return "mod";
-			case MODASSIGN:
-				return "modAssign";
-			case AND:
-				return "and";
-			case ANDASSIGN:
-				return "andAssign";
-			case OR:
-				return "or";
-			case ORASSIGN:
-				return "orAssign";
-			case XOR:
-				return "xor";
-			case XORASSIGN:
-				return "xorAssign";
-			case SHL:
-				return "shl";
-			case SHLASSIGN:
-				return "shlAssign";
-			case SHR:
-				return "shr";
-			case SHRASSIGN:
-				return "shrAssign";
-			case USHR:
-				return "ushr";
-			case USHRASSIGN:
-				return "ushrAssign";
-			case INDEXGET:
-				return "getAt";
-			case INDEXSET:
-				return "setAt";
-			case INCREMENT:
-				return "increment";
-			case DECREMENT:
-				return "decrement";
-			case CONTAINS:
-				return "contains";
-			case EQUALS:
-				return "equals";
-			case COMPARE:
-				return "compareTo";
-			case RANGE:
-				return "until";
-			case CAST:
-				return "cast";
-			case CALL:
-				return "call";
-			case MEMBERGETTER:
-				return "getMember";
-			case MEMBERSETTER:
-				return "setMember";
-			default:
-				throw new IllegalArgumentException("Invalid operator: " + operator);
-		}
-	}
 }

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

@@ -6,78 +6,88 @@
 package org.openzen.zenscript.javasource;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
-import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.codemodel.member.ConstMember;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
 import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.member.DefinitionMember;
 import org.openzen.zenscript.codemodel.member.DestructorMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.ImplementationMember;
 import org.openzen.zenscript.codemodel.member.InnerDefinitionMember;
-import org.openzen.zenscript.codemodel.member.MemberVisitor;
 import org.openzen.zenscript.codemodel.member.MethodMember;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.member.StaticInitializerMember;
-import org.openzen.zenscript.codemodel.statement.BlockStatement;
 import org.openzen.zenscript.codemodel.statement.EmptyStatement;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.javasource.scope.JavaSourceFileScope;
-import org.openzen.zenscript.javasource.scope.JavaSourceStatementScope;
 import org.openzen.zenscript.javasource.tags.JavaSourceMethod;
-import org.openzen.zenscript.shared.StringUtils;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class JavaMemberCompiler implements MemberVisitor<Void> {
-	private final String indent;
-	private final StringBuilder output;
-	private final JavaSourceFileScope scope;
-	private final JavaSourceStatementScope fieldInitializerScope;
-	private final JavaSourceFormattingSettings settings;
+public class JavaMemberCompiler extends BaseMemberCompiler {
 	private final List<FieldMember> fields = new ArrayList<>();
-	private final boolean isExpansion;
 	private final boolean isInterface;
-	private boolean first = true;
 	
-	public JavaMemberCompiler(JavaSourceFormattingSettings settings, String indent, StringBuilder output, JavaSourceFileScope scope, boolean isExpansion, boolean isInterface) {
-		this.indent = indent;
-		this.output = output;
-		this.scope = scope;
-		this.settings = settings;
-		this.isExpansion = isExpansion;
-		this.isInterface = isInterface;
+	public JavaMemberCompiler(
+			JavaSourceFormattingSettings settings,
+			String indent,
+			StringBuilder output,
+			JavaSourceFileScope scope,
+			boolean isInterface,
+			HighLevelDefinition definition)
+	{
+		super(settings, indent, output, scope, null, definition);
 		
-		fieldInitializerScope = new JavaSourceStatementScope(
-				scope,
-				settings,
-				null,
-				indent + settings.indent,
-				null,
-				null,
-				isExpansion);
+		this.isInterface = isInterface;
 	}
 	
-	private void addSpacing() {
-		if (first)
-			first = false;
+	private void compileMethod(DefinitionMember member, FunctionHeader header, Statement body) {
+		JavaSourceMethod method = member.getTag(JavaSourceMethod.class);
+		if (method == null)
+			throw new AssertionError();
+		if (!method.compile)
+			return;
+		
+		boolean hasBody = body != null && !(body instanceof EmptyStatement);
+		if (isInterface && method.name.equals("toString") && header.parameters.length == 0) {
+			hasBody = false;
+		}
+			
+		
+		begin(ElementType.METHOD);
+		output.append(indent);
+		if (isInterface && hasBody)
+			output.append("default ");
+		
+		modifiers(member.modifiers);
+		JavaSourceUtils.formatTypeParameters(scope.typeVisitor, output, header.typeParameters);
+		output.append(header.returnType.accept(scope.typeVisitor));
+		output.append(" ");
+		output.append(method.name);
+		formatParameters(member.isStatic(), header);
+		
+		if (hasBody)
+			compileBody(body, header);
 		else
-			output.append(indent).append("\n");
+			output.append(";\n");
 	}
 	
 	@Override
 	public Void visitConst(ConstMember member) {
+		begin(ElementType.FIELD);
+		
 		output.append(indent);
 		modifiers(member.modifiers | Modifiers.STATIC | Modifiers.FINAL);
 		output.append(scope.type(member.type));
@@ -91,7 +101,7 @@ public class JavaMemberCompiler implements MemberVisitor<Void> {
 
 	@Override
 	public Void visitField(FieldMember member) {
-		first = false;
+		begin(ElementType.FIELD);
 		
 		output.append(indent);
 		int modifiers = 0;
@@ -121,20 +131,20 @@ public class JavaMemberCompiler implements MemberVisitor<Void> {
 
 	@Override
 	public Void visitConstructor(ConstructorMember member) {
-		addSpacing();
+		begin(ElementType.CONSTRUCTOR);
 		
 		output.append(indent);
 		modifiers(member.modifiers);
-		JavaSourceUtils.formatTypeParameters(scope, output, member.header.typeParameters);
-		output.append(scope.className);
-		formatParameters(member.header);
+		JavaSourceUtils.formatTypeParameters(scope.typeVisitor, output, member.header.typeParameters);
+		output.append(scope.cls.name);
+		formatParameters(member.isStatic(), member.header);
 		compileBody(member.body, member.header);
 		return null;
 	}
 
 	@Override
 	public Void visitDestructor(DestructorMember member) {
-		addSpacing();
+		begin(ElementType.METHOD);
 		
 		output.append(indent).append("@Override\n");
 		output.append(indent).append("public void close()");
@@ -144,123 +154,61 @@ public class JavaMemberCompiler implements MemberVisitor<Void> {
 
 	@Override
 	public Void visitMethod(MethodMember member) {
-		addSpacing();
-		
-		
-		output.append(indent);
-		if (isInterface && member.body != null && !(member.body instanceof EmptyStatement))
-			output.append("default ");
-		
-		modifiers(member.modifiers);
-		JavaSourceUtils.formatTypeParameters(scope, output, member.header.typeParameters);
-		output.append(member.header.returnType.accept(scope.typeVisitor));
-		output.append(" ");
-		output.append(member.name);
-		formatParameters(member.header);
-		compileBody(member.body, member.header);
+		compileMethod(member, member.header, member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitGetter(GetterMember member) {
-		addSpacing();
-		
-		output.append(indent);
-		if (isInterface && member.body != null && !(member.body instanceof EmptyStatement))
-			output.append("default ");
-		
-		modifiers(member.modifiers);
-		output.append(scope.type(member.type));
-		output.append(" ");
-		output.append("get").append(StringUtils.capitalize(member.name));
-		output.append("()");
-		compileBody(member.body, member.header);
+		compileMethod(member, member.header, member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitSetter(SetterMember member) {
-		addSpacing();
-		
-		output.append(indent);
-		if (isInterface && member.body != null && !(member.body instanceof EmptyStatement))
-			output.append("default ");
-		
-		modifiers(member.modifiers);
-		output.append("void set").append(StringUtils.capitalize(member.name));
-		output.append("(");
-		output.append(scope.type(member.type));
-		output.append(" ");
-		output.append("value");
-		output.append(")");
-		compileBody(member.body, member.header);
+		compileMethod(member, new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(member.type, "value")), member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitOperator(OperatorMember member) {
-		addSpacing();
-		JavaSourceMethod method = member.getTag(JavaSourceMethod.class);
-		if (method == null)
-			throw new IllegalStateException("Missing method tag!");
-		
-		output.append(indent);
-		if (isInterface && member.body != null && !(member.body instanceof EmptyStatement))
-			output.append("default ");
-		
-		modifiers(member.modifiers);
-		output.append(scope.type(member.header.returnType));
-		output.append(' ');
-		output.append(method.name);
-		formatParameters(member.header);
-		compileBody(member.body, member.header);
+		compileMethod(member, member.header, member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitCaster(CasterMember member) {
-		addSpacing();
-		
-		output.append(indent);
-		if (isInterface && member.body != null && !(member.body instanceof EmptyStatement))
-			output.append("default ");
-		
-		modifiers(member.modifiers);
-		output.append(scope.type(member.toType));
-		output.append(" ");
-		output.append("to").append(member.toType.accept(new JavaSourceTypeNameVisitor()));
-		output.append("()");
-		compileBody(member.body, member.header);
+		compileMethod(member, new FunctionHeader(member.toType), member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitCustomIterator(CustomIteratorMember member) {
-		addSpacing();
-		
+		compileMethod(member, new FunctionHeader(scope.semanticScope.getTypeRegistry().getIterator(member.getLoopVariableTypes())), member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitCaller(CallerMember member) {
-		addSpacing();
-		
+		compileMethod(member, member.header, member.body);
 		return null;
 	}
 
 	@Override
 	public Void visitImplementation(ImplementationMember member) {
+		// TODO
 		return null;
 	}
 
 	@Override
 	public Void visitInnerDefinition(InnerDefinitionMember member) {
+		// TODO
 		return null;
 	}
 
 	@Override
 	public Void visitStaticInitializer(StaticInitializerMember member) {
-		addSpacing();
+		begin(ElementType.STATICINIT);
 		output.append(indent).append("static");
 		compileBody(member.body, new FunctionHeader(BasicTypeID.VOID));
 		return null;
@@ -275,64 +223,4 @@ public class JavaMemberCompiler implements MemberVisitor<Void> {
 				visitSetter(field.autoSetter);
 		}
 	}
-	
-	private void modifiers(int modifiers) {
-		if (Modifiers.isPublic(modifiers))
-			output.append("public ");
-		if (Modifiers.isProtected(modifiers))
-			output.append("protected ");
-		if (Modifiers.isPrivate(modifiers))
-			output.append("private ");
-		if (Modifiers.isStatic(modifiers))
-			output.append("static ");
-		if (Modifiers.isFinal(modifiers))
-			output.append("final ");
-	}
-	
-	private void compileBody(Statement body, FunctionHeader header) {
-		if (body == null || body instanceof EmptyStatement) {
-			output.append(";\n");
-		} else {
-			if (!(body instanceof BlockStatement))
-				body = new BlockStatement(body.position, Collections.singletonList(body));
-			
-			JavaSourceStatementScope scope = new JavaSourceStatementScope(this.scope, settings, header, indent + settings.indent, null, null, isExpansion);
-			body.accept(new JavaSourceStatementCompiler(scope, output, true, false));
-			output.append('\n');
-		}
-	}
-	
-	private void formatParameters(FunctionHeader header) {
-		output.append("(");
-		boolean first = true;
-		if (header.typeParameters != null) {
-			for (TypeParameter typeParameter : header.typeParameters) {
-				if (first)
-					first = false;
-				else
-					output.append(", ");
-
-				output.append("Class<")
-						.append(typeParameter.name)
-						.append(">")
-						.append(" ")
-						.append("typeOf")
-						.append(typeParameter.name);
-			}
-		}
-		
-		for (int i = 0; i < header.parameters.length; i++) {
-			if (first)
-				first = false;
-			else
-				output.append(", ");
-			
-			FunctionParameter parameter = header.parameters[i];
-			output.append(scope.type(parameter.type));
-			output.append(" ").append(parameter.name);
-			if (parameter.variadic)
-				output.append("...");
-		}
-		output.append(")");
-	}
 }

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

@@ -10,11 +10,12 @@ import java.util.HashMap;
 import java.util.Map;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.ScriptBlock;
-import org.openzen.zenscript.codemodel.definition.FunctionDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.compiler.CompilationUnit;
 import org.openzen.zenscript.compiler.SemanticModule;
 import org.openzen.zenscript.compiler.ZenCodeCompiler;
+import org.openzen.zenscript.javasource.prepare.JavaSourcePrepareDefinitionVisitor;
+import org.openzen.zenscript.javasource.tags.JavaSourceClass;
 import org.openzen.zenscript.shared.SourceFile;
 
 /**
@@ -29,6 +30,8 @@ public class JavaSourceCompiler implements ZenCodeCompiler {
 	private final File directory;
 	private final Map<File, JavaSourceFile> sourceFiles = new HashMap<>();
 	
+	private final Map<String, Integer> classNameCounters = new HashMap<>();
+	
 	public JavaSourceCompiler(File directory, CompilationUnit compilationUnit) {
 		if (!directory.exists())
 			directory.mkdirs();
@@ -42,20 +45,17 @@ public class JavaSourceCompiler implements ZenCodeCompiler {
 	
 	@Override
 	public void addDefinition(HighLevelDefinition definition, SemanticModule module) {
-		File file = new File(getDirectory(definition.pkg), definition.name + ".java");
-		if (definition.name == null || definition instanceof FunctionDefinition) {
-			SourceFile source = definition.getTag(SourceFile.class);
-			if (source != null) {
-				int slash = Math.max(source.filename.lastIndexOf('/'), source.filename.lastIndexOf('\\'));
-				String filename = source.filename.substring(slash < 0 ? 0 : slash);
-				filename = filename.substring(0, filename.lastIndexOf('.'));
-				file = new File(getDirectory(definition.pkg), filename + ".java");
-			}
-		}
+		String filename = getFilename(definition);
+		JavaSourcePrepareDefinitionVisitor prepare = new JavaSourcePrepareDefinitionVisitor(filename);
+		JavaSourceClass cls = definition.accept(prepare);
+		if (cls.empty)
+			return;
 		
+		File file = new File(getDirectory(definition.pkg), cls.name + ".java");
+		System.out.println("Compiling " + definition.name + " as " + cls.fullName);
 		JavaSourceFile sourceFile = sourceFiles.get(file);
 		if (sourceFile == null)
-			sourceFiles.put(file, sourceFile = new JavaSourceFile(this, file, definition.pkg));
+			sourceFiles.put(file, sourceFile = new JavaSourceFile(this, file, cls, definition.pkg));
 		
 		sourceFile.add(definition, module);
 	}
@@ -89,4 +89,16 @@ public class JavaSourceCompiler implements ZenCodeCompiler {
 		File base = getDirectory(pkg.parent);
 		return new File(base, pkg.name.replace('.', '/'));
 	}
+	
+	private String getFilename(HighLevelDefinition definition) {
+		SourceFile source = definition.getTag(SourceFile.class);
+		if (source != null) {
+			int slash = Math.max(source.filename.lastIndexOf('/'), source.filename.lastIndexOf('\\'));
+			String filename = source.filename.substring(slash < 0 ? 0 : slash + 1);
+			filename = filename.substring(0, filename.lastIndexOf('.'));
+			return filename;
+		} else {
+			return definition.name == null ? "Expansion" : definition.name;
+		}
+	}
 }

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

@@ -80,6 +80,7 @@ import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.codemodel.type.AssocTypeID;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
@@ -100,8 +101,12 @@ import org.openzen.zenscript.shared.StringUtils;
  * @author Hoofdgebruiker
  */
 public class JavaSourceExpressionFormatter implements ExpressionVisitor<ExpressionString> {
-	private final JavaSourceStatementScope scope;
-	private final StatementFormattingTarget target;
+	private static final JavaSourceClass RESULT = new JavaSourceClass("stdlib", "Result");
+	private static final JavaSourceClass RESULT_OK = new JavaSourceClass("stdlib", "Result.Ok");
+	private static final JavaSourceClass RESULT_ERROR = new JavaSourceClass("stdlib", "Result.Error");
+	
+	public final JavaSourceStatementScope scope;
+	public final StatementFormattingTarget target;
 	
 	public JavaSourceExpressionFormatter(StatementFormattingTarget target, JavaSourceStatementScope scope) {
 		this.target = target;
@@ -168,7 +173,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 		switch (method.kind) {
 			case EXPANSION: {
 				StringBuilder output = new StringBuilder();
-				output.append(scope.sourceClass(method.cls));
+				output.append(scope.type(method.cls));
 				output.append('.');
 				output.append(method.name);
 				FormattingUtils.formatExpansionCall(output, this.target, scope, target.accept(this), arguments);
@@ -197,7 +202,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 			throw new IllegalStateException("No source method tag for " + expression.member.getCanonicalName() + "!");
 		
 		StringBuilder result = new StringBuilder();
-		result.append(scope.sourceClass(method.cls));
+		result.append(scope.type(method.cls));
 		result.append('.');
 		result.append(method.name);
 		FormattingUtils.formatCall(result, target, scope, expression.arguments);
@@ -488,11 +493,26 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 		if (expression.constructor.getBuiltin() != null)
 			return visitBuiltinConstructor(expression);
 		
-		StringBuilder result = new StringBuilder();
-		result.append("new ");
-		result.append(scope.type(expression.type));
-		FormattingUtils.formatCall(result, target, scope, expression.arguments);
-		return new ExpressionString(result.toString(), JavaOperator.PRIMARY);
+		JavaSourceMethod method = expression.constructor.getTag(JavaSourceMethod.class);
+		switch (method.kind) {
+			case EXPANSION: {
+				StringBuilder output = new StringBuilder();
+				output.append(scope.type(method.cls));
+				output.append('.');
+				output.append(method.name);
+				FormattingUtils.formatCall(output, this.target, scope, expression.arguments);
+				return new ExpressionString(output.toString(), JavaOperator.CALL);
+			}
+			case CONSTRUCTOR: {
+				StringBuilder output = new StringBuilder();
+				output.append("new ");
+				output.append(scope.type(expression.type, method.cls));
+				FormattingUtils.formatCall(output, this.target, scope, expression.arguments);
+				return new ExpressionString(output.toString(), JavaOperator.PRIMARY);
+			}
+			default:
+				throw new IllegalStateException("Invalid method call kind: " + method.kind);
+		}
 	}
 
 	@Override
@@ -559,10 +579,15 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 		JavaSourceField field = expression.field.getTag(JavaSourceField.class);
 		if (field == null)
 			throw new CompileException(expression.position, CompileExceptionCode.INTERNAL_ERROR, "Missing field tag");
-		
-		return new ExpressionString(
-				scope.type(field.cls) + "." + field.name + " = " + expression.value.accept(this).value,
-				JavaOperator.ASSIGN);
+		if (field.cls.fullName.equals(scope.fileScope.cls.fullName) && !scope.hasLocalVariable(field.name)) {
+			return new ExpressionString(
+					field.name + " = " + expression.value.accept(this).value,
+					JavaOperator.ASSIGN);
+		} else {
+			return new ExpressionString(
+					scope.type(field.cls) + "." + field.name + " = " + expression.value.accept(this).value,
+					JavaOperator.ASSIGN);
+		}
 	}
 
 	@Override
@@ -613,23 +638,33 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 
 	@Override
 	public ExpressionString visitTryRethrowAsException(TryRethrowAsExceptionExpression expression) {
+		DefinitionTypeID type = (DefinitionTypeID) expression.value.type;
+		
+		String errorType = scope.fileScope.importer.importType(RESULT_ERROR);
+		String okType = scope.fileScope.importer.importType(RESULT_OK);
+		
 		ExpressionString value = hoist(expression.value).accept(this);
-		target.writeLine("if (" + value.value + " instanceof " + scope.fileScope.importer.importType("stdlib.Result.Error") + ")");
-		target.writeLine(scope.settings.indent + "throw (" + scope.fileScope.importer.importType("stdlib.Result.Error") + ")" + value.value + ".value;");
+		target.writeLine("if (" + value.value + " instanceof " + errorType + ")");
+		target.writeLine(scope.settings.indent + "throw ((" + errorType + formatTypeArguments(type.typeParameters) + ")" + value.value + ").value;");
 		
 		return value
-				.unaryPrefix(JavaOperator.CAST, "(" + scope.fileScope.importer.importType("stdlib.Result.Ok") + ")")
+				.unaryPrefix(JavaOperator.CAST, "(" + okType + formatTypeArguments(type.typeParameters) + ")")
 				.unaryPostfix(JavaOperator.MEMBER, ".value");
 	}
 
 	@Override
 	public ExpressionString visitTryRethrowAsResult(TryRethrowAsResultExpression expression) {
+		DefinitionTypeID type = (DefinitionTypeID) expression.value.type;
+		
+		String errorType = scope.fileScope.importer.importType(RESULT_ERROR);
+		String okType = scope.fileScope.importer.importType(RESULT_OK);
+		
 		ExpressionString value = hoist(expression.value).accept(this);
-		target.writeLine("if (" + value.value + " instanceof " + scope.fileScope.importer.importType("stdlib.Result.Error") + ")");
-		target.writeLine(scope.settings.indent + "return new " + scope.fileScope.importer.importType("stdlib.Result.Error") + "<>((" + scope.fileScope.importer.importType("stdlib.Result.Error") + ")" + value.value + ".value);");
+		target.writeLine("if (" + value.value + " instanceof " + errorType + ")");
+		target.writeLine(scope.settings.indent + "return new " + errorType + "<>(((" + errorType + formatTypeArguments(type.typeParameters) + ")" + value.value + ").value);");
 		
 		return value
-				.unaryPrefix(JavaOperator.CAST, "(" + scope.fileScope.importer.importType("stdlib.Result.Ok") + ")")
+				.unaryPrefix(JavaOperator.CAST, "(" + okType + formatTypeArguments(type.typeParameters) + ")")
 				.unaryPostfix(JavaOperator.MEMBER, ".value");
 	}
 	
@@ -648,12 +683,40 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 		return expression.value.accept(this);
 	}
 	
+	private String formatTypeArguments(ITypeID[] types) {
+		if (types == null || types.length == 0)
+			return "";
+		
+		StringBuilder output = new StringBuilder();
+		output.append("<");
+		
+		for (int i = 0; i < types.length; i++) {
+			if (i > 0)
+				output.append(", ");
+			
+			output.append(types[i].accept(scope.fileScope.objectTypeVisitor));
+		}
+		output.append(">");
+		return output.toString();
+	}
+	
+	public ExpressionString newArray(ITypeID elementType, ExpressionString length) {
+		if (elementType instanceof GenericTypeID) {
+			// generic array creation
+			GenericTypeID generic = (GenericTypeID)elementType;
+			String array = scope.type(new JavaSourceClass("java.lang.reflect", "Array"));
+			return new ExpressionString("(" + generic.parameter.name + "[])(" + array + ".newInstance(typeOf" + generic.parameter.name + ", " + length.value + "))", JavaOperator.CAST);
+		} else {
+			return new ExpressionString("new " + scope.type(elementType) + "[" + length.value + "]", JavaOperator.NEW);
+		}
+	}
+	
 	public ExpressionString listToArray(CastExpression expression) {
 		Expression target = duplicable(expression.target);
 		ExpressionString targetString = target.accept(this);
 		ArrayTypeID resultType = (ArrayTypeID)expression.type;
 		return new ExpressionString(
-				targetString.value + ".toArray(new " + scope.type(resultType.elementType) + "[" + targetString.value + ".size()])",
+				targetString.value + ".toArray(" + newArray(resultType.elementType, targetString.unaryPostfix(JavaOperator.CALL, ".size()")).value + ")",
 				JavaOperator.CALL);
 	}
 	
@@ -829,7 +892,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 		return cast.isImplicit ? cast.target.accept(this) : cast(cast, type);
 	}
 	
-	private Expression duplicable(Expression expression) {
+	public Expression duplicable(Expression expression) {
 		boolean shouldHoist = expression.accept(ExpressionHoistingChecker.INSTANCE);
 		if (!shouldHoist)
 			return expression;
@@ -843,7 +906,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 		return new GetLocalVariableExpression(value.position, temp);
 	}
 	
-	private ExpressionString hoist(ExpressionString value, String type) {
+	public ExpressionString hoist(ExpressionString value, String type) {
 		String temp = scope.createTempVariable();
 		target.writeLine(type + " " + temp + " = " + value.value + ";");
 		return new ExpressionString(temp, JavaOperator.PRIMARY);
@@ -1014,6 +1077,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 			case GENERICMAP_GETOPTIONAL: return call("get", call).unaryPrefix(JavaOperator.CAST, "(" + scope.type(call.type) + ")");
 			case GENERICMAP_PUT: return call("put", call);
 			case GENERICMAP_CONTAINS: return call("containsKey", call);
+			case GENERICMAP_ADDALL: return call("putAll", call);
 			case GENERICMAP_EQUALS: throw new UnsupportedOperationException("Not yet supported!");
 			case GENERICMAP_NOTEQUALS: throw new UnsupportedOperationException("Not yet supported!");
 			case GENERICMAP_SAME: return binary(call, JavaOperator.EQUALS);
@@ -1038,7 +1102,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 			}
 			case ARRAY_CONTAINS: {
 				JavaSourceMethod method = scope.fileScope.helperGenerator.createArrayContains((ArrayTypeID)call.target.type);
-				return callAsStatic(scope.fileScope.importer.importType(method.cls.fullName) + '.' + method.name, call);
+				return callAsStatic(scope.fileScope.importer.importType(method.cls) + '.' + method.name, call);
 			}
 			case ARRAY_EQUALS: return callAsStatic("Arrays.equals", call);
 			case ARRAY_NOTEQUALS: return callAsStatic("!Arrays.equals", call);
@@ -1062,6 +1126,8 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 			case FUNCTION_NOTSAME: return binary(call, JavaOperator.NOTEQUALS);
 			case OBJECT_SAME: return binary(call, JavaOperator.EQUALS);
 			case OBJECT_NOTSAME: return binary(call, JavaOperator.NOTEQUALS);
+			case OPTIONAL_IS_NULL: return call.target.accept(this).unaryPostfix(JavaOperator.EQUALS, " == null");
+			case OPTIONAL_IS_NOT_NULL: return call.target.accept(this).unaryPostfix(JavaOperator.NOTEQUALS, " != null");
 			case AUTOOP_NOTEQUALS:
 				throw new UnsupportedOperationException("Not yet supported!");
 		}
@@ -1377,19 +1443,19 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 			case STRING_CONSTRUCTOR_CHARACTERS:
 				return callStatic("new String", expression.arguments.arguments[0]);
 			case ASSOC_CONSTRUCTOR: {
-				String typeName = scope.type(new JavaSourceClass("HashMap", "java.util.HashMap"));
+				String typeName = scope.type(new JavaSourceClass("java.util", "HashMap"));
 				AssocTypeID type = (AssocTypeID) expression.type;
 				
 				StringBuilder result = new StringBuilder();
 				result.append("new ").append(typeName).append("<");
-				result.append(scope.type(type.keyType));
-				result.append(", ");
-				result.append(scope.type(type.valueType));
+				//result.append(scope.type(type.keyType));
+				//result.append(", ");
+				//result.append(scope.type(type.valueType));
 				result.append(">()");
 				return new ExpressionString(result.toString(), JavaOperator.NEW);
 			}
 			case GENERICMAP_CONSTRUCTOR: {
-				String typeName = scope.type(new JavaSourceClass("HashMap", "java.util.HashMap"));
+				String typeName = scope.type(new JavaSourceClass("java.util", "HashMap"));
 				StringBuilder result = new StringBuilder();
 				result.append("new ").append(typeName).append("<Class<?>, Object>()");
 				return new ExpressionString(result.toString(), JavaOperator.NEW);
@@ -1398,8 +1464,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 				ArrayTypeID type = (ArrayTypeID) expression.type;
 				if (type.dimension == 1) {
 					ExpressionString size = expression.arguments.arguments[0].accept(this);
-					String typeName = scope.type(type.elementType);
-					return new ExpressionString("new " + typeName + "[" + size.value + "]", JavaOperator.NEW);
+					return newArray(type.elementType, size);
 				} else {
 					// TODO: implement
 					throw new UnsupportedOperationException("Not yet supported!");
@@ -1418,11 +1483,8 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 							.append(' ')
 							.append(temp)
 							.append(" = ")
-							.append(" new ")
-							.append(scope.type(type.elementType))
-							.append("[")
-							.append(size.value)
-							.append("];")
+							.append(newArray(type.elementType, size).value)
+							.append(";")
 							.toString());
 					target.writeLine(new StringBuilder()
 							.append("for (int ")
@@ -1465,11 +1527,9 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 								.append(scope.type(type))
 								.append(' ')
 								.append(temp)
-								.append(" = new ")
-								.append(scope.type(type.elementType))
-								.append("[")
-								.append(size.value)
-								.append("];")
+								.append(" = ")
+								.append(newArray(type.elementType, size))
+								.append(";")
 								.toString());
 					VarStatement tempI = new VarStatement(expression.position, scope.createTempVariable(), BasicTypeID.INT, null, true);
 					target.writeLine(new StringBuilder()
@@ -1537,11 +1597,9 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 							.append(scope.type(type))
 							.append(' ')
 							.append(temp)
-							.append(" = new ")
-							.append(scope.type(type.elementType))
-							.append("[")
-							.append(originalString.value)
-							.append(".length];")
+							.append(" = ")
+							.append(newArray(type.elementType, originalString.unaryPostfix(JavaOperator.MEMBER, ".length")))
+							.append(";")
 							.toString());
 					VarStatement tempI = new VarStatement(expression.position, scope.createTempVariable(), BasicTypeID.INT, null, true);
 					target.writeLine(new StringBuilder()
@@ -1615,11 +1673,9 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 							.append(scope.type(type))
 							.append(' ')
 							.append(temp)
-							.append(" = new ")
-							.append(scope.type(type.elementType))
-							.append("[")
-							.append(originalString.value)
-							.append(".length];")
+							.append(" = ")
+							.append(newArray(type.elementType, originalString.unaryPostfix(JavaOperator.MEMBER, ".length")))
+							.append(";")
 							.toString());
 					VarStatement tempI = new VarStatement(expression.position, scope.createTempVariable(), BasicTypeID.INT, null, true);
 					target.writeLine(new StringBuilder()
@@ -1666,6 +1722,8 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 								.append("] = ")
 								.append(lambdaString.value)
 								.append(".invoke(")
+								.append(tempI.name)
+								.append(", ")
 								.append(originalString.value)
 								.append("[")
 								.append(tempI.name)

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

@@ -12,68 +12,76 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
-import org.openzen.zenscript.codemodel.definition.InterfaceDefinition;
+import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
-import org.openzen.zenscript.compiler.CompileScope;
 import org.openzen.zenscript.compiler.SemanticModule;
-import org.openzen.zenscript.javasource.prepare.JavaSourcePrepareDefinitionVisitor;
-import org.openzen.zenscript.javasource.scope.JavaSourceFileScope;
+import org.openzen.zenscript.javasource.tags.JavaSourceClass;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class JavaSourceFile {
-	private final JavaSourceImporter importer;
+	public final JavaSourceImporter importer;
 	private final JavaSourceCompiler compiler;
 	private final File file;
+	private final JavaSourceClass cls;
 	private final StringBuilder contents = new StringBuilder();
 	private final ZSPackage pkg;
 	
-	private final Map<HighLevelDefinition, SemanticModule> definitions = new HashMap<>();
+	private HighLevelDefinition mainDefinition;
+	private final List<ExpansionDefinition> expansions = new ArrayList<>();
+	
+	private final Map<HighLevelDefinition, SemanticModule> modules = new HashMap<>();
 	private final Set<String> existing = new HashSet<>();
 	
-	public JavaSourceFile(JavaSourceCompiler compiler, File file, ZSPackage pkg) {
+	public JavaSourceFile(JavaSourceCompiler compiler, File file, JavaSourceClass cls, ZSPackage pkg) {
 		this.compiler = compiler;
 		this.pkg = pkg;
+		this.cls = cls;
 		this.file = file;
 		
-		importer = new JavaSourceImporter(pkg);
+		importer = new JavaSourceImporter(cls);
 	}
 	
 	public String getName() {
-		return file.getName().substring(0, file.getName().lastIndexOf('.'));
+		return cls.name;
 	}
 	
 	public void add(HighLevelDefinition definition, SemanticModule module) {
-		if (existing.contains(definition.name))
-			throw new IllegalStateException("Duplicate " + definition.name);
-		
-		System.out.println("adding " + definition.name + " to " + file.getName());
+		if (definition instanceof ExpansionDefinition) {
+			expansions.add((ExpansionDefinition)definition);
+		} else if (mainDefinition != null) {
+			throw new IllegalStateException("Multiple main definitions!");
+		} else {
+			mainDefinition = definition;
+		}
 		
-		JavaSourcePrepareDefinitionVisitor prepare = new JavaSourcePrepareDefinitionVisitor(this);
-		definition.accept(prepare);
-		definitions.put(definition, module);
+		modules.put(definition, module);
 	}
 	
 	public void write() {
 		System.out.println("Calling write on " + file.getName());
 		
-		for (Map.Entry<HighLevelDefinition, SemanticModule> entry : definitions.entrySet()) {
-			HighLevelDefinition definition = entry.getKey();
-			SemanticModule module = entry.getValue();
-			CompileScope scope = new CompileScope(definition.access, module.compilationUnit.globalTypeRegistry, module.expansions, module.annotations);
-			JavaDefinitionVisitor visitor = new JavaDefinitionVisitor(
-					compiler.settings,
-					new JavaSourceFileScope(importer, compiler.typeGenerator, compiler.helperGenerator, getName(), scope, definition instanceof InterfaceDefinition),
-					contents);
-			definition.accept(visitor);
-		}
+		if (mainDefinition == null)
+			mainDefinition = expansions.remove(0);
+		
+		HighLevelDefinition definition = mainDefinition;
+		JavaDefinitionVisitor visitor = new JavaDefinitionVisitor(
+				compiler,
+				cls,
+				this,
+				contents,
+				expansions,
+				modules);
+		definition.accept(visitor);
 		
 		if (!file.getParentFile().exists())
 			file.getParentFile().mkdirs();
@@ -83,14 +91,14 @@ public class JavaSourceFile {
 			writer.write(pkg.fullName);
 			writer.write(";\n\n");
 			
-			JavaSourceImporter.Import[] imports = importer.getUsedImports();
+			JavaSourceClass[] imports = importer.getUsedImports();
 			if (imports.length > 0) {
-				for (JavaSourceImporter.Import import_ : imports) {
-					if (import_.actualName.startsWith("java.lang."))
+				for (JavaSourceClass import_ : imports) {
+					if (import_.pkg.equals("java.lang"))
 						continue;
 					
 					writer.write("import ");
-					writer.write(import_.actualName);
+					writer.write(import_.fullName);
 					writer.write(";\n");
 				}
 

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

@@ -11,64 +11,46 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
-import org.openzen.zenscript.codemodel.definition.ZSPackage;
+import org.openzen.zenscript.javasource.tags.JavaSourceClass;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class JavaSourceImporter {
-	private final ZSPackage pkg;
-	private final Map<String, Import> imports = new HashMap<>();
-	private final Set<Import> usedImports = new HashSet<>();
+	private final JavaSourceClass cls;
+	private final Map<String, JavaSourceClass> imports = new HashMap<>();
+	private final Set<JavaSourceClass> usedImports = new HashSet<>();
 	
-	public JavaSourceImporter(ZSPackage pkg) {
-		this.pkg = pkg;
-		
-		imports.put("IllegalArgumentException", new Import("IllegalArgumentException", "stdlib.IllegalArgumentException", "java.lang.IllegalArgumentException"));
-		imports.put("StringBuilder", new Import("StringBuilder", "stdlib.StringBuilder", "java.lang.StringBuilder"));
+	public JavaSourceImporter(JavaSourceClass cls) {
+		this.cls = cls;
 	}
 	
 	public String importType(HighLevelDefinition definition) {
-		if (definition.pkg == pkg)
-			return definition.name;
+		JavaSourceClass cls = definition.getTag(JavaSourceClass.class);
+		if (cls == null)
+			throw new IllegalStateException("Missing source class tag on " + definition.name);
+		if (cls.pkg.equals(this.cls.pkg))
+			return cls.name;
 		
-		return importType(definition.pkg.fullName + "." + definition.name);
+		return importType(cls);
 	}
 	
-	public String importType(String fullName) {
-		String name = fullName.substring(fullName.lastIndexOf('.') + 1);
-		if (imports.containsKey(name)) {
-			Import imported = imports.get(name);
+	public String importType(JavaSourceClass cls) {
+		if (imports.containsKey(cls.name)) {
+			JavaSourceClass imported = imports.get(cls.name);
 			usedImports.add(imported);
-			return imported.originalName.equals(fullName) ? name : fullName;
+			return imported.fullName.equals(cls.fullName) ? cls.name : cls.fullName;
 		}
 		
-		Import imported = new Import(name, fullName, fullName);
-		imports.put(name, imported);
-		return name;
+		imports.put(cls.name, cls);
+		usedImports.add(cls);
+		return cls.name;
 	}
 	
-	public Import[] getUsedImports() {
-		Import[] imports = usedImports.toArray(new Import[usedImports.size()]);
+	public JavaSourceClass[] getUsedImports() {
+		JavaSourceClass[] imports = usedImports.toArray(new JavaSourceClass[usedImports.size()]);
 		Arrays.sort(imports);
 		return imports;
 	}
-	
-	public static class Import implements Comparable<Import> {
-		public final String name;
-		public final String originalName;
-		public final String actualName;
-		
-		public Import(String name, String originalName, String actualName) {
-			this.name = name;
-			this.originalName = originalName;
-			this.actualName = actualName;
-		}
-
-		@Override
-		public int compareTo(Import o) {
-			return actualName.compareTo(o.actualName);
-		}
-	}
 }

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

@@ -9,12 +9,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
-import org.openzen.zenscript.codemodel.OperatorType;
-import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
-import org.openzen.zenscript.codemodel.expression.GetLocalVariableExpression;
 import org.openzen.zenscript.codemodel.expression.RangeExpression;
-import org.openzen.zenscript.codemodel.expression.SetLocalVariableExpression;
 import org.openzen.zenscript.codemodel.expression.switchvalue.CharSwitchValue;
 import org.openzen.zenscript.codemodel.expression.switchvalue.EnumConstantSwitchValue;
 import org.openzen.zenscript.codemodel.expression.switchvalue.IntSwitchValue;
@@ -32,8 +28,8 @@ import org.openzen.zenscript.codemodel.statement.ExpressionStatement;
 import org.openzen.zenscript.codemodel.statement.ForeachStatement;
 import org.openzen.zenscript.codemodel.statement.IfStatement;
 import org.openzen.zenscript.codemodel.statement.LockStatement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.statement.ReturnStatement;
-import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.statement.SwitchCase;
 import org.openzen.zenscript.codemodel.statement.SwitchStatement;
 import org.openzen.zenscript.codemodel.statement.ThrowStatement;
@@ -41,7 +37,6 @@ import org.openzen.zenscript.codemodel.statement.TryCatchStatement;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.codemodel.statement.WhileStatement;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
-import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.formattershared.ExpressionString;
 import org.openzen.zenscript.formattershared.StatementFormatter;
 import org.openzen.zenscript.formattershared.StatementFormattingSubBlock;
@@ -60,6 +55,11 @@ public class JavaSourceStatementFormatter implements StatementFormatter.Formatte
 	public JavaSourceStatementFormatter(JavaSourceStatementScope scope) {
 		this.scope = scope;
 	}
+	
+	@Override
+	public JavaSourceStatementFormatter forLoop(LoopStatement statement) {
+		return new JavaSourceStatementFormatter(scope.createBlockScope(statement));
+	}
 
 	@Override
 	public void formatBlock(StatementFormattingTarget target, BlockStatement statement) {
@@ -68,7 +68,7 @@ public class JavaSourceStatementFormatter implements StatementFormatter.Formatte
 
 	@Override
 	public void formatBreak(StatementFormattingTarget target, BreakStatement statement) {
-		if (target.getInnerLoop() == statement.target)
+		if (scope.innerLoop == statement.target)
 			target.writeLine("break;");
 		else
 			target.writeLine("break " + statement.target.label + ";");
@@ -76,7 +76,7 @@ public class JavaSourceStatementFormatter implements StatementFormatter.Formatte
 
 	@Override
 	public void formatContinue(StatementFormattingTarget target, ContinueStatement statement) {
-		if (target.getInnerLoop() == statement.target)
+		if (scope.innerLoop == statement.target)
 			target.writeLine("continue;");
 		else
 			target.writeLine("continue " + statement.target.label + ";");
@@ -133,7 +133,6 @@ public class JavaSourceStatementFormatter implements StatementFormatter.Formatte
 			DefinitionTypeID variantType = (DefinitionTypeID)statement.value.type;
 			HighLevelDefinition variant = variantType.definition;
 			String variantTypeName = scope.type(variant.getTag(JavaSourceClass.class));
-			JavaSourceStatementScope innerScope = scope.createBlockScope(statement);
 			for (SwitchCase switchCase : statement.cases) {
 				VariantOptionSwitchValue switchValue = (VariantOptionSwitchValue)switchCase.value;
 				String header = switchValue == null ? "default:" : "case " + switchValue.option.getName() + ":";
@@ -276,35 +275,16 @@ public class JavaSourceStatementFormatter implements StatementFormatter.Formatte
 
 		@Override
 		public Void visitArrayKeyValueIterator() {
-			Statement content = statement.content;
-			
-			Expression list = scope.duplicable(target, statement.list);
-			
-			List<Statement> modifiedContent = new ArrayList<>();
-			TypeMembers arrayMembers = scope.fileScope.semanticScope.getTypeMembers(statement.list.type);
-			
-			Expression getElement = arrayMembers
-							.getOrCreateGroup(OperatorType.INDEXGET)
-							.call(statement.position,
-									scope.fileScope.semanticScope,
-									list,
-									new CallArguments(new GetLocalVariableExpression(statement.position, statement.loopVariables[0])), true);
-			Expression setLocal = new SetLocalVariableExpression(statement.position, statement.loopVariables[1], getElement);
-			
-			modifiedContent.add(new ExpressionStatement(
-					statement.position,
-					setLocal));
-			if (content instanceof BlockStatement) {
-				modifiedContent.addAll(((BlockStatement) content).statements);
-			} else {
-				modifiedContent.add(content);
-			}
+			ExpressionString list = scope.expression(target, scope.duplicable(target, statement.list));
 			
 			target.writeInner(
-					"for (" + scope.type(statement.loopVariables[0].type) + " " + statement.loopVariables[0].name + " : " + scope.expression(target, list) + ")",
-					new BlockStatement(statement.position, modifiedContent),
+					"for (int " + statement.loopVariables[0].name + " = 0; i < " + list.value + ".length; i++) {",
+					new String[] {
+						scope.type(statement.loopVariables[1].type) + " " + statement.loopVariables[1].name + " = " + list.value + "[" + statement.loopVariables[0].name + "];"
+					},
+					statement.content,
 					statement,
-					"");
+					"}");
 			
 			return null;
 		}
@@ -317,11 +297,39 @@ public class JavaSourceStatementFormatter implements StatementFormatter.Formatte
 		@Override
 		public Void visitStringCharacterIterator() {
 			target.writeInner(
-					"for (char " + statement.loopVariables[0].name + " : " + scope.expression(target, statement.list) + ".toCharArray())",
+					"for (char " + statement.loopVariables[0].name + " : " + scope.expression(target, statement.list).value + ".toCharArray())",
+					statement.content,
+					statement,
+					"");
+			return null;
+		}
+
+		@Override
+		public Void visitAssocKeyIterator() {
+			VarStatement key = statement.loopVariables[0];
+			target.writeInner(
+					"for (" + scope.type(key.type) + " " + key + " : " + scope.expression(target, statement.list).value + ".keySet())",
 					statement.content,
 					statement,
 					"");
 			return null;
 		}
+
+		@Override
+		public Void visitAssocKeyValueIterator() {
+			String temp = scope.createTempVariable();
+			VarStatement key = statement.loopVariables[0];
+			VarStatement value = statement.loopVariables[1];
+			target.writeInner(
+					"for (Map.Entry<" + scope.type(key.type) + ", " + scope.type(value.type) + "> " + temp + " : " + scope.expression(target, statement.list).value + ".entrySet()) {",
+					new String[] {
+						scope.type(key.type) + " " + key.name + " = " + temp + ".getKey();",
+						scope.type(value.type) + " " + value.name + " = " + temp + ".getValue();"
+					},
+					statement.content,
+					statement,
+					"}");
+			return null;
+		}
 	}
 }

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

@@ -39,7 +39,7 @@ public class JavaSourceSyntheticHelperGenerator {
 	private final File directory;
 	private final JavaSourceFormattingSettings settings;
 	private final Map<String, List<String>> members = new HashMap<>();
-	private final JavaSourceClass arrayHelpers = new JavaSourceClass("ArrayHelpers", "zsynthetic.ArrayHelpers");
+	private final JavaSourceClass arrayHelpers = new JavaSourceClass("zsynthetic", "ArrayHelpers");
 	private final Map<ArrayKind, JavaSourceMethod> existingContains = new HashMap<>();
 	private final Map<ArrayKind, JavaSourceMethod> existingIndexOf = new HashMap<>();
 	
@@ -56,7 +56,7 @@ public class JavaSourceSyntheticHelperGenerator {
 		String method = generateContains(kind);
 		addMember(arrayHelpers, method);
 		
-		JavaSourceMethod sourceMethod = new JavaSourceMethod(arrayHelpers, JavaSourceMethod.Kind.EXPANSION, kind.containsName);
+		JavaSourceMethod sourceMethod = new JavaSourceMethod(arrayHelpers, JavaSourceMethod.Kind.EXPANSION, kind.containsName, false);
 		existingContains.put(kind, sourceMethod);
 		return sourceMethod;
 	}
@@ -69,7 +69,7 @@ public class JavaSourceSyntheticHelperGenerator {
 		String method = generateContains(kind);
 		addMember(arrayHelpers, method);
 		
-		JavaSourceMethod sourceMethod = new JavaSourceMethod(arrayHelpers, JavaSourceMethod.Kind.EXPANSION, kind.containsName);
+		JavaSourceMethod sourceMethod = new JavaSourceMethod(arrayHelpers, JavaSourceMethod.Kind.EXPANSION, kind.containsName, false);
 		existingContains.put(kind, sourceMethod);
 		return sourceMethod;
 	}

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

@@ -12,11 +12,14 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.openzen.zenscript.codemodel.FunctionParameter;
-import org.openzen.zenscript.codemodel.definition.ZSPackage;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.FunctionTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.javasource.tags.JavaSourceClass;
 
 /**
@@ -24,7 +27,7 @@ import org.openzen.zenscript.javasource.tags.JavaSourceClass;
  * @author Hoofdgebruiker
  */
 public class JavaSourceSyntheticTypeGenerator {
-	private final Map<FunctionTypeID, JavaSourceClass> functions = new HashMap<>();
+	private final Map<FunctionTypeID, JavaSynthesizedClass> functions = new HashMap<>();
 	private final File directory;
 	private final JavaSourceFormattingSettings settings;
 	
@@ -33,21 +36,23 @@ public class JavaSourceSyntheticTypeGenerator {
 		this.settings = settings;
 	}
 	
-	public JavaSourceClass createFunction(FunctionTypeID function) {
+	public JavaSynthesizedClass createFunction(JavaSourceTypeVisitor typeFormatter, FunctionTypeID function) {
 		if (functions.containsKey(function))
 			return functions.get(function);
 		
 		String className = createFunctionClassName(function);
-		JavaSourceClass result = new JavaSourceClass(className, "zsynthetic." + className);
+		JavaSourceClass cls = new JavaSourceClass("zsynthetic", className);
+		JavaSynthesizedClass result = new JavaSynthesizedClass(cls, extractTypeParameters(function));
 		functions.put(function, result);
 		
-		JavaSourceImporter importer = new JavaSourceImporter(new ZSPackage(null, "zsynthetic"));
+		JavaSourceImporter importer = new JavaSourceImporter(cls);
 		JavaSourceTypeVisitor typeVisitor = new JavaSourceTypeVisitor(importer, this);
 		
 		StringBuilder contents = new StringBuilder();
 		contents.append("@FunctionalInterface\n");
 		contents.append("public interface ");
 		contents.append(className);
+		JavaSourceUtils.formatTypeParameters(typeFormatter, contents, result.typeParameters);
 		contents.append(" {\n");
 		contents.append(settings.indent);
 		if (function.header.getNumberOfTypeParameters() > 0) {
@@ -83,14 +88,14 @@ public class JavaSourceSyntheticTypeGenerator {
 		try (Writer writer = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(file)), StandardCharsets.UTF_8)) {
 			writer.write("package zsynthetic;\n");
 			
-			JavaSourceImporter.Import[] imports = importer.getUsedImports();
+			JavaSourceClass[] imports = importer.getUsedImports();
 			if (imports.length > 0) {
-				for (JavaSourceImporter.Import import_ : imports) {
-					if (import_.actualName.startsWith("java.lang."))
+				for (JavaSourceClass import_ : imports) {
+					if (import_.pkg.equals("java.lang"))
 						continue;
 					
 					writer.write("import ");
-					writer.write(import_.actualName);
+					writer.write(import_.fullName);
 					writer.write(";\n");
 				}
 
@@ -111,4 +116,10 @@ public class JavaSourceSyntheticTypeGenerator {
 		className.append(functions.size() + 1); // TODO: create more meaningful names
 		return className.toString();
 	}
+	
+	private TypeParameter[] extractTypeParameters(ITypeID type) {
+		List<TypeParameter> result = new ArrayList<>();
+		type.extractTypeParameters(result);
+		return result.toArray(new TypeParameter[result.size()]);
+	}
 }

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

@@ -21,19 +21,30 @@ 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.javasource.tags.JavaSourceClass;
+import org.openzen.zenscript.javasource.tags.JavaSourceMethod;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class JavaSourceTypeVisitor implements ITypeVisitor<String>, GenericParameterBoundVisitor<String> {
+	private static final JavaSourceClass MAP = new JavaSourceClass("java.util", "Map");
+	private static final JavaSourceClass HASHMAP = new JavaSourceClass("java.util", "HashMap");
+	private static final JavaSourceClass ITERATOR = new JavaSourceClass("java.util", "Iterator");
+	
 	public final JavaSourceImporter importer;
 	public final JavaSourceSyntheticTypeGenerator typeGenerator;
 	public final JavaSourceObjectTypeVisitor objectTypeVisitor;
+	public final JavaSourceClass cls;
 	
 	public JavaSourceTypeVisitor(JavaSourceImporter importer, JavaSourceSyntheticTypeGenerator typeGenerator) {
+		this(importer, typeGenerator, null);
+	}
+	
+	public JavaSourceTypeVisitor(JavaSourceImporter importer, JavaSourceSyntheticTypeGenerator typeGenerator, JavaSourceClass cls) {
 		this.importer = importer;
 		this.typeGenerator = typeGenerator;
+		this.cls = cls;
 		
 		if (this instanceof JavaSourceObjectTypeVisitor) {
 			objectTypeVisitor = (JavaSourceObjectTypeVisitor)this;
@@ -77,30 +88,45 @@ public class JavaSourceTypeVisitor implements ITypeVisitor<String>, GenericParam
 
 	@Override
 	public String visitAssoc(AssocTypeID assoc) {
-		String map = importer.importType("java.util.Map");
+		String map = importer.importType(MAP);
 		return map + "<" + assoc.keyType.accept(new JavaSourceObjectTypeVisitor(importer, typeGenerator)) + ", " + assoc.valueType.accept(new JavaSourceObjectTypeVisitor(importer, typeGenerator)) + ">";
 	}
 
 	@Override
 	public String visitGenericMap(GenericMapTypeID map) {
-		String javaMap = importer.importType("java.util.Map");
-		return javaMap + "<Class<?>, Object>";
+		return importer.importType(MAP) + "<Class<?>, Object>";
 	}
 
 	@Override
 	public String visitIterator(IteratorTypeID iterator) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		if (iterator.iteratorTypes.length == 1) {
+			return importer.importType(ITERATOR) + "<" + iterator.iteratorTypes[0].accept(objectTypeVisitor) + '>';
+		} else {
+			throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		}
 	}
 
 	@Override
 	public String visitFunction(FunctionTypeID function) {
-		JavaSourceClass synthetic = typeGenerator.createFunction(function);
-		return importer.importType(synthetic.fullName);
+		JavaSynthesizedClass synthetic = typeGenerator.createFunction(this, function);
+		StringBuilder result = new StringBuilder();
+		result.append(importer.importType(synthetic.cls));
+		if (synthetic.typeParameters.length > 0) {
+			result.append('<');
+			for (int i = 0; i < synthetic.typeParameters.length; i++) {
+				if (i > 0)
+					result.append(", ");
+				
+				result.append(synthetic.typeParameters[i].name);
+			}
+			result.append('>');
+		}
+		return result.toString();
 	}
 
 	@Override
 	public String visitDefinition(DefinitionTypeID definition) {
-		String javaType = importer.importType(definition.definition);
+		String javaType = cls == null ? importer.importType(definition.definition) : importer.importType(cls);
 		StringBuilder result = new StringBuilder(javaType);
 		if (definition.typeParameters != null && definition.typeParameters.length > 0) {
 			result.append("<");

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

@@ -10,7 +10,7 @@ import org.openzen.zenscript.codemodel.generic.GenericParameterBoundVisitor;
 import org.openzen.zenscript.codemodel.generic.ParameterSuperBound;
 import org.openzen.zenscript.codemodel.generic.ParameterTypeBound;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
-import org.openzen.zenscript.javasource.scope.JavaSourceFileScope;
+import org.openzen.zenscript.codemodel.type.ITypeID;
 
 /**
  *
@@ -19,11 +19,11 @@ import org.openzen.zenscript.javasource.scope.JavaSourceFileScope;
 public class JavaSourceUtils {
 	private JavaSourceUtils() {}
 	
-	public static void formatTypeParameters(JavaSourceFileScope scope, StringBuilder output, TypeParameter[] parameters) {
+	public static void formatTypeParameters(JavaSourceTypeVisitor typeFormatter, StringBuilder output, TypeParameter[] parameters) {
 		if (parameters == null || parameters.length == 0)
 			return;
 		
-		TypeParameterBoundVisitor boundVisitor = new TypeParameterBoundVisitor(scope, output);
+		TypeParameterBoundVisitor boundVisitor = new TypeParameterBoundVisitor(typeFormatter, output);
 		output.append("<");
 		for (int i = 0; i < parameters.length; i++) {
 			if (i > 0)
@@ -40,24 +40,66 @@ public class JavaSourceUtils {
 		output.append("> ");
 	}
 	
+	public static void formatTypeParameters(JavaSourceTypeVisitor typeFormatter, StringBuilder output, TypeParameter[] expansion, TypeParameter[] parameters) {
+		if (((parameters == null ? 0 : parameters.length) + (expansion == null ? 0 : expansion.length)) == 0)
+			return;
+		
+		TypeParameterBoundVisitor boundVisitor = new TypeParameterBoundVisitor(typeFormatter, output);
+		output.append("<");
+		boolean first = true;
+		if (parameters != null) {
+			for (int i = 0; i < parameters.length; i++) {
+				if (first)
+					first = false;
+				else
+					output.append(", ");
+
+				TypeParameter typeParameter = parameters[i];
+				output.append(typeParameter.name);
+
+				if (typeParameter.bounds.size() > 0) {
+					for (GenericParameterBound bound : typeParameter.bounds)
+						bound.accept(boundVisitor);
+				}
+			}
+		}
+		if (expansion != null) {
+			for (int i = 0; i < expansion.length; i++) {
+				if (first)
+					first = false;
+				else
+					output.append(", ");
+
+				TypeParameter typeParameter = expansion[i];
+				output.append(typeParameter.name);
+
+				if (typeParameter.bounds.size() > 0) {
+					for (GenericParameterBound bound : typeParameter.bounds)
+						bound.accept(boundVisitor);
+				}
+			}
+		}
+		output.append("> ");
+	}
+	
 	private static class TypeParameterBoundVisitor implements GenericParameterBoundVisitor<Void> {
-		private final JavaSourceFileScope scope;
+		private final JavaSourceTypeVisitor typeFormatter;
 		private final StringBuilder output;
 		
-		public TypeParameterBoundVisitor(JavaSourceFileScope scope, StringBuilder output) {
-			this.scope = scope;
+		public TypeParameterBoundVisitor(JavaSourceTypeVisitor typeFormatter, StringBuilder output) {
+			this.typeFormatter = typeFormatter;
 			this.output = output;
 		}
 
 		@Override
 		public Void visitSuper(ParameterSuperBound bound) {
-			output.append(" super ").append(scope.type(bound.type));
+			output.append(" super ").append(bound.type.accept(typeFormatter));
 			return null;
 		}
 
 		@Override
 		public Void visitType(ParameterTypeBound bound) {
-			output.append(" extends ").append(scope.type(bound.type));
+			output.append(" extends ").append(bound.type.accept(typeFormatter));
 			return null;
 		}
 	}

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

@@ -0,0 +1,23 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.javasource;
+
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.javasource.tags.JavaSourceClass;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class JavaSynthesizedClass {
+	public final JavaSourceClass cls;
+	public final TypeParameter[] typeParameters;
+	
+	public JavaSynthesizedClass(JavaSourceClass cls, TypeParameter[] typeParameters) {
+		this.cls = cls;
+		this.typeParameters = typeParameters;
+	}
+}

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

@@ -0,0 +1,40 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.javasource.prepare;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.openzen.zenscript.javasource.tags.JavaSourceClass;
+import org.openzen.zenscript.javasource.tags.JavaSourceMethod;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class JavaNativeClass {
+	public final JavaSourceClass cls;
+	private final Map<String, JavaSourceMethod> methods = new HashMap<>();
+	
+	public JavaNativeClass(JavaSourceClass cls) {
+		this.cls = cls;
+	}
+	
+	public void addMethod(String key, JavaSourceMethod method) {
+		methods.put(key, method);
+	}
+	
+	public void addConstructor(String key, String name) {
+		methods.put(key, new JavaSourceMethod(cls, JavaSourceMethod.Kind.CONSTRUCTOR, name, false));
+	}
+	
+	public void addInstanceMethod(String key, String name) {
+		methods.put(key, new JavaSourceMethod(cls, JavaSourceMethod.Kind.INSTANCE, name, false));
+	}
+	
+	public JavaSourceMethod getMethod(String name) {
+		return methods.get(name);
+	}
+}

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

@@ -7,7 +7,6 @@ package org.openzen.zenscript.javasource.prepare;
 
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.annotations.NativeTag;
-import org.openzen.zenscript.codemodel.expression.CastExpression;
 import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.codemodel.member.ConstMember;
@@ -24,8 +23,6 @@ import org.openzen.zenscript.codemodel.member.MethodMember;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.member.StaticInitializerMember;
-import org.openzen.zenscript.formattershared.ExpressionString;
-import org.openzen.zenscript.javasource.JavaOperator;
 import org.openzen.zenscript.javasource.JavaSourceTypeNameVisitor;
 import org.openzen.zenscript.javasource.tags.JavaSourceClass;
 import org.openzen.zenscript.javasource.tags.JavaSourceField;
@@ -38,20 +35,30 @@ import org.openzen.zenscript.shared.StringUtils;
  */
 public class JavaSourcePrepareClassMethodVisitor implements MemberVisitor<Void> {
 	private final JavaSourceClass cls;
+	private final JavaNativeClass nativeClass;
 	
-	public JavaSourcePrepareClassMethodVisitor(JavaSourceClass cls) {
+	public JavaSourcePrepareClassMethodVisitor(JavaSourceClass cls, JavaNativeClass nativeClass, boolean startsEmpty) {
 		this.cls = cls;
+		this.nativeClass = nativeClass;
+		cls.empty = startsEmpty;
 	}
 	
 	@Override
 	public Void visitConst(ConstMember member) {
+		cls.empty = false;
 		member.setTag(JavaSourceField.class, new JavaSourceField(cls, member.name));
 		return null;
 	}
 	
 	@Override
 	public Void visitField(FieldMember member) {
+		cls.empty = false;
 		member.setTag(JavaSourceField.class, new JavaSourceField(cls, member.name));
+		if (member.hasAutoGetter())
+			visitGetter(member.autoGetter);
+		if (member.hasAutoSetter())
+			visitSetter(member.autoSetter);
+		
 		return null;
 	}
 
@@ -63,6 +70,7 @@ public class JavaSourcePrepareClassMethodVisitor implements MemberVisitor<Void>
 
 	@Override
 	public Void visitDestructor(DestructorMember member) {
+		cls.empty = false;
 		return null;
 	}
 
@@ -111,21 +119,27 @@ public class JavaSourcePrepareClassMethodVisitor implements MemberVisitor<Void>
 	@Override
 	public Void visitImplementation(ImplementationMember member) {
 		// TODO: implementation merge check
+		cls.empty = false;
 		return null;
 	}
 
 	@Override
 	public Void visitInnerDefinition(InnerDefinitionMember member) {
 		// TODO
+		cls.empty = false;
 		return null;
 	}
 
 	@Override
 	public Void visitStaticInitializer(StaticInitializerMember member) {
+		cls.empty = false;
 		return null;
 	}
 	
 	private JavaSourceMethod.Kind getKind(DefinitionMember member) {
+		if (member instanceof ConstructorMember)
+			return JavaSourceMethod.Kind.CONSTRUCTOR;
+		
 		return member.isStatic() ? JavaSourceMethod.Kind.STATIC : JavaSourceMethod.Kind.INSTANCE;
 	}
 	
@@ -194,7 +208,7 @@ public class JavaSourcePrepareClassMethodVisitor implements MemberVisitor<Void>
 			case CONTAINS:
 				return "contains";
 			case EQUALS:
-				return "equals";
+				return "equals_";
 			case COMPARE:
 				return "compareTo";
 			case RANGE:
@@ -214,74 +228,15 @@ public class JavaSourcePrepareClassMethodVisitor implements MemberVisitor<Void>
 	
 	private void visitFunctional(DefinitionMember member, String name) {
 		NativeTag nativeTag = member.getTag(NativeTag.class);
-		if (nativeTag == null) {
-			member.setTag(
-					JavaSourceMethod.class,
-					new JavaSourceMethod(cls, getKind(member), name));
-		} else {
-			member.setTag(JavaSourceMethod.class, getNative(nativeTag.value));
-		}
-	}
-	
-	private JavaSourceMethod getNative(String name) {
-		if (cls.fullName.equals("java.lang.StringBuilder"))
-			return getStringBuilderNative(name);
-		else if (cls.fullName.equals("java.util.List"))
-			return getListNative(name);
+		JavaSourceMethod method = null;
+		if (nativeTag != null && nativeClass != null)
+			method = nativeClass.getMethod(nativeTag.value);
+		if (method == null)
+			method = new JavaSourceMethod(cls, getKind(member), name, true);
 		
-		throw new UnsupportedOperationException("Unknown native class: " + cls.fullName);
-	}
-	
-	private JavaSourceMethod getListNative(String name) {
-		switch (name) {
-			case "constructor":
-				return new JavaSourceMethod((formatter, call) -> new ExpressionString("new ArrayList<>()", JavaOperator.NEW));
-			case "add":
-				return new JavaSourceMethod(cls, JavaSourceMethod.Kind.INSTANCE, "add");
-			case "getIndex":
-				return new JavaSourceMethod(cls, JavaSourceMethod.Kind.INSTANCE, "get");
-			case "setIndex":
-				return new JavaSourceMethod(cls, JavaSourceMethod.Kind.INSTANCE, "set");
-			case "toArray":
-				return new JavaSourceMethod((formatter, calle)
-						-> formatter.listToArray((CastExpression)calle));
-			case "length":
-				return new JavaSourceMethod(cls, JavaSourceMethod.Kind.INSTANCE, "size");
-			case "isEmpty":
-				return new JavaSourceMethod(cls, JavaSourceMethod.Kind.INSTANCE, "isEmpty");
-			default:
-				throw new UnsupportedOperationException("Unknown native method: " + name);
-		}
-	}
-	
-	private JavaSourceMethod getStringBuilderNative(String name) {
-		switch (name) {
-			case "constructor":
-			case "constructorWithCapacity":
-			case "constructorWithValue":
-				return new JavaSourceMethod(cls, JavaSourceMethod.Kind.INSTANCE, "");
-			case "isEmpty":
-				return new JavaSourceMethod(cls, JavaSourceMethod.Kind.INSTANCE, "isEmpty");
-			case "length":
-				return new JavaSourceMethod(cls, JavaSourceMethod.Kind.INSTANCE, "length");
-			case "appendBool":
-			case "appendByte":
-			case "appendSByte":
-			case "appendShort":
-			case "appendUShort":
-			case "appendInt":
-			case "appendUInt":
-			case "appendLong":
-			case "appendULong":
-			case "appendFloat":
-			case "appendDouble":
-			case "appendChar":
-			case "appendString":
-				return new JavaSourceMethod(cls, JavaSourceMethod.Kind.INSTANCE, "append");
-			case "asString":
-				return new JavaSourceMethod(cls, JavaSourceMethod.Kind.INSTANCE, "toString");
-			default:
-				throw new UnsupportedOperationException("Unknown native method: " + name);
-		}
+		if (method.compile)
+			cls.empty = false;
+		
+		member.setTag(JavaSourceMethod.class, method);
 	}
 }

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

@@ -5,6 +5,8 @@
  */
 package org.openzen.zenscript.javasource.prepare;
 
+import java.util.HashMap;
+import java.util.Map;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.annotations.NativeTag;
 import org.openzen.zenscript.codemodel.definition.AliasDefinition;
@@ -16,9 +18,14 @@ import org.openzen.zenscript.codemodel.definition.FunctionDefinition;
 import org.openzen.zenscript.codemodel.definition.InterfaceDefinition;
 import org.openzen.zenscript.codemodel.definition.StructDefinition;
 import org.openzen.zenscript.codemodel.definition.VariantDefinition;
+import org.openzen.zenscript.codemodel.expression.CallExpression;
+import org.openzen.zenscript.codemodel.expression.CastExpression;
+import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.type.ArrayTypeID;
+import org.openzen.zenscript.formattershared.ExpressionString;
+import org.openzen.zenscript.javasource.JavaOperator;
 import org.openzen.zenscript.javasource.tags.JavaSourceClass;
-import org.openzen.zenscript.javasource.JavaSourceFile;
 import org.openzen.zenscript.javasource.tags.JavaSourceMethod;
 import org.openzen.zenscript.javasource.tags.JavaSourceVariantOption;
 
@@ -26,100 +33,234 @@ import org.openzen.zenscript.javasource.tags.JavaSourceVariantOption;
  *
  * @author Hoofdgebruiker
  */
-public class JavaSourcePrepareDefinitionVisitor implements DefinitionVisitor<Void> {
-	private final JavaSourceFile file;
+public class JavaSourcePrepareDefinitionVisitor implements DefinitionVisitor<JavaSourceClass> {
+	private static final Map<String, JavaNativeClass> nativeClasses = new HashMap<>();
 	
-	public JavaSourcePrepareDefinitionVisitor(JavaSourceFile file) {
-		this.file = file;
+	static {
+		{
+			JavaNativeClass cls = new JavaNativeClass(new JavaSourceClass("java.lang", "StringBuilder"));
+			cls.addConstructor("constructor", "");
+			cls.addConstructor("constructorWithCapacity", "");
+			cls.addConstructor("constructorWithValue", "");
+			cls.addMethod("isEmpty", new JavaSourceMethod((formatter, call) -> ((CallExpression)call).accept(formatter).unaryPostfix(JavaOperator.EQUALS, "length() == 0")));
+			cls.addInstanceMethod("length", "length");
+			cls.addInstanceMethod("appendBool", "append");
+			cls.addInstanceMethod("appendByte", "append");
+			cls.addInstanceMethod("appendSByte", "append");
+			cls.addInstanceMethod("appendShort", "append");
+			cls.addInstanceMethod("appendUShort", "append");
+			cls.addInstanceMethod("appendInt", "append");
+			cls.addInstanceMethod("appendUInt", "append");
+			cls.addInstanceMethod("appendLong", "append");
+			cls.addInstanceMethod("appendULong", "append");
+			cls.addInstanceMethod("appendFloat", "append");
+			cls.addInstanceMethod("appendDouble", "append");
+			cls.addInstanceMethod("appendChar", "append");
+			cls.addInstanceMethod("appendString", "append");
+			cls.addInstanceMethod("asString", "toString");
+			nativeClasses.put("stdlib::StringBuilder", cls);
+		}
+		
+		{
+			JavaNativeClass list = new JavaNativeClass(new JavaSourceClass("java.util", "List"));
+			JavaSourceClass arrayList = new JavaSourceClass("java.util", "ArrayList");
+			list.addMethod("constructor", new JavaSourceMethod(arrayList, JavaSourceMethod.Kind.CONSTRUCTOR, "", false));
+			list.addInstanceMethod("add", "add");
+			list.addInstanceMethod("insert", "add");
+			list.addInstanceMethod("getAtIndex", "get");
+			list.addInstanceMethod("setAtIndex", "set");
+			list.addMethod("toArray", new JavaSourceMethod((formatter, call) -> formatter.listToArray((CastExpression)call)));
+			list.addInstanceMethod("length", "length");
+			list.addInstanceMethod("isEmpty", "isEmpty");
+			nativeClasses.put("stdlib::List", list);
+		}
+		
+		{
+			JavaNativeClass comparable = new JavaNativeClass(new JavaSourceClass("java.lang", "Comparable"));
+			comparable.addInstanceMethod("compareTo", "compareTo");
+			nativeClasses.put("stdlib::Comparable", comparable);
+		}
+		
+		{
+			JavaSourceClass integer = new JavaSourceClass("java.lang", "Integer");
+			JavaSourceClass math = new JavaSourceClass("java.lang", "Math");
+			
+			JavaNativeClass cls = new JavaNativeClass(integer);
+			cls.addMethod("min", new JavaSourceMethod(math, JavaSourceMethod.Kind.STATIC, "min", false));
+			cls.addMethod("max", new JavaSourceMethod(math, JavaSourceMethod.Kind.STATIC, "max", false));
+			cls.addMethod("toHexString", new JavaSourceMethod(integer, JavaSourceMethod.Kind.EXPANSION, "toHexString", false));
+			nativeClasses.put("stdlib::Integer", cls);
+		}
+		
+		{
+			JavaNativeClass cls = new JavaNativeClass(new JavaSourceClass("java.lang", "String"));
+			cls.addMethod("contains", new JavaSourceMethod((formatter, calle) -> {
+				CallExpression call = (CallExpression)calle;
+				ExpressionString str = call.arguments.arguments[0].accept(formatter);
+				ExpressionString character = call.arguments.arguments[1].accept(formatter);
+				return str.unaryPostfix(JavaOperator.GREATER_EQUALS, ".indexOf(" + character.value + ")");
+			}));
+			cls.addInstanceMethod("indexOf", "indexOf");
+			cls.addInstanceMethod("indexOfFrom", "indexOf");
+			cls.addInstanceMethod("lastIndexOf", "lastIndexOf");
+			cls.addInstanceMethod("lastIndexOfFrom", "lastIndexOf");
+			cls.addInstanceMethod("trim", "trim");
+			nativeClasses.put("stdlib::String", cls);
+		}
+		
+		{
+			JavaSourceClass arrays = new JavaSourceClass("java.lang", "Arrays");
+			JavaNativeClass cls = new JavaNativeClass(arrays);
+			cls.addMethod("sort", new JavaSourceMethod(arrays, JavaSourceMethod.Kind.EXPANSION, "sort", false));
+			cls.addMethod("sorted", new JavaSourceMethod((formatter, calle) -> {
+				Expression target = formatter.duplicable(((CallExpression)calle).target);
+				ExpressionString targetString = target.accept(formatter);
+				ExpressionString copy = new ExpressionString("Arrays.copyOf(" + targetString.value + ", " + targetString.value + ".length).sort()", JavaOperator.CALL);
+				ExpressionString source = formatter.hoist(copy, formatter.scope.type(target.type));
+				formatter.target.writeLine("Arrays.sort(" + source.value + ");");
+				return source;
+			}));
+			cls.addMethod("sortWithComparator", new JavaSourceMethod(arrays, JavaSourceMethod.Kind.EXPANSION, "sort", false));
+			cls.addMethod("sortedWithComparator", new JavaSourceMethod((formatter, calle) -> {
+				Expression target = formatter.duplicable(((CallExpression)calle).target);
+				ExpressionString comparator = ((CallExpression)calle).arguments.arguments[0].accept(formatter);
+				ExpressionString targetString = target.accept(formatter);
+				ExpressionString copy = new ExpressionString("Arrays.copyOf(" + targetString.value + ", " + targetString.value + ".length).sort()", JavaOperator.CALL);
+				ExpressionString source = formatter.hoist(copy, formatter.scope.type(target.type));
+				formatter.target.writeLine("Arrays.sort(" + source.value + ", " + comparator.value + ");");
+				return source;
+			}));
+			cls.addMethod("copy", new JavaSourceMethod((formatter, calle) -> {
+				Expression target = formatter.duplicable(((CallExpression)calle).target);
+				ExpressionString source = target.accept(formatter);
+				return new ExpressionString("Arrays.copyOf(" + source.value + ", " + source.value + ".length)", JavaOperator.CALL);
+			}));
+			cls.addMethod("copyResize", new JavaSourceMethod(arrays, JavaSourceMethod.Kind.EXPANSION, "copyOf", false));
+			cls.addMethod("copyTo", new JavaSourceMethod((formatter, calle) -> {
+				CallExpression call = (CallExpression)calle;
+				Expression source = call.target;
+				Expression target = call.arguments.arguments[0];
+				Expression sourceOffset = call.arguments.arguments[1];
+				Expression targetOffset = call.arguments.arguments[2];
+				Expression length = call.arguments.arguments[3];
+				return new ExpressionString("System.arraycopy("
+					+ source.accept(formatter) + ", "
+					+ sourceOffset.accept(formatter) + ", "
+					+ target.accept(formatter) + ", "
+					+ targetOffset.accept(formatter) + ", "
+					+ length.accept(formatter) + ")", JavaOperator.CALL);
+			}));
+			nativeClasses.put("stdlib::Arrays", cls);
+		}
+		
+		{
+			JavaNativeClass cls = new JavaNativeClass(new JavaSourceClass("java.lang", "IllegalArgumentException"));
+			cls.addConstructor("constructor", "");
+			nativeClasses.put("stdlib::IllegalArgumentException", cls);
+		}
+		
+		{
+			JavaNativeClass cls = new JavaNativeClass(new JavaSourceClass("java.lang", "Exception"));
+			cls.addConstructor("constructor", "");
+			cls.addConstructor("constructorWithCause", "");
+			nativeClasses.put("stdlib::Exception", cls);
+		}
+	}
+	
+	private final String filename;
+	
+	public JavaSourcePrepareDefinitionVisitor(String filename) {
+		this.filename = filename;
 	}
 	
 	@Override
-	public Void visitClass(ClassDefinition definition) {
-		visitClassCompiled(definition);
-		return null;
+	public JavaSourceClass visitClass(ClassDefinition definition) {
+		return visitClassCompiled(definition, true);
 	}
 
 	@Override
-	public Void visitInterface(InterfaceDefinition definition) {
-		visitClassCompiled(definition);
-		return null;
+	public JavaSourceClass visitInterface(InterfaceDefinition definition) {
+		return visitClassCompiled(definition, true);
 	}
 
 	@Override
-	public Void visitEnum(EnumDefinition definition) {
-		visitClassCompiled(definition);
-		return null;
+	public JavaSourceClass visitEnum(EnumDefinition definition) {
+		return visitClassCompiled(definition, false);
 	}
 
 	@Override
-	public Void visitStruct(StructDefinition definition) {
-		visitClassCompiled(definition);
-		return null;
+	public JavaSourceClass visitStruct(StructDefinition definition) {
+		return visitClassCompiled(definition, true);
 	}
 
 	@Override
-	public Void visitFunction(FunctionDefinition definition) {
-		JavaSourceClass cls = new JavaSourceClass(file.getName(), definition.pkg.fullName + "." + file.getName());
+	public JavaSourceClass visitFunction(FunctionDefinition definition) {
+		JavaSourceClass cls = new JavaSourceClass(definition.pkg.fullName, filename);
 		definition.setTag(JavaSourceClass.class, cls);
-		JavaSourceMethod method = new JavaSourceMethod(cls, JavaSourceMethod.Kind.STATIC, definition.name);
+		JavaSourceMethod method = new JavaSourceMethod(cls, JavaSourceMethod.Kind.STATIC, definition.name, true);
 		definition.caller.setTag(JavaSourceMethod.class, method);
-		return null;
+		return cls;
 	}
 
 	@Override
-	public Void visitExpansion(ExpansionDefinition definition) {
-		JavaSourceClass cls = new JavaSourceClass(file.getName(), definition.pkg.fullName + "." + file.getName());
-		definition.setTag(JavaSourceClass.class, cls);
-		JavaSourcePrepareExpansionMethodVisitor methodVisitor = new JavaSourcePrepareExpansionMethodVisitor(cls);
-		for (IDefinitionMember member : definition.members) {
-			member.accept(methodVisitor);
+	public JavaSourceClass visitExpansion(ExpansionDefinition definition) {
+		NativeTag nativeTag = definition.getTag(NativeTag.class);
+		JavaNativeClass nativeClass = null;
+		if (nativeTag != null) {
+			nativeClass = nativeClasses.get(nativeTag.value);
 		}
-		return null;
+		
+		JavaSourceClass cls = new JavaSourceClass(definition.pkg.fullName, filename);
+		definition.setTag(JavaSourceClass.class, cls);
+		visitExpansionMembers(definition, cls, nativeClass);
+		return cls;
 	}
 
 	@Override
-	public Void visitAlias(AliasDefinition definition) {
+	public JavaSourceClass visitAlias(AliasDefinition definition) {
 		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
 	}
 
 	@Override
-	public Void visitVariant(VariantDefinition variant) {
-		JavaSourceClass cls = new JavaSourceClass(variant.name, variant.pkg.fullName + "." + variant.name);
+	public JavaSourceClass visitVariant(VariantDefinition variant) {
+		JavaSourceClass cls = new JavaSourceClass(variant.pkg.fullName, variant.name);
 		variant.setTag(JavaSourceClass.class, cls);
 		
 		for (VariantDefinition.Option option : variant.options) {
-			JavaSourceClass variantCls = new JavaSourceClass(option.name, cls.fullName + "." + option.name);
+			JavaSourceClass variantCls = new JavaSourceClass(cls.fullName, option.name);
 			option.setTag(JavaSourceVariantOption.class, new JavaSourceVariantOption(cls, variantCls));
 		}
 		
-		visitClassMembers(variant, cls);
-		return null;
+		visitClassMembers(variant, cls, null, false);
+		return cls;
 	}
 	
-	private void visitClassCompiled(HighLevelDefinition definition) {
+	private JavaSourceClass visitClassCompiled(HighLevelDefinition definition, boolean startsEmpty) {
 		NativeTag nativeTag = definition.getTag(NativeTag.class);
-		if (nativeTag == null) {
-			JavaSourceClass cls = new JavaSourceClass(definition.name, definition.pkg.fullName + "." + definition.name);
+		JavaNativeClass nativeClass = nativeTag == null ? null : nativeClasses.get(nativeTag.value);
+		if (nativeClass == null) {
+			JavaSourceClass cls = new JavaSourceClass(definition.pkg.fullName, definition.name);
 			definition.setTag(JavaSourceClass.class, cls);
-			visitClassMembers(definition, cls);
+			visitClassMembers(definition, cls, null, startsEmpty);
+			return cls;
 		} else {
-			JavaSourceClass cls = getNativeClass(nativeTag.value);
-			definition.setTag(JavaSourceClass.class, cls);
-			visitClassMembers(definition, cls);
+			JavaSourceClass cls = new JavaSourceClass(definition.pkg.fullName, filename);
+			definition.setTag(JavaSourceClass.class, nativeClass.cls);
+			definition.setTag(JavaNativeClass.class, nativeClass);
+			visitExpansionMembers(definition, cls, nativeClass);
+			return cls;
 		}
 	}
 	
-	private JavaSourceClass getNativeClass(String name) {
-		if (name.equals("stdlib::StringBuilder"))
-			return new JavaSourceClass("StringBuilder", "java.lang.StringBuilder");
-		else if (name.equals("stdlib::List"))
-			return new JavaSourceClass("List", "java.util.List");
-		
-		throw new UnsupportedOperationException("Unknown native class: " + name);
+	private void visitClassMembers(HighLevelDefinition definition, JavaSourceClass cls, JavaNativeClass nativeClass, boolean startsEmpty) {
+		JavaSourcePrepareClassMethodVisitor methodVisitor = new JavaSourcePrepareClassMethodVisitor(cls, nativeClass, startsEmpty);
+		for (IDefinitionMember member : definition.members) {
+			member.accept(methodVisitor);
+		}
 	}
 	
-	private void visitClassMembers(HighLevelDefinition definition, JavaSourceClass cls) {
-		JavaSourcePrepareClassMethodVisitor methodVisitor = new JavaSourcePrepareClassMethodVisitor(cls);
+	private void visitExpansionMembers(HighLevelDefinition definition, JavaSourceClass cls, JavaNativeClass nativeClass) {
+		JavaSourcePrepareExpansionMethodVisitor methodVisitor = new JavaSourcePrepareExpansionMethodVisitor(cls, nativeClass);
 		for (IDefinitionMember member : definition.members) {
 			member.accept(methodVisitor);
 		}

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.javasource.prepare;
 
 import org.openzen.zenscript.codemodel.OperatorType;
+import org.openzen.zenscript.codemodel.annotations.NativeTag;
 import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.codemodel.member.ConstMember;
@@ -34,14 +35,18 @@ import org.openzen.zenscript.shared.StringUtils;
  */
 public class JavaSourcePrepareExpansionMethodVisitor implements MemberVisitor<Void> {
 	private final JavaSourceClass cls;
+	private final JavaNativeClass nativeClass;
 	
-	public JavaSourcePrepareExpansionMethodVisitor(JavaSourceClass cls) {
+	public JavaSourcePrepareExpansionMethodVisitor(JavaSourceClass cls, JavaNativeClass nativeClass) {
 		this.cls = cls;
+		this.nativeClass = nativeClass;
+		cls.empty = true;
 	}
 	
 	@Override
 	public Void visitConst(ConstMember member) {
 		member.setTag(JavaSourceField.class, new JavaSourceField(cls, member.name));
+		cls.empty = false;
 		return null;
 	}
 	
@@ -49,17 +54,19 @@ public class JavaSourcePrepareExpansionMethodVisitor implements MemberVisitor<Vo
 	public Void visitField(FieldMember member) {
 		// TODO: expansion fields
 		member.setTag(JavaSourceField.class, new JavaSourceField(cls, member.name));
+		cls.empty = false;
 		return null;
 	}
 
 	@Override
 	public Void visitConstructor(ConstructorMember member) {
+		visitFunctional(member, "");
 		return null;
 	}
 
 	@Override
 	public Void visitDestructor(DestructorMember member) {
-		return null;
+		throw new UnsupportedOperationException("Destructors not allowed on expansions");
 	}
 
 	@Override
@@ -107,24 +114,35 @@ public class JavaSourcePrepareExpansionMethodVisitor implements MemberVisitor<Vo
 	@Override
 	public Void visitImplementation(ImplementationMember member) {
 		// TODO: implementation merge check
+		cls.empty = false;
 		return null;
 	}
 
 	@Override
 	public Void visitInnerDefinition(InnerDefinitionMember member) {
 		// TODO
+		cls.empty = false;
 		return null;
 	}
 
 	@Override
 	public Void visitStaticInitializer(StaticInitializerMember member) {
+		cls.empty = false;
 		return null;
 	}
 	
 	private void visitFunctional(DefinitionMember member, String name) {
-		member.setTag(
-				JavaSourceMethod.class,
-				new JavaSourceMethod(cls, getKind(member), name));
+		NativeTag nativeTag = member.getTag(NativeTag.class);
+		JavaSourceMethod method = null;
+		if (nativeTag != null && nativeClass != null)
+			method = nativeClass.getMethod(nativeTag.value);
+		if (method == null)
+			method = new JavaSourceMethod(cls, getKind(member), name, true); 
+		
+		if (method.compile)
+			cls.empty = false;
+		
+		member.setTag(JavaSourceMethod.class, method);
 	}
 	
 	private JavaSourceMethod.Kind getKind(DefinitionMember member) {
@@ -196,7 +214,7 @@ public class JavaSourcePrepareExpansionMethodVisitor implements MemberVisitor<Vo
 			case CONTAINS:
 				return "contains";
 			case EQUALS:
-				return "equals";
+				return "equals_";
 			case COMPARE:
 				return "compareTo";
 			case RANGE:

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/scope/JavaSourceFileScope.java

@@ -12,6 +12,7 @@ import org.openzen.zenscript.javasource.JavaSourceObjectTypeVisitor;
 import org.openzen.zenscript.javasource.JavaSourceSyntheticHelperGenerator;
 import org.openzen.zenscript.javasource.JavaSourceSyntheticTypeGenerator;
 import org.openzen.zenscript.javasource.JavaSourceTypeVisitor;
+import org.openzen.zenscript.javasource.tags.JavaSourceClass;
 
 /**
  *
@@ -21,7 +22,7 @@ public class JavaSourceFileScope {
 	public final JavaSourceImporter importer;
 	public final JavaSourceSyntheticTypeGenerator typeGenerator;
 	public final JavaSourceSyntheticHelperGenerator helperGenerator;
-	public final String className;
+	public final JavaSourceClass cls;
 	public final JavaSourceTypeVisitor typeVisitor;
 	public final JavaSourceObjectTypeVisitor objectTypeVisitor;
 	public final TypeScope semanticScope;
@@ -31,14 +32,14 @@ public class JavaSourceFileScope {
 			JavaSourceImporter importer, 
 			JavaSourceSyntheticTypeGenerator typeGenerator,
 			JavaSourceSyntheticHelperGenerator helperGenerator,
-			String className,
+			JavaSourceClass cls,
 			TypeScope semanticScope,
 			boolean isInterface)
 	{
 		this.importer = importer;
 		this.typeGenerator = typeGenerator;
 		this.helperGenerator = helperGenerator;
-		this.className = className;
+		this.cls = cls;
 		this.semanticScope = semanticScope;
 		this.isInterface = isInterface;
 		
@@ -49,4 +50,8 @@ public class JavaSourceFileScope {
 	public String type(ITypeID type) {
 		return type.accept(typeVisitor);
 	}
+	
+	public String type(ITypeID type, JavaSourceClass rename) {
+		return type.accept(new JavaSourceTypeVisitor(importer, typeGenerator, rename));
+	}
 }

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/scope/JavaSourceStatementScope.java

@@ -74,12 +74,12 @@ public class JavaSourceStatementScope {
 		return fileScope.type(type);
 	}
 	
-	public String type(JavaSourceClass cls) {
-		return fileScope.importer.importType(cls.fullName);
+	public String type(ITypeID type, JavaSourceClass renamed) {
+		return fileScope.type(type, renamed);
 	}
 	
-	public String sourceClass(JavaSourceClass cls) {
-		return fileScope.importer.importType(cls.fullName);
+	public String type(JavaSourceClass cls) {
+		return fileScope.importer.importType(cls);
 	}
 	
 	public void addLocalVariable(String localVariable) {

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

@@ -9,12 +9,20 @@ package org.openzen.zenscript.javasource.tags;
  *
  * @author Hoofdgebruiker
  */
-public class JavaSourceClass {
+public class JavaSourceClass implements Comparable<JavaSourceClass> {
+	public final String pkg;
 	public final String name;
 	public final String fullName;
+	public boolean empty = false;
 	
-	public JavaSourceClass(String name, String fullName) {
+	public JavaSourceClass(String pkg, String name) {
+		this.pkg = pkg;
 		this.name = name;
-		this.fullName = fullName;
+		this.fullName = pkg + '.' + name;
+	}
+
+	@Override
+	public int compareTo(JavaSourceClass o) {
+		return fullName.compareTo(o.fullName);
 	}
 }

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

@@ -15,12 +15,14 @@ public class JavaSourceMethod {
 	public final JavaSourceClass cls;
 	public final Kind kind;
 	public final String name;
+	public final boolean compile;
 	public final JavaCallCompiler compiler;
 	
-	public JavaSourceMethod(JavaSourceClass cls, Kind kind, String name) {
+	public JavaSourceMethod(JavaSourceClass cls, Kind kind, String name, boolean compile) {
 		this.cls = cls;
 		this.kind = kind;
 		this.name = name;
+		this.compile = compile;
 		compiler = null;
 	}
 	
@@ -28,6 +30,7 @@ public class JavaSourceMethod {
 		this.cls = null;
 		this.kind = Kind.COMPILED;
 		this.name = null;
+		this.compile = false;
 		this.compiler = compiler;
 	}
 	
@@ -35,6 +38,7 @@ public class JavaSourceMethod {
 		STATIC,
 		INSTANCE,
 		EXPANSION,
+		CONSTRUCTOR,
 		COMPILED
 	}
 }

Shared/src/main/java/org/openzen/zenscript/shared/ConcatMap.java

@@ -47,7 +47,7 @@ public class ConcatMap<K, V> {
 	}
 	
 	public V get(K key) {
-		if (key == null)
+		if (this.key == null)
 			return null;
 		if (key.equals(this.key))
 			return value;
@@ -56,7 +56,7 @@ public class ConcatMap<K, V> {
 	}
 	
 	public V get(K key, V defaultValue) {
-		if (key == null)
+		if (this.key == null)
 			return defaultValue;
 		if (key.equals(this.key))
 			return value;

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

@@ -63,6 +63,9 @@ public class ValidationLogEntry {
 		SETTING_FINAL_VARIABLE,
 		INVALID_SUPERTYPE,
 		MULTIPLE_DESTRUCTORS,
-		PANIC_ARGUMENT_NO_STRING
+		PANIC_ARGUMENT_NO_STRING,
+		THROW_WITHOUT_THROWS,
+		DESTRUCTOR_CANNOT_THROW,
+		STATIC_INITIALIZER_CANNOT_THROW
 	}
 }

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

@@ -20,6 +20,7 @@ import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
 import org.openzen.zenscript.codemodel.member.DestructorMember;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
+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.ImplementationMember;
@@ -107,7 +108,8 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		} else {
 			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
 			member.body.accept(statementValidator);
-			
+			validateThrow(member);
+				
 			if (member.definition.superType != null && !statementValidator.constructorForwarded) {
 				validator.logError(ValidationLogEntry.Code.CONSTRUCTOR_FORWARD_MISSING, member.position, "Constructor not forwarded to base type");
 			}
@@ -125,6 +127,10 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		if (member.body != null) {
 			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
 			member.body.accept(statementValidator);
+			validateThrow(member);
+			
+			if (member.header.thrownType != null)
+				validator.logError(ValidationLogEntry.Code.DESTRUCTOR_CANNOT_THROW, member.position, "Destructor cannot throw");
 		}
 		return null;
 	}
@@ -137,6 +143,7 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		if (member.body != null) {
 			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
 			member.body.accept(statementValidator);
+			validateThrow(member);
 		}
 		return null;
 	}
@@ -149,6 +156,7 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		if (member.body != null) {
 			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
 			member.body.accept(statementValidator);
+			validateThrow(member);
 		}
 		
 		return null;
@@ -162,6 +170,7 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		if (member.body != null) {
 			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
 			member.body.accept(statementValidator);
+			validateThrow(member);
 		}
 		
 		return null;
@@ -186,6 +195,7 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		if (member.body != null) {
 			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
 			member.body.accept(statementValidator);
+			validateThrow(member);
 		}
 		
 		return null;
@@ -198,6 +208,7 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		if (member.body != null) {
 			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
 			member.body.accept(statementValidator);
+			validateThrow(member);
 		}
 		
 		return null;
@@ -216,6 +227,7 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		if (member.body != null) {
 			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
 			member.body.accept(statementValidator);
+			validateThrow(member);
 		}
 		
 		return null;
@@ -255,9 +267,16 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 	@Override
 	public Void visitStaticInitializer(StaticInitializerMember member) {
 		member.body.accept(new StatementValidator(validator, new StaticInitializerScope()));
+		if (member.body.thrownType != null)
+			validator.logError(ValidationLogEntry.Code.STATIC_INITIALIZER_CANNOT_THROW, member.position, "Static initializer cannot throw");
 		return null;
 	}
 	
+	private void validateThrow(FunctionalMember member) {
+		if (member.body.thrownType != null && member.header.thrownType == null) // TODO: validate thrown type
+			validator.logError(ValidationLogEntry.Code.THROW_WITHOUT_THROWS, member.position, "Method is throwing but doesn't declare throws type");
+	}
+	
 	private class FieldInitializerScope implements ExpressionScope {
 		private final FieldMember field;
 		

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

@@ -449,7 +449,7 @@ public class ExpressionValidator implements ExpressionVisitor<Void> {
 	@Override
 	public Void visitPanic(PanicExpression expression) {
 		expression.value.accept(this);
-		if (expression.type != BasicTypeID.STRING)
+		if (expression.value.type != BasicTypeID.STRING)
 			validator.logError(ValidationLogEntry.Code.PANIC_ARGUMENT_NO_STRING, expression.position, "Argument to a panic must be a string");
 		return null;
 	}