- Added (key, value) iterator for associative arrays

- Added type bounds checking code
- Fixed definitions not being added to the respective packages
- Fixed various bugs with generics
- Added some things to stdlib and created collections library

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

@@ -15,6 +15,7 @@ import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
 
 /**
  *
@@ -58,7 +59,7 @@ public class FunctionHeader {
 		return new FunctionHeader(genericParameters, returnType, parameters);
 	}
 	
-	public ITypeID[] inferTypes(CallArguments arguments, List<ITypeID> resultHint) {
+	public ITypeID[] inferTypes(LocalMemberCache cache, CallArguments arguments, List<ITypeID> resultHint) {
 		if (arguments.arguments.length != this.parameters.length)
 			return null;
 		
@@ -66,7 +67,7 @@ public class FunctionHeader {
 		if (!resultHint.isEmpty()) {
 			Map<TypeParameter, ITypeID> temp = new HashMap<>();
 			for (ITypeID hint : resultHint) {
-				if (returnType.inferTypeParameters(hint, temp)) {
+				if (returnType.inferTypeParameters(cache, hint, temp)) {
 					mapping = temp;
 					break;
 				}
@@ -75,7 +76,7 @@ public class FunctionHeader {
 		
 		// TODO: lambda header inference
 		for (int i = 0; i < parameters.length; i++)
-			if (!parameters[i].type.inferTypeParameters(arguments.arguments[i].type, mapping))
+			if (!parameters[i].type.inferTypeParameters(cache, arguments.arguments[i].type, mapping))
 				return null;
 		
 		if (mapping.size() > typeParameters.length)

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

@@ -10,6 +10,7 @@ import java.util.List;
 import org.openzen.zenscript.codemodel.definition.DefinitionVisitor;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.member.ConstructorMember;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
@@ -22,14 +23,12 @@ import org.openzen.zenscript.shared.Taggable;
  * @author Hoofdgebruiker
  */
 public abstract class HighLevelDefinition extends Taggable {
-	private static final TypeParameter[] NO_PARAMETERS = new TypeParameter[0];
-	
 	public final CodePosition position;
 	public final ZSPackage pkg;
 	public final String name;
 	public final int modifiers;
 	public final List<IDefinitionMember> members = new ArrayList<>();
-	public TypeParameter[] genericParameters = NO_PARAMETERS;
+	public TypeParameter[] genericParameters = null;
 	
 	public HighLevelDefinition outerDefinition;
 	public ITypeID superType;
@@ -40,6 +39,13 @@ public abstract class HighLevelDefinition extends Taggable {
 		this.name = name;
 		this.modifiers = modifiers;
 		this.outerDefinition = outerDefinition;
+		
+		if (pkg != null)
+			pkg.register(this);
+	}
+	
+	public int getNumberOfGenericParameters() {
+		return genericParameters == null ? 0 : genericParameters.length;
 	}
 	
 	public void setOuterDefinition(HighLevelDefinition outerDefinition) {
@@ -77,6 +83,17 @@ public abstract class HighLevelDefinition extends Taggable {
 		return enumMembers;
 	}
 	
+	public boolean hasEmptyConstructor() {
+		for (IDefinitionMember member : members) {
+			if (member instanceof ConstructorMember) {
+				if (((ConstructorMember) member).header.parameters.length == 0)
+					return true;
+			}
+		}
+		
+		return false;
+	}
+	
 	public boolean isStatic() {
 		return (modifiers & Modifiers.STATIC) > 0;
 	}

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

@@ -38,15 +38,15 @@ public class ZSPackage {
 		if (subPackages.containsKey(name))
 			throw new RuntimeException("Such package already exists: " + name);
 		
-		subPackages.put(name, this);
+		subPackages.put(name, subPackage);
 	}
 	
 	public IPartialExpression getMember(CodePosition position, GlobalTypeRegistry registry, GenericName name) {
-		if (subPackages.containsKey(name.name) && name.arguments.isEmpty())
+		if (subPackages.containsKey(name.name) && name.hasNoArguments())
 			return new PartialPackageExpression(position, subPackages.get(name.name));
 		
 		if (types.containsKey(name.name)) {
-			if (types.get(name.name).genericParameters.length != name.arguments.size())
+			if (types.get(name.name).genericParameters.length != name.getNumberOfArguments())
 				throw new CompileException(position, CompileExceptionCode.TYPE_ARGUMENTS_INVALID_NUMBER, "Invalid number of type arguments");
 			
 			return new PartialTypeExpression(position, registry.getForDefinition(types.get(name.name), name.arguments));
@@ -77,7 +77,7 @@ public class ZSPackage {
 			return null;
 		
 		GenericName name = nameParts.get(depth);
-		if (subPackages.containsKey(name.name) && name.arguments.isEmpty())
+		if (subPackages.containsKey(name.name) && name.hasNoArguments())
 			return subPackages.get(name.name).getType(position, scope, nameParts, depth + 1);
 		
 		if (types.containsKey(name.name)) {

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

@@ -25,7 +25,7 @@ public class CallArguments {
 	
 	public CallArguments(ITypeID[] typeArguments, Expression[] arguments) {
 		if (typeArguments == null)
-			throw new IllegalArgumentException("Type arguments cannot be null!");
+			typeArguments = NO_TYPE_ARGUMENTS;
 		if (arguments == null)
 			throw new IllegalArgumentException("Arguments cannot be null!");
 		

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

@@ -20,6 +20,7 @@ public class CallExpression extends Expression {
 	public final Expression target;
 	public final FunctionalMember member;
 	public final CallArguments arguments;
+	public final FunctionHeader instancedHeader;
 	
 	public CallExpression(CodePosition position, Expression target, FunctionalMember member, FunctionHeader instancedHeader, CallArguments arguments) {
 		super(position, instancedHeader.returnType);
@@ -37,6 +38,7 @@ public class CallExpression extends Expression {
 		this.target = target;
 		this.member = member;
 		this.arguments = arguments;
+		this.instancedHeader = instancedHeader;
 	}
 	
 	public Expression getFirstArgument() {

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.shared.CodePosition;
@@ -17,13 +18,15 @@ public class CallStaticExpression extends Expression {
 	public final FunctionalMember member;
 	public final ITypeID target;
 	public final CallArguments arguments;
+	public final FunctionHeader instancedHeader;
 	
-	public CallStaticExpression(CodePosition position, ITypeID target, FunctionalMember member, CallArguments arguments) {
+	public CallStaticExpression(CodePosition position, ITypeID target, FunctionalMember member, CallArguments arguments, FunctionHeader instancedHeader) {
 		super(position, member.header.returnType);
 		
 		this.member = member;
 		this.target = target;
 		this.arguments = arguments;
+		this.instancedHeader = instancedHeader;
 	}
 
 	@Override

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
-import java.util.Collections;
 import org.openzen.zenscript.codemodel.definition.EnumDefinition;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
@@ -26,7 +25,7 @@ public class EnumConstantExpression extends Expression {
 	}
 	
 	public EnumConstantExpression(CodePosition position, GlobalTypeRegistry registry, EnumDefinition type, EnumConstantMember value) {
-		super(position, registry.getForDefinition(type, Collections.emptyList()));
+		super(position, registry.getForDefinition(type, null));
 		
 		this.value = value;
 	}

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

@@ -79,4 +79,9 @@ public abstract class Expression implements IPartialExpression {
 		TypeMembers members = scope.getTypeMembers(type);
 		return members.getMemberExpression(position, this, name, false);
 	}
+	
+	@Override
+	public ITypeID[] getGenericCallTypes() {
+		return null;
+	}
 }

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

@@ -18,6 +18,9 @@ public class WrapOptionalExpression extends Expression {
 	public WrapOptionalExpression(CodePosition position, Expression value, ITypeID optionalType) {
 		super(position, optionalType);
 		
+		if (value.type.isOptional())
+			throw new IllegalArgumentException("Value is already optional");
+		
 		this.value = value;
 	}
 

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

@@ -20,7 +20,7 @@ public abstract class GenericParameterBound {
 	
 	public abstract void registerMembers(LocalMemberCache cache, TypeMembers type);
 	
-	public abstract boolean matches(ITypeID type);
+	public abstract boolean matches(LocalMemberCache cache, ITypeID type);
 	
 	public abstract GenericParameterBound withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments);
 }

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

@@ -28,13 +28,17 @@ public class ParameterSuperBound extends GenericParameterBound {
 	}
 
 	@Override
-	public boolean matches(ITypeID type) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	public boolean matches(LocalMemberCache cache, ITypeID type) {
+		return cache.get(this.type).extendsOrImplements(type);
 	}
 
 	@Override
 	public GenericParameterBound withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		ITypeID translated = type.withGenericArguments(registry, arguments);
+		if (translated == type)
+			return this;
+		
+		return new ParameterSuperBound(translated);
 	}
 
 	@Override

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

@@ -32,8 +32,8 @@ public class ParameterTypeBound extends GenericParameterBound {
 	}
 
 	@Override
-	public boolean matches(ITypeID type) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	public boolean matches(LocalMemberCache cache, ITypeID type) {
+		return cache.get(type).extendsOrImplements(this.type);
 	}
 
 	@Override

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

@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Map;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
 import org.openzen.zenscript.shared.CodePosition;
 
 /**
@@ -36,9 +37,9 @@ public class TypeParameter {
 		bounds.add(bound);
 	}
 	
-	public boolean matches(ITypeID type) {
+	public boolean matches(LocalMemberCache cache, ITypeID type) {
 		for (GenericParameterBound bound : bounds) {
-			if (!bound.matches(type))
+			if (!bound.matches(cache, type))
 				return false;
 		}
 		

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

@@ -58,7 +58,7 @@ public abstract class FunctionalMember extends DefinitionMember implements ICall
 	
 	@Override
 	public Expression callStatic(CodePosition position, ITypeID target, FunctionHeader instancedHeader, CallArguments arguments) {
-		return new CallStaticExpression(position, target, this, arguments);
+		return new CallStaticExpression(position, target, this, arguments, instancedHeader);
 	}
 	
 	@Override

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

@@ -6,7 +6,6 @@
 package org.openzen.zenscript.codemodel.member;
 
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
@@ -32,7 +31,7 @@ public class InnerDefinition {
 		this.outerTypeArguments = outerTypeArguments;
 	}
 	
-	public DefinitionTypeID instance(GlobalTypeRegistry registry, List<ITypeID> typeArguments) {
+	public DefinitionTypeID instance(GlobalTypeRegistry registry, ITypeID[] typeArguments) {
 		return registry.getForDefinition(definition, typeArguments, outerTypeArguments);
 	}
 }

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

@@ -0,0 +1,77 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.codemodel.member.builtin;
+
+import java.util.Map;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.member.IIteratorMember;
+import org.openzen.zenscript.codemodel.member.MemberVisitor;
+import org.openzen.zenscript.codemodel.type.AssocTypeID;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.Taggable;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class AssocIterator extends Taggable implements IIteratorMember {
+	private final AssocTypeID type;
+	private final ITypeID[] loopVariableTypes;
+	
+	public AssocIterator(AssocTypeID type) {
+		this.type = type;
+		
+		loopVariableTypes = new ITypeID[2];
+		loopVariableTypes[0] = type.keyType;
+		loopVariableTypes[1] = type.valueType;
+	}
+	
+	@Override
+	public CodePosition getPosition() {
+		return CodePosition.BUILTIN;
+	}
+
+	@Override
+	public int getLoopVariableCount() {
+		return loopVariableTypes.length;
+	}
+
+	@Override
+	public ITypeID[] getLoopVariableTypes() {
+		return loopVariableTypes;
+	}
+
+	@Override
+	public String describe() {
+		return "iterator for key/value pairs in an associative array";
+	}
+
+	@Override
+	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
+		type.addIterator(this, priority);
+	}
+
+	@Override
+	public IDefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
+		return new AssocIterator(type.withGenericArguments(registry, mapping));
+	}
+
+	@Override
+	public <T> T accept(MemberVisitor<T> visitor) {
+		throw new UnsupportedOperationException("Not a compilable member");
+	}
+
+	@Override
+	public <T> T acceptForIterator(ForeachIteratorVisitor<T> visitor) {
+		return visitor.visitArrayKeyValueIterator();
+	}
+}

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

@@ -37,6 +37,8 @@ public interface IPartialExpression {
 	
 	Expression call(CodePosition position, TypeScope scope, List<ITypeID> hints, CallArguments arguments);
 	
+	ITypeID[] getGenericCallTypes();
+	
 	default Expression assign(CodePosition position, TypeScope scope, Expression value) {
 		throw new CompileException(position, CompileExceptionCode.CANNOT_ASSIGN, "This expression is not assignable");
 	}

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

@@ -24,11 +24,13 @@ public class PartialGlobalExpression implements IPartialExpression {
 	private final CodePosition position;
 	private final String name;
 	private final IPartialExpression resolution;
+	private final ITypeID[] typeParameters;
 	
-	public PartialGlobalExpression(CodePosition position, String name, IPartialExpression resolution) {
+	public PartialGlobalExpression(CodePosition position, String name, IPartialExpression resolution, ITypeID[] typeParameters) {
 		this.position = position;
 		this.name = name;
 		this.resolution = resolution;
+		this.typeParameters = typeParameters;
 	}
 	
 	@Override
@@ -55,4 +57,9 @@ public class PartialGlobalExpression implements IPartialExpression {
 	public Expression call(CodePosition position, TypeScope scope, List<ITypeID> hints, CallArguments arguments) {
 		return new GlobalCallExpression(position, name, arguments, resolution.call(position, scope, hints, arguments));
 	}
+
+	@Override
+	public ITypeID[] getGenericCallTypes() {
+		return typeParameters;
+	}
 }

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

@@ -27,19 +27,22 @@ public class PartialMemberGroupExpression implements IPartialExpression {
 	private final CodePosition position;
 	private final Expression target;
 	private final DefinitionMemberGroup group;
+	private final ITypeID[] typeArguments;
 	private final boolean allowStaticUsage;
 	
-	public PartialMemberGroupExpression(CodePosition position, Expression target, DefinitionMemberGroup group, boolean allowStaticMembers) {
+	public PartialMemberGroupExpression(CodePosition position, Expression target, DefinitionMemberGroup group, ITypeID[] typeArguments, boolean allowStaticMembers) {
 		this.position = position;
 		this.target = target;
 		this.group = group;
+		this.typeArguments = typeArguments;
 		this.allowStaticUsage = allowStaticMembers;
 	}
 	
-	public PartialMemberGroupExpression(CodePosition position, Expression target, ICallableMember member, boolean allowStaticMembers) {
+	public PartialMemberGroupExpression(CodePosition position, Expression target, ICallableMember member, ITypeID[] typeArguments, boolean allowStaticMembers) {
 		this.position = position;
 		this.target = target;
 		this.group = DefinitionMemberGroup.forMethod(member);
+		this.typeArguments = typeArguments;
 		this.allowStaticUsage = allowStaticMembers;
 	}
 
@@ -91,6 +94,11 @@ public class PartialMemberGroupExpression implements IPartialExpression {
 	
 	@Override
 	public IPartialExpression capture(CodePosition position, LambdaClosure closure) {
-		return new PartialMemberGroupExpression(position, target.capture(position, closure).eval(), group, allowStaticUsage);
+		return new PartialMemberGroupExpression(position, target.capture(position, closure).eval(), group, typeArguments, allowStaticUsage);
+	}
+
+	@Override
+	public ITypeID[] getGenericCallTypes() {
+		return typeArguments;
 	}
 }

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

@@ -55,4 +55,9 @@ public class PartialPackageExpression implements IPartialExpression {
 	public Expression call(CodePosition position, TypeScope scope, List<ITypeID> hints, CallArguments arguments) {
 		throw new CompileException(position, CompileExceptionCode.USING_PACKAGE_AS_CALL_TARGET, "Cannot call a package");
 	}
+
+	@Override
+	public ITypeID[] getGenericCallTypes() {
+		return null;
+	}
 }

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

@@ -23,20 +23,22 @@ import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
  * @author Hoofdgebruiker
  */
 public class PartialStaticMemberGroupExpression implements IPartialExpression {
-	public static PartialStaticMemberGroupExpression forMethod(CodePosition position, ITypeID target, ICallableMember method) {
+	public static PartialStaticMemberGroupExpression forMethod(CodePosition position, ITypeID target, ICallableMember method, ITypeID[] typeArguments) {
 		DefinitionMemberGroup group = new DefinitionMemberGroup(true);
 		group.addMethod(method, TypeMemberPriority.SPECIFIED);
-		return new PartialStaticMemberGroupExpression(position, target, group);
+		return new PartialStaticMemberGroupExpression(position, target, group, typeArguments);
 	}
 	
 	private final CodePosition position;
 	private final ITypeID target;
 	private final DefinitionMemberGroup group;
+	private final ITypeID[] typeArguments;
 	
-	public PartialStaticMemberGroupExpression(CodePosition position, ITypeID target, DefinitionMemberGroup group) {
+	public PartialStaticMemberGroupExpression(CodePosition position, ITypeID target, DefinitionMemberGroup group, ITypeID[] typeArguments) {
 		this.position = position;
 		this.group = group;
 		this.target = target;
+		this.typeArguments = typeArguments;
 	}
 	
 	@Override
@@ -71,4 +73,9 @@ public class PartialStaticMemberGroupExpression implements IPartialExpression {
 	public Expression assign(CodePosition position, TypeScope scope, Expression value) {
 		return group.staticSetter(position, scope, value);
 	}
+
+	@Override
+	public ITypeID[] getGenericCallTypes() {
+		return typeArguments;
+	}
 }

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

@@ -60,4 +60,9 @@ public class PartialTypeExpression implements IPartialExpression {
 	public Expression call(CodePosition position, TypeScope scope, List<ITypeID> hints, CallArguments arguments) {
 		return scope.getTypeMembers(type).getOrCreateGroup(OperatorType.CALL).callStatic(position, type, scope, arguments);
 	}
+
+	@Override
+	public ITypeID[] getGenericCallTypes() {
+		return null;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/TypeScope.java

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.scope;
 
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 
 /**
@@ -16,5 +17,7 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 public interface TypeScope {
 	public GlobalTypeRegistry getTypeRegistry();
 	
+	public LocalMemberCache getMemberCache();
+	
 	public TypeMembers getTypeMembers(ITypeID type);
 }

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

@@ -54,6 +54,11 @@ public class ArrayTypeID implements ITypeID {
 		return elementType.hasInferenceBlockingTypeParameters(parameters);
 	}
 
+	@Override
+	public boolean hasDefaultValue() {
+		return false;
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 7;

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

@@ -22,7 +22,7 @@ public class AssocTypeID implements ITypeID {
 	}
 	
 	@Override
-	public ITypeID withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
+	public AssocTypeID withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
 		return registry.getAssociative(
 				keyType.withGenericArguments(registry, arguments),
 				valueType.withGenericArguments(registry, arguments));
@@ -53,6 +53,11 @@ public class AssocTypeID implements ITypeID {
 		return keyType.hasInferenceBlockingTypeParameters(parameters) || valueType.hasInferenceBlockingTypeParameters(parameters);
 	}
 
+	@Override
+	public boolean hasDefaultValue() {
+		return true;
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 7;

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

@@ -76,4 +76,9 @@ public enum BasicTypeID implements ITypeID {
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {
 		return false;
 	}
+
+	@Override
+	public boolean hasDefaultValue() {
+		return true;
+	}
 }

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

@@ -82,4 +82,9 @@ 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

@@ -5,11 +5,9 @@
  */
 package org.openzen.zenscript.codemodel.type;
 
-import java.util.ArrayList;
 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.HighLevelDefinition;
@@ -24,11 +22,10 @@ public class DefinitionTypeID implements ITypeID {
 		if (definition.genericParameters.length > 0)
 			throw new IllegalArgumentException("Definition has type arguments!");
 		
-		return new DefinitionTypeID(definition, NO_TYPE_PARAMETERS);
+		return new DefinitionTypeID(definition, null);
 	}
 	
 	private static final OuterTypeEntry[] NO_OUTER_ENTRIES = new OuterTypeEntry[0];
-	private static final ITypeID[] NO_TYPE_PARAMETERS = new ITypeID[0];
 	
 	public final HighLevelDefinition definition;
 	public final ITypeID[] typeParameters;
@@ -57,13 +54,17 @@ public class DefinitionTypeID implements ITypeID {
 			Arrays.sort(outerTypeEntries, (a, b) -> a.parameter.name.compareTo(b.parameter.name));
 		}
 		
-		if (typeParameters.length != definition.genericParameters.length)
+		if ((typeParameters == null ? 0 : typeParameters.length) != definition.getNumberOfGenericParameters())
 			throw new RuntimeException("Invalid number of type parameters");
 	}
 	
+	public boolean hasTypeParameters() {
+		return typeParameters != null && typeParameters.length > 0;
+	}
+	
 	public void init(GlobalTypeRegistry registry) {
 		ITypeID superType = definition.superType;
-		if (superType != null && typeParameters.length > 0) {
+		if (superType != null && hasTypeParameters()) {
 			Map<TypeParameter, ITypeID> genericSuperArguments = new HashMap<>();
 			for (int i = 0; i < typeParameters.length; i++)
 				genericSuperArguments.put(definition.genericParameters[i], typeParameters[i]);
@@ -76,7 +77,7 @@ public class DefinitionTypeID implements ITypeID {
 	// To be used exclusively by StaticDefinitionTypeID
 	protected DefinitionTypeID(HighLevelDefinition definition) {
 		this.definition = definition;
-		this.typeParameters = new ITypeID[0];
+		this.typeParameters = null;
 		this.superType = definition.superType;
 		this.outerTypeParameters = Collections.emptyMap();
 		this.outerTypeEntries = NO_OUTER_ENTRIES;
@@ -84,13 +85,17 @@ public class DefinitionTypeID implements ITypeID {
 	
 	@Override
 	public ITypeID withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
-		if (typeParameters.length == 0 && outerTypeParameters.isEmpty())
+		if (!hasTypeParameters() && outerTypeParameters.isEmpty())
 			return this;
 		
-		List<ITypeID> instancedArguments = new ArrayList<>();
-		for (int i = 0; i < typeParameters.length; i++) {
-			instancedArguments.add(arguments.containsKey(definition.genericParameters[i]) ? arguments.get(definition.genericParameters[i]) : typeParameters[i].withGenericArguments(registry, arguments));
+		ITypeID[] instancedArguments = null;
+		if (typeParameters != null) {
+			instancedArguments = new ITypeID[typeParameters.length];
+			for (int i = 0; i < typeParameters.length; i++) {
+				instancedArguments[i] = arguments.containsKey(definition.genericParameters[i]) ? arguments.get(definition.genericParameters[i]) : typeParameters[i].withGenericArguments(registry, arguments);
+			}
 		}
+		
 		Map<TypeParameter, ITypeID> instancedOuter;
 		if (outerTypeParameters.isEmpty()) {
 			instancedOuter = Collections.emptyMap();
@@ -129,9 +134,11 @@ public class DefinitionTypeID implements ITypeID {
 
 	@Override
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {
-		for (ITypeID typeParameter : typeParameters)
-			if (typeParameter.hasInferenceBlockingTypeParameters(parameters))
-				return true;
+		if (typeParameters != null) {
+			for (ITypeID typeParameter : typeParameters)
+				if (typeParameter.hasInferenceBlockingTypeParameters(parameters))
+					return true;
+		}
 		
 		return superType != null && superType.hasInferenceBlockingTypeParameters(parameters);
 	}
@@ -164,7 +171,7 @@ public class DefinitionTypeID implements ITypeID {
 	
 	@Override
 	public String toString() {
-		if (typeParameters.length == 0) {
+		if (typeParameters == null) {
 			return definition.name;
 		} else {
 			StringBuilder result = new StringBuilder();
@@ -179,6 +186,11 @@ public class DefinitionTypeID implements ITypeID {
 			return result.toString();
 		}
 	}
+
+	@Override
+	public boolean hasDefaultValue() {
+		return definition.hasEmptyConstructor();
+	}
 	
 	private class OuterTypeEntry {
 		private final TypeParameter parameter;

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

@@ -52,6 +52,11 @@ public class FunctionTypeID implements ITypeID {
 		return header.hasInferenceBlockingTypeParameters(parameters);
 	}
 
+	@Override
+	public boolean hasDefaultValue() {
+		return false;
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 5;

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

@@ -52,6 +52,11 @@ public class GenericMapTypeID implements ITypeID {
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {
 		return value.hasInferenceBlockingTypeParameters(parameters);
 	}
+
+	@Override
+	public boolean hasDefaultValue() {
+		return true;
+	}
 	
 	@Override
 	public String toString() {

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

@@ -5,31 +5,45 @@
  */
 package org.openzen.zenscript.codemodel.type;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  *
  * @author Hoofdgebruiker
  */
 public class GenericName {
 	public final String name;
-	public final List<ITypeID> arguments;
+	public final ITypeID[] arguments;
 	
 	public GenericName(String name) {
-		this(name, Collections.emptyList());
+		this(name, null);
 	}
 	
-	public GenericName(String name, List<ITypeID> arguments) {
+	public GenericName(String name, ITypeID[] arguments) {
 		this.name = name;
 		this.arguments = arguments;
 	}
 	
+	public int getNumberOfArguments() {
+		return arguments == null ? 0 : arguments.length;
+	}
+	
+	public boolean hasArguments() {
+		return arguments != null && arguments.length > 0;
+	}
+	
+	public boolean hasNoArguments() {
+		return arguments == null || arguments.length == 0;
+	}
+	
 	@Override
 	public String toString() {
 		StringBuilder result = new StringBuilder(name);
-		if (!arguments.isEmpty()) {
+		if (arguments != null) {
 			result.append("<");
+			for (int i = 0; i < arguments.length; i++) {
+				if (i > 0)
+					result.append(", ");
+				result.append(arguments[i].toString());
+			}
 			result.append(">");
 		}
 		return result.toString();

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.type;
 
 import java.util.Map;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
 
 /**
  *
@@ -19,8 +20,8 @@ public class GenericTypeID implements ITypeID {
 		this.parameter = parameter;
 	}
 	
-	public boolean matches(ITypeID type) {
-		return parameter.matches(type);
+	public boolean matches(LocalMemberCache cache, ITypeID type) {
+		return parameter.matches(cache, type);
 	}
 	
 	@Override
@@ -57,6 +58,11 @@ public class GenericTypeID implements ITypeID {
 		return false;
 	}
 
+	@Override
+	public boolean hasDefaultValue() {
+		return false;
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 7;

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

@@ -7,7 +7,6 @@ package org.openzen.zenscript.codemodel.type;
 
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
@@ -111,17 +110,17 @@ public class GlobalTypeRegistry {
 		}
 	}
 	
-	public DefinitionTypeID getForDefinition(HighLevelDefinition definition, List<ITypeID> genericArguments) {
+	public DefinitionTypeID getForDefinition(HighLevelDefinition definition, ITypeID[] genericArguments) {
 		return this.getForDefinition(definition, genericArguments, Collections.emptyMap());
 	}
 	
-	public DefinitionTypeID getForDefinition(HighLevelDefinition definition, List<ITypeID> typeParameters, Map<TypeParameter, ITypeID> outerInstance) {
+	public DefinitionTypeID getForDefinition(HighLevelDefinition definition, ITypeID[] typeParameters, Map<TypeParameter, ITypeID> outerInstance) {
 		DefinitionTypeID id;
-		if (definition.genericParameters.length > 0 && typeParameters.isEmpty() && outerInstance.isEmpty()) {
+		if (definition.genericParameters == null && typeParameters == null && outerInstance.isEmpty()) {
 			// make it a static one
 			id = new StaticDefinitionTypeID(definition);
 		} else {
-			id = new DefinitionTypeID(definition, typeParameters.toArray(new ITypeID[typeParameters.size()]), outerInstance);
+			id = new DefinitionTypeID(definition, typeParameters, outerInstance);
 		}
 		
 		if (definitionTypes.containsKey(id)) {

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.type;
 
 import java.util.Map;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
 
 /**
  *
@@ -33,23 +34,27 @@ public interface ITypeID {
 		return this;
 	}
 	
+	public boolean hasDefaultValue();
+	
 	public ITypeID withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments);
 	
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters);
 	
 	// Infers type parameters for this type so it matches with targetType
 	// returns false if that isn't possible
-	public default boolean inferTypeParameters(ITypeID targetType, Map<TypeParameter, ITypeID> mapping) {
-		return accept(new MatchingTypeVisitor(targetType, mapping));
+	public default boolean inferTypeParameters(LocalMemberCache cache, ITypeID targetType, Map<TypeParameter, ITypeID> mapping) {
+		return accept(new MatchingTypeVisitor(cache, targetType, mapping));
 	}
 	
 	public static class MatchingTypeVisitor implements ITypeVisitor<Boolean> {
 		private final ITypeID type;
 		private final Map<TypeParameter, ITypeID> mapping;
+		private final LocalMemberCache cache;
 		
-		public MatchingTypeVisitor(ITypeID type, Map<TypeParameter, ITypeID> mapping) {
+		public MatchingTypeVisitor(LocalMemberCache cache, ITypeID type, Map<TypeParameter, ITypeID> mapping) {
 			this.type = type;
 			this.mapping = mapping;
+			this.cache = cache;
 		}
 
 		@Override
@@ -141,7 +146,7 @@ public interface ITypeID {
 		public Boolean visitGeneric(GenericTypeID generic) {
 			if (mapping.containsKey(generic.parameter)) {
 				return mapping.get(generic.parameter) == type;
-			} else if (generic.matches(type)) {
+			} else if (generic.matches(cache, type)) {
 				mapping.put(generic.parameter, type);
 				return true;
 			} else {
@@ -183,7 +188,7 @@ public interface ITypeID {
 			if (type == pattern)
 				return true;
 			
-			return pattern.accept(new MatchingTypeVisitor(type, mapping));
+			return pattern.accept(new MatchingTypeVisitor(cache, type, mapping));
 		}
 
 		@Override

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

@@ -58,6 +58,11 @@ public class IteratorTypeID implements ITypeID {
 		return false;
 	}
 
+	@Override
+	public boolean hasDefaultValue() {
+		return false;
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 5;

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

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

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

@@ -55,6 +55,11 @@ public class RangeTypeID implements ITypeID {
 		return from.hasInferenceBlockingTypeParameters(parameters) || to.hasInferenceBlockingTypeParameters(parameters);
 	}
 
+	@Override
+	public boolean hasDefaultValue() {
+		return false;
+	}
+
 	@Override
 	public int hashCode() {
 		int hash = 5;

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

@@ -224,6 +224,7 @@ public class BuiltinTypeMembers {
 	public static final OperatorMember STRING_INDEXGET = new OperatorMember(BUILTIN, T_STRING, Modifiers.EXPORT | Modifiers.EXTERN, OperatorType.INDEXGET, new FunctionHeader(CHAR, new FunctionParameter(INT)));
 	public static final OperatorMember STRING_RANGEGET = new OperatorMember(BUILTIN, T_STRING, Modifiers.EXPORT | Modifiers.EXTERN, OperatorType.INDEXGET, new FunctionHeader(STRING, new FunctionParameter(RangeTypeID.INT)));
 	public static final GetterMember STRING_LENGTH = new GetterMember(BUILTIN, T_STRING, Modifiers.EXPORT | Modifiers.EXTERN, "length", INT);
+	public static final GetterMember STRING_CHARACTERS = new GetterMember(BUILTIN, T_STRING, Modifiers.PUBLIC | Modifiers.EXTERN, "characters", ArrayTypeID.CHAR);
 	
 	private static OperatorMember not(ClassDefinition cls, ITypeID result) {
 		return new OperatorMember(BUILTIN, cls, 0, OperatorType.NOT, new FunctionHeader(result));

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

@@ -218,7 +218,7 @@ public class DefinitionMemberGroup {
 			if (header.typeParameters.length > 0) {
 				for (ITypeID resultHint : typeHints) {
 					Map<TypeParameter, ITypeID> mapping = new HashMap<>();
-					if (header.returnType.inferTypeParameters(resultHint, mapping)) {
+					if (header.returnType.inferTypeParameters(scope.getMemberCache(), resultHint, mapping)) {
 						header = header.withGenericArguments(scope.getTypeRegistry(), mapping);
 						break;
 					}
@@ -236,11 +236,11 @@ public class DefinitionMemberGroup {
 	
 	public Expression call(CodePosition position, TypeScope scope, Expression target, CallArguments arguments, boolean allowStaticUsage) {
 		ICallableMember method = selectMethod(position, scope, arguments, true, allowStaticUsage);
+		FunctionHeader instancedHeader = method.getHeader().withGenericArguments(scope.getTypeRegistry(), arguments.typeArguments);
 		for (int i = 0; i < arguments.arguments.length; i++) {
-			arguments.arguments[i] = arguments.arguments[i].castImplicit(position, scope, method.getHeader().parameters[i].type);
+			arguments.arguments[i] = arguments.arguments[i].castImplicit(position, scope, instancedHeader.parameters[i].type);
 		}
 		
-		FunctionHeader instancedHeader = method.getHeader().withGenericArguments(scope.getTypeRegistry(), arguments.typeArguments);
 		return method.call(position, target, instancedHeader, arguments);
 	}
 	

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

@@ -54,7 +54,7 @@ public class LocalMemberCache {
 	}
 	
 	private void registerMembers(TypeMembers members) {
-		members.type.accept(new TypeMemberBuilder(members, this));
+		members.type.accept(new TypeMemberBuilder(registry, members, this));
 		
 		for (ExpansionDefinition expansion : expansions) {
 			if (expansion.target == null)
@@ -78,7 +78,7 @@ public class LocalMemberCache {
 			return Collections.emptyMap();
 		
 		Map<TypeParameter, ITypeID> mapping = new HashMap<>();
-		if (pattern.inferTypeParameters(type, mapping))
+		if (pattern.inferTypeParameters(this, type, mapping))
 			return mapping;
 		
 		return null;

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

@@ -35,6 +35,7 @@ import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.member.TranslatedOperatorMember;
 import org.openzen.zenscript.codemodel.member.builtin.ArrayIteratorKeyValues;
 import org.openzen.zenscript.codemodel.member.builtin.ArrayIteratorValues;
+import org.openzen.zenscript.codemodel.member.builtin.AssocIterator;
 import org.openzen.zenscript.codemodel.member.builtin.ComparatorMember;
 import org.openzen.zenscript.codemodel.member.builtin.ConstantGetterMember;
 import org.openzen.zenscript.codemodel.member.builtin.RangeIterator;
@@ -48,6 +49,7 @@ import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericMapTypeID;
 import org.openzen.zenscript.codemodel.type.GenericTypeID;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.ITypeVisitor;
 import org.openzen.zenscript.codemodel.type.IteratorTypeID;
@@ -61,10 +63,12 @@ import static org.openzen.zenscript.shared.CodePosition.BUILTIN;
  * @author Hoofdgebruiker
  */
 public class TypeMemberBuilder implements ITypeVisitor<Void> {
+	private final GlobalTypeRegistry registry;
 	private final TypeMembers members;
 	private final LocalMemberCache cache;
 
-	public TypeMemberBuilder(TypeMembers members, LocalMemberCache cache) {
+	public TypeMemberBuilder(GlobalTypeRegistry registry, TypeMembers members, LocalMemberCache cache) {
+		this.registry = registry;
 		this.members = members;
 		this.cache = cache;
 		
@@ -178,7 +182,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		FunctionHeader indexSetHeader = new FunctionHeader(VOID, new FunctionParameter(keyType, "key"), new FunctionParameter(valueType, "value"));
 		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.INDEXSET, indexSetHeader));
 		
-		FunctionHeader getOrDefaultHeader = new FunctionHeader(valueType, new FunctionParameter(keyType, "key"), new FunctionParameter(valueType, "defaultValue"));
+		FunctionHeader getOrDefaultHeader = new FunctionHeader(registry.getOptional(valueType), new FunctionParameter(keyType, "key"), new FunctionParameter(valueType, "defaultValue"));
 		members.addMethod(new MethodMember(BUILTIN, definition, 0, "getOrDefault", getOrDefaultHeader));
 		
 		members.addOperator(new OperatorMember(BUILTIN, definition, 0, OperatorType.CONTAINS, new FunctionHeader(BOOL, new FunctionParameter(keyType, "key"))));
@@ -186,6 +190,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addField(new FieldMember(BUILTIN, definition, Modifiers.FINAL, "size", INT));
 		members.addGetter(new GetterMember(BUILTIN, definition, 0, "empty", BOOL));
 		members.addGetter(new GetterMember(BUILTIN, definition, 0, "keys", cache.getRegistry().getArray(keyType, 1)));
+		
+		members.addIterator(new AssocIterator(assoc), TypeMemberPriority.SPECIFIED);
 		return null;
 	}
 	
@@ -195,7 +201,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		
 		ClassDefinition definition = new ClassDefinition(BUILTIN, null, "", Modifiers.EXPORT);
 		members.addConstructor(new ConstructorMember(BUILTIN, definition, 0, new FunctionHeader(VOID)));
-		members.addMethod(new MethodMember(BUILTIN, definition, 0, "getOptional", new FunctionHeader(map.keys, valueType, new FunctionParameter[0])));
+		members.addMethod(new MethodMember(BUILTIN, definition, 0, "getOptional", new FunctionHeader(map.keys, registry.getOptional(valueType), new FunctionParameter[0])));
 		members.addMethod(new MethodMember(BUILTIN, definition, 0, "put", new FunctionHeader(map.keys, BasicTypeID.VOID, new FunctionParameter(valueType))));
 		members.addMethod(new MethodMember(BUILTIN, definition, 0, "contains", new FunctionHeader(map.keys, BasicTypeID.BOOL, new FunctionParameter[0])));
 		return null;
@@ -216,10 +222,12 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 	@Override
 	public Void visitDefinition(DefinitionTypeID type) {
 		HighLevelDefinition definition = type.definition;
-		if (type.typeParameters.length > 0 || !type.outerTypeParameters.isEmpty()) {
+		if (type.hasTypeParameters() || !type.outerTypeParameters.isEmpty()) {
 			Map<TypeParameter, ITypeID> mapping = new HashMap<>();
-			for (int i = 0; i < type.typeParameters.length; i++)
-				mapping.put(definition.genericParameters[i], type.typeParameters[i]);
+			if (type.typeParameters != null)
+				for (int i = 0; i < type.typeParameters.length; i++)
+					mapping.put(definition.genericParameters[i], type.typeParameters[i]);
+			
 			for (Map.Entry<TypeParameter, ITypeID> entry : type.outerTypeParameters.entrySet())
 				mapping.put(entry.getKey(), entry.getValue());
 			
@@ -286,7 +294,16 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		ClassDefinition definition = new ClassDefinition(BUILTIN, null, "", Modifiers.EXPORT);
 		members.addField(new FieldMember(BUILTIN, definition, Modifiers.FINAL, "from", fromType), TypeMemberPriority.SPECIFIED);
 		members.addField(new FieldMember(BUILTIN, definition, Modifiers.FINAL, "to", toType), TypeMemberPriority.SPECIFIED);
-		members.addIterator(new RangeIterator(range), TypeMemberPriority.SPECIFIED);
+		if (range.from == range.to && (range.from == BasicTypeID.BYTE
+				|| range.from == BasicTypeID.SBYTE
+				|| range.from == BasicTypeID.SHORT
+				|| range.from == BasicTypeID.USHORT
+				|| range.from == BasicTypeID.INT
+				|| range.from == BasicTypeID.UINT
+				|| range.from == BasicTypeID.LONG
+				|| range.from == BasicTypeID.ULONG)) {
+			members.addIterator(new RangeIterator(range), TypeMemberPriority.SPECIFIED);
+		}
 		return null;
 	}
 
@@ -450,6 +467,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addOperator(STRING_INDEXGET);
 		members.addOperator(STRING_RANGEGET);
 		members.addGetter(STRING_LENGTH);
+		members.addGetter(STRING_CHARACTERS);
 
 		members.addConstructor(STRING_CONSTRUCTOR_CHARACTERS);
 		members.addConstructor(STRING_CONSTRUCTOR_CHARACTER_RANGE);

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

@@ -78,12 +78,32 @@ public final class TypeMembers {
 		return cache;
 	}
 	
+	public boolean extendsOrImplements(ITypeID other) {
+		ITypeID superType = type.getSuperType();
+		if (superType != null) {
+			if (superType == other)
+				return true;
+			if (cache.get(superType).extendsOrImplements(other))
+				return true;
+		}
+		
+		for (TypeMember<ImplementationMember> implementation : implementations) {
+			if (implementation.member.type == other)
+				return true;
+			if (cache.get(implementation.member.type).extendsOrImplements(other))
+				return true;
+		}
+		
+		return false;
+	}
+	
 	public GlobalTypeRegistry getTypeRegistry() {
 		return cache.getRegistry();
 	}
 	
 	public void copyMembersTo(CodePosition position, TypeMembers other, TypeMemberPriority priority) {
 		other.casters.addAll(casters);
+		other.iterators.addAll(iterators);
 		
 		for (Map.Entry<String, EnumConstantMember> entry : enumMembers.entrySet())
 			other.addEnumMember(entry.getValue(), priority);
@@ -369,14 +389,10 @@ public final class TypeMembers {
 		if (members.containsKey(name.name)) {
 			DefinitionMemberGroup group = members.get(name.name);
 			
-			if (!name.arguments.isEmpty()) {
-				/* ... */
-			}
-			
 			if (group.isStatic)
-				return new PartialStaticMemberGroupExpression(position, type, group);
+				return new PartialStaticMemberGroupExpression(position, type, group, name.arguments);
 			else
-				return new PartialMemberGroupExpression(position, target, group, allowStatic);
+				return new PartialMemberGroupExpression(position, target, group, name.arguments, allowStatic);
 		}
 		
 		return null;
@@ -384,7 +400,7 @@ public final class TypeMembers {
 	
 	public IPartialExpression getStaticMemberExpression(CodePosition position, GenericName name) {
 		if (members.containsKey(name.name))
-			return new PartialStaticMemberGroupExpression(position, type, members.get(name.name));
+			return new PartialStaticMemberGroupExpression(position, type, members.get(name.name), name.arguments);
 		if (innerTypes.containsKey(name.name))
 			return new PartialTypeExpression(position, innerTypes.get(name.name).instance(cache.getRegistry(), name.arguments));
 		

Constructor/libraries/collections/module.json

@@ -0,0 +1,4 @@
+{
+	"package": "collections",
+	"host": "universal"
+}

Constructor/libraries/collections/src/HashSet.zs

@@ -0,0 +1,9 @@
+export class HashSet<T> {
+	public implements Set<T> {
+		add(value as T) as bool;
+		remove(value as T) as bool;
+		
+		in(value as T) as bool;
+		for(x as T);
+	}
+}

Constructor/libraries/collections/src/LinkedList.zs

@@ -0,0 +1,43 @@
+export class LinkedList<T> {
+	var first as Node?;
+	var last as Node?;
+	
+	public get empty as bool
+		=> first == null;
+	
+	public add(value as T) as void {
+		if first == null {
+			first = last = new Node(value);
+		} else {
+			val node = new Node(value);
+			last.next = node;
+			node.prev = last;
+			last = node;
+		}
+	}
+	
+	public implements Queue<T> {
+		poll() as T?
+			=> first == null ? null : first.value;
+		
+		peek() as T {
+			if first == null
+				throw new NoSuchElementException("Cannot peek an empty queue");
+			
+			return first.value;
+		}
+		
+		offer(value as T) as void
+			=> add(value);
+	}
+	
+	private struct Node {
+		var next as Node?;
+		var prev as Node?;
+		val value as T;
+		
+		this(value as T) {
+			this.value = value;
+		}
+	}
+}

Constructor/libraries/collections/src/NoSuchElementException.zs

@@ -0,0 +1,5 @@
+export class NoSuchElementException : Exception {
+	public this(message as string) {
+		super(message);
+	}
+}

Constructor/libraries/collections/src/Queue.zs

@@ -0,0 +1,7 @@
+export interface Queue<T> {
+	get empty as bool;
+	
+	poll() as T;
+	peek() as T;
+	push(value as T) as void;
+}

Constructor/libraries/collections/src/Set.zs

@@ -0,0 +1,8 @@
+export interface Set<T> {
+	add(value as T) as bool;
+	remove(value as T) as bool;
+	
+	in(value as T) as bool;
+	
+	for(x as T);
+}

Constructor/libraries/stdlib/module.json

@@ -2,8 +2,10 @@
 	"package": "stdlib",
 	"host": "universal",
 	"globals": {
+		"Comparable": {"type": "Definition", "definition": "Comparable"},
 		"Exception": {"type": "Definition", "definition": "Exception"},
 		"IllegalArgumentException": {"type": "Definition", "definition": "IllegalArgumentException"},
-		"StringBuilder": {"type": "Definition", "definition": "StringBuilder"}
+		"StringBuilder": {"type": "Definition", "definition": "StringBuilder"},
+		"StringBuildable": {"type": "Definition", "definition": "StringBuildable"}
 	}
 }

Constructor/libraries/stdlib/src/Comparable.zs

@@ -0,0 +1,3 @@
+export interface Comparable<T> {
+	compareTo(other as T) as int;
+}

Constructor/libraries/stdlib/src/StringBuildable.zs

@@ -0,0 +1,6 @@
+export interface StringBuildable {
+	toString(output as StringBuilder) as void;
+	
+	as string
+		=> new StringBuilder() << this;
+}

Constructor/libraries/stdlib/src/StringBuilder.zs

@@ -3,8 +3,22 @@ export class StringBuilder {
 	public extern this(capacity as int);
 	public extern this(value as string);
 	
-	public extern +=(value as string);
-	public extern +=(value as char);
+	public extern <<(value as bool) as StringBuilder;
+	public extern <<(value as char) as StringBuilder;
+	public extern <<(value as byte) as StringBuilder;
+	public extern <<(value as sbyte) as StringBuilder;
+	public extern <<(value as short) as StringBuilder;
+	public extern <<(value as ushort) as StringBuilder;
+	public extern <<(value as int) as StringBuilder;
+	public extern <<(value as uint) as StringBuilder;
+	public extern <<(value as float) as StringBuilder;
+	public extern <<(value as double) as StringBuilder;
+	public extern <<(value as string) as StringBuilder;
+	
+	public <<(value as StringBuildable) as StringBuilder {
+		value.toString(this);
+		return this;
+	}
 	
 	public extern implicit as string;
 }

Constructor/src/main/java/org/openzen/zenscript/constructor/Main.java

@@ -3,6 +3,7 @@ package org.openzen.zenscript.constructor;
 import java.io.File;
 import java.io.IOException;
 import org.openzen.zenscript.constructor.module.DirectoryModuleLoader;
+import org.openzen.zenscript.constructor.module.ModuleReference;
 
 public class Main {
     /**
@@ -17,23 +18,17 @@ public class Main {
 		}
 		
 		File currentDirectory = new File(arguments.directory);
-		File projectJson = new File(currentDirectory, "project.json");
-		if (!projectJson.exists()) {
-			System.out.println("Error: not a valid project (missing project.json)");
-			return;
-		}
-		
 		ModuleLoader moduleLoader = new ModuleLoader();
 		moduleLoader.register("stdlib", new DirectoryModuleLoader(moduleLoader, "stdlib", new File("libraries/stdlib"), true));
 		
-		Project project = new Project(projectJson);
-		for (String moduleName : project.modules) {
-			moduleLoader.register(moduleName, new DirectoryModuleLoader(moduleLoader, moduleName, new File(currentDirectory, moduleName), false));
+		Project project = new Project(moduleLoader, currentDirectory);
+		for (ModuleReference module : project.modules) {
+			moduleLoader.register(module.getName(), module);
 		}
 		
 		// TODO: compile targets
-		for (String moduleName : project.modules) {
-			moduleLoader.getModule(moduleName);
+		for (ModuleReference module : project.modules) {
+			moduleLoader.getModule(module.getName());
 		}
     }
 	

Constructor/src/main/java/org/openzen/zenscript/constructor/Project.java

@@ -9,20 +9,45 @@ import java.io.File;
 import java.io.IOException;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.openzen.zenscript.constructor.module.DirectoryModuleLoader;
+import org.openzen.zenscript.constructor.module.ModuleReference;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class Project {
-	public final String[] modules;
+	public final ModuleReference[] modules;
 	
-	public Project(File projectFile) throws IOException {
+	public Project(ModuleLoader loader, File directory) throws IOException {
+		if (!directory.exists())
+			throw new ConstructorException("Project directory doesn't exist");
+		if (!directory.isDirectory())
+			throw new ConstructorException("Project directory isn't a directory");
+		
+		File projectFile = new File(directory, "project.json");
+		if (!projectFile.exists())
+			throw new ConstructorException("Missing project.json file in project directory");
+		
 		JSONObject json = JSONUtils.load(projectFile);
 		
 		JSONArray jsonModules = json.getJSONArray("modules");
-		modules = new String[jsonModules.length()];
-		for (int i = 0; i < jsonModules.length(); i++)
-			modules[i] = jsonModules.getString(i);
+		modules = new ModuleReference[jsonModules.length()];
+		for (int i = 0; i < jsonModules.length(); i++) {
+			Object module = jsonModules.get(i);
+			if (module instanceof String) {
+				modules[i] = new DirectoryModuleLoader(loader, module.toString(), new File(directory, module.toString()), false);
+			} else if (module instanceof JSONObject) {
+				JSONObject jsonModule = (JSONObject) module;
+				String name = jsonModule.getString("name");
+				switch (jsonModule.getString("type")) {
+					case "directory":
+						modules[i] = new DirectoryModuleLoader(loader, name, new File(directory, jsonModule.getString("directory")), false);
+						break;
+					default:
+						throw new ConstructorException("Invalid module type: " + jsonModule.getString("type"));
+				}
+			}
+		}
 	}
 }

Constructor/src/main/java/org/openzen/zenscript/constructor/module/DirectoryModuleLoader.java

@@ -35,6 +35,11 @@ public class DirectoryModuleLoader implements ModuleReference {
 		this.directory = directory;
 		this.isStdlib = isStdlib;
 	}
+	
+	@Override
+	public String getName() {
+		return moduleName;
+	}
 
 	@Override
 	public SemanticModule load() {

Constructor/src/main/java/org/openzen/zenscript/constructor/module/ModuleReference.java

@@ -10,5 +10,7 @@ package org.openzen.zenscript.constructor.module;
  * @author Hoofdgebruiker
  */
 public interface ModuleReference {
+	public String getName();
+	
 	public SemanticModule load();
 }

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.zenscript.linker;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,10 +42,14 @@ public class DefinitionScope extends BaseScope {
 		this.outer = outer;
 		this.definition = definition;
 		
-		List<ITypeID> genericParameterList = new ArrayList<>();
-		for (TypeParameter parameter : definition.genericParameters) {
-			genericParameterList.add(outer.getTypeRegistry().getGeneric(parameter));
-			genericParameters.put(parameter.name, parameter);
+		ITypeID[] genericParameterList = null;
+		if (definition.genericParameters != null) {
+			genericParameterList = new ITypeID[definition.genericParameters.length];
+			for (int i = 0; i < definition.genericParameters.length; i++) {
+				TypeParameter parameter = definition.genericParameters[i];
+				genericParameterList[i] = outer.getTypeRegistry().getGeneric(parameter);
+				genericParameters.put(parameter.name, parameter);
+			}
 		}
 		
 		if (definition instanceof ExpansionDefinition) {
@@ -67,9 +70,9 @@ public class DefinitionScope extends BaseScope {
 	public IPartialExpression get(CodePosition position, GenericName name) {
 		if (members.hasInnerType(name.name))
 			return new PartialTypeExpression(position, members.getInnerType(position, name));
-		if (members.hasMember(name.name) && name.arguments.isEmpty())
+		if (members.hasMember(name.name) && !name.hasArguments())
 			return members.getMemberExpression(position, new ThisExpression(position, type), name, true);
-		if (genericParameters.containsKey(name.name) && name.arguments.isEmpty())
+		if (genericParameters.containsKey(name.name) && !name.hasArguments())
 			return new PartialTypeExpression(position, getTypeRegistry().getGeneric(genericParameters.get(name.name)));
 		
 		return outer.get(position, name);
@@ -83,7 +86,7 @@ public class DefinitionScope extends BaseScope {
 				result = getTypeMembers(result).getInnerType(position, name.get(i));
 			}
 			return result;
-		} else if (genericParameters.containsKey(name.get(0).name) && name.size() == 1 && name.get(0).arguments.isEmpty()) {
+		} else if (genericParameters.containsKey(name.get(0).name) && name.size() == 1 && !name.get(0).hasArguments()) {
 			return getTypeRegistry().getGeneric(genericParameters.get(name.get(0).name));
 		}
 		

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

@@ -77,7 +77,7 @@ public class FileScope extends BaseScope {
 		
 		if (globalSymbols.containsKey(name.name)) {
 			IPartialExpression resolution = globalSymbols.get(name.name).getExpression(position, globalRegistry, name.arguments);
-			return new PartialGlobalExpression(position, name.name, resolution);
+			return new PartialGlobalExpression(position, name.name, resolution, name.arguments);
 		}
 		
 		return rootPackage.getMember(position, globalRegistry, name);
@@ -103,7 +103,7 @@ public class FileScope extends BaseScope {
 			}
 			
 			// TODO: take care of non-static inner classes in generic classes!
-			if (type != null && name.get(name.size() - 1).arguments.size() != type.definition.genericParameters.length)
+			if (type != null && name.get(name.size() - 1).getNumberOfArguments() != type.definition.getNumberOfGenericParameters())
 				throw new CompileException(position, CompileExceptionCode.TYPE_ARGUMENTS_INVALID_NUMBER, "Invalid number of type arguments");
 			
 			if (type != null)

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

@@ -39,7 +39,7 @@ public class ForeachScope extends StatementScope {
 
 	@Override
 	public IPartialExpression get(CodePosition position, GenericName name) {
-		if (name.arguments.isEmpty()) {
+		if (name.hasNoArguments()) {
 			for (VarStatement loopVariable : statement.loopVariables) {
 				if (loopVariable.name.equals(name.name))
 					return new GetLocalVariableExpression(position, loopVariable);

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

@@ -54,7 +54,7 @@ public class FunctionScope extends StatementScope {
 		if (fromSuper != null)
 			return fromSuper;
 		
-		if (name.arguments.isEmpty()) {
+		if (name.hasNoArguments()) {
 			for (FunctionParameter parameter : header.parameters) {
 				if (parameter.name.equals(name.name)) {
 					return new GetFunctionParameterExpression(position, parameter);
@@ -72,7 +72,7 @@ public class FunctionScope extends StatementScope {
 
 	@Override
 	public ITypeID getType(CodePosition position, List<GenericName> name) {
-		if (name.size() == 1 && name.get(0).arguments.isEmpty()) {
+		if (name.size() == 1 && name.get(0).hasNoArguments()) {
 			for (TypeParameter parameter : header.typeParameters) {
 				if (parameter.name.equals(name.get(0).name))
 					return getTypeRegistry().getGeneric(parameter);

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

@@ -31,8 +31,9 @@ public class GenericFunctionScope extends BaseScope {
 	public GenericFunctionScope(BaseScope outer, TypeParameter[] parameters) {
 		this.outer = outer;
 		
-		for (TypeParameter parameter : parameters)
-			this.parameters.put(parameter.name, parameter);
+		if (parameters != null)
+			for (TypeParameter parameter : parameters)
+				this.parameters.put(parameter.name, parameter);
 	}
 	
 	@Override
@@ -42,7 +43,7 @@ public class GenericFunctionScope extends BaseScope {
 
 	@Override
 	public IPartialExpression get(CodePosition position, GenericName name) {
-		if (parameters.containsKey(name.name) && name.arguments.isEmpty())
+		if (parameters.containsKey(name.name) && name.hasNoArguments())
 			return new PartialTypeExpression(position, getTypeRegistry().getGeneric(parameters.get(name.name)));
 		
 		return outer.get(position, name);
@@ -50,7 +51,7 @@ public class GenericFunctionScope extends BaseScope {
 
 	@Override
 	public ITypeID getType(CodePosition position, List<GenericName> name) {
-		if (name.size() == 1 && parameters.containsKey(name.get(0).name) && name.get(0).arguments.isEmpty())
+		if (name.size() == 1 && parameters.containsKey(name.get(0).name) && name.get(0).hasNoArguments())
 			return getTypeRegistry().getGeneric(parameters.get(name.get(0).name));
 		
 		return outer.getType(position, name);

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

@@ -53,7 +53,7 @@ public class ImplementationScope extends BaseScope {
 	public IPartialExpression get(CodePosition position, GenericName name) {
 		if (members.hasInnerType(name.name))
 			return new PartialTypeExpression(position, members.getInnerType(position, name));
-		if (members.hasMember(name.name) && name.arguments.isEmpty())
+		if (members.hasMember(name.name))
 			return members.getMemberExpression(position, new ThisExpression(position, outer.getThisType()), name, true);
 		
 		return outer.get(position, name);

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

@@ -43,7 +43,7 @@ public class LambdaScope extends StatementScope {
 	public IPartialExpression get(CodePosition position, GenericName name) {
 		IPartialExpression outer = this.outer.get(position, name);
 		if (outer == null) {
-			if (name.arguments.isEmpty()) {
+			if (name.hasNoArguments()) {
 				for (FunctionParameter parameter : header.parameters) {
 					if (parameter.name.equals(name.name))
 						return new GetFunctionParameterExpression(position, parameter);

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

@@ -26,7 +26,7 @@ public abstract class StatementScope extends BaseScope {
 	
 	@Override
 	public IPartialExpression get(CodePosition position, GenericName name) {
-		if (variables.containsKey(name.name) && name.arguments.isEmpty())
+		if (variables.containsKey(name.name) && name.hasNoArguments())
 			return new GetLocalVariableExpression(position, variables.get(name.name));
 		
 		return null;

Linker/src/main/java/org/openzen/zenscript/linker/symbol/ISymbol.java

@@ -5,7 +5,6 @@
  */
 package org.openzen.zenscript.linker.symbol;
 
-import java.util.List;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -16,7 +15,7 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public interface ISymbol {
-	public IPartialExpression getExpression(CodePosition position, GlobalTypeRegistry types, List<ITypeID> typeArguments);
+	public IPartialExpression getExpression(CodePosition position, GlobalTypeRegistry types, ITypeID[] typeArguments);
 	
-	public ITypeID getType(CodePosition position, GlobalTypeRegistry types, List<ITypeID> typeArguments);
+	public ITypeID getType(CodePosition position, GlobalTypeRegistry types, ITypeID[] typeArguments);
 }

Linker/src/main/java/org/openzen/zenscript/linker/symbol/TypeSymbol.java

@@ -5,7 +5,6 @@
  */
 package org.openzen.zenscript.linker.symbol;
 
-import java.util.List;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.partial.PartialTypeExpression;
@@ -25,12 +24,12 @@ public class TypeSymbol implements ISymbol {
 	}
 	
 	@Override
-	public IPartialExpression getExpression(CodePosition position, GlobalTypeRegistry types, List<ITypeID> typeArguments) {
+	public IPartialExpression getExpression(CodePosition position, GlobalTypeRegistry types, ITypeID[] typeArguments) {
 		return new PartialTypeExpression(position, types.getForDefinition(definition, typeArguments));
 	}
 
 	@Override
-	public ITypeID getType(CodePosition position, GlobalTypeRegistry types, List<ITypeID> typeArguments) {
+	public ITypeID getType(CodePosition position, GlobalTypeRegistry types, ITypeID[] typeArguments) {
 		return types.getForDefinition(definition, typeArguments);
 	}
 }

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

@@ -4,7 +4,6 @@ package org.openzen.zenscript.lexer;
 import gnu.trove.iterator.TIntIterator;
 import gnu.trove.map.hash.TIntIntHashMap;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -21,8 +20,8 @@ public class CompiledDFA<T>
 {
 	public static <T extends TokenType & Comparable<T>> CompiledDFA<T> createLexerDFA(T[] tokenTypes, Class<T> tokenClass)
 	{
-		List<T> tokens = new ArrayList<T>();
-		List<String> regexps = new ArrayList<String>();
+		List<T> tokens = new ArrayList<>();
+		List<String> regexps = new ArrayList<>();
 		for (T tokenType : tokenTypes) {
 			if (tokenType.getRegexp() != null) {
 				tokens.add(tokenType);

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

@@ -170,6 +170,15 @@ public abstract class TokenStream<T extends Token<TT>, TT extends TokenType> imp
 	{
         tokenMemoryCurrent = marks.pop();
     }
+	
+	/**
+	 * Replaces the current token with another one. Used to split composite tokens.
+	 * 
+	 * @param other 
+	 */
+	public void replace(TT other) {
+		next = createToken(next.getPosition(), next.getWhitespaceBefore(), next.getContent(), other);
+	}
 
     // ===============================
     // === Iterator implementation ===

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

@@ -58,7 +58,7 @@ public class ZSTokenStream extends TokenStream<ZSToken, ZSTokenType> {
 		KEYWORDS.put("any", K_ANY);
 		KEYWORDS.put("bool", K_BOOL);
 		KEYWORDS.put("byte", K_BYTE);
-		KEYWORDS.put("ubyte", K_UBYTE);
+		KEYWORDS.put("sbyte", K_SBYTE);
 		KEYWORDS.put("short", K_SHORT);
 		KEYWORDS.put("ushort", K_USHORT);
 		KEYWORDS.put("int", K_INT);

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

@@ -108,7 +108,7 @@ public enum ZSTokenType implements TokenType {
 	K_ANY,
 	K_BOOL,
 	K_BYTE,
-	K_UBYTE,
+	K_SBYTE,
 	K_SHORT,
 	K_USHORT,
 	K_INT,

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

@@ -35,18 +35,19 @@ public class ParsedGenericParameter {
 	}
 	
 	public static List<ParsedGenericParameter> parseAll(ZSTokenStream tokens) {
+		if (tokens.optional(ZSTokenType.T_LESS) == null)
+			return null;
+		
 		List<ParsedGenericParameter> genericParameters = new ArrayList<>();
-		if (tokens.optional(ZSTokenType.T_LESS) != null) {
-			do {
-				genericParameters.add(ParsedGenericParameter.parse(tokens));
-			} while (tokens.optional(ZSTokenType.T_COMMA) != null);
-			tokens.required(ZSTokenType.T_GREATER, "> expected");
-		}
+		do {
+			genericParameters.add(ParsedGenericParameter.parse(tokens));
+		} while (tokens.optional(ZSTokenType.T_COMMA) != null);
+		tokens.required(ZSTokenType.T_GREATER, "> expected");
 		return genericParameters;
 	}
 	
 	public static void compile(BaseScope scope, TypeParameter[] compiled, List<ParsedGenericParameter> parameters) {
-		if (compiled.length == 0)
+		if (compiled == null)
 			return;
 		
 		GenericFunctionScope innerScope = new GenericFunctionScope(scope, compiled);
@@ -58,8 +59,8 @@ public class ParsedGenericParameter {
 	
 	private static TypeParameter[] NO_TYPE_PARAMETERS = new TypeParameter[0];
 	public static TypeParameter[] getCompiled(List<ParsedGenericParameter> parameters) {
-		if (parameters.isEmpty())
-			return NO_TYPE_PARAMETERS;
+		if (parameters == null)
+			return null;
 		
 		TypeParameter[] result = new TypeParameter[parameters.size()];
 		for (int i = 0; i < result.length; i++)

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

@@ -55,6 +55,7 @@ public class ParsedInterface extends BaseParsedDefinition {
 		this.superInterfaces = superInterfaces;
 		
 		compiled = new InterfaceDefinition(position, pkg, name, modifiers, outerDefinition);
+		compiled.setTypeParameters(ParsedGenericParameter.getCompiled(genericParameters));
 	}
 
 	@Override

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

@@ -53,22 +53,24 @@ public class ParsedCallArguments {
 	public CallArguments compileCall(
 			CodePosition position, 
 			ExpressionScope scope,
+			ITypeID[] genericParameters,
 			DefinitionMemberGroup member)
 	{
 		List<FunctionHeader> possibleHeaders = member.getMethodMembers().stream()
 				.map(method -> method.member.getHeader())
 				.collect(Collectors.toList());
-		return compileCall(position, scope, possibleHeaders);
+		return compileCall(position, scope, genericParameters, possibleHeaders);
 	}
 	
 	public CallArguments compileCall(
 			CodePosition position,
 			ExpressionScope scope,
+			ITypeID[] genericParameters,
 			List<FunctionHeader> candidateFunctions)
 	{
 		List<FunctionHeader> candidates = new ArrayList<>();
 		for (FunctionHeader header : candidateFunctions) {
-			if (isCompatibleWith(scope, header))
+			if (isCompatibleWith(scope, header, genericParameters))
 				candidates.add(header);
 		}
 		
@@ -110,18 +112,20 @@ public class ParsedCallArguments {
 			cArguments[i] = cArgument.eval();
 		}
 		
-		ITypeID[] typeParameters = CallArguments.NO_TYPE_ARGUMENTS;
-		for (FunctionHeader candidate : candidates) {
-			if (candidate.typeParameters.length > 0) {
-				typeParameters = new ITypeID[candidate.typeParameters.length];
-				for (int i = 0; i < typeParameters.length; i++) {
-					if (innerScope.genericInferenceMap.get(candidate.typeParameters[i]) == null)
-						throw new CompileException(position, CompileExceptionCode.TYPE_ARGUMENTS_NOT_INFERRABLE, "Could not infer type parameter " + candidate.typeParameters[i].name);
-					else
-						typeParameters[i] = innerScope.genericInferenceMap.get(candidate.typeParameters[i]);
-				}
+		ITypeID[] typeParameters = genericParameters;
+		if (typeParameters == null) {
+			for (FunctionHeader candidate : candidates) {
+				if (candidate.typeParameters.length > 0) {
+					typeParameters = new ITypeID[candidate.typeParameters.length];
+					for (int i = 0; i < typeParameters.length; i++) {
+						if (innerScope.genericInferenceMap.get(candidate.typeParameters[i]) == null)
+							throw new CompileException(position, CompileExceptionCode.TYPE_ARGUMENTS_NOT_INFERRABLE, "Could not infer type parameter " + candidate.typeParameters[i].name);
+						else
+							typeParameters[i] = innerScope.genericInferenceMap.get(candidate.typeParameters[i]);
+					}
 
-				break;
+					break;
+				}
 			}
 		}
 		
@@ -137,12 +141,12 @@ public class ParsedCallArguments {
 		return new CallArguments(new ITypeID[0], cArguments);
 	}
 	
-	private boolean isCompatibleWith(BaseScope scope, FunctionHeader header) {
+	private boolean isCompatibleWith(BaseScope scope, FunctionHeader header, ITypeID[] typeParameters) {
 		if (arguments.size() != header.parameters.length)
 			return false;
 		
 		for (int i = 0; i < arguments.size(); i++) {
-			if (header.parameters[i].type.hasInferenceBlockingTypeParameters(header.typeParameters))
+			if (typeParameters == null && header.parameters[i].type.hasInferenceBlockingTypeParameters(header.typeParameters))
 				return false;
 			
 			if (!arguments.get(i).isCompatibleWith(scope, header.parameters[i].type))

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

@@ -47,7 +47,7 @@ public class ParsedExpressionCall extends ParsedExpression {
 				throw new CompileException(position, CompileExceptionCode.SUPER_CALL_NO_SUPERCLASS, "Class has no superclass");
 			
 			DefinitionMemberGroup memberGroup = scope.getTypeMembers(targetType).getOrCreateGroup(OperatorType.CONSTRUCTOR);
-			CallArguments callArguments = arguments.compileCall(position, scope, memberGroup);
+			CallArguments callArguments = arguments.compileCall(position, scope, null, memberGroup);
 			ICallableMember member = memberGroup.selectMethod(position, scope, callArguments, true, true);
 			if (!(member instanceof ConstructorMember))
 				throw new CompileException(position, CompileExceptionCode.INTERNAL_ERROR, "Constructor is not a constructor!");
@@ -58,7 +58,7 @@ public class ParsedExpressionCall extends ParsedExpression {
 			ITypeID targetType = scope.getThisType();
 			
 			DefinitionMemberGroup memberGroup = scope.getTypeMembers(targetType).getOrCreateGroup(OperatorType.CONSTRUCTOR);
-			CallArguments callArguments = arguments.compileCall(position, scope, memberGroup);
+			CallArguments callArguments = arguments.compileCall(position, scope, null, memberGroup);
 			ICallableMember member = memberGroup.selectMethod(position, scope, callArguments, true, true);
 			if (!(member instanceof ConstructorMember))
 				throw new CompileException(position, CompileExceptionCode.INTERNAL_ERROR, "Constructor is not a constructor!");
@@ -67,7 +67,7 @@ public class ParsedExpressionCall extends ParsedExpression {
 		}
 
 		List<FunctionHeader> headers = cReceiver.getPossibleFunctionHeaders(scope, scope.hints, arguments.arguments.size());
-		CallArguments callArguments = arguments.compileCall(position, scope, headers);
+		CallArguments callArguments = arguments.compileCall(position, scope, cReceiver.getGenericCallTypes(), headers);
 		return cReceiver.call(position, scope, scope.hints, callArguments);
 	}
 

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

@@ -70,7 +70,7 @@ public class ParsedExpressionFunction extends ParsedExpression {
 			// perform type parameter inference
 			ITypeID returnType = statements.getReturnType();
 			Map<TypeParameter, ITypeID> inferredTypes = new HashMap<>();
-			if (!genericHeader.returnType.inferTypeParameters(returnType, inferredTypes))
+			if (!genericHeader.returnType.inferTypeParameters(scope.getMemberCache(), returnType, inferredTypes))
 				throw new CompileException(position, CompileExceptionCode.TYPE_ARGUMENTS_NOT_INFERRABLE, "Could not infer generic type parameters");
 			
 			for (Map.Entry<TypeParameter, ITypeID> type : inferredTypes.entrySet()) {

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

@@ -107,5 +107,10 @@ public class ParsedExpressionIndex extends ParsedExpression {
 		private Expression getLength(CodePosition position) {
 			return target.getMember(position, scope, scope.hints, new GenericName("length")).eval();
 		}
+
+		@Override
+		public ITypeID[] getGenericCallTypes() {
+			return null;
+		}
 	}
 }

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

@@ -6,8 +6,6 @@
 
 package org.openzen.zenscript.parser.expression;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.GenericName;
@@ -37,16 +35,13 @@ public class ParsedExpressionMember extends ParsedExpression {
 
 	@Override
 	public IPartialExpression compile(ExpressionScope scope) {
-		List<ITypeID> genericArguments = Collections.emptyList();
-		if (!genericParameters.isEmpty()) {
-			genericArguments = new ArrayList<>();
-			for (IParsedType type : this.genericParameters) {
-				genericArguments.add(type.compile(scope));
-			}
-		}
-		
 		IPartialExpression cValue = value.compile(scope.withoutHints());
-		IPartialExpression member = cValue.getMember(position, scope, scope.hints, new GenericName(this.member, genericArguments));
+		ITypeID[] typeParameters = IParsedType.compileList(genericParameters, scope);
+		IPartialExpression member = cValue.getMember(
+				position,
+				scope,
+				scope.hints,
+				new GenericName(this.member, typeParameters));
 		if (member == null)
 			throw new CompileException(position, CompileExceptionCode.NO_SUCH_MEMBER, "Member not found: " + this.member);
 		return member;

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

@@ -6,7 +6,6 @@
 
 package org.openzen.zenscript.parser.expression;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.openzen.zenscript.codemodel.expression.ConstantStringExpression;
@@ -42,13 +41,15 @@ public class ParsedExpressionVariable extends ParsedExpression {
 
 	@Override
 	public IPartialExpression compile(ExpressionScope scope) {
-		List<ITypeID> genericParameters = Collections.emptyList();
-		if (!this.genericParameters.isEmpty()) {
-			genericParameters = new ArrayList<>();
-			for (IParsedType genericType : this.genericParameters)
-				genericParameters.add(genericType.compile(scope));
+		ITypeID[] genericArguments = null;
+		if (genericParameters != null) {
+			genericArguments = new ITypeID[genericParameters.size()];
+			for (int i = 0; i < genericParameters.size(); i++) {
+				genericArguments[i] = genericParameters.get(i).compile(scope);
+			}
 		}
-		IPartialExpression result = scope.get(position, new GenericName(name, genericParameters));
+		
+		IPartialExpression result = scope.get(position, new GenericName(name, genericArguments));
 		if (result == null) {
 			for (ITypeID hint : scope.hints) {
 				EnumConstantMember member = scope.getTypeMembers(hint).getEnumMember(name);

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

@@ -50,7 +50,7 @@ public class ParsedNewExpression extends ParsedExpression{
 	public static NewExpression compile(CodePosition position, ITypeID type, ParsedCallArguments arguments, ExpressionScope scope) {
 		DefinitionMemberGroup constructors = scope.getTypeMembers(type).getOrCreateGroup(OperatorType.CONSTRUCTOR);
 		List<ITypeID>[] predictedTypes = constructors.predictCallTypes(scope, scope.hints, arguments.arguments.size());
-		CallArguments compiledArguments = arguments.compileCall(position, scope, constructors);
+		CallArguments compiledArguments = arguments.compileCall(position, scope, null, constructors);
 		ICallableMember member = constructors.selectMethod(position, scope, compiledArguments, true, true);
 		if (member == null)
 			throw new CompileException(position, CompileExceptionCode.CALL_NO_VALID_METHOD, "No matching constructor found");

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

@@ -16,7 +16,6 @@ import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
-import org.openzen.zenscript.codemodel.member.StaticInitializerMember;
 import org.openzen.zenscript.lexer.ZSToken;
 import org.openzen.zenscript.lexer.ZSTokenStream;
 import org.openzen.zenscript.lexer.ZSTokenType;
@@ -205,7 +204,13 @@ public abstract class ParsedDefinitionMember {
 			case T_XORASSIGN:
 			case T_INCREMENT:
 			case T_DECREMENT:
-			case T_DOT2: {
+			case T_DOT2:
+			case T_SHL:
+			case T_SHR:
+			case T_USHR:
+			case T_SHLASSIGN:
+			case T_SHRASSIGN:
+			case T_USHRASSIGN: {
 				ZSToken token = tokens.next();
 				ParsedFunctionHeader header = ParsedFunctionHeader.parse(tokens);
 				ParsedFunctionBody body = ParsedStatement.parseFunctionBody(tokens);
@@ -274,6 +279,12 @@ public abstract class ParsedDefinitionMember {
 			case T_INCREMENT: return OperatorType.INCREMENT;
 			case T_DECREMENT: return OperatorType.DECREMENT;
 			case T_DOT2: return OperatorType.RANGE;
+			case T_SHL: return OperatorType.SHL;
+			case T_SHR: return OperatorType.SHR;
+			case T_USHR: return OperatorType.USHR;
+			case T_SHLASSIGN: return OperatorType.SHLASSIGN;
+			case T_SHRASSIGN: return OperatorType.SHRASSIGN;
+			case T_USHRASSIGN: return OperatorType.USHRASSIGN;
 			default:
 				throw new AssertionError("Missing switch case in getOperator");
 		}

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

@@ -7,6 +7,7 @@ import org.openzen.zenscript.codemodel.statement.ForeachStatement;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.linker.ExpressionScope;
 import org.openzen.zenscript.linker.ForeachScope;
 import org.openzen.zenscript.linker.StatementScope;
@@ -32,7 +33,8 @@ public class ParsedStatementForeach extends ParsedStatement {
 	public Statement compile(StatementScope scope) {
 		Expression list = this.list.compile(new ExpressionScope(scope)).eval();
 		
-		IIteratorMember iterator = scope.getTypeMembers(list.type).getIterator(varnames.length);
+		TypeMembers members = scope.getTypeMembers(list.type);
+		IIteratorMember iterator = members.getIterator(varnames.length);
 		if (iterator == null)
 			throw new CompileException(position, CompileExceptionCode.NO_SUCH_ITERATOR, list.type + " doesn't have an iterator with " + varnames.length + " variables");
 		

Parser/src/main/java/org/openzen/zenscript/parser/type/IParsedType.java

@@ -12,9 +12,7 @@ import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.lexer.ZSTokenStream;
 import org.openzen.zenscript.lexer.ZSTokenType;
-import static org.openzen.zenscript.lexer.ZSTokenType.T_COMMA;
-import static org.openzen.zenscript.lexer.ZSTokenType.T_GREATER;
-import static org.openzen.zenscript.lexer.ZSTokenType.T_LESS;
+import static org.openzen.zenscript.lexer.ZSTokenType.*;
 import org.openzen.zenscript.linker.BaseScope;
 import org.openzen.zenscript.parser.ParseException;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
@@ -64,11 +62,11 @@ public interface IParsedType {
 				break;
 			case K_BYTE:
 				tokens.next();
-				result = ParsedTypeBasic.SBYTE;
+				result = ParsedTypeBasic.BYTE;
 				break;
-			case K_UBYTE:
+			case K_SBYTE:
 				tokens.next();
-				result = ParsedTypeBasic.BYTE;
+				result = ParsedTypeBasic.SBYTE;
 				break;
 			case K_SHORT:
 				tokens.next();
@@ -175,7 +173,7 @@ public interface IParsedType {
 	
 	public static List<IParsedType> parseGenericParameters(ZSTokenStream tokens) {
 		if (!tokens.isNext(T_LESS))
-			return Collections.emptyList();
+			return null;
 		
 		tokens.pushMark();
 		tokens.next();
@@ -190,13 +188,32 @@ public interface IParsedType {
 			genericParameters.add(type);
 		} while (tokens.optional(T_COMMA) != null);
 		
-		if (tokens.optional(T_GREATER) == null) {
+		if (tokens.isNext(T_SHR)) {
+			tokens.replace(T_GREATER);
+		} else if (tokens.isNext(T_USHR)) {
+			tokens.replace(T_SHR);
+		} else if (tokens.isNext(T_SHRASSIGN)) {
+			tokens.replace(T_GREATEREQ);
+		} else if (tokens.isNext(T_USHRASSIGN)) {
+			tokens.replace(T_SHRASSIGN);
+		} else if (tokens.optional(T_GREATER) == null) {
 			tokens.reset();
 			return Collections.emptyList();
-		} else {
-			tokens.popMark();
-			return genericParameters;
 		}
+		
+		tokens.popMark();
+		return genericParameters;
+	}
+	
+	public static ITypeID[] compileList(List<IParsedType> typeParameters, BaseScope scope) {
+		ITypeID[] result = null;
+		if (typeParameters != null) {
+			result = new ITypeID[typeParameters.size()];
+			for (int i = 0; i < typeParameters.size(); i++) {
+				result[i] = typeParameters.get(i).compile(scope);
+			}
+		}
+		return result;
 	}
 	
 	public IParsedType withOptional();

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedNamedType.java

@@ -6,7 +6,6 @@
 package org.openzen.zenscript.parser.type;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -94,21 +93,13 @@ public class ParsedNamedType implements IParsedType {
 		}
 		
 		private GenericName compile(BaseScope scope) {
-			if (typeArguments.isEmpty()) {
-				return new GenericName(name, Collections.emptyList());
-			} else {
-				List<ITypeID> genericTypes = new ArrayList<>();
-				for (IParsedType type : typeArguments)
-					genericTypes.add(type.compile(scope));
-				
-				return new GenericName(name, genericTypes);
-			}
+			return new GenericName(name, IParsedType.compileList(typeArguments, scope));
 		}
 		
 		@Override
 		public String toString() {
 			StringBuilder result = new StringBuilder(name);
-			if (!typeArguments.isEmpty()) {
+			if (typeArguments != null) {
 				result.append("<");
 				for (int i = 0; i < typeArguments.size(); i++) {
 					if (i > 0)

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedTypeGenericMap.java

@@ -75,7 +75,7 @@ public class ParsedTypeGenericMap implements IParsedType {
 
 		@Override
 		public IPartialExpression get(CodePosition position, GenericName name) {
-			if (typeParameters.containsKey(name.name) && name.arguments.isEmpty())
+			if (typeParameters.containsKey(name.name) && name.hasNoArguments())
 				return new PartialTypeExpression(position, getTypeRegistry().getGeneric(typeParameters.get(name.name)));
 			
 			return outer.get(position, name);
@@ -83,7 +83,7 @@ public class ParsedTypeGenericMap implements IParsedType {
 
 		@Override
 		public ITypeID getType(CodePosition position, List<GenericName> name) {
-			if (typeParameters.containsKey(name.get(0).name) && name.size() == 1 && name.get(0).arguments.isEmpty())
+			if (typeParameters.containsKey(name.get(0).name) && name.size() == 1 && name.get(0).hasNoArguments())
 				return getTypeRegistry().getGeneric(typeParameters.get(name.get(0).name));
 			
 			return outer.getType(position, name);

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

@@ -121,17 +121,18 @@ public class GlobalRegistry {
 	private class PrintlnSymbol implements ISymbol {
 
 		@Override
-		public IPartialExpression getExpression(CodePosition position, GlobalTypeRegistry types, List<ITypeID> typeArguments) {
+		public IPartialExpression getExpression(CodePosition position, GlobalTypeRegistry types, ITypeID[] typeArguments) {
 			//return new PartialStaticMemberGroupExpression(position, PRINTLN.callerGroup);
 			return new PartialMemberGroupExpression(
 					position,
 					new GetStaticFieldExpression(position, SYSTEM_OUT),
 					PRINTSTREAM_PRINTLN,
+					null,
 					false);
 		}
 
 		@Override
-		public ITypeID getType(CodePosition position, GlobalTypeRegistry types, List<ITypeID> typeArguments) {
+		public ITypeID getType(CodePosition position, GlobalTypeRegistry types, ITypeID[] typeArguments) {
 			// don't be fooled! this symbol is the System.out.println bound method and thus its type is a function
 			return new FunctionTypeID(PRINTSTREAM_PRINTLN.header);
 		}

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

@@ -187,7 +187,8 @@ public class DefinitionMemberValidator implements MemberVisitor<Boolean> {
 
 	@Override
 	public Boolean visitCustomIterator(CustomIteratorMember member) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		// TODO: validate iterators
+		return true;
 	}
 
 	@Override

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

@@ -145,13 +145,13 @@ public class ExpressionValidator implements ExpressionVisitor<Boolean> {
 	public Boolean visitCall(CallExpression expression) {
 		boolean isValid = true;
 		isValid &= expression.target.accept(this);
-		isValid &= checkCallArguments(expression.position, expression.member.header, expression.arguments);
+		isValid &= checkCallArguments(expression.position, expression.member.header, expression.instancedHeader, expression.arguments);
 		return isValid;
 	}
 
 	@Override
 	public Boolean visitCallStatic(CallStaticExpression expression) {
-		return checkCallArguments(expression.position, expression.member.header, expression.arguments);
+		return checkCallArguments(expression.position, expression.member.header, expression.instancedHeader, expression.arguments);
 	}
 
 	@Override
@@ -297,7 +297,7 @@ public class ExpressionValidator implements ExpressionVisitor<Boolean> {
 			isValid = false;
 		}
 		scope.markConstructorForwarded();
-		isValid &= checkCallArguments(expression.position, expression.constructor.header, expression.arguments);
+		isValid &= checkCallArguments(expression.position, expression.constructor.header, expression.constructor.header, expression.arguments);
 		return isValid;
 	}
 
@@ -313,7 +313,7 @@ public class ExpressionValidator implements ExpressionVisitor<Boolean> {
 			isValid = false;
 		}
 		scope.markConstructorForwarded();
-		isValid &= checkCallArguments(expression.position, expression.constructor.header, expression.arguments);
+		isValid &= checkCallArguments(expression.position, expression.constructor.header, expression.constructor.header, expression.arguments);
 		return isValid;
 	}
 
@@ -331,7 +331,8 @@ public class ExpressionValidator implements ExpressionVisitor<Boolean> {
 
 	@Override
 	public Boolean visitFunction(FunctionExpression expression) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		// TODO
+		return true;
 	}
 
 	@Override
@@ -444,6 +445,7 @@ public class ExpressionValidator implements ExpressionVisitor<Boolean> {
 		boolean isValid = checkCallArguments(
 				expression.position,
 				expression.constructor.header,
+				expression.constructor.header,
 				expression.arguments);
 		return isValid;
 	}
@@ -618,23 +620,23 @@ public class ExpressionValidator implements ExpressionVisitor<Boolean> {
 	@Override
 	public Boolean visitWrapOptional(WrapOptionalExpression expression) {
 		boolean isValid = expression.value.accept(this);
-		if (expression.type.isOptional()) {
+		if (expression.value.type.isOptional()) {
 			validator.logError(ValidationLogEntry.Code.INVALID_OPERAND_TYPE, expression.position, "expression value is already optional");
 			isValid = false;
 		}
 		return isValid;
 	}
 	
-	private boolean checkCallArguments(CodePosition position, FunctionHeader header, CallArguments arguments) {
+	private boolean checkCallArguments(CodePosition position, FunctionHeader originalHeader, FunctionHeader instancedHeader, CallArguments arguments) {
 		boolean isValid = true;
-		isValid &= ValidationUtils.validateTypeArguments(validator, position, header.typeParameters, arguments.typeArguments);
+		isValid &= ValidationUtils.validateTypeArguments(validator, position, originalHeader.typeParameters, arguments.typeArguments);
 		
 		for (int i = 0; i < arguments.arguments.length; i++) {
 			Expression argument = arguments.arguments[i];
 			isValid &= argument.accept(this);
 			
-			if (i >= header.parameters.length) {
-				FunctionParameter variadic = header.getVariadicParameter();
+			if (i >= instancedHeader.parameters.length) {
+				FunctionParameter variadic = instancedHeader.getVariadicParameter();
 				if (variadic == null) {
 					validator.logError(ValidationLogEntry.Code.INVALID_CALL_ARGUMENT, position, "too many call arguments");
 					isValid = false;
@@ -649,7 +651,7 @@ public class ExpressionValidator implements ExpressionVisitor<Boolean> {
 				}
 			}
 			
-			FunctionParameter parameter = header.parameters[i];
+			FunctionParameter parameter = instancedHeader.parameters[i];
 			if (parameter.type != argument.type) {
 				validator.logError(
 						ValidationLogEntry.Code.INVALID_CALL_ARGUMENT,
@@ -659,8 +661,8 @@ public class ExpressionValidator implements ExpressionVisitor<Boolean> {
 			}
 		}
 		
-		for (int i = arguments.arguments.length; i < header.parameters.length; i++) {
-			FunctionParameter parameter = header.parameters[i];
+		for (int i = arguments.arguments.length; i < instancedHeader.parameters.length; i++) {
+			FunctionParameter parameter = instancedHeader.parameters[i];
 			if (parameter.defaultValue == null && !parameter.variadic) {
 				validator.logError(ValidationLogEntry.Code.INVALID_CALL_ARGUMENT, position, "missing call argument for " + parameter.name);
 				isValid = false;

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

@@ -148,6 +148,11 @@ public class ValidationUtils {
 			TypeParameter[] typeParameters,
 			ITypeID[] typeArguments)
 	{
+		if (typeParameters == null)
+			return typeArguments == null;
+		if (typeArguments == null)
+			return false;
+		
 		if (typeParameters.length != typeArguments.length) {
 			target.logError(
 					ValidationLogEntry.Code.INVALID_TYPE_ARGUMENT,
@@ -164,13 +169,14 @@ public class ValidationUtils {
 		for (int i = 0; i < typeParameters.length; i++) {
 			TypeParameter typeParameter = typeParameters[i];
 			for (GenericParameterBound bound : typeParameter.bounds) {
-				if (!bound.matches(typeArguments[i])) {
+				// TODO - obtain member cache for validation
+				/*if (!bound.matches(typeArguments[i])) {
 					target.logError(
 							ValidationLogEntry.Code.INVALID_TYPE_ARGUMENT,
 							position,
 							bound.accept(new TypeParameterBoundErrorVisitor(typeArguments[i], target)));
 					isValid = false;
-				}
+				}*/
 			}
 		}
 		return isValid;