- Changed class hierarchy for getters and setters.

- Rewrote iterator implementation

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

@@ -10,7 +10,7 @@ import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.codemodel.member.ConstMember;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
-import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.member.IteratorMember;
 import org.openzen.zenscript.codemodel.member.DestructorMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
@@ -192,7 +192,7 @@ public class MemberFormatter implements MemberVisitor<Void> {
 	}
 
 	@Override
-	public Void visitCustomIterator(CustomIteratorMember member) {
+	public Void visitCustomIterator(IteratorMember member) {
 		visit(false);
 		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
 	}

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

@@ -18,7 +18,7 @@ import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.codemodel.member.ConstMember;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
-import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.member.IteratorMember;
 import org.openzen.zenscript.codemodel.member.DestructorMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
@@ -32,6 +32,8 @@ import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.member.StaticInitializerMember;
 import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
+import org.openzen.zenscript.codemodel.member.ref.GetterMemberRef;
+import org.openzen.zenscript.codemodel.member.ref.SetterMemberRef;
 import org.openzen.zenscript.codemodel.scope.DefinitionScope;
 import org.openzen.zenscript.codemodel.scope.FileScope;
 import org.openzen.zenscript.codemodel.scope.FunctionScope;
@@ -130,12 +132,12 @@ public class AnnotationProcessor implements ModuleProcessor {
 
 		@Override
 		public Void visitGetter(GetterMember member) {
-			return functional(member);
+			return getter(member);
 		}
 
 		@Override
 		public Void visitSetter(SetterMember member) {
-			return functional(member);
+			return setter(member);
 		}
 
 		@Override
@@ -149,7 +151,7 @@ public class AnnotationProcessor implements ModuleProcessor {
 		}
 
 		@Override
-		public Void visitCustomIterator(CustomIteratorMember member) {
+		public Void visitCustomIterator(IteratorMember member) {
 			return functional(member);
 		}
 
@@ -199,6 +201,38 @@ public class AnnotationProcessor implements ModuleProcessor {
 			return null;
 		}
 		
+		private Void getter(GetterMember member) {
+			for (MemberAnnotation annotation : member.annotations)
+				annotation.apply(member, scope);
+			
+			if (member.getOverrides() != null) {
+				getter(member, member.getOverrides());
+			}
+			
+			if (member.body == null)
+				return null;
+			
+			StatementScope scope = new FunctionScope(this.scope, new FunctionHeader(member.type));
+			member.body = process(member.body, scope);
+			return null;
+		}
+		
+		private Void setter(SetterMember member) {
+			for (MemberAnnotation annotation : member.annotations)
+				annotation.apply(member, scope);
+			
+			if (member.getOverrides() != null) {
+				setter(member, member.getOverrides());
+			}
+			
+			if (member.body == null)
+				return null;
+			
+			StatementScope scope = new FunctionScope(this.scope, new FunctionHeader(BasicTypeID.VOID, member.parameter));
+			member.body = process(member.body, scope);
+			return null;
+		}
+		
 		private void functional(FunctionalMember member, DefinitionMemberRef overrides) {
 			for (MemberAnnotation annotation : overrides.getAnnotations())
 				annotation.applyOnOverridingMethod(member, scope);
@@ -207,5 +241,23 @@ public class AnnotationProcessor implements ModuleProcessor {
 				functional(member, overrides.getOverrides());
 			}
 		}
+		
+		private void getter(GetterMember member, GetterMemberRef overrides) {
+			for (MemberAnnotation annotation : overrides.getAnnotations())
+				annotation.applyOnOverridingGetter(member, scope);
+			
+			if (overrides.getOverrides() != null) {
+				getter(member, overrides.getOverrides());
+			}
+		}
+		
+		private void setter(SetterMember member, SetterMemberRef overrides) {
+			for (MemberAnnotation annotation : overrides.getAnnotations())
+				annotation.applyOnOverridingSetter(member, scope);
+			
+			if (overrides.getOverrides() != null) {
+				setter(member, overrides.getOverrides());
+			}
+		}
 	}
 }

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

@@ -6,7 +6,9 @@
 package org.openzen.zenscript.codemodel.annotations;
 
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 
 /**
@@ -19,4 +21,8 @@ public interface MemberAnnotation {
 	public void apply(IDefinitionMember member, BaseScope scope);
 	
 	public void applyOnOverridingMethod(FunctionalMember member, BaseScope scope);
+	
+	public void applyOnOverridingGetter(GetterMember member, BaseScope scope);
+	
+	public void applyOnOverridingSetter(SetterMember member, BaseScope scope);
 }

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

@@ -6,7 +6,9 @@
 package org.openzen.zenscript.codemodel.annotations;
 
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 
 /**
@@ -29,4 +31,14 @@ public class NativeMemberAnnotation implements MemberAnnotation {
 	public void applyOnOverridingMethod(FunctionalMember member, BaseScope scope) {
 		// not inherited
 	}
+
+	@Override
+	public void applyOnOverridingGetter(GetterMember member, BaseScope scope) {
+		// not inherited
+	}
+
+	@Override
+	public void applyOnOverridingSetter(SetterMember member, BaseScope scope) {
+		// not inherited
+	}
 }

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

@@ -12,7 +12,9 @@ import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionBuilder;
 import org.openzen.zenscript.codemodel.expression.PanicExpression;
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.codemodel.statement.BlockStatement;
@@ -44,13 +46,33 @@ public class PreconditionForMethod implements MemberAnnotation {
 
 	@Override
 	public void apply(IDefinitionMember member, BaseScope scope) {
-		applyOnOverridingMethod((FunctionalMember)member, scope);
+		if (member instanceof GetterMember) {
+			applyOnOverridingGetter((GetterMember)member, scope);
+		} else if (member instanceof SetterMember) {
+			applyOnOverridingSetter((SetterMember)member, scope);
+		} else if (member instanceof FunctionalMember) {
+			applyOnOverridingMethod((FunctionalMember)member, scope);
+		}
 	}
 
 	@Override
 	public void applyOnOverridingMethod(FunctionalMember member, BaseScope scope) {
-		if (member.body == null)
-			return;
+		member.body = applyOnOverride(member.body, scope);
+	}
+
+	@Override
+	public void applyOnOverridingGetter(GetterMember member, BaseScope scope) {
+		member.body = applyOnOverride(member.body, scope);
+	}
+
+	@Override
+	public void applyOnOverridingSetter(SetterMember member, BaseScope scope) {
+		member.body = applyOnOverride(member.body, scope);
+	}
+	
+	private Statement applyOnOverride(Statement body, BaseScope scope) {
+		if (body == null)
+			return body;
 		
 		ExpressionScope expressionScope = new ExpressionScope(scope, BasicTypeID.BOOL);
 		List<Statement> statements = new ArrayList<>();
@@ -58,11 +80,12 @@ public class PreconditionForMethod implements MemberAnnotation {
 		Expression inverseCondition = expressionBuilder.not(condition);
 		Statement throwStatement = new ExpressionStatement(position, new PanicExpression(position, BasicTypeID.VOID, message));
 		statements.add(new IfStatement(position, inverseCondition, throwStatement, null));
-		if (member.body instanceof BlockStatement) {
-			statements.addAll(((BlockStatement)member.body).statements);
+		
+		if (body instanceof BlockStatement) {
+			statements.addAll(((BlockStatement)body).statements);
 		} else {
-			statements.add(member.body);
+			statements.add(body);
 		}
-		member.body = new BlockStatement(position, statements);
+		return new BlockStatement(position, statements);
 	}
 }

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.codemodel.expression;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.member.ref.FieldMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 
@@ -17,6 +18,7 @@ public class SetFieldExpression extends Expression {
 	public final Expression target;
 	public final FieldMemberRef field;
 	public final Expression value;
+	public final FunctionParameter parameter;
 	
 	public SetFieldExpression(CodePosition position, Expression target, FieldMemberRef field, Expression value) {
 		super(position, field.getType(), binaryThrow(position, target.thrownType, value.thrownType));
@@ -24,6 +26,7 @@ public class SetFieldExpression extends Expression {
 		this.target = target;
 		this.field = field;
 		this.value = value;
+		this.parameter = new FunctionParameter(type);
 	}
 
 	@Override

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

@@ -1,26 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.openzen.zenscript.codemodel.iterator;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public interface ForeachIteratorVisitor<T> {
-	T visitIntRange();
-	
-	T visitArrayValueIterator();
-	
-	T visitArrayKeyValueIterator();
-	
-	T visitAssocKeyIterator();
-	
-	T visitAssocKeyValueIterator();
-	
-	T visitStringCharacterIterator();
-	
-	T visitCustomIterator();
-}

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

@@ -77,7 +77,7 @@ public class FieldMember extends PropertyMember {
 					position,
 					new ThisExpression(position, thisType),
 					new FieldMemberRef(this, null),
-					new GetFunctionParameterExpression(position, this.autoSetter.header.parameters[0]))));
+					new GetFunctionParameterExpression(position, this.autoSetter.parameter))));
 		} else {
 			this.autoSetter = null;
 		}

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

@@ -6,10 +6,13 @@
 package org.openzen.zenscript.codemodel.member;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.ConcatMap;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.member.ref.GetterMemberRef;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
@@ -21,10 +24,10 @@ import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
  *
  * @author Hoofdgebruiker
  */
-public class GetterMember extends FunctionalMember implements IPropertyMember {
+public class GetterMember extends PropertyMember {
 	public final String name;
-	public ITypeID type;
 	private GetterMemberRef overrides;
+	public Statement body = null;
 	
 	public GetterMember(
 			CodePosition position,
@@ -33,33 +36,21 @@ public class GetterMember extends FunctionalMember implements IPropertyMember {
 			String name,
 			ITypeID type,
 			BuiltinID builtin) {
-		super(position, definition, modifiers, new FunctionHeader(type), builtin);
+		super(position, definition, modifiers, type, builtin);
 		
 		this.name = name;
-		this.type = type;
 	}
 	
-	@Override
 	public void setBody(Statement body) {
-		super.setBody(body);
+		this.body = body;
 		
 		if (type == BasicTypeID.UNDETERMINED)
 			type = body.getReturnType();
 	}
 	
 	@Override
-	public ITypeID getType() {
-		return type;
-	}
-	
-	@Override
-	public String getCanonicalName() {
-		return definition.getFullName() + ":getter:" + name;
-	}
-	
-	@Override
-	public FunctionalKind getKind() {
-		return FunctionalKind.GETTER;
+	public boolean isAbstract() {
+		return body == null && builtin == null;
 	}
 	
 	@Override
@@ -81,6 +72,12 @@ public class GetterMember extends FunctionalMember implements IPropertyMember {
 	public GetterMemberRef getOverrides() {
 		return overrides;
 	}
+
+	@Override
+	public void normalize(TypeScope scope) {
+		if (body != null)
+			body = body.normalize(scope, ConcatMap.empty(LoopStatement.class, LoopStatement.class));
+	}
 	
 	public void setOverrides(GetterMemberRef override) {
 		this.overrides = override;

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

@@ -1,21 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.openzen.zenscript.codemodel.member;
-
-import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
-import org.openzen.zenscript.codemodel.type.ITypeID;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public interface IIteratorMember extends IDefinitionMember {
-	public int getLoopVariableCount();
-	
-	public ITypeID[] getLoopVariableTypes();
-	
-	public <T> T acceptForIterator(ForeachIteratorVisitor<T> visitor);
-}

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

@@ -1,23 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.openzen.zenscript.codemodel.member;
-
-import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
-import org.openzen.zenscript.codemodel.type.ITypeID;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public interface IPropertyMember extends IDefinitionMember {
-	ITypeID getType();
-	
-	boolean isStatic();
-	
-	boolean isFinal();
-	
-	MemberAnnotation[] getAnnotations();
-}

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

@@ -9,7 +9,6 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
-import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
 import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
 import org.openzen.zenscript.codemodel.statement.Statement;
@@ -23,12 +22,12 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
  *
  * @author Hoofdgebruiker
  */
-public class CustomIteratorMember extends FunctionalMember implements IIteratorMember {
+public class IteratorMember extends FunctionalMember {
 	private final ITypeID[] iteratorTypes;
 	public Statement body;
 	public IteratorMemberRef overrides;
 	
-	public CustomIteratorMember(CodePosition position, HighLevelDefinition definition, int modifiers, ITypeID[] iteratorTypes, GlobalTypeRegistry registry, BuiltinID builtin) {
+	public IteratorMember(CodePosition position, HighLevelDefinition definition, int modifiers, ITypeID[] iteratorTypes, GlobalTypeRegistry registry, BuiltinID builtin) {
 		super(position, definition, modifiers, createIteratorHeader(registry, iteratorTypes), builtin);
 		
 		this.iteratorTypes = iteratorTypes;
@@ -42,25 +41,18 @@ public class CustomIteratorMember extends FunctionalMember implements IIteratorM
 	public String getCanonicalName() {
 		return definition.getFullName() + ":iterator:" + iteratorTypes.length;
 	}
-
-	@Override
+	
 	public int getLoopVariableCount() {
 		return iteratorTypes.length;
 	}
-
-	@Override
+	
 	public ITypeID[] getLoopVariableTypes() {
 		return iteratorTypes;
 	}
-	
-	@Override
-	public BuiltinID getBuiltin() {
-		return null;
-	}
 
 	@Override
 	public void registerTo(TypeMembers type, TypeMemberPriority priority, GenericMapper mapper) {
-		type.addIterator(new IteratorMemberRef(this, mapper.map(iteratorTypes)), priority);
+		type.addIterator(new IteratorMemberRef(this, mapper == null ? iteratorTypes : mapper.map(iteratorTypes)), priority);
 	}
 
 	@Override
@@ -72,11 +64,6 @@ public class CustomIteratorMember extends FunctionalMember implements IIteratorM
 	public <T> T accept(MemberVisitor<T> visitor) {
 		return visitor.visitCustomIterator(this);
 	}
-
-	@Override
-	public <T> T acceptForIterator(ForeachIteratorVisitor<T> visitor) {
-		return visitor.visitCustomIterator();
-	}
 	
 	public void setOverrides(IteratorMemberRef overrides) {
 		this.overrides = overrides;

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

@@ -28,7 +28,7 @@ public interface MemberVisitor<T> {
 	
 	public T visitCaster(CasterMember member);
 	
-	public T visitCustomIterator(CustomIteratorMember member);
+	public T visitCustomIterator(IteratorMember member);
 	
 	public T visitCaller(CallerMember member);
 	

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

@@ -14,7 +14,7 @@ import org.openzen.zenscript.codemodel.type.member.BuiltinID;
  *
  * @author Hoofdgebruiker
  */
-public abstract class PropertyMember extends DefinitionMember implements IPropertyMember {
+public abstract class PropertyMember extends DefinitionMember {
 	public ITypeID type;
 	public final BuiltinID builtin;
 	
@@ -25,8 +25,12 @@ public abstract class PropertyMember extends DefinitionMember implements IProper
 		this.builtin = builtin;
 	}
 	
-	@Override
 	public ITypeID getType() {
 		return type;
 	}
+	
+	@Override
+	public BuiltinID getBuiltin() {
+		return builtin;
+	}
 }

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

@@ -14,6 +14,7 @@ import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.member.ref.SetterMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.statement.LoopStatement;
+import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
@@ -24,10 +25,11 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
  *
  * @author Hoofdgebruiker
  */
-public class SetterMember extends FunctionalMember implements IPropertyMember {
-	public ITypeID type;
+public class SetterMember extends PropertyMember {
 	public final String name;
 	private SetterMemberRef overrides;
+	public Statement body;
+	public final FunctionParameter parameter;
 	
 	public SetterMember(
 			CodePosition position,
@@ -40,26 +42,15 @@ public class SetterMember extends FunctionalMember implements IPropertyMember {
 		super(position,
 				definition,
 				modifiers,
-				new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(type, "$")),
+				type,
 				builtin);
 		
-		this.type = type;
 		this.name = name;
+		this.parameter = new FunctionParameter(type, "value");
 	}
 	
-	@Override
-	public ITypeID getType() {
-		return type;
-	}
-	
-	@Override
-	public String getCanonicalName() {
-		return definition.getFullName() + ":setter:" + name;
-	}
-
-	@Override
-	public FunctionalKind getKind() {
-		return FunctionalKind.SETTER;
+	public void setBody(Statement body) {
+		this.body = body;
 	}
 
 	@Override
@@ -88,6 +79,11 @@ public class SetterMember extends FunctionalMember implements IPropertyMember {
 			body = body.normalize(scope, ConcatMap.empty(LoopStatement.class, LoopStatement.class));
 	}
 	
+	@Override
+	public boolean isAbstract() {
+		return body == null && builtin == null;
+	}
+	
 	public void setOverrides(SetterMemberRef overrides) {
 		this.overrides = overrides;
 		

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

@@ -7,8 +7,8 @@ package org.openzen.zenscript.codemodel.member;
 
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.ConcatMap;
-import org.openzen.zencode.shared.Taggable;
 import org.openzen.zenscript.codemodel.GenericMapper;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
@@ -22,18 +22,11 @@ import org.openzen.zenscript.codemodel.type.member.TypeMembers;
  *
  * @author Hoofdgebruiker
  */
-public class StaticInitializerMember extends Taggable implements IDefinitionMember {
-	public final CodePosition position;
+public class StaticInitializerMember extends DefinitionMember {
 	public Statement body;
-	public MemberAnnotation[] annotations = MemberAnnotation.NONE;
 	
-	public StaticInitializerMember(CodePosition position) {
-		this.position = position;
-	}
-	
-	@Override
-	public CodePosition getPosition() {
-		return position;
+	public StaticInitializerMember(CodePosition position, HighLevelDefinition definition) {
+		super(position, definition, 0);
 	}
 	
 	@Override

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

@@ -1,95 +0,0 @@
-/*
- * 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 org.openzen.zencode.shared.CodePosition;
-import org.openzen.zencode.shared.Taggable;
-import org.openzen.zenscript.codemodel.GenericMapper;
-import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
-import org.openzen.zenscript.codemodel.member.IIteratorMember;
-import org.openzen.zenscript.codemodel.member.MemberVisitor;
-import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
-import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
-import org.openzen.zenscript.codemodel.scope.TypeScope;
-import org.openzen.zenscript.codemodel.type.ArrayTypeID;
-import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.codemodel.type.member.BuiltinID;
-import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
-import org.openzen.zenscript.codemodel.type.member.TypeMembers;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class ArrayIteratorKeyValues extends Taggable implements IIteratorMember {
-	private ArrayTypeID type;
-	private final ITypeID[] loopVariableTypes;
-	
-	public ArrayIteratorKeyValues(ArrayTypeID type) {
-		this.type = type;
-		
-		loopVariableTypes = new ITypeID[type.dimension + 1];
-		for (int i = 0; i < type.dimension; i++)
-			loopVariableTypes[i] = BasicTypeID.INT;
-		loopVariableTypes[type.dimension] = type.elementType;
-	}
-	
-	@Override
-	public CodePosition getPosition() {
-		return CodePosition.BUILTIN;
-	}
-	
-	@Override
-	public BuiltinID getBuiltin() {
-		return null;
-	}
-
-	@Override
-	public int getLoopVariableCount() {
-		return loopVariableTypes.length;
-	}
-
-	@Override
-	public ITypeID[] getLoopVariableTypes() {
-		return loopVariableTypes;
-	}
-
-	@Override
-	public String describe() {
-		return "iterator for array elements with index";
-	}
-
-	@Override
-	public void registerTo(TypeMembers members, TypeMemberPriority priority, GenericMapper mapper) {
-		members.addIterator(new IteratorMemberRef(this, mapper == null ? loopVariableTypes : mapper.map(loopVariableTypes)), priority);
-	}
-
-	@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();
-	}
-
-	@Override
-	public DefinitionMemberRef getOverrides() {
-		return null;
-	}
-
-	@Override
-	public void normalize(TypeScope scope) {
-		
-	}
-
-	@Override
-	public boolean isAbstract() {
-		return false;
-	}
-}

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

@@ -1,90 +0,0 @@
-/*
- * 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 org.openzen.zencode.shared.CodePosition;
-import org.openzen.zencode.shared.Taggable;
-import org.openzen.zenscript.codemodel.GenericMapper;
-import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
-import org.openzen.zenscript.codemodel.member.IIteratorMember;
-import org.openzen.zenscript.codemodel.member.MemberVisitor;
-import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
-import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
-import org.openzen.zenscript.codemodel.scope.TypeScope;
-import org.openzen.zenscript.codemodel.type.ArrayTypeID;
-import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.codemodel.type.member.BuiltinID;
-import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
-import org.openzen.zenscript.codemodel.type.member.TypeMembers;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class ArrayIteratorValues extends Taggable implements IIteratorMember {
-	private final ArrayTypeID type;
-	private final ITypeID[] loopVariableTypes;
-	
-	public ArrayIteratorValues(ArrayTypeID type) {
-		this.type = type;
-		loopVariableTypes = new ITypeID[] { type.elementType };
-	}
-	
-	@Override
-	public CodePosition getPosition() {
-		return CodePosition.BUILTIN;
-	}
-	
-	@Override
-	public BuiltinID getBuiltin() {
-		return null;
-	}
-
-	@Override
-	public int getLoopVariableCount() {
-		return 1;
-	}
-
-	@Override
-	public ITypeID[] getLoopVariableTypes() {
-		return loopVariableTypes;
-	}
-
-	@Override
-	public String describe() {
-		return "iterator for array values";
-	}
-
-	@Override
-	public void registerTo(TypeMembers members, TypeMemberPriority priority, GenericMapper mapper) {
-		members.addIterator(new IteratorMemberRef(this, mapper == null ? loopVariableTypes : mapper.map(loopVariableTypes)), priority);
-	}
-
-	@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.visitArrayValueIterator();
-	}
-
-	@Override
-	public DefinitionMemberRef getOverrides() {
-		return null;
-	}
-
-	@Override
-	public void normalize(TypeScope scope) {
-		
-	}
-
-	@Override
-	public boolean isAbstract() {
-		return false;
-	}
-}

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

@@ -1,93 +0,0 @@
-/*
- * 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 org.openzen.zencode.shared.CodePosition;
-import org.openzen.zencode.shared.Taggable;
-import org.openzen.zenscript.codemodel.GenericMapper;
-import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
-import org.openzen.zenscript.codemodel.member.IIteratorMember;
-import org.openzen.zenscript.codemodel.member.MemberVisitor;
-import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
-import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
-import org.openzen.zenscript.codemodel.scope.TypeScope;
-import org.openzen.zenscript.codemodel.type.AssocTypeID;
-import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.codemodel.type.member.BuiltinID;
-import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
-import org.openzen.zenscript.codemodel.type.member.TypeMembers;
-
-/**
- *
- * @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 BuiltinID getBuiltin() {
-		return null;
-	}
-
-	@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, GenericMapper mapper) {
-		type.addIterator(new IteratorMemberRef(this, mapper == null ? loopVariableTypes : mapper.map(loopVariableTypes)), priority);
-	}
-
-	@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.visitAssocKeyValueIterator();
-	}
-
-	@Override
-	public DefinitionMemberRef getOverrides() {
-		return null;
-	}
-
-	@Override
-	public void normalize(TypeScope scope) {
-		
-	}
-
-	@Override
-	public boolean isAbstract() {
-		return false;
-	}
-}

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

@@ -1,101 +0,0 @@
-/*
- * 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 org.openzen.zencode.shared.CodePosition;
-import org.openzen.zencode.shared.Taggable;
-import org.openzen.zenscript.codemodel.GenericMapper;
-import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
-import org.openzen.zenscript.codemodel.member.IIteratorMember;
-import org.openzen.zenscript.codemodel.member.MemberVisitor;
-import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
-import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
-import org.openzen.zenscript.codemodel.scope.TypeScope;
-import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.codemodel.type.RangeTypeID;
-import org.openzen.zenscript.codemodel.type.member.BuiltinID;
-import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
-import org.openzen.zenscript.codemodel.type.member.TypeMembers;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class RangeIterator extends Taggable implements IIteratorMember {
-	private final ITypeID[] loopVariableTypes;
-	
-	public RangeIterator(RangeTypeID type) {
-		if (type.from != type.to)
-			throw new UnsupportedOperationException("Cannot iterator over a range with different from and to types");
-		if (type.from != BasicTypeID.BYTE
-				&& type.from != BasicTypeID.SBYTE
-				&& type.from != BasicTypeID.SHORT
-				&& type.from != BasicTypeID.USHORT
-				&& type.from != BasicTypeID.INT
-				&& type.from != BasicTypeID.UINT
-				&& type.from != BasicTypeID.LONG
-				&& type.from != BasicTypeID.ULONG)
-			throw new UnsupportedOperationException("Can only use range iterator over integer types");
-		
-		loopVariableTypes = new ITypeID[] { type.from };
-	}
-	
-	@Override
-	public CodePosition getPosition() {
-		return CodePosition.BUILTIN;
-	}
-	
-	@Override
-	public BuiltinID getBuiltin() {
-		return null;
-	}
-
-	@Override
-	public int getLoopVariableCount() {
-		return 1;
-	}
-
-	@Override
-	public ITypeID[] getLoopVariableTypes() {
-		return loopVariableTypes;
-	}
-
-	@Override
-	public String describe() {
-		return "range iterator";
-	}
-
-	@Override
-	public void registerTo(TypeMembers type, TypeMemberPriority priority, GenericMapper mapper) {
-		type.addIterator(new IteratorMemberRef(this, mapper == null ? loopVariableTypes : mapper.map(loopVariableTypes)), priority);
-	}
-
-	@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.visitIntRange();
-	}
-
-	@Override
-	public DefinitionMemberRef getOverrides() {
-		return null;
-	}
-
-	@Override
-	public void normalize(TypeScope scope) {
-		
-	}
-
-	@Override
-	public boolean isAbstract() {
-		return false;
-	}
-}

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

@@ -1,84 +0,0 @@
-/*
- * 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 org.openzen.zencode.shared.CodePosition;
-import org.openzen.zencode.shared.Taggable;
-import org.openzen.zenscript.codemodel.GenericMapper;
-import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
-import org.openzen.zenscript.codemodel.member.IIteratorMember;
-import org.openzen.zenscript.codemodel.member.MemberVisitor;
-import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
-import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
-import org.openzen.zenscript.codemodel.scope.TypeScope;
-import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.codemodel.type.member.BuiltinID;
-import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
-import org.openzen.zenscript.codemodel.type.member.TypeMembers;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class StringCharIterator extends Taggable implements IIteratorMember {
-	private static final ITypeID[] TYPES = new ITypeID[] { BasicTypeID.CHAR };
-
-	@Override
-	public int getLoopVariableCount() {
-		return 1;
-	}
-	
-	@Override
-	public BuiltinID getBuiltin() {
-		return null;
-	}
-
-	@Override
-	public ITypeID[] getLoopVariableTypes() {
-		return TYPES;
-	}
-
-	@Override
-	public <T> T acceptForIterator(ForeachIteratorVisitor<T> visitor) {
-		return visitor.visitStringCharacterIterator();
-	}
-
-	@Override
-	public CodePosition getPosition() {
-		return CodePosition.BUILTIN;
-	}
-
-	@Override
-	public String describe() {
-		return "string character iterator";
-	}
-
-	@Override
-	public void registerTo(TypeMembers type, TypeMemberPriority priority, GenericMapper mapper) {
-		type.addIterator(new IteratorMemberRef(this, TYPES), priority);
-	}
-
-	@Override
-	public <T> T accept(MemberVisitor<T> visitor) {
-		throw new UnsupportedOperationException("Not a compilable member");
-	}
-
-	@Override
-	public DefinitionMemberRef getOverrides() {
-		return null;
-	}
-
-	@Override
-	public void normalize(TypeScope scope) {
-		
-	}
-
-	@Override
-	public boolean isAbstract() {
-		return false;
-	}
-}

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

@@ -34,7 +34,7 @@ public class GetterMemberRef extends PropertyRef {
 	}
 
 	@Override
-	public DefinitionMemberRef getOverrides() {
+	public GetterMemberRef getOverrides() {
 		return member.getOverrides();
 	}
 }

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

@@ -8,9 +8,8 @@ package org.openzen.zenscript.codemodel.member.ref;
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
-import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.member.IteratorMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
-import org.openzen.zenscript.codemodel.member.IIteratorMember;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 
 /**
@@ -18,10 +17,10 @@ import org.openzen.zenscript.codemodel.type.ITypeID;
  * @author Hoofdgebruiker
  */
 public class IteratorMemberRef implements DefinitionMemberRef {
-	public final IIteratorMember target;
+	public final IteratorMember target;
 	public final ITypeID[] types;
 	
-	public IteratorMemberRef(IIteratorMember target, ITypeID... types) {
+	public IteratorMemberRef(IteratorMember target, ITypeID... types) {
 		this.target = target;
 		this.types = types;
 	}
@@ -57,8 +56,8 @@ public class IteratorMemberRef implements DefinitionMemberRef {
 
 	@Override
 	public MemberAnnotation[] getAnnotations() {
-		if (target instanceof CustomIteratorMember) {
-			return ((CustomIteratorMember)target).annotations;
+		if (target instanceof IteratorMember) {
+			return ((IteratorMember)target).annotations;
 		} else {
 			return null;
 		}

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

@@ -10,7 +10,7 @@ import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
-import org.openzen.zenscript.codemodel.member.IPropertyMember;
+import org.openzen.zenscript.codemodel.member.PropertyMember;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 
@@ -19,12 +19,12 @@ import org.openzen.zenscript.codemodel.type.ITypeID;
  * @author Hoofdgebruiker
  */
 public abstract class PropertyRef implements DefinitionMemberRef {
-	private final IPropertyMember member;
+	private final PropertyMember member;
 	
 	private ITypeID type;
 	private GenericMapper mapper;
 	
-	public PropertyRef(IPropertyMember member, GenericMapper mapper) {
+	public PropertyRef(PropertyMember member, GenericMapper mapper) {
 		this.member = member;
 		
 		if (member.getType() == BasicTypeID.UNDETERMINED) {

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

@@ -22,7 +22,7 @@ public class SetterMemberRef extends PropertyRef {
 	}
 
 	@Override
-	public DefinitionMemberRef getOverrides() {
+	public SetterMemberRef getOverrides() {
 		return member.getOverrides();
 	}
 }

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

@@ -444,5 +444,12 @@ public enum BuiltinID {
 	
 	OPTIONAL_IS_NULL,
 	OPTIONAL_IS_NOT_NULL,
-	AUTOOP_NOTEQUALS
+	AUTOOP_NOTEQUALS,
+	
+	ITERATOR_INT_RANGE,
+	ITERATOR_ARRAY_VALUES,
+	ITERATOR_ARRAY_KEY_VALUES,
+	ITERATOR_ASSOC_KEYS,
+	ITERATOR_ASSOC_KEY_VALUES,
+	ITERATOR_STRING_CHARS
 }

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

@@ -47,11 +47,6 @@ import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.member.MethodMember;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
-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.RangeIterator;
-import org.openzen.zenscript.codemodel.member.builtin.StringCharIterator;
 import org.openzen.zenscript.codemodel.member.ref.CasterMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.TranslatedOperatorMemberRef;
@@ -74,6 +69,7 @@ import static org.openzen.zencode.shared.CodePosition.BUILTIN;
 import org.openzen.zencode.shared.CompileException;
 import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.definition.InterfaceDefinition;
+import org.openzen.zenscript.codemodel.member.IteratorMember;
 
 /**
  *
@@ -286,8 +282,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 
 		getter(definition, ARRAY_ISEMPTY, "isEmpty", BOOL);
 		getter(definition, ARRAY_HASHCODE, "objectHashCode", INT);
-		new ArrayIteratorKeyValues(array).registerTo(members, TypeMemberPriority.SPECIFIED, null);
-		new ArrayIteratorValues(array).registerTo(members, TypeMemberPriority.SPECIFIED, null);
+		iterator(definition, ITERATOR_ARRAY_VALUES, baseType);
+		iterator(definition, ITERATOR_ARRAY_KEY_VALUES, INT, baseType);
 		
 		equals(definition, ARRAY_EQUALS, array);
 		notequals(definition, ARRAY_NOTEQUALS, array);
@@ -324,7 +320,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		getter(builtin, BuiltinID.ASSOC_VALUES, "values", cache.getRegistry().getArray(valueType, 1));
 		getter(builtin, BuiltinID.ASSOC_HASHCODE, "objectHashCode", BasicTypeID.INT);
 		
-		new AssocIterator(assoc).registerTo(members, TypeMemberPriority.SPECIFIED, null);
+		iterator(builtin, ITERATOR_ASSOC_KEYS, keyType);
+		iterator(builtin, ITERATOR_ASSOC_KEY_VALUES, keyType, valueType);
 		
 		equals(builtin, BuiltinID.ASSOC_EQUALS, assoc);
 		notequals(builtin, BuiltinID.ASSOC_NOTEQUALS, assoc);
@@ -499,7 +496,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		ClassDefinition definition = new ClassDefinition(BUILTIN, null, "", Modifiers.EXPORT);
 		getter(definition, RANGE_FROM, "from", fromType);
 		getter(definition, RANGE_TO, "to", toType);
-		if (range.from == range.to && (range.from == BasicTypeID.BYTE
+		if (range.from == range.to && (
+				   range.from == BYTE
 				|| range.from == SBYTE
 				|| range.from == SHORT
 				|| range.from == USHORT
@@ -507,7 +505,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 				|| range.from == UINT
 				|| range.from == LONG
 				|| range.from == ULONG)) {
-			new RangeIterator(range).registerTo(members, TypeMemberPriority.SPECIFIED, null);
+			
+			iterator(definition, ITERATOR_INT_RANGE, range.from);
 		}
 		
 		processType(definition, range);
@@ -1116,7 +1115,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		method(builtin, STRING_TO_LOWER_CASE, "toLowerCase", STRING);
 		method(builtin, STRING_TO_UPPER_CASE, "toUpperCase", STRING);
 		
-		new StringCharIterator().registerTo(members, TypeMemberPriority.SPECIFIED, null);
+		iterator(builtin, ITERATOR_STRING_CHARS, CHAR);
 		
 		processType(builtin, STRING);
 	}
@@ -1557,4 +1556,9 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 				new FunctionHeader(BOOL, new FunctionParameter(type)),
 				id).registerTo(members, TypeMemberPriority.SPECIFIED, null);
 	}
+	
+	private void iterator(HighLevelDefinition cls, BuiltinID builtin, ITypeID... types) {
+		new IteratorMember(BUILTIN, cls, Modifiers.PUBLIC, types, registry, builtin)
+				.registerTo(members, TypeMemberPriority.SPECIFIED, null);
+	}
 }

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

@@ -1,12 +1,11 @@
 package org.openzen.zenscript.javabytecode.compiler;
 
 import org.objectweb.asm.Label;
-import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.javabytecode.JavaLocalVariableInfo;
 
-public class JavaForeachVisitor implements ForeachIteratorVisitor<Void> {
+public class JavaForeachWriter {
 
 	private final JavaWriter javaWriter;
 	private final VarStatement[] variables;
@@ -15,7 +14,7 @@ public class JavaForeachVisitor implements ForeachIteratorVisitor<Void> {
 	private final Label endLabel;
 	private final JavaStatementVisitor statementVisitor;
 
-	public JavaForeachVisitor(JavaStatementVisitor statementVisitor, VarStatement[] variables, Statement content, Label start, Label end) {
+	public JavaForeachWriter(JavaStatementVisitor statementVisitor, VarStatement[] variables, Statement content, Label start, Label end) {
 		this.statementVisitor = statementVisitor;
 		this.javaWriter = statementVisitor.getJavaWriter();
 		this.variables = variables;
@@ -23,9 +22,8 @@ public class JavaForeachVisitor implements ForeachIteratorVisitor<Void> {
 		this.startLabel = start;
 		this.endLabel = end;
 	}
-
-	@Override
-	public Void visitIntRange() {
+	
+	public void visitIntRange() {
 		javaWriter.dup();
 		javaWriter.getField("zsynthetic/IntRange", "to", "I");
 		javaWriter.swap();
@@ -40,26 +38,17 @@ public class JavaForeachVisitor implements ForeachIteratorVisitor<Void> {
 
 		content.accept(statementVisitor);
 		javaWriter.iinc(z);
-
-
-		return null;
 	}
 
-	@Override
-	public Void visitArrayValueIterator() {
+	public void visitArrayValueIterator() {
 		handleArray(javaWriter.local(int.class), variables[0].getTag(JavaLocalVariableInfo.class));
-		return null;
 	}
 
-	@Override
-	public Void visitArrayKeyValueIterator() {
+	public void visitArrayKeyValueIterator() {
 		handleArray(variables[0].getTag(JavaLocalVariableInfo.class).local, variables[1].getTag(JavaLocalVariableInfo.class));
-		return null;
 	}
 
-	@Override
-	public Void visitStringCharacterIterator() {
-		// TODO: implement this one
+	public void visitStringCharacterIterator() {
 		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
 	}
 
@@ -83,18 +72,15 @@ public class JavaForeachVisitor implements ForeachIteratorVisitor<Void> {
 		javaWriter.iinc(z);
 	}
 
-	@Override
-	public Void visitCustomIterator() {
-		return null;
+	public void visitCustomIterator() {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
 	}
 
-	@Override
-	public Void visitAssocKeyIterator() {
+	public void visitAssocKeyIterator() {
 		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
 	}
 
-	@Override
-	public Void visitAssocKeyValueIterator() {
+	public void visitAssocKeyValueIterator() {
 		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
 	}
 }

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

@@ -108,7 +108,34 @@ public class JavaStatementVisitor implements StatementVisitor<Boolean> {
         }
 
 		//javaWriter.label(min);
-		statement.iterator.target.acceptForIterator(new JavaForeachVisitor(this, statement.loopVariables, statement.content, start, end));
+		JavaForeachWriter iteratorWriter = new JavaForeachWriter(this, statement.loopVariables, statement.content, start, end);
+		if (statement.iterator.target.getBuiltin() == null) {
+			iteratorWriter.visitCustomIterator();
+		} else {
+			switch (statement.iterator.target.getBuiltin()) {
+				case ITERATOR_INT_RANGE:
+					iteratorWriter.visitIntRange();
+					break;
+				case ITERATOR_ARRAY_VALUES:
+					iteratorWriter.visitArrayValueIterator();
+					break;
+				case ITERATOR_ARRAY_KEY_VALUES:
+					iteratorWriter.visitArrayKeyValueIterator();
+					break;
+				case ITERATOR_ASSOC_KEYS:
+					iteratorWriter.visitAssocKeyIterator();
+					break;
+				case ITERATOR_ASSOC_KEY_VALUES:
+					iteratorWriter.visitAssocKeyValueIterator();
+					break;
+				case ITERATOR_STRING_CHARS:
+					iteratorWriter.visitStringCharacterIterator();
+					break;
+				default:
+					throw new IllegalArgumentException("Invalid iterator: " + statement.iterator.target.getBuiltin());
+			}
+		}
+		
 		javaWriter.goTo(start);
 		javaWriter.label(end);
 		return false;

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/definitions/JavaMemberVisitor.java

@@ -164,7 +164,7 @@ public class JavaMemberVisitor implements MemberVisitor<Void> {
 	}
 
 	@Override
-	public Void visitCustomIterator(CustomIteratorMember member) {
+	public Void visitCustomIterator(IteratorMember member) {
 		return null;
 	}
 

JavaShared/src/main/java/org/openzen/zenscript/javashared/prepare/JavaPrepareClassMethodVisitor.java

@@ -7,17 +7,17 @@ package org.openzen.zenscript.javashared.prepare;
 
 import org.openzen.zenscript.javashared.JavaNativeClass;
 import org.openzen.zencode.shared.StringExpansion;
+import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.annotations.NativeTag;
 import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.codemodel.member.ConstMember;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
-import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.member.IteratorMember;
 import org.openzen.zenscript.codemodel.member.DefinitionMember;
 import org.openzen.zenscript.codemodel.member.DestructorMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
-import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.member.ImplementationMember;
@@ -28,6 +28,7 @@ import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.member.StaticInitializerMember;
 import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GenericTypeID;
 import org.openzen.zenscript.javashared.JavaTypeNameVisitor;
 import org.openzen.zenscript.javashared.JavaClass;
@@ -86,7 +87,7 @@ public class JavaPrepareClassMethodVisitor implements MemberVisitor<Void> {
 
 	@Override
 	public Void visitConstructor(ConstructorMember member) {
-		visitFunctional(member, "<init>");
+		visitFunctional(member, member.header, "<init>");
 		return null;
 	}
 
@@ -101,43 +102,43 @@ public class JavaPrepareClassMethodVisitor implements MemberVisitor<Void> {
 
 	@Override
 	public Void visitMethod(MethodMember member) {
-		visitFunctional(member, member.name);
+		visitFunctional(member, member.header, member.name);
 		return null;
 	}
 
 	@Override
 	public Void visitGetter(GetterMember member) {
-		visitFunctional(member, "get" + StringExpansion.capitalize(member.name));
+		visitFunctional(member, new FunctionHeader(member.type), "get" + StringExpansion.capitalize(member.name));
 		return null;
 	}
 
 	@Override
 	public Void visitSetter(SetterMember member) {
-		visitFunctional(member, "set" + StringExpansion.capitalize(member.name));
+		visitFunctional(member, new FunctionHeader(BasicTypeID.VOID, member.type), "set" + StringExpansion.capitalize(member.name));
 		return null;
 	}
 
 	@Override
 	public Void visitOperator(OperatorMember member) {
-		visitFunctional(member, getOperatorName(member.operator));
+		visitFunctional(member, member.header, getOperatorName(member.operator));
 		return null;
 	}
 
 	@Override
 	public Void visitCaster(CasterMember member) {
-		visitFunctional(member, "to" + member.toType.accept(new JavaTypeNameVisitor()));
+		visitFunctional(member, member.header, "to" + member.toType.accept(new JavaTypeNameVisitor()));
 		return null;
 	}
 
 	@Override
-	public Void visitCustomIterator(CustomIteratorMember member) {
-		visitFunctional(member, member.getLoopVariableCount() == 1 ? "iterator" : "iterator" + member.getLoopVariableCount());
+	public Void visitCustomIterator(IteratorMember member) {
+		visitFunctional(member, member.header, member.getLoopVariableCount() == 1 ? "iterator" : "iterator" + member.getLoopVariableCount());
 		return null;
 	}
 
 	@Override
 	public Void visitCaller(CallerMember member) {
-		visitFunctional(member, "call");
+		visitFunctional(member, member.header, "call");
 		return null;
 	}
 
@@ -279,7 +280,7 @@ public class JavaPrepareClassMethodVisitor implements MemberVisitor<Void> {
 		}
 	}
 	
-	private void visitFunctional(FunctionalMember member, String name) {
+	private void visitFunctional(DefinitionMember member, FunctionHeader header, String name) {
 		NativeTag nativeTag = member.getTag(NativeTag.class);
 		JavaMethod method = null;
 		if (nativeTag != null && nativeClass != null)
@@ -296,18 +297,18 @@ public class JavaPrepareClassMethodVisitor implements MemberVisitor<Void> {
 					baseMethod.kind,
 					baseMethod.name,
 					true,
-					context.getMethodDescriptor(member.header),
+					context.getMethodDescriptor(header),
 					JavaModifiers.getJavaModifiers(member.modifiers),
-					member.header.returnType instanceof GenericTypeID);
+					header.returnType instanceof GenericTypeID);
 		} else if (method == null) {
 			method = new JavaMethod(
 					cls,
 					getKind(member),
 					name,
 					true,
-					context.getMethodDescriptor(member.header),
+					context.getMethodDescriptor(header),
 					JavaModifiers.getJavaModifiers(member.modifiers),
-					member.header.returnType instanceof GenericTypeID);
+					header.returnType instanceof GenericTypeID);
 		}
 		
 		if (method.compile) {

JavaShared/src/main/java/org/openzen/zenscript/javashared/prepare/JavaPrepareExpansionMethodVisitor.java

@@ -7,17 +7,17 @@ package org.openzen.zenscript.javashared.prepare;
 
 import org.openzen.zenscript.javashared.JavaNativeClass;
 import org.openzen.zencode.shared.StringExpansion;
+import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.annotations.NativeTag;
 import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.codemodel.member.ConstMember;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
-import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.member.IteratorMember;
 import org.openzen.zenscript.codemodel.member.DefinitionMember;
 import org.openzen.zenscript.codemodel.member.DestructorMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
-import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.member.ImplementationMember;
@@ -27,6 +27,7 @@ import org.openzen.zenscript.codemodel.member.MethodMember;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.member.StaticInitializerMember;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GenericTypeID;
 import org.openzen.zenscript.javashared.JavaTypeNameVisitor;
 import org.openzen.zenscript.javashared.JavaClass;
@@ -76,7 +77,7 @@ public class JavaPrepareExpansionMethodVisitor implements MemberVisitor<Void> {
 
 	@Override
 	public Void visitConstructor(ConstructorMember member) {
-		visitFunctional(member, "");
+		visitFunctional(member, member.header, "");
 		return null;
 	}
 
@@ -85,49 +86,49 @@ public class JavaPrepareExpansionMethodVisitor implements MemberVisitor<Void> {
 		if (nativeClass != null && nativeClass.nonDestructible)
 			return null;
 		
-		visitFunctional(member, "");
+		visitFunctional(member, member.header, "");
 		return null;
 	}
 
 	@Override
 	public Void visitMethod(MethodMember member) {
-		visitFunctional(member, member.name);
+		visitFunctional(member, member.header, member.name);
 		return null;
 	}
 
 	@Override
 	public Void visitGetter(GetterMember member) {
-		visitFunctional(member, "get" + StringExpansion.capitalize(member.name));
+		visitFunctional(member, new FunctionHeader(member.type), "get" + StringExpansion.capitalize(member.name));
 		return null;
 	}
 
 	@Override
 	public Void visitSetter(SetterMember member) {
-		visitFunctional(member, "set" + StringExpansion.capitalize(member.name));
+		visitFunctional(member, new FunctionHeader(BasicTypeID.VOID, member.type), "set" + StringExpansion.capitalize(member.name));
 		return null;
 	}
 
 	@Override
 	public Void visitOperator(OperatorMember member) {
-		visitFunctional(member, getOperatorName(member.operator));
+		visitFunctional(member, member.header, getOperatorName(member.operator));
 		return null;
 	}
 
 	@Override
 	public Void visitCaster(CasterMember member) {
-		visitFunctional(member, "to" + member.toType.accept(new JavaTypeNameVisitor()));
+		visitFunctional(member, member.header, "to" + member.toType.accept(new JavaTypeNameVisitor()));
 		return null;
 	}
 
 	@Override
-	public Void visitCustomIterator(CustomIteratorMember member) {
-		visitFunctional(member, member.getLoopVariableCount() == 1 ? "iterator" : "iterator" + member.getLoopVariableCount());
+	public Void visitCustomIterator(IteratorMember member) {
+		visitFunctional(member, member.header, member.getLoopVariableCount() == 1 ? "iterator" : "iterator" + member.getLoopVariableCount());
 		return null;
 	}
 
 	@Override
 	public Void visitCaller(CallerMember member) {
-		visitFunctional(member, "call");
+		visitFunctional(member, member.header, "call");
 		return null;
 	}
 
@@ -154,13 +155,13 @@ public class JavaPrepareExpansionMethodVisitor implements MemberVisitor<Void> {
 		return null;
 	}
 	
-	private void visitFunctional(FunctionalMember member, String name) {
+	private void visitFunctional(DefinitionMember member, FunctionHeader header, String name) {
 		NativeTag nativeTag = member.getTag(NativeTag.class);
 		JavaMethod method = null;
 		if (nativeTag != null && nativeClass != null)
 			method = nativeClass.getMethod(nativeTag.value);
 		if (method == null)
-			method = new JavaMethod(cls, getKind(member), name, true, context.getMethodDescriptor(member.header), JavaModifiers.getJavaModifiers(member.modifiers), member.header.returnType instanceof GenericTypeID); 
+			method = new JavaMethod(cls, getKind(member), name, true, context.getMethodDescriptor(header), JavaModifiers.getJavaModifiers(member.modifiers), header.returnType instanceof GenericTypeID); 
 		
 		if (method.compile) {
 			if (DEBUG_EMPTY && cls.empty)

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

@@ -16,7 +16,7 @@ import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.codemodel.member.ConstMember;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
-import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.member.IteratorMember;
 import org.openzen.zenscript.codemodel.member.DefinitionMember;
 import org.openzen.zenscript.codemodel.member.DestructorMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
@@ -140,7 +140,7 @@ public class JavaExpansionMemberCompiler extends BaseMemberCompiler {
 
 	@Override
 	public Void visitGetter(GetterMember member) {
-		compileMethod(member, member.header, member.body);
+		compileMethod(member, new FunctionHeader(member.type), member.body);
 		return null;
 	}
 
@@ -163,7 +163,7 @@ public class JavaExpansionMemberCompiler extends BaseMemberCompiler {
 	}
 
 	@Override
-	public Void visitCustomIterator(CustomIteratorMember member) {
+	public Void visitCustomIterator(IteratorMember member) {
 		compileMethod(member, new FunctionHeader(scope.semanticScope.getTypeRegistry().getIterator(member.getLoopVariableTypes())), member.body);
 		return null;
 	}

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

@@ -19,7 +19,7 @@ import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.codemodel.member.ConstMember;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
-import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.member.IteratorMember;
 import org.openzen.zenscript.codemodel.member.DefinitionMember;
 import org.openzen.zenscript.codemodel.member.DestructorMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
@@ -186,7 +186,7 @@ public class JavaMemberCompiler extends BaseMemberCompiler {
 
 	@Override
 	public Void visitGetter(GetterMember member) {
-		compileMethod(member, member.header, member.body);
+		compileMethod(member, new FunctionHeader(member.type), member.body);
 		return null;
 	}
 
@@ -209,7 +209,7 @@ public class JavaMemberCompiler extends BaseMemberCompiler {
 	}
 
 	@Override
-	public Void visitCustomIterator(CustomIteratorMember member) {
+	public Void visitCustomIterator(IteratorMember member) {
 		compileMethod(member, new FunctionHeader(scope.semanticScope.getTypeRegistry().getIterator(member.getLoopVariableTypes())), member.body);
 		return null;
 	}

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

@@ -18,7 +18,6 @@ import org.openzen.zenscript.codemodel.expression.switchvalue.IntSwitchValue;
 import org.openzen.zenscript.codemodel.expression.switchvalue.StringSwitchValue;
 import org.openzen.zenscript.codemodel.expression.switchvalue.SwitchValueVisitor;
 import org.openzen.zenscript.codemodel.expression.switchvalue.VariantOptionSwitchValue;
-import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
 import org.openzen.zenscript.codemodel.statement.BlockStatement;
 import org.openzen.zenscript.codemodel.statement.BreakStatement;
 import org.openzen.zenscript.codemodel.statement.CatchClause;
@@ -100,7 +99,33 @@ public class JavaSourceStatementFormatter implements StatementFormatter.Formatte
 
 	@Override
 	public void formatForeach(StatementFormattingTarget target, ForeachStatement statement) {
-		statement.iterator.target.acceptForIterator(new ForeachFormatter(scope, target, statement));
+		if (statement.iterator.target.getBuiltin() == null) {
+			iterateOverCustomIterator(target, statement);
+			return;
+		}
+		
+		switch (statement.iterator.target.getBuiltin()) {
+			case ITERATOR_INT_RANGE:
+				iterateOverIntRange(target, statement);
+				break;
+			case ITERATOR_ARRAY_VALUES:
+				iterateOverArrayValues(target, statement);
+				break;
+			case ITERATOR_ARRAY_KEY_VALUES:
+				iteratorOverArrayKeyValues(target, statement);
+				break;
+			case ITERATOR_ASSOC_KEYS:
+				iterateOverAssocKeys(target, statement);
+				break;
+			case ITERATOR_ASSOC_KEY_VALUES:
+				iterateOverAssocKeyValues(target, statement);
+				break;
+			case ITERATOR_STRING_CHARS:
+				iterateOverStringCharacters(target, statement);
+				break;
+			default:
+				throw new IllegalArgumentException("Invalid iterator: " + statement.iterator.target.getBuiltin());
+		}
 	}
 
 	@Override
@@ -230,108 +255,86 @@ public class JavaSourceStatementFormatter implements StatementFormatter.Formatte
 		return value.option.getName();
 	}
 	
-	private static class ForeachFormatter implements ForeachIteratorVisitor<Void> {
-		private final JavaSourceStatementScope scope;
-		private final StatementFormattingTarget target;
-		private final ForeachStatement statement;
-		
-		public ForeachFormatter(JavaSourceStatementScope scope, StatementFormattingTarget target, ForeachStatement statement) {
-			this.scope = scope;
-			this.target = target;
-			this.statement = statement;
-		}
+	private void iterateOverIntRange(StatementFormattingTarget target, ForeachStatement statement) {
+		String name = statement.loopVariables[0].name;
 
-		@Override
-		public Void visitIntRange() {
-			String name = statement.loopVariables[0].name;
-			
-			if (statement.list instanceof RangeExpression) {
-				String limitName = "limitFor" + StringExpansion.capitalize(name);
-				RangeExpression range = (RangeExpression)(statement.list);
-				target.writeLine("int " + limitName + " = " + scope.expression(target, range.to) + ";");
-				target.writeInner(
-						"for (int " + name + " = " + scope.expression(target, range.from) + "; " + name + " < " + limitName + "; " + name + "++)",
-						statement.content,
-						statement,
-						"");
-			} else {
-				target.writeLine("IntRange rangeFor" + name + " = " + scope.expression(target, statement.list) + ";");
-				target.writeInner(
-						"for (int " + name + " = rangeFor" + name + ".from; i < rangeFor" + name + ".to; " + name + "++)",
-						statement.content,
-						statement,
-						"");
-			}
-			return null;
-		}
-
-		@Override
-		public Void visitArrayValueIterator() {
+		if (statement.list instanceof RangeExpression) {
+			String limitName = "limitFor" + StringExpansion.capitalize(name);
+			RangeExpression range = (RangeExpression)(statement.list);
+			target.writeLine("int " + limitName + " = " + scope.expression(target, range.to) + ";");
 			target.writeInner(
-					"for (" + scope.type(statement.loopVariables[0].type) + " " + statement.loopVariables[0].name + " : " + scope.expression(target, statement.list) + ")",
+					"for (int " + name + " = " + scope.expression(target, range.from) + "; " + name + " < " + limitName + "; " + name + "++)",
 					statement.content,
 					statement,
 					"");
-			return null;
-		}
-
-		@Override
-		public Void visitArrayKeyValueIterator() {
-			ExpressionString list = scope.expression(target, scope.duplicable(target, statement.list));
-			
+		} else {
+			target.writeLine("IntRange rangeFor" + name + " = " + scope.expression(target, statement.list) + ";");
 			target.writeInner(
-					"for (int " + statement.loopVariables[0].name + " = 0; i < " + list.value + ".length; i++) {",
-					new String[] {
-						scope.type(statement.loopVariables[1].type) + " " + statement.loopVariables[1].name + " = " + list.value + "[" + statement.loopVariables[0].name + "];"
-					},
+					"for (int " + name + " = rangeFor" + name + ".from; i < rangeFor" + name + ".to; " + name + "++)",
 					statement.content,
 					statement,
-					"}");
-			
-			return null;
+					"");
 		}
+	}
 
-		@Override
-		public Void visitCustomIterator() {
-			throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-		}
+	private void iterateOverArrayValues(StatementFormattingTarget target, ForeachStatement statement) {
+		target.writeInner(
+				"for (" + scope.type(statement.loopVariables[0].type) + " " + statement.loopVariables[0].name + " : " + scope.expression(target, statement.list) + ")",
+				statement.content,
+				statement,
+				"");
+	}
 
-		@Override
-		public Void visitStringCharacterIterator() {
-			target.writeInner(
-					"for (char " + statement.loopVariables[0].name + " : " + scope.expression(target, statement.list).value + ".toCharArray())",
-					statement.content,
-					statement,
-					"");
-			return null;
-		}
+	private void iteratorOverArrayKeyValues(StatementFormattingTarget target, ForeachStatement statement) {
+		ExpressionString list = scope.expression(target, scope.duplicable(target, statement.list));
 
-		@Override
-		public Void visitAssocKeyIterator() {
-			VarStatement key = statement.loopVariables[0];
-			target.writeInner(
-					"for (" + scope.type(key.type) + " " + key + " : " + scope.expression(target, statement.list).value + ".keySet())",
+		target.writeInner(
+				"for (int " + statement.loopVariables[0].name + " = 0; i < " + list.value + ".length; i++) {",
+				new String[] {
+					scope.type(statement.loopVariables[1].type) + " " + statement.loopVariables[1].name + " = " + list.value + "[" + statement.loopVariables[0].name + "];"
+				},
+				statement.content,
+				statement,
+				"}");
+	}
+
+	private void iterateOverCustomIterator(StatementFormattingTarget target, ForeachStatement statement) {
+		target.writeInner(
+					"for (" + scope.type(statement.loopVariables[0].type) + " " + statement.loopVariables[0].name + " : " + scope.expression(target, statement.list) + ")",
 					statement.content,
 					statement,
 					"");
-			return null;
-		}
+	}
 
-		@Override
-		public Void visitAssocKeyValueIterator() {
-			String temp = scope.createTempVariable();
-			VarStatement key = statement.loopVariables[0];
-			VarStatement value = statement.loopVariables[1];
-			target.writeInner(
-					"for (Map.Entry<" + scope.type(key.type) + ", " + scope.type(value.type) + "> " + temp + " : " + scope.expression(target, statement.list).value + ".entrySet()) {",
-					new String[] {
-						scope.type(key.type) + " " + key.name + " = " + temp + ".getKey();",
-						scope.type(value.type) + " " + value.name + " = " + temp + ".getValue();"
-					},
-					statement.content,
-					statement,
-					"}");
-			return null;
-		}
+	private void iterateOverStringCharacters(StatementFormattingTarget target, ForeachStatement statement) {
+		target.writeInner(
+				"for (char " + statement.loopVariables[0].name + " : " + scope.expression(target, statement.list).value + ".toCharArray())",
+				statement.content,
+				statement,
+				"");
+	}
+
+	private void iterateOverAssocKeys(StatementFormattingTarget target, ForeachStatement statement) {
+		VarStatement key = statement.loopVariables[0];
+		target.writeInner(
+				"for (" + scope.type(key.type) + " " + key + " : " + scope.expression(target, statement.list).value + ".keySet())",
+				statement.content,
+				statement,
+				"");
+	}
+
+	private void iterateOverAssocKeyValues(StatementFormattingTarget target, ForeachStatement statement) {
+		String temp = scope.createTempVariable();
+		VarStatement key = statement.loopVariables[0];
+		VarStatement value = statement.loopVariables[1];
+		target.writeInner(
+				"for (Map.Entry<" + scope.type(key.type) + ", " + scope.type(value.type) + "> " + temp + " : " + scope.expression(target, statement.list).value + ".entrySet()) {",
+				new String[] {
+					scope.type(key.type) + " " + key.name + " = " + temp + ".getKey();",
+					scope.type(value.type) + " " + value.name + " = " + temp + ".getValue();"
+				},
+				statement.content,
+				statement,
+				"}");
 	}
 }

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

@@ -108,11 +108,11 @@ public class JavaSourceSyntheticTypeGenerator implements JavaSyntheticClassGener
 				.append(result.cls.getName())
 				.append("(")
 				.append(type.from.accept(typeVisitor))
-				.append(", ")
+				.append(" from, ")
 				.append(type.to.accept(typeVisitor))
-				.append(") {\n");
+				.append(" to) {\n");
 		contents.append(settings.indent).append(settings.indent).append("this.from = from;\n");
-		contents.append(settings.indent).append(settings.indent).append("this.to = top;\n");
+		contents.append(settings.indent).append(settings.indent).append("this.to = to;\n");
 		contents.append(settings.indent).append("}\n");
 		contents.append("}\n");
 		

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

@@ -152,7 +152,20 @@ public class JavaSourceTypeVisitor implements ITypeVisitor<String>, GenericParam
 
 	@Override
 	public String visitRange(RangeTypeID range) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		JavaSynthesizedClass synthetic = typeGenerator.synthesizeRange(range);
+		StringBuilder result = new StringBuilder();
+		result.append(importer.importType(synthetic.cls));
+		if (synthetic.typeParameters.length > 0) {
+			result.append('<');
+			for (int i = 0; i < synthetic.typeParameters.length; i++) {
+				if (i > 0)
+					result.append(", ");
+				
+				result.append(synthetic.typeParameters[i].name);
+			}
+			result.append('>');
+		}
+		return result.toString();
 	}
 
 	@Override

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

@@ -6,27 +6,36 @@
 package org.openzen.zenscript.parser.member;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.CompileException;
+import org.openzen.zencode.shared.CompileExceptionCode;
+import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
-import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
+import org.openzen.zenscript.codemodel.scope.FunctionScope;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.parser.ParsedAnnotation;
-import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.statements.ParsedFunctionBody;
 import org.openzen.zenscript.parser.type.IParsedType;
-import org.openzen.zenscript.parser.type.ParsedTypeBasic;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class ParsedGetter extends ParsedFunctionalMember {
+public class ParsedGetter extends ParsedDefinitionMember {
+	private final CodePosition position;
+	private final int modifiers;
+	private final ParsedImplementation implementation;
+	private final ParsedFunctionBody body;
+	
 	private final String name;
 	private final IParsedType type;
 	private GetterMember compiled;
+	private boolean isCompiled = false;
 	
 	public ParsedGetter(
 			CodePosition position,
@@ -38,7 +47,12 @@ public class ParsedGetter extends ParsedFunctionalMember {
 			IParsedType type,
 			ParsedFunctionBody body)
 	{
-		super(position, definition, implementation, modifiers, annotations, body);
+		super(definition, annotations);
+		
+		this.implementation = implementation;
+		this.position = position;
+		this.modifiers = modifiers;
+		this.body = body;
 		
 		this.name = name;
 		this.type = type;
@@ -48,22 +62,45 @@ public class ParsedGetter extends ParsedFunctionalMember {
 	public void linkTypes(TypeResolutionContext context) {
 		compiled = new GetterMember(position, definition, modifiers, name, type.compile(context), null);
 	}
-
+	
 	@Override
-	public FunctionalMember getCompiled() {
+	public GetterMember getCompiled() {
 		return compiled;
 	}
 	
-	@Override
-	protected void inferHeaders(BaseScope scope) {
-		super.inferHeaders(scope);
+	private void inferHeaders(BaseScope scope) {
+		if ((implementation != null && !Modifiers.isPrivate(modifiers))) {
+			fillOverride(scope, implementation.getCompiled().type);
+			compiled.modifiers |= Modifiers.PUBLIC;
+		} else if (implementation == null && Modifiers.isOverride(modifiers)) {
+			if (definition.getSuperType() == null)
+				throw new CompileException(position, CompileExceptionCode.OVERRIDE_WITHOUT_BASE, "Override specified without base type");
+			
+			fillOverride(scope, definition.getSuperType());
+		}
 		
-		if (type == ParsedTypeBasic.UNDETERMINED)
-			compiled.type = compiled.header.returnType;
+		if (compiled == null)
+			throw new IllegalStateException("Types not yet linked");
 	}
 
-	@Override
-	protected void fillOverride(TypeScope scope, ITypeID baseType) {
+	private void fillOverride(TypeScope scope, ITypeID baseType) {
 		compiled.setOverrides(scope.getTypeMembers(baseType).getOrCreateGroup(name, false).getGetter());
 	}
+	
+	@Override
+	public final void compile(BaseScope scope) {
+		if (isCompiled)
+			return;
+		isCompiled = true;
+		
+		inferHeaders(scope);
+		
+		FunctionHeader header = new FunctionHeader(compiled.type);
+		FunctionScope innerScope = new FunctionScope(scope, header);
+		compiled.annotations = ParsedAnnotation.compileForMember(annotations, getCompiled(), scope);
+		compiled.setBody(body.compile(innerScope, header));
+		
+		if (compiled.type == BasicTypeID.UNDETERMINED)
+			compiled.type = compiled.body.getReturnType();
+	}
 }

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

@@ -9,7 +9,7 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
-import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.member.IteratorMember;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.FunctionScope;
@@ -29,7 +29,7 @@ public class ParsedIterator extends ParsedDefinitionMember {
 	private final ParsedFunctionHeader header;
 	private final ParsedFunctionBody body;
 	
-	private CustomIteratorMember compiled;
+	private IteratorMember compiled;
 	
 	public ParsedIterator(
 			CodePosition position,
@@ -53,11 +53,11 @@ public class ParsedIterator extends ParsedDefinitionMember {
 		for (int i = 0; i < loopVariableTypes.length; i++)
 			loopVariableTypes[i] = header.parameters.get(i).type.compile(context);
 		
-		compiled = new CustomIteratorMember(position, definition, modifiers, loopVariableTypes, context.getTypeRegistry(), null);
+		compiled = new IteratorMember(position, definition, modifiers, loopVariableTypes, context.getTypeRegistry(), null);
 	}
 
 	@Override
-	public CustomIteratorMember getCompiled() {
+	public IteratorMember getCompiled() {
 		return compiled;
 	}
 

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

@@ -6,14 +6,18 @@
 package org.openzen.zenscript.parser.member;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.CompileException;
+import org.openzen.zencode.shared.CompileExceptionCode;
+import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
+import org.openzen.zenscript.codemodel.scope.FunctionScope;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.parser.ParsedAnnotation;
-import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.statements.ParsedFunctionBody;
 import org.openzen.zenscript.parser.type.IParsedType;
 
@@ -21,10 +25,16 @@ import org.openzen.zenscript.parser.type.IParsedType;
  *
  * @author Hoofdgebruiker
  */
-public class ParsedSetter extends ParsedFunctionalMember {
+public class ParsedSetter extends ParsedDefinitionMember {
+	private final CodePosition position;
+	private final int modifiers;
+	private final ParsedImplementation implementation;
+	private final ParsedFunctionBody body;
+	
 	private final String name;
 	private final IParsedType type;
 	private SetterMember compiled;
+	private boolean isCompiled = false;
 	
 	public ParsedSetter(
 			CodePosition position,
@@ -36,7 +46,12 @@ public class ParsedSetter extends ParsedFunctionalMember {
 			IParsedType type,
 			ParsedFunctionBody body)
 	{
-		super(position, definition, implementation, modifiers, annotations, body);
+		super(definition, annotations);
+		
+		this.implementation = implementation;
+		this.position = position;
+		this.modifiers = modifiers;
+		this.body = body;
 		
 		this.name = name;
 		this.type = type;
@@ -51,9 +66,37 @@ public class ParsedSetter extends ParsedFunctionalMember {
 	public SetterMember getCompiled() {
 		return compiled;
 	}
+	
+	private void inferHeaders(BaseScope scope) {
+		if ((implementation != null && !Modifiers.isPrivate(modifiers))) {
+			fillOverride(scope, implementation.getCompiled().type);
+			compiled.modifiers |= Modifiers.PUBLIC;
+		} else if (implementation == null && Modifiers.isOverride(modifiers)) {
+			if (definition.getSuperType() == null)
+				throw new CompileException(position, CompileExceptionCode.OVERRIDE_WITHOUT_BASE, "Override specified without base type");
+			
+			fillOverride(scope, definition.getSuperType());
+		}
+		
+		if (compiled == null)
+			throw new IllegalStateException("Types not yet linked");
+	}
 
-	@Override
-	protected void fillOverride(TypeScope scope, ITypeID baseType) {
+	private void fillOverride(TypeScope scope, ITypeID baseType) {
 		compiled.setOverrides(scope.getTypeMembers(baseType).getOrCreateGroup(name, true).getSetter());
 	}
+	
+	@Override
+	public final void compile(BaseScope scope) {
+		if (isCompiled)
+			return;
+		isCompiled = true;
+		
+		inferHeaders(scope);
+		
+		FunctionHeader header = new FunctionHeader(compiled.type);
+		FunctionScope innerScope = new FunctionScope(scope, header);
+		compiled.annotations = ParsedAnnotation.compileForMember(annotations, getCompiled(), scope);
+		compiled.setBody(body.compile(innerScope, header));
+	}
 }

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

@@ -15,7 +15,6 @@ import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.FunctionScope;
 import org.openzen.zenscript.parser.ParsedAnnotation;
-import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.statements.ParsedStatement;
 
 /**
@@ -31,7 +30,7 @@ public class ParsedStaticInitializer extends ParsedDefinitionMember {
 		super(definition, annotations);
 		
 		this.body = body;
-		compiled = new StaticInitializerMember(position);
+		compiled = new StaticInitializerMember(position, definition);
 	}
 
 	@Override

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

@@ -16,7 +16,8 @@ import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 import org.openzen.zenscript.codemodel.member.ConstMember;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
-import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.member.DefinitionMember;
+import org.openzen.zenscript.codemodel.member.IteratorMember;
 import org.openzen.zenscript.codemodel.member.DestructorMember;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
@@ -28,9 +29,11 @@ import org.openzen.zenscript.codemodel.member.InnerDefinitionMember;
 import org.openzen.zenscript.codemodel.member.MemberVisitor;
 import org.openzen.zenscript.codemodel.member.MethodMember;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
+import org.openzen.zenscript.codemodel.member.PropertyMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.member.StaticInitializerMember;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
@@ -117,7 +120,7 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		} else {
 			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
 			member.body.accept(statementValidator);
-			validateThrow(member);
+			validateThrow(member, member.header, member.body);
 			
 			if (member.definition.getSuperType() != null && !statementValidator.constructorForwarded) {
 				validator.logError(ValidationLogEntry.Code.CONSTRUCTOR_FORWARD_MISSING, member.position, "Constructor not forwarded to base type");
@@ -152,7 +155,7 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 	public Void visitGetter(GetterMember member) {
 		ValidationUtils.validateIdentifier(validator, member.position, member.name);
 		member.type.accept(new TypeValidator(validator, member.position));
-		validateProperty(member, new MethodStatementScope(member.header));
+		validateGetter(member, new MethodStatementScope(new FunctionHeader(member.type)));
 		return null;
 	}
 
@@ -160,7 +163,7 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 	public Void visitSetter(SetterMember member) {
 		ValidationUtils.validateIdentifier(validator, member.position, member.name);
 		member.type.accept(new TypeValidator(validator, member.position));
-		validateProperty(member, new MethodStatementScope(member.header));
+		validateSetter(member, new MethodStatementScope(new FunctionHeader(BasicTypeID.VOID, member.parameter)));
 		return null;
 	}
 	
@@ -191,7 +194,7 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 	}
 
 	@Override
-	public Void visitCustomIterator(CustomIteratorMember member) {
+	public Void visitCustomIterator(IteratorMember member) {
 		for (ITypeID type : member.getLoopVariableTypes())
 			type.accept(new TypeValidator(validator, member.position));
 		validateFunctional(member, new MethodStatementScope(new FunctionHeader(scope.getTypeRegistry().getIterator(member.getLoopVariableTypes()))));
@@ -277,8 +280,8 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		return null;
 	}
 	
-	private void validateThrow(FunctionalMember member) {
-		if (member.body.thrownType != null && member.header.thrownType == null) // TODO: validate thrown type
+	private void validateThrow(DefinitionMember member, FunctionHeader header, Statement body) {
+		if (body.thrownType != null && header.thrownType == null) // TODO: validate thrown type
 			validator.logError(ValidationLogEntry.Code.THROW_WITHOUT_THROWS, member.position, "Method is throwing but doesn't declare throws type");
 	}
 	
@@ -294,11 +297,11 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		if (member.body != null) {
 			StatementValidator statementValidator = new StatementValidator(validator, scope);
 			member.body.accept(statementValidator);
-			validateThrow(member);
+			validateThrow(member, member.header, member.body);
 		}
 	}
 	
-	private void validateProperty(FunctionalMember member, StatementScope scope) {
+	private void validateGetter(GetterMember member, StatementScope scope) {
 		if (Modifiers.isOverride(member.modifiers) || (context == DefinitionMemberContext.IMPLEMENTATION && !member.isPrivate())) {
 			if (member.getOverrides() == null) {
 				validator.logError(ValidationLogEntry.Code.OVERRIDE_MISSING_BASE, member.position, "Overridden method not identified");
@@ -308,7 +311,22 @@ public class DefinitionMemberValidator implements MemberVisitor<Void> {
 		if (member.body != null) {
 			StatementValidator statementValidator = new StatementValidator(validator, scope);
 			member.body.accept(statementValidator);
-			validateThrow(member);
+			
+			validateThrow(member, new FunctionHeader(member.type), member.body);
+		}
+	}
+	
+	private void validateSetter(SetterMember member, StatementScope scope) {
+		if (Modifiers.isOverride(member.modifiers) || (context == DefinitionMemberContext.IMPLEMENTATION && !member.isPrivate())) {
+			if (member.getOverrides() == null) {
+				validator.logError(ValidationLogEntry.Code.OVERRIDE_MISSING_BASE, member.position, "Overridden method not identified");
+			}
+		}
+		
+		if (member.body != null) {
+			StatementValidator statementValidator = new StatementValidator(validator, scope);
+			member.body.accept(statementValidator);
+			validateThrow(member, new FunctionHeader(BasicTypeID.VOID, member.type), member.body);
 		}
 	}