- Added annotation support

- Removed some redundant types
- Moved scopes to CodeModel and removed Linker
- Added const members and expression support for them
- Added statement transformation (can be used by annotations)

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

@@ -21,6 +21,7 @@ import org.openzen.zenscript.codemodel.expression.CastExpression;
 import org.openzen.zenscript.codemodel.expression.CheckNullExpression;
 import org.openzen.zenscript.codemodel.expression.CoalesceExpression;
 import org.openzen.zenscript.codemodel.expression.ConditionalExpression;
+import org.openzen.zenscript.codemodel.expression.ConstExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantBoolExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantByteExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantCharExpression;
@@ -323,6 +324,15 @@ public class ExpressionFormatter implements ExpressionVisitor<ExpressionString>
 		result.append(expression.ifElse.accept(this));
 		return new ExpressionString(result.toString(), ZenScriptOperator.TERNARY);
 	}
+	
+	@Override
+	public ExpressionString visitConst(ConstExpression expression) {
+		StringBuilder result = new StringBuilder();
+		result.append(expression.type.accept(typeFormatter));
+		result.append('.');
+		result.append(expression.constant.name);
+		return new ExpressionString(result.toString(), ZenScriptOperator.MEMBER);
+	}
 
 	@Override
 	public ExpressionString visitConstantBool(ConstantBoolExpression expression) {
@@ -331,7 +341,7 @@ public class ExpressionFormatter implements ExpressionVisitor<ExpressionString>
 
 	@Override
 	public ExpressionString visitConstantByte(ConstantByteExpression expression) {
-		return new ExpressionString(Byte.toString(expression.value) + " as byte", ZenScriptOperator.CAST);
+		return new ExpressionString(Integer.toString(expression.value) + " as byte", ZenScriptOperator.CAST);
 	}
 
 	@Override

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

@@ -8,10 +8,10 @@ package org.openzen.zenscript.formatter;
 import org.openzen.zenscript.codemodel.Modifiers;
 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.DestructorMember;
-import org.openzen.zenscript.codemodel.member.EnumConstantMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
@@ -54,6 +54,20 @@ public class MemberFormatter implements MemberVisitor<Void> {
 		
 		wasField = field;
 	}
+	
+	@Override
+	public Void visitConst(ConstMember member) {
+		visit(true);
+		FormattingUtils.formatModifiers(output, member.modifiers & ~Modifiers.FINAL);
+		output.append("const")
+				.append(member.name)
+				.append(" as ")
+				.append(member.type.accept(typeFormatter))
+				.append(" = ")
+				.append(member.value.accept(new ExpressionFormatter(settings, typeFormatter)))
+				.append(";\n");
+		return null;
+	}
 
 	@Override
 	public Void visitField(FieldMember member) {
@@ -68,7 +82,7 @@ public class MemberFormatter implements MemberVisitor<Void> {
 			output.append(" = ")
 					.append(member.initializer.accept(new ExpressionFormatter(settings, typeFormatter)));
 		}
-		output.append(";").append("\n");
+		output.append(";\n");
 		return null;
 	}
 

Linker/build.gradle → CodeFormatterShared/build.gradle

@@ -14,6 +14,5 @@ if (!hasProperty('mainClass')) {
 }
 
 dependencies {
-	compile project(':Shared')
 	compile project(':CodeModel')
 }

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel;
 
+import org.openzen.zenscript.codemodel.annotations.Annotation;
 import java.util.Map;
 import java.util.Objects;
 import org.openzen.zenscript.codemodel.expression.Expression;
@@ -20,12 +21,14 @@ import org.openzen.zenscript.shared.Taggable;
 public class FunctionParameter extends Taggable {
 	public static final FunctionParameter[] NONE = new FunctionParameter[0];
 	
+	public Annotation[] annotations;
 	public final ITypeID type;
 	public final String name;
 	public final Expression defaultValue;
 	public final boolean variadic;
 	
 	public FunctionParameter(ITypeID type) {
+		this.annotations = Annotation.NONE;
 		this.type = type;
 		this.name = "";
 		this.defaultValue = null;
@@ -33,6 +36,7 @@ public class FunctionParameter extends Taggable {
 	}
 	
 	public FunctionParameter(ITypeID type, String name) {
+		this.annotations = Annotation.NONE;
 		this.type = type;
 		this.name = name;
 		this.defaultValue = null;
@@ -40,6 +44,7 @@ public class FunctionParameter extends Taggable {
 	}
 	
 	public FunctionParameter(ITypeID type, String name, Expression defaultValue, boolean variadic) {
+		this.annotations = Annotation.NONE;
 		this.type = type;
 		this.name = name;
 		this.defaultValue = defaultValue;
@@ -47,7 +52,9 @@ public class FunctionParameter extends Taggable {
 	}
 	
 	public FunctionParameter withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
-		return new FunctionParameter(type.withGenericArguments(registry, arguments), name, defaultValue, variadic);
+		FunctionParameter result = new FunctionParameter(type.withGenericArguments(registry, arguments), name, defaultValue, variadic);
+		result.annotations = annotations;
+		return result;
 	}
 	
 	@Override

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

@@ -7,11 +7,11 @@ package org.openzen.zenscript.codemodel;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.openzen.zenscript.codemodel.annotations.DefinitionAnnotation;
 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;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -30,6 +30,7 @@ public abstract class HighLevelDefinition extends Taggable {
 	public final List<IDefinitionMember> members = new ArrayList<>();
 	public final AccessScope access = new AccessScope();
 	public TypeParameter[] genericParameters = null;
+	public DefinitionAnnotation[] annotations = DefinitionAnnotation.NONE;
 	
 	public HighLevelDefinition outerDefinition;
 	public ITypeID superType;

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

@@ -0,0 +1,16 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface ModuleProcessor {
+	public ScriptBlock process(ScriptBlock block);
+	
+	public void process(HighLevelDefinition definition);
+}

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

@@ -14,9 +14,17 @@ import org.openzen.zenscript.shared.Taggable;
  * @author Hoofdgebruiker
  */
 public class ScriptBlock extends Taggable {
+	public final AccessScope access;
 	public final List<Statement> statements;
 	
-	public ScriptBlock(List<Statement> statements) {
+	public ScriptBlock(AccessScope access, List<Statement> statements) {
+		this.access = access;
 		this.statements = statements;
 	}
+	
+	public ScriptBlock withStatements(List<Statement> newStatements) {
+		ScriptBlock result = new ScriptBlock(access, newStatements);
+		result.addAllTagsFrom(this);
+		return result;
+	}
 }

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

@@ -0,0 +1,16 @@
+/*
+ * 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.annotations;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface Annotation {
+	public static final Annotation[] NONE = new Annotation[0];
+	
+	public void apply();
+}

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

@@ -0,0 +1,44 @@
+/*
+ * 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.annotations;
+
+import java.util.List;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.expression.CallArguments;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.scope.BaseScope;
+import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.scope.StatementScope;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface AnnotationDefinition {
+	public String getAnnotationName();
+	
+	public List<FunctionHeader> getInitializers(BaseScope scope);
+	
+	public ExpressionScope getScopeForMember(IDefinitionMember member, BaseScope scope);
+	
+	public ExpressionScope getScopeForType(HighLevelDefinition definition, BaseScope scope);
+	
+	public ExpressionScope getScopeForStatement(Statement statement, StatementScope scope);
+	
+	public ExpressionScope getScopeForParameter(FunctionHeader header, FunctionParameter parameter, BaseScope scope);
+	
+	public MemberAnnotation createForMember(CodePosition position, CallArguments arguments);
+	
+	public DefinitionAnnotation createForDefinition(CodePosition position, CallArguments arguments);
+	
+	public StatementAnnotation createForStatement(CodePosition position, CallArguments arguments);
+	
+	public Annotation createForParameter(CodePosition position, CallArguments arguments);
+}

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

@@ -0,0 +1,219 @@
+/*
+ * 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.annotations;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.ModuleProcessor;
+import org.openzen.zenscript.codemodel.PackageDefinitions;
+import org.openzen.zenscript.codemodel.ScriptBlock;
+import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
+import org.openzen.zenscript.codemodel.definition.ZSPackage;
+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.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;
+import org.openzen.zenscript.codemodel.member.InnerDefinitionMember;
+import org.openzen.zenscript.codemodel.member.MemberVisitor;
+import org.openzen.zenscript.codemodel.member.MethodMember;
+import org.openzen.zenscript.codemodel.member.OperatorMember;
+import org.openzen.zenscript.codemodel.member.SetterMember;
+import org.openzen.zenscript.codemodel.member.StaticInitializerMember;
+import org.openzen.zenscript.codemodel.scope.DefinitionScope;
+import org.openzen.zenscript.codemodel.scope.FileScope;
+import org.openzen.zenscript.codemodel.scope.FunctionScope;
+import org.openzen.zenscript.codemodel.scope.GlobalScriptScope;
+import org.openzen.zenscript.codemodel.scope.StatementScope;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class AnnotationProcessor implements ModuleProcessor {
+	private final ZSPackage rootPackage;
+	private final PackageDefinitions packageDefinitions;
+	private final GlobalTypeRegistry globalRegistry;
+	private final List<ExpansionDefinition> expansions;
+	private final List<AnnotationDefinition> annotations;
+	
+	public AnnotationProcessor(
+			ZSPackage rootPackage,
+			PackageDefinitions packageDefinitions,
+			GlobalTypeRegistry globalRegistry,
+			List<ExpansionDefinition> expansions,
+			List<AnnotationDefinition> annotations) {
+		this.rootPackage = rootPackage;
+		this.packageDefinitions = packageDefinitions;
+		this.globalRegistry = globalRegistry;
+		this.expansions = expansions;
+		this.annotations = annotations;
+	}
+	
+	@Override
+	public ScriptBlock process(ScriptBlock block) {
+		FileScope fileScope = new FileScope(block.access, rootPackage, packageDefinitions, globalRegistry, expansions, new HashMap<>(), annotations);
+		StatementScope scope = new GlobalScriptScope(fileScope);
+		List<Statement> transformed = new ArrayList<>();
+		boolean unchanged = true;
+		for (Statement statement : block.statements) {
+			Statement newStatement = process(statement, scope);
+			transformed.add(newStatement);
+			unchanged &= statement == newStatement;
+		}
+		return unchanged ? block : block.withStatements(transformed);
+	}
+	
+	@Override
+	public void process(HighLevelDefinition definition) {
+		FileScope fileScope = new FileScope(definition.access, rootPackage, packageDefinitions, globalRegistry, expansions, new HashMap<>(), annotations);
+		DefinitionScope scope = new DefinitionScope(fileScope, definition);
+		for (DefinitionAnnotation annotation : definition.annotations) {
+			annotation.apply(definition, scope);
+		}
+		
+		MemberAnnotationVisitor visitor = new MemberAnnotationVisitor(scope);
+		for (IDefinitionMember member : definition.members) {
+			member.accept(visitor);
+		}
+	}
+	
+	private Statement process(Statement statement, StatementScope scope) {
+		return statement.transform(s -> {
+			for (StatementAnnotation annotation : s.annotations) {
+				s = annotation.apply(s, scope);
+			}
+			return s;
+		});
+	}
+	
+	private class MemberAnnotationVisitor implements MemberVisitor<Void> {
+		private final DefinitionScope scope;
+		
+		public MemberAnnotationVisitor(DefinitionScope scope) {
+			this.scope = scope;
+		}
+		
+		@Override
+		public Void visitConst(ConstMember member) {
+			for (MemberAnnotation annotation : member.annotations)
+				annotation.apply(member, scope);
+			
+			return null;
+		}
+
+		@Override
+		public Void visitField(FieldMember member) {
+			for (MemberAnnotation annotation : member.annotations)
+				annotation.apply(member, scope);
+			
+			return null;
+		}
+
+		@Override
+		public Void visitConstructor(ConstructorMember member) {
+			return functional(member);
+		}
+
+		@Override
+		public Void visitDestructor(DestructorMember member) {
+			return functional(member);
+		}
+
+		@Override
+		public Void visitMethod(MethodMember member) {
+			return functional(member);
+		}
+
+		@Override
+		public Void visitGetter(GetterMember member) {
+			return functional(member);
+		}
+
+		@Override
+		public Void visitSetter(SetterMember member) {
+			return functional(member);
+		}
+
+		@Override
+		public Void visitOperator(OperatorMember member) {
+			return functional(member);
+		}
+
+		@Override
+		public Void visitCaster(CasterMember member) {
+			return functional(member);
+		}
+
+		@Override
+		public Void visitCustomIterator(CustomIteratorMember member) {
+			throw new UnsupportedOperationException("Not supported yet!");
+		}
+
+		@Override
+		public Void visitCaller(CallerMember member) {
+			return functional(member);
+		}
+
+		@Override
+		public Void visitImplementation(ImplementationMember implementation) {
+			for (IDefinitionMember member : implementation.members) {
+				member.accept(this);
+			}
+			return null;
+		}
+
+		@Override
+		public Void visitInnerDefinition(InnerDefinitionMember member) {
+			process(member.innerDefinition);
+			return null;
+		}
+
+		@Override
+		public Void visitStaticInitializer(StaticInitializerMember member) {
+			StatementScope scope = new FunctionScope(this.scope, new FunctionHeader(BasicTypeID.VOID));
+			member.body = process(member.body, scope);
+			return null;
+		}
+		
+		private Void functional(FunctionalMember member) {
+			for (MemberAnnotation annotation : member.annotations)
+				annotation.apply(member, scope);
+			
+			if (member.overrides != null) {
+				functional(member, member.overrides);
+			}
+			
+			if (member.body == null)
+				return null;
+			
+			StatementScope scope = new FunctionScope(this.scope, member.header);
+			member.body = process(member.body, scope);
+			return null;
+		}
+		
+		private void functional(FunctionalMember member, FunctionalMember overrides) {
+			for (MemberAnnotation annotation : overrides.annotations)
+				annotation.applyOnOverridingMethod(member, scope);
+			
+			if (overrides.overrides != null) {
+				functional(member, overrides.overrides);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,21 @@
+/*
+ * 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.annotations;
+
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.scope.BaseScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface DefinitionAnnotation {
+	public static final DefinitionAnnotation[] NONE = new DefinitionAnnotation[0];
+	
+	public void apply(HighLevelDefinition definition, BaseScope scope);
+	
+	public void applyOnSubtype(HighLevelDefinition definition, BaseScope scope);
+}

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

@@ -0,0 +1,22 @@
+/*
+ * 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.annotations;
+
+import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.scope.BaseScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface MemberAnnotation {
+	public static final MemberAnnotation[] NONE = new MemberAnnotation[0];
+	
+	public void apply(IDefinitionMember member, BaseScope scope);
+	
+	public void applyOnOverridingMethod(FunctionalMember member, BaseScope scope);
+}

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

@@ -0,0 +1,88 @@
+/*
+ * 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.annotations;
+
+import java.util.Collections;
+import java.util.List;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.expression.CallArguments;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.scope.BaseScope;
+import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.scope.StatementScope;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class NativeAnnotationDefinition implements AnnotationDefinition {
+	public static final NativeAnnotationDefinition INSTANCE = new NativeAnnotationDefinition();
+	
+	private static final List<FunctionHeader> INITIALIZERS = Collections.singletonList(
+			new FunctionHeader(BasicTypeID.VOID, BasicTypeID.STRING));
+	
+	private NativeAnnotationDefinition() {}
+
+	@Override
+	public String getAnnotationName() {
+		return "Native";
+	}
+
+	@Override
+	public List<FunctionHeader> getInitializers(BaseScope scope) {
+		return INITIALIZERS;
+	}
+
+	@Override
+	public ExpressionScope getScopeForMember(IDefinitionMember member, BaseScope scope) {
+		return new ExpressionScope(scope);
+	}
+
+	@Override
+	public ExpressionScope getScopeForType(HighLevelDefinition definition, BaseScope scope) {
+		return new ExpressionScope(scope);
+	}
+
+	@Override
+	public ExpressionScope getScopeForStatement(Statement statement, StatementScope scope) {
+		return new ExpressionScope(scope);
+	}
+
+	@Override
+	public ExpressionScope getScopeForParameter(FunctionHeader header, FunctionParameter parameter, BaseScope scope) {
+		return new ExpressionScope(scope);
+	}
+
+	@Override
+	public MemberAnnotation createForMember(CodePosition position, CallArguments arguments) {
+		Expression value = arguments.arguments[0];
+		String constant = value.evaluateStringConstant();
+		return new NativeMemberAnnotation(constant);
+	}
+
+	@Override
+	public DefinitionAnnotation createForDefinition(CodePosition position, CallArguments arguments) {
+		Expression value = arguments.arguments[0];
+		String constant = value.evaluateStringConstant();
+		return new NativeDefinitionAnnotation(constant);
+	}
+
+	@Override
+	public StatementAnnotation createForStatement(CodePosition position, CallArguments arguments) {
+		throw new UnsupportedOperationException("Not supported");
+	}
+
+	@Override
+	public Annotation createForParameter(CodePosition position, CallArguments arguments) {
+		throw new UnsupportedOperationException("Not supported");
+	}
+}

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

@@ -0,0 +1,31 @@
+/*
+ * 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.annotations;
+
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.scope.BaseScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class NativeDefinitionAnnotation implements DefinitionAnnotation {
+	private final String identifier;
+	
+	public NativeDefinitionAnnotation(String identifier) {
+		this.identifier = identifier;
+	}
+	
+	@Override
+	public void apply(HighLevelDefinition definition, BaseScope scope) {
+		definition.setTag(NativeTag.class, new NativeTag(identifier));
+	}
+
+	@Override
+	public void applyOnSubtype(HighLevelDefinition definition, BaseScope scope) {
+		// this annotation is not inherited
+	}
+}

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

@@ -0,0 +1,32 @@
+/*
+ * 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.annotations;
+
+import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.scope.BaseScope;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class NativeMemberAnnotation implements MemberAnnotation {
+	private final String identifier;
+	
+	public NativeMemberAnnotation(String identifier) {
+		this.identifier = identifier;
+	}
+	
+	@Override
+	public void apply(IDefinitionMember member, BaseScope scope) {
+		member.setTag(NativeTag.class, new NativeTag(identifier));
+	}
+
+	@Override
+	public void applyOnOverridingMethod(FunctionalMember member, BaseScope scope) {
+		// not inherited
+	}
+}

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

@@ -0,0 +1,18 @@
+/*
+ * 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.annotations;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class NativeTag {
+	public final String value;
+	
+	public NativeTag(String value) {
+		this.value = value;
+	}
+}

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

@@ -0,0 +1,107 @@
+/*
+ * 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.annotations;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.definition.FunctionDefinition;
+import org.openzen.zenscript.codemodel.expression.CallArguments;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.scope.BaseScope;
+import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.scope.FunctionScope;
+import org.openzen.zenscript.codemodel.scope.StatementScope;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.GenericName;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class PreconditionAnnotationDefinition implements AnnotationDefinition {
+	public static final PreconditionAnnotationDefinition INSTANCE = new PreconditionAnnotationDefinition();
+	
+	private final List<GenericName> enforcementLevelName = Arrays.asList(
+			new GenericName("stdlib"),
+			new GenericName("EnforcementLevel"));
+	
+	private PreconditionAnnotationDefinition() {}
+
+	@Override
+	public String getAnnotationName() {
+		return "Precondition";
+	}
+
+	@Override
+	public List<FunctionHeader> getInitializers(BaseScope scope) {
+		return Collections.singletonList(new FunctionHeader(
+				BasicTypeID.VOID,
+				scope.getType(CodePosition.BUILTIN, enforcementLevelName),
+				BasicTypeID.BOOL,
+				BasicTypeID.STRING));
+	}
+
+	@Override
+	public ExpressionScope getScopeForMember(IDefinitionMember member, BaseScope scope) {
+		if (member instanceof FunctionalMember) {
+			FunctionHeader header = ((FunctionalMember)member).header;
+			return new ExpressionScope(new FunctionScope(scope, header));
+		} else {
+			throw new UnsupportedOperationException("Can only assign preconditions to methods");
+		}
+	}
+
+	@Override
+	public ExpressionScope getScopeForType(HighLevelDefinition definition, BaseScope scope) {
+		if (definition instanceof FunctionDefinition) {
+			FunctionHeader header = ((FunctionDefinition)definition).header;
+			return new ExpressionScope(new FunctionScope(scope, header));
+		} else {
+			throw new UnsupportedOperationException("Can only assign preconditions to functions");
+		}
+	}
+
+	@Override
+	public ExpressionScope getScopeForStatement(Statement statement, StatementScope scope) {
+		throw new UnsupportedOperationException("Not supported");
+	}
+
+	@Override
+	public ExpressionScope getScopeForParameter(FunctionHeader header, FunctionParameter parameter, BaseScope scope) {
+		throw new UnsupportedOperationException("Not supported");
+	}
+
+	@Override
+	public MemberAnnotation createForMember(CodePosition position, CallArguments arguments) {
+		String enforcement = arguments.arguments[0].evaluateEnumConstant().name;
+		Expression condition = arguments.arguments[1];
+		Expression message = arguments.arguments[2];
+		return new PreconditionForMethod(position, enforcement, condition, message);
+	}
+
+	@Override
+	public DefinitionAnnotation createForDefinition(CodePosition position, CallArguments arguments) {
+		throw new UnsupportedOperationException("Not supported");
+	}
+
+	@Override
+	public StatementAnnotation createForStatement(CodePosition position, CallArguments arguments) {
+		throw new UnsupportedOperationException("Not supported");
+	}
+
+	@Override
+	public Annotation createForParameter(CodePosition position, CallArguments arguments) {
+		throw new UnsupportedOperationException("Not supported");
+	}
+}

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

@@ -0,0 +1,67 @@
+/*
+ * 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.annotations;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.expression.ExpressionBuilder;
+import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.scope.BaseScope;
+import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.statement.BlockStatement;
+import org.openzen.zenscript.codemodel.statement.IfStatement;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.ThrowStatement;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class PreconditionForMethod implements MemberAnnotation {
+	private final CodePosition position;
+	private final String enforcement;
+	private final Expression condition;
+	private final Expression message;
+	
+	public PreconditionForMethod(
+			CodePosition position,
+			String enforcement,
+			Expression condition,
+			Expression message) {
+		this.position = position;
+		this.enforcement = enforcement;
+		this.condition = condition;
+		this.message = message;
+	}
+
+	@Override
+	public void apply(IDefinitionMember member, BaseScope scope) {
+		applyOnOverridingMethod((FunctionalMember)member, scope);
+	}
+
+	@Override
+	public void applyOnOverridingMethod(FunctionalMember member, BaseScope scope) {
+		if (member.body == null)
+			return;
+		
+		ExpressionScope expressionScope = new ExpressionScope(scope, BasicTypeID.BOOL);
+		List<Statement> statements = new ArrayList<>();
+		ExpressionBuilder expressionBuilder = new ExpressionBuilder(position, expressionScope);
+		Expression inverseCondition = expressionBuilder.not(condition);
+		Statement throwStatement = new ThrowStatement(CodePosition.BUILTIN, expressionBuilder.constructNew("stdlib.IllegalArgumentException", message));
+		statements.add(new IfStatement(CodePosition.BUILTIN, inverseCondition, throwStatement, null));
+		if (member.body instanceof BlockStatement) {
+			statements.addAll(((BlockStatement)member.body).statements);
+		} else {
+			statements.add(member.body);
+		}
+		member.body = new BlockStatement(position, statements);
+	}
+}

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

@@ -0,0 +1,19 @@
+/*
+ * 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.annotations;
+
+import org.openzen.zenscript.codemodel.scope.StatementScope;
+import org.openzen.zenscript.codemodel.statement.Statement;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface StatementAnnotation {
+	public static final StatementAnnotation[] NONE = new StatementAnnotation[0];
+	
+	public Statement apply(Statement statement, StatementScope scope);
+}

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

@@ -46,4 +46,17 @@ public class CallExpression extends Expression {
 				? this
 				: new CallExpression(position, tTarget, member, instancedHeader, tArguments, null);
 	}
+	
+	@Override
+	public String evaluateStringConstant() {
+		if (member.builtin == null)
+			throw new UnsupportedOperationException("Cannot evaluate to a string constant!");
+		
+		switch (member.builtin) {
+			case STRING_ADD_STRING:
+				return target.evaluateStringConstant() + arguments.arguments[0].evaluateStringConstant();
+			default:
+				throw new UnsupportedOperationException("Cannot evaluate to a string constant!");
+		}
+	}
 }

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

@@ -0,0 +1,44 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.codemodel.expression;
+
+import org.openzen.zenscript.codemodel.member.ConstMember;
+import org.openzen.zenscript.codemodel.member.EnumConstantMember;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstExpression extends Expression {
+	public final ConstMember constant;
+	
+	public ConstExpression(CodePosition position, ConstMember constant) {
+		super(position, constant.type, null);
+		
+		this.constant = constant;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConst(this);
+	}
+
+	@Override
+	public Expression transform(ExpressionTransformer transformer) {
+		return this;
+	}
+	
+	@Override
+	public String evaluateStringConstant() {
+		return constant.value.evaluateStringConstant();
+	}
+	
+	@Override
+	public EnumConstantMember evaluateEnumConstant() {
+		return constant.value.evaluateEnumConstant();
+	}
+}

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

@@ -13,9 +13,9 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class ConstantByteExpression extends Expression {
-	public final byte value;
+	public final int value;
 	
-	public ConstantByteExpression(CodePosition position, byte value) {
+	public ConstantByteExpression(CodePosition position, int value) {
 		super(position, BasicTypeID.BYTE, null);
 		
 		this.value = value;

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

@@ -30,4 +30,9 @@ public class ConstantStringExpression extends Expression {
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;
 	}
+	
+	@Override
+	public String evaluateStringConstant() {
+		return value;
+	}
 }

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

@@ -13,9 +13,9 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class ConstantUShortExpression extends Expression {
-	public final short value;
+	public final int value;
 	
-	public ConstantUShortExpression(CodePosition position, short value) {
+	public ConstantUShortExpression(CodePosition position, int value) {
 		super(position, BasicTypeID.USHORT, null);
 		
 		this.value = value;

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

@@ -39,4 +39,9 @@ public class EnumConstantExpression extends Expression {
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;
 	}
+	
+	@Override
+	public EnumConstantMember evaluateEnumConstant() {
+		return value;
+	}
 }

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

@@ -7,17 +7,20 @@ package org.openzen.zenscript.codemodel.expression;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import org.openzen.zenscript.codemodel.FunctionHeader;
-import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.OperatorType;
+import org.openzen.zenscript.codemodel.member.EnumConstantMember;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.StatementTransformer;
+import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.shared.CompileException;
 import org.openzen.zenscript.shared.CompileExceptionCode;
 
@@ -26,6 +29,8 @@ import org.openzen.zenscript.shared.CompileExceptionCode;
  * @author Hoofdgebruiker
  */
 public abstract class Expression implements IPartialExpression {
+	public static final Expression[] NONE = new Expression[0];
+	
 	public final CodePosition position;
 	public final ITypeID type;
 	public final ITypeID thrownType;
@@ -40,6 +45,21 @@ public abstract class Expression implements IPartialExpression {
 	
 	public abstract Expression transform(ExpressionTransformer transformer);
 	
+	public final Expression transform(StatementTransformer transformer) {
+		return transform((ExpressionTransformer)expression -> {
+			if (expression instanceof FunctionExpression) {
+				FunctionExpression function = (FunctionExpression)expression;
+				Statement body = function.body.transform(transformer);
+				if (body == function.body)
+					return function;
+				
+				return new FunctionExpression(function.position, (FunctionTypeID)function.type, function.closure, body);
+			} else {
+				return expression;
+			}
+		});
+	}
+	
 	@Override
 	public List<ITypeID> getAssignHints() {
 		return Collections.singletonList(type);
@@ -68,8 +88,8 @@ public abstract class Expression implements IPartialExpression {
 		return scope.getTypeMembers(type)
 				.getOrCreateGroup(OperatorType.CALL)
 				.getMethodMembers().stream()
-				.filter(method -> method.member.getHeader().parameters.length == arguments && !method.member.isStatic())
-				.map(method -> method.member.getHeader())
+				.filter(method -> method.member.header.parameters.length == arguments && !method.member.isStatic())
+				.map(method -> method.member.header)
 				.collect(Collectors.toList());
 	}
 	
@@ -81,7 +101,10 @@ public abstract class Expression implements IPartialExpression {
 	@Override
 	public IPartialExpression getMember(CodePosition position, TypeScope scope, List<ITypeID> hints, GenericName name) {
 		TypeMembers members = scope.getTypeMembers(type);
-		return members.getMemberExpression(position, this, name, false);
+		IPartialExpression result = members.getMemberExpression(position, this, name, false);
+		if (result == null)
+			System.out.println("No such member: " + name.name);
+		return result;
 	}
 	
 	@Override
@@ -89,6 +112,18 @@ public abstract class Expression implements IPartialExpression {
 		return null;
 	}
 	
+	public void forEachStatement(Consumer<Statement> consumer) {
+		
+	}
+	
+	public String evaluateStringConstant() {
+		throw new UnsupportedOperationException("Cannot evaluate this value to a string constant!");
+	}
+	
+	public EnumConstantMember evaluateEnumConstant() {
+		throw new UnsupportedOperationException("Cannot evaluate this value to an enum constant!");
+	}
+	
 	public static ITypeID binaryThrow(CodePosition position, ITypeID left, ITypeID right) {
 		if (left == right)
 			return left;

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

@@ -0,0 +1,72 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.codemodel.expression;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.openzen.zenscript.codemodel.OperatorType;
+import org.openzen.zenscript.codemodel.member.ConstructorMember;
+import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.type.GenericName;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.CompileException;
+import org.openzen.zenscript.shared.CompileExceptionCode;
+import org.openzen.zenscript.shared.StringUtils;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ExpressionBuilder {
+	public final CodePosition position;
+	public final ExpressionScope scope;
+	
+	public ExpressionBuilder(CodePosition position, ExpressionScope scope) {
+		this.position = position;
+		this.scope = scope;
+	}
+	
+	public Expression constructNew(String typename, Expression... arguments) {
+		List<String> nameParts = StringUtils.split(typename, '.');
+		List<GenericName> name = new ArrayList<>();
+		for (String namePart : nameParts)
+			name.add(new GenericName(namePart));
+		ITypeID type = scope.getType(position, name);
+		if (type == null)
+			throw new CompileException(position, CompileExceptionCode.NO_SUCH_TYPE, "No such type: " + typename);
+		
+		return constructNew(type, arguments);
+	}
+	
+	public Expression constructNew(ITypeID type, Expression... arguments) {
+		DefinitionMemberGroup constructors = scope.getTypeMembers(type).getOrCreateGroup(OperatorType.CONSTRUCTOR);
+		List<ITypeID>[] predictedTypes = constructors.predictCallTypes(scope, scope.hints, arguments.length);
+		CallArguments compiledArguments = new CallArguments(arguments);
+		FunctionalMember member = constructors.selectMethod(position, scope, compiledArguments, true, true);
+		if (member == null)
+			throw new CompileException(position, CompileExceptionCode.CALL_NO_VALID_METHOD, "No matching constructor found");
+		if (!(member instanceof ConstructorMember))
+			throw new CompileException(position, CompileExceptionCode.INTERNAL_ERROR, "COMPILER BUG: constructor is not a constructor");
+		
+		return new NewExpression(
+				position,
+				type,
+				(ConstructorMember) member,
+				compiledArguments,
+				compiledArguments.getNumberOfTypeArguments() == 0 ? member.header : member.header.withGenericArguments(scope.getTypeRegistry(), compiledArguments.typeArguments),
+				scope);
+	}
+	
+	public Expression not(Expression value) {
+		TypeMembers members = scope.getTypeMembers(value.type);
+		return members.getOrCreateGroup(OperatorType.NOT)
+				.call(position, scope, value, CallArguments.EMPTY, false);
+	}
+}

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

@@ -38,6 +38,8 @@ public interface ExpressionVisitor<T> {
 	
 	public T visitConditional(ConditionalExpression expression);
 	
+	public T visitConst(ConstExpression expression);
+	
 	public T visitConstantBool(ConstantBoolExpression expression);
 	
 	public T visitConstantByte(ConstantByteExpression expression);

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.expression;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.statement.ExpressionStatement;
@@ -48,6 +49,11 @@ public class FunctionExpression extends Expression {
 		return tBody == body ? this : new FunctionExpression(position, (FunctionTypeID)type, closure, tBody);
 	}
 	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		body.forEachStatement(consumer);
+	}
+	
 	/**
 	 * Checks if this is a simple function expression. A simple function
 	 * expression consists of a body with just a expression or return statement.

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

@@ -20,14 +20,14 @@ public class VariantValueExpression extends Expression {
 	public final Expression[] arguments;
 	
 	public VariantValueExpression(CodePosition position, ITypeID variantType, VariantDefinition.Option option) {
-		this(position, variantType, option, null);
+		this(position, variantType, option, Expression.NONE);
 	}
 	
 	public VariantValueExpression(CodePosition position, ITypeID variantType, VariantDefinition.Option option, Expression[] arguments) {
-		super(position, variantType, arguments == null ? null : multiThrow(position, arguments));
+		super(position, variantType, multiThrow(position, arguments));
 		
 		this.option = option;
-		this.arguments = null;
+		this.arguments = arguments;
 	}
 	
 	public int getNumberOfArguments() {

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

@@ -25,7 +25,7 @@ import org.openzen.zenscript.shared.CodePosition;
  *
  * @author Hoofdgebruiker
  */
-public class CasterMember extends FunctionalMember implements ICasterMember {
+public class CasterMember extends FunctionalMember {
 	public final ITypeID toType;
 	
 	public CasterMember(
@@ -65,7 +65,6 @@ public class CasterMember extends FunctionalMember implements ICasterMember {
 				builtin);
 	}
 	
-	@Override
 	public ITypeID getTargetType() {
 		return toType;
 	}
@@ -74,13 +73,11 @@ public class CasterMember extends FunctionalMember implements ICasterMember {
 	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		throw new UnsupportedOperationException("Cannot call a caster!");
 	}
-
-	@Override
+	
 	public Expression cast(CodePosition position, Expression value, boolean implicit) {
 		return new CastExpression(position, value, this, implicit);
 	}
 	
-	@Override
 	public boolean isImplicit() {
 		return Modifiers.isImplicit(modifiers);
 	}

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

@@ -0,0 +1,61 @@
+/*
+ * 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 java.util.Map;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+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;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstMember extends DefinitionMember {
+	public final String name;
+	public final ITypeID type;
+	public Expression value;
+	public final BuiltinID builtin;
+	
+	public ConstMember(CodePosition position, HighLevelDefinition definition, int modifiers, String name, ITypeID type, BuiltinID builtin) {
+		super(position, definition, modifiers);
+		
+		this.name = name;
+		this.type = type;
+		this.builtin = builtin;
+	}
+
+	@Override
+	public String describe() {
+		return "const " + name;
+	}
+
+	@Override
+	public BuiltinID getBuiltin() {
+		return builtin;
+	}
+
+	@Override
+	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
+		type.addConst(this);
+	}
+
+	@Override
+	public IDefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
+		return this;
+	}
+
+	@Override
+	public <T> T accept(MemberVisitor<T> visitor) {
+		return visitor.visitConst(this);
+	}
+}

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

@@ -76,8 +76,6 @@ public class ConstructorMember extends FunctionalMember {
 				modifiers,
 				header.instance(registry, mapping),
 				builtin);
-		if (definition.name.equals("NFAState"))
-			System.out.println("X");
 		return result;
 	}
 

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.member;
 
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.shared.Taggable;
 
@@ -18,6 +19,7 @@ public abstract class DefinitionMember extends Taggable implements IDefinitionMe
 	public final CodePosition position;
 	public final HighLevelDefinition definition;
 	public final int modifiers;
+	public MemberAnnotation[] annotations = MemberAnnotation.NONE;
 	
 	public DefinitionMember(CodePosition position, HighLevelDefinition definition, int modifiers) {
 		this.position = position;

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

@@ -23,11 +23,12 @@ import org.openzen.zenscript.shared.CodePosition;
  *
  * @author Hoofdgebruiker
  */
-public abstract class FunctionalMember extends DefinitionMember implements ICallableMember {
+public abstract class FunctionalMember extends DefinitionMember {
 	public final FunctionHeader header;
 	public final String name;
 	public final BuiltinID builtin;
-	public Statement body;
+	public Statement body = null;
+	public FunctionalMember overrides = null;
 	
 	public FunctionalMember(
 			CodePosition position,
@@ -47,17 +48,13 @@ public abstract class FunctionalMember extends DefinitionMember implements ICall
 		this.body = body;
 	}
 	
-	@Override
-	public FunctionHeader getHeader() {
-		return header;
-	}
+	public abstract String getInformalName();
 	
 	@Override
 	public BuiltinID getBuiltin() {
 		return builtin;
 	}
-
-	@Override
+	
 	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		return new CallExpression(position, target, this, instancedHeader, arguments, scope);
 	}
@@ -66,12 +63,10 @@ public abstract class FunctionalMember extends DefinitionMember implements ICall
 		return call(position, target, header, arguments, scope);
 	}
 	
-	@Override
 	public Expression callWithComparator(CodePosition position, CompareType comparison, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		return new CompareExpression(position, target, arguments.arguments[0], this, comparison, scope);
 	}
 	
-	@Override
 	public Expression callStatic(CodePosition position, ITypeID target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		return new CallStaticExpression(position, target, this, arguments, instancedHeader, scope);
 	}

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

@@ -23,7 +23,7 @@ import org.openzen.zenscript.shared.CodePosition;
  *
  * @author Hoofdgebruiker
  */
-public class GetterMember extends FunctionalMember implements IGettableMember {
+public class GetterMember extends FunctionalMember {
 	public final String name;
 	public final ITypeID type;
 	
@@ -44,27 +44,15 @@ public class GetterMember extends FunctionalMember implements IGettableMember {
 	public String getInformalName() {
 		return "getter " + name;
 	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-	
-	@Override
-	public ITypeID getType() {
-		return type;
-	}
 	
-	@Override
 	public Expression get(CodePosition position, Expression target) {
 		return new GetterExpression(position, target, this);
 	}
 	
-	@Override
 	public Expression getStatic(CodePosition position) {
 		return new StaticGetterExpression(position, this);
 	}
-
+	
 	@Override
 	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
 		type.addGetter(this, priority);

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

@@ -1,32 +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.CompareType;
-import org.openzen.zenscript.codemodel.FunctionHeader;
-import org.openzen.zenscript.codemodel.expression.CallArguments;
-import org.openzen.zenscript.codemodel.expression.Expression;
-import org.openzen.zenscript.codemodel.scope.TypeScope;
-import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public interface ICallableMember extends IDefinitionMember {
-	public boolean isStatic();
-	
-	public String getInformalName();
-	
-	public FunctionHeader getHeader();
-	
-	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope);
-	
-	public Expression callWithComparator(CodePosition position, CompareType operator, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope);
-	
-	public Expression callStatic(CodePosition position, ITypeID target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope);
-}

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

@@ -1,22 +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.expression.Expression;
-import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public interface ICasterMember extends IDefinitionMember {
-	public ITypeID getTargetType();
-	
-	public Expression cast(CodePosition position, Expression value, boolean implicit);
-	
-	public boolean isImplicit();
-}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/IGettableMember.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.member;
-
-import org.openzen.zenscript.codemodel.expression.Expression;
-import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public interface IGettableMember extends IDefinitionMember {
-	public String getName();
-	
-	public boolean isStatic();
-	
-	public ITypeID getType();
-	
-	public Expression get(CodePosition position, Expression target);
-	
-	public Expression getStatic(CodePosition position);
-}

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

@@ -10,6 +10,8 @@ package org.openzen.zenscript.codemodel.member;
  * @author Hoofdgebruiker
  */
 public interface MemberVisitor<T> {
+	public T visitConst(ConstMember member);
+	
 	public T visitField(FieldMember member);
 	
 	public T visitConstructor(ConstructorMember member);

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.codemodel.member;
 
 import java.util.Map;
+import org.openzen.zenscript.codemodel.annotations.MemberAnnotation;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
@@ -23,6 +24,7 @@ import org.openzen.zenscript.shared.Taggable;
 public class StaticInitializerMember extends Taggable implements IDefinitionMember {
 	private final CodePosition position;
 	public Statement body;
+	public MemberAnnotation[] annotations = MemberAnnotation.NONE;
 	
 	public StaticInitializerMember(CodePosition position) {
 		this.position = position;

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

@@ -1,94 +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 java.util.Map;
-import java.util.function.Function;
-import org.openzen.zenscript.shared.CompileException;
-import org.openzen.zenscript.shared.CompileExceptionCode;
-import org.openzen.zenscript.codemodel.expression.Expression;
-import org.openzen.zenscript.codemodel.generic.TypeParameter;
-import org.openzen.zenscript.codemodel.member.IDefinitionMember;
-import org.openzen.zenscript.codemodel.member.IGettableMember;
-import org.openzen.zenscript.codemodel.member.MemberVisitor;
-import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
-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;
-import org.openzen.zenscript.shared.CodePosition;
-import org.openzen.zenscript.shared.Taggable;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class ConstantGetterMember extends Taggable implements IGettableMember {
-	private final String name;
-	private final Function<CodePosition, Expression> value;
-	private final ITypeID type;
-	
-	public ConstantGetterMember(String name, Function<CodePosition, Expression> value) {
-		this.name = name;
-		this.value = value;
-		this.type = value.apply(CodePosition.BUILTIN).type;
-	}
-	
-	@Override
-	public CodePosition getPosition() {
-		return CodePosition.BUILTIN;
-	}
-	
-	@Override
-	public BuiltinID getBuiltin() {
-		return null;
-	}
-	
-	@Override
-	public String getName() {
-		return name;
-	}
-	
-	@Override
-	public ITypeID getType() {
-		return type;
-	}
-	
-	@Override
-	public boolean isStatic() {
-		return true;
-	}
-	
-	@Override
-	public Expression get(CodePosition position, Expression target) {
-		throw new CompileException(position, CompileExceptionCode.USING_STATIC_ON_INSTANCE, "Not an instance member");
-	}
-	
-	@Override
-	public Expression getStatic(CodePosition position) {
-		return value.apply(position);
-	}
-
-	@Override
-	public String describe() {
-		return "constant getter " + name;
-	}
-
-	@Override
-	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
-		type.addGetter(this, priority);
-	}
-
-	@Override
-	public IDefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
-		return this; // not instancable
-	}
-
-	@Override
-	public <T> T accept(MemberVisitor<T> visitor) {
-		throw new UnsupportedOperationException("Not a compilable member");
-	}
-}

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

@@ -12,7 +12,7 @@ import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.LambdaClosure;
-import org.openzen.zenscript.codemodel.member.ICallableMember;
+import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -38,7 +38,7 @@ public class PartialMemberGroupExpression implements IPartialExpression {
 		this.allowStaticUsage = allowStaticMembers;
 	}
 	
-	public PartialMemberGroupExpression(CodePosition position, Expression target, ICallableMember member, ITypeID[] typeArguments, boolean allowStaticMembers) {
+	public PartialMemberGroupExpression(CodePosition position, Expression target, FunctionalMember member, ITypeID[] typeArguments, boolean allowStaticMembers) {
 		this.position = position;
 		this.target = target;
 		this.group = DefinitionMemberGroup.forMethod(member);
@@ -69,8 +69,8 @@ public class PartialMemberGroupExpression implements IPartialExpression {
 	@Override
 	public List<FunctionHeader> getPossibleFunctionHeaders(TypeScope scope, List<ITypeID> hints, int arguments) {
 		List<FunctionHeader> results = group.getMethodMembers().stream()
-				.filter(method -> method.member.getHeader().parameters.length == arguments && !method.member.isStatic())
-				.map(method -> method.member.getHeader())
+				.filter(method -> method.member.header.parameters.length == arguments && !method.member.isStatic())
+				.map(method -> method.member.header)
 				.collect(Collectors.toList());
 		if (results.isEmpty())
 			System.out.println("!");

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

@@ -11,7 +11,7 @@ import java.util.stream.Collectors;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
-import org.openzen.zenscript.codemodel.member.ICallableMember;
+import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -24,7 +24,7 @@ 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, ITypeID[] typeArguments) {
+	public static PartialStaticMemberGroupExpression forMethod(CodePosition position, ITypeID target, FunctionalMember method, ITypeID[] typeArguments) {
 		DefinitionMemberGroup group = new DefinitionMemberGroup(true, method.getInformalName());
 		group.addMethod(method, TypeMemberPriority.SPECIFIED);
 		return new PartialStaticMemberGroupExpression(position, target, group, typeArguments);
@@ -55,8 +55,8 @@ public class PartialStaticMemberGroupExpression implements IPartialExpression {
 	@Override
 	public List<FunctionHeader> getPossibleFunctionHeaders(TypeScope scope, List<ITypeID> hints, int arguments) {
 		return group.getMethodMembers().stream()
-				.filter(method -> method.member.getHeader().parameters.length == arguments && method.member.isStatic())
-				.map(method -> method.member.getHeader())
+				.filter(method -> method.member.header.parameters.length == arguments && method.member.isStatic())
+				.map(method -> method.member.header)
 				.collect(Collectors.toList());
 	}
 

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

@@ -49,8 +49,8 @@ public class PartialTypeExpression implements IPartialExpression {
 		return scope.getTypeMembers(type)
 				.getOrCreateGroup(OperatorType.CALL)
 				.getMethodMembers().stream()
-				.filter(method -> method.member.getHeader().parameters.length == arguments && method.member.isStatic())
-				.map(method -> method.member.getHeader())
+				.filter(method -> method.member.header.parameters.length == arguments && method.member.isStatic())
+				.map(method -> method.member.header)
 				.collect(Collectors.toList());
 	}
 

CodeModel/src/main/java/org/openzen/zenscript/codemodel/processor/InterfaceProcessor.java

@@ -0,0 +1,19 @@
+/*
+ * 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.processor;
+
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.member.ImplementationMember;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface InterfaceProcessor {
+	public void apply(ImplementationMember implementation);
+
+	public void applyOnSubclass(HighLevelDefinition definition, ImplementationMember implementation);
+}

Linker/src/main/java/org/openzen/zenscript/linker/BaseScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/BaseScope.java

@@ -3,14 +3,13 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.List;
 import java.util.function.Function;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
-import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;

Linker/src/main/java/org/openzen/zenscript/linker/BlockScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/BlockScope.java

@@ -3,10 +3,11 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.List;
 import java.util.function.Function;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
@@ -70,4 +71,9 @@ public class BlockScope extends StatementScope {
 	public IPartialExpression getOuterInstance(CodePosition position) {
 		return parent.getOuterInstance(position);
 	}
+
+	@Override
+	public AnnotationDefinition getAnnotation(String name) {
+		return parent.getAnnotation(name);
+	}
 }

Linker/src/main/java/org/openzen/zenscript/linker/DefinitionScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/DefinitionScope.java

@@ -3,12 +3,13 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 
 import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.shared.CompileException;
@@ -131,4 +132,9 @@ public class DefinitionScope extends BaseScope {
 			throw new UnsupportedOperationException("not yet supported");
 		}
 	}
+
+	@Override
+	public AnnotationDefinition getAnnotation(String name) {
+		return outer.getAnnotation(name);
+	}
 }

Linker/src/main/java/org/openzen/zenscript/linker/ExpressionScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/ExpressionScope.java

@@ -3,13 +3,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.GetLocalVariableExpression;
@@ -62,6 +63,19 @@ public class ExpressionScope extends BaseScope {
 		this.genericInferenceMap = genericInferenceMap;
 	}
 	
+	private ExpressionScope(
+			BaseScope scope,
+			List<ITypeID> hints,
+			Function<CodePosition, Expression> dollar,
+			Map<TypeParameter, ITypeID> genericInferenceMap,
+			Map<String, VarStatement> innerVariables) {
+		this.outer = scope;
+		this.hints = hints;
+		this.dollar = dollar;
+		this.genericInferenceMap = genericInferenceMap;
+		this.innerVariables.putAll(innerVariables);
+	}
+	
 	public void addInnerVariable(VarStatement variable) {
 		innerVariables.put(variable.name, variable);
 	}
@@ -71,19 +85,19 @@ public class ExpressionScope extends BaseScope {
 	}
 	
 	public ExpressionScope withoutHints() {
-		return new ExpressionScope(outer, Collections.emptyList(), dollar, genericInferenceMap);
+		return new ExpressionScope(outer, Collections.emptyList(), dollar, genericInferenceMap, innerVariables);
 	}
 	
 	public ExpressionScope withHint(ITypeID hint) {
-		return new ExpressionScope(outer, Collections.singletonList(hint), dollar, genericInferenceMap);
+		return new ExpressionScope(outer, Collections.singletonList(hint), dollar, genericInferenceMap, innerVariables);
 	}
 	
 	public ExpressionScope withHints(List<ITypeID> hints) {
-		return new ExpressionScope(outer, hints, dollar, genericInferenceMap);
+		return new ExpressionScope(outer, hints, dollar, genericInferenceMap, innerVariables);
 	}
 	
 	public ExpressionScope createInner(List<ITypeID> hints, Function<CodePosition, Expression> dollar) {
-		return new ExpressionScope(outer, hints, dollar, genericInferenceMap);
+		return new ExpressionScope(outer, hints, dollar, genericInferenceMap, innerVariables);
 	}
 	
 	public ExpressionScope forCall(FunctionHeader header) {
@@ -94,7 +108,7 @@ public class ExpressionScope extends BaseScope {
 		for (TypeParameter parameter : header.typeParameters)
 			genericInferenceMap.put(parameter, null);
 		
-		return new ExpressionScope(outer, hints, dollar, genericInferenceMap);
+		return new ExpressionScope(outer, hints, dollar, genericInferenceMap, innerVariables);
 	}
 	
 	@Override
@@ -139,4 +153,9 @@ public class ExpressionScope extends BaseScope {
 	public IPartialExpression getOuterInstance(CodePosition position) {
 		return outer.getOuterInstance(position);
 	}
+
+	@Override
+	public AnnotationDefinition getAnnotation(String name) {
+		return outer.getAnnotation(name);
+	}
 }

Linker/src/main/java/org/openzen/zenscript/linker/FileScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/FileScope.java

@@ -3,13 +3,14 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import org.openzen.zenscript.codemodel.AccessScope;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.PackageDefinitions;
@@ -23,9 +24,9 @@ import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ISymbol;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
-import org.openzen.zenscript.linker.symbol.ISymbol;
 import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.shared.CompileException;
 import org.openzen.zenscript.shared.CompileExceptionCode;
@@ -41,6 +42,7 @@ public class FileScope extends BaseScope {
 	private final GlobalTypeRegistry globalRegistry;
 	private final Map<String, HighLevelDefinition> importedTypes = new HashMap<>();
 	private final Map<String, ISymbol> globalSymbols;
+	private final Map<String, AnnotationDefinition> annotations = new HashMap<>();
 	
 	public FileScope(
 			AccessScope access,
@@ -48,13 +50,18 @@ public class FileScope extends BaseScope {
 			PackageDefinitions packageDefinitions,
 			GlobalTypeRegistry globalRegistry,
 			List<ExpansionDefinition> expansions,
-			Map<String, ISymbol> globalSymbols) {
+			Map<String, ISymbol> globalSymbols,
+			List<AnnotationDefinition> annotations) {
 		this.rootPackage = rootPackage;
 		this.packageDefinitions = packageDefinitions;
 		this.globalRegistry = globalRegistry;
 		this.globalSymbols = globalSymbols;
 		
 		memberCache = new LocalMemberCache(access, globalRegistry, expansions);
+		
+		for (AnnotationDefinition annotation : annotations) {
+			this.annotations.put(annotation.getAnnotationName(), annotation);
+		}
 	}
 	
 	@Override
@@ -147,4 +154,9 @@ public class FileScope extends BaseScope {
 	public IPartialExpression getOuterInstance(CodePosition position) {
 		throw new CompileException(position, CompileExceptionCode.NO_OUTER_BECAUSE_OUTSIDE_TYPE, "Not in an inner type");
 	}
+
+	@Override
+	public AnnotationDefinition getAnnotation(String name) {
+		return annotations.get(name);
+	}
 }

Linker/src/main/java/org/openzen/zenscript/linker/ForeachScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/ForeachScope.java

@@ -3,10 +3,11 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.List;
 import java.util.function.Function;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.GetLocalVariableExpression;
@@ -90,4 +91,9 @@ public class ForeachScope extends StatementScope {
 	public IPartialExpression getOuterInstance(CodePosition position) {
 		return outer.getOuterInstance(position);
 	}
+
+	@Override
+	public AnnotationDefinition getAnnotation(String name) {
+		return outer.getAnnotation(name);
+	}
 }

Linker/src/main/java/org/openzen/zenscript/linker/FunctionScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/FunctionScope.java

@@ -3,10 +3,11 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.List;
 import java.util.function.Function;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.expression.Expression;
@@ -104,4 +105,9 @@ public class FunctionScope extends StatementScope {
 	public IPartialExpression getOuterInstance(CodePosition position) {
 		return outer.getOuterInstance(position);
 	}
+
+	@Override
+	public AnnotationDefinition getAnnotation(String name) {
+		return outer.getAnnotation(name);
+	}
 }

Linker/src/main/java/org/openzen/zenscript/linker/GenericFunctionScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/GenericFunctionScope.java

@@ -3,12 +3,13 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
@@ -81,4 +82,9 @@ public class GenericFunctionScope extends BaseScope {
 	public IPartialExpression getOuterInstance(CodePosition position) {
 		return outer.getOuterInstance(position);
 	}
+
+	@Override
+	public AnnotationDefinition getAnnotation(String name) {
+		return outer.getAnnotation(name);
+	}
 }

Linker/src/main/java/org/openzen/zenscript/linker/GlobalScriptScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/GlobalScriptScope.java

@@ -3,10 +3,11 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.List;
 import java.util.function.Function;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
@@ -21,9 +22,9 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class GlobalScriptScope extends StatementScope {
-	private final FileScope file;
+	private final BaseScope file;
 	
-	public GlobalScriptScope(FileScope file) {
+	public GlobalScriptScope(BaseScope file) {
 		this.file = file;
 	}
 
@@ -70,4 +71,9 @@ public class GlobalScriptScope extends StatementScope {
 	public IPartialExpression getOuterInstance(CodePosition position) {
 		return null;
 	}
+
+	@Override
+	public AnnotationDefinition getAnnotation(String name) {
+		return file.getAnnotation(name);
+	}
 }

Linker/src/main/java/org/openzen/zenscript/linker/ImplementationScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/ImplementationScope.java

@@ -3,10 +3,11 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.List;
 import java.util.function.Function;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ThisExpression;
@@ -96,4 +97,9 @@ public class ImplementationScope extends BaseScope {
 	public IPartialExpression getOuterInstance(CodePosition position) {
 		return new ThisExpression(position, outer.getThisType());
 	}
+
+	@Override
+	public AnnotationDefinition getAnnotation(String name) {
+		return outer.getAnnotation(name);
+	}
 }

Linker/src/main/java/org/openzen/zenscript/linker/LambdaScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/LambdaScope.java

@@ -3,10 +3,11 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.List;
 import java.util.function.Function;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.expression.Expression;
@@ -89,4 +90,9 @@ public class LambdaScope extends StatementScope {
 	public IPartialExpression getOuterInstance(CodePosition position) {
 		return outer.getOuterInstance(position);
 	}
+
+	@Override
+	public AnnotationDefinition getAnnotation(String name) {
+		return outer.getAnnotation(name);
+	}
 }

Linker/src/main/java/org/openzen/zenscript/linker/LoopScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/LoopScope.java

@@ -3,10 +3,11 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.List;
 import java.util.function.Function;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
@@ -78,5 +79,9 @@ public class LoopScope extends StatementScope {
 	public IPartialExpression getOuterInstance(CodePosition position) {
 		return outer.getOuterInstance(position);
 	}
-}
 
+	@Override
+	public AnnotationDefinition getAnnotation(String name) {
+		return outer.getAnnotation(name);
+	}
+}

Linker/src/main/java/org/openzen/zenscript/linker/StatementScope.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/StatementScope.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker;
+package org.openzen.zenscript.codemodel.scope;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.scope;
 
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
@@ -20,4 +21,6 @@ public interface TypeScope {
 	public LocalMemberCache getMemberCache();
 	
 	public TypeMembers getTypeMembers(ITypeID type);
+	
+	public AnnotationDefinition getAnnotation(String name);
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/BlockStatement.java

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.statement;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -30,6 +31,26 @@ public class BlockStatement extends Statement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitBlock(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+		for (Statement s : statements) {
+			s.forEachStatement(consumer);
+		}
+	}
+	
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		List<Statement> tStatements = new ArrayList<>();
+		boolean unchanged = true;
+		for (Statement statement : statements) {
+			Statement tStatement = statement.transform(transformer, modified);
+			unchanged &= statement == tStatement;
+			tStatements.add(statement);
+		}
+		return unchanged ? this : new BlockStatement(position, tStatements);
+	}
 
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/BreakStatement.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.shared.ConcatMap;
@@ -26,6 +27,16 @@ public class BreakStatement extends Statement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitBreak(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+	}
+
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		return modified.containsKey(target) ? new BreakStatement(position, modified.get(target)) : this;
+	}
 
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/CatchClause.java

@@ -24,6 +24,11 @@ public class CatchClause {
 		this.content = content;
 	}
 	
+	public CatchClause transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		Statement tContent = content.transform(transformer, modified);
+		return content == tContent ? this : new CatchClause(position, exceptionVariable, tContent);
+	}
+	
 	public CatchClause transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
 		Statement tContent = content.transform(transformer, modified);
 		return content == tContent ? this : new CatchClause(position, exceptionVariable, tContent);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/ContinueStatement.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.shared.ConcatMap;
@@ -26,6 +27,16 @@ public class ContinueStatement extends Statement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitContinue(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+	}
+
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		return modified.containsKey(target) ? new ContinueStatement(position, modified.get(target)) : this;
+	}
 
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/DoWhileStatement.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.shared.CodePosition;
@@ -28,10 +29,32 @@ public class DoWhileStatement extends LoopStatement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitDoWhile(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+		content.forEachStatement(consumer);
+	}
+
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		Expression tCondition = condition.transform(transformer);
+		Statement tContent = content.transform(transformer, modified);
+		if (tCondition == condition && tContent == content)
+			return this;
+		
+		DoWhileStatement result = new DoWhileStatement(position, label, condition);
+		result.content = content.transform(transformer, modified.concat(this, result));
+		return result;
+	}
 
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
 		Expression tCondition = condition.transform(transformer);
+		Statement tContent = content.transform(transformer, modified);
+		if (tCondition == condition && tContent == content)
+			return this;
+		
 		DoWhileStatement result = new DoWhileStatement(position, label, tCondition);
 		result.content = content.transform(transformer, modified.concat(this, result));
 		return result;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/EmptyStatement.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.shared.ConcatMap;
@@ -22,6 +23,16 @@ public class EmptyStatement extends Statement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitEmpty(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+	}
+
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		return this;
+	}
 
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/ExpressionStatement.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.shared.CodePosition;
@@ -27,6 +28,18 @@ public class ExpressionStatement extends Statement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitExpression(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+		expression.forEachStatement(consumer);
+	}
+
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		Expression tExpression = expression.transform(transformer);
+		return tExpression == expression ? this : new ExpressionStatement(position, tExpression);
+	}
 
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/ForeachStatement.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.member.IIteratorMember;
@@ -33,10 +34,32 @@ public class ForeachStatement extends LoopStatement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitForeach(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+		content.forEachStatement(consumer);
+	}
+
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		Expression tList = list.transform(transformer);
+		Statement tContent = content.transform(transformer, modified);
+		if (tList == list && tContent == content)
+			return this;
+		
+		ForeachStatement result = new ForeachStatement(position, loopVariables, iterator, tList);
+		result.content = content.transform(transformer, modified.concat(this, result));
+		return result;
+	}
 
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
 		Expression tList = list.transform(transformer);
+		Statement tContent = content.transform(transformer, modified);
+		if (tList == list && tContent == content)
+			return this;
+		
 		ForeachStatement result = new ForeachStatement(position, loopVariables, iterator, tList);
 		result.content = content.transform(transformer, modified.concat(this, result));
 		return result;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/IfStatement.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -32,12 +33,30 @@ public class IfStatement extends Statement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitIf(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+		onThen.forEachStatement(consumer);
+		if (onElse != null)
+			onElse.forEachStatement(consumer);
+	}
+
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		Expression tCondition = condition.transform(transformer);
+		Statement tOnThen = onThen.transform(transformer, modified);
+		Statement tOnElse = onElse == null ? null : onElse.transform(transformer, modified);
+		return tCondition == condition && onThen == tOnThen && onElse == tOnElse
+				? this
+				: new IfStatement(position, tCondition, tOnThen, tOnElse);
+	}
 
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
 		Expression tCondition = condition.transform(transformer);
 		Statement tOnThen = onThen.transform(transformer, modified);
-		Statement tOnElse = onElse.transform(transformer, modified);
+		Statement tOnElse = onElse == null ? null : onElse.transform(transformer, modified);
 		return tCondition == condition && onThen == tOnThen && onElse == tOnElse
 				? this
 				: new IfStatement(position, tCondition, tOnThen, tOnElse);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/LockStatement.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.shared.CodePosition;
@@ -29,6 +30,19 @@ public class LockStatement extends Statement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitLock(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+		content.forEachStatement(consumer);
+	}
+
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		Expression tObject = object.transform(transformer);
+		Statement tContent = content.transform(transformer, modified);
+		return tObject == object && tContent == content ? this : new LockStatement(position, tObject, tContent);
+	}
 
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/ReturnStatement.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -30,6 +31,11 @@ public class ReturnStatement extends Statement {
 		return value.type;
 	}
 	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+	}
+	
 	@Override
 	public Statement withReturnType(TypeScope scope, ITypeID returnType) {
 		return new ReturnStatement(position, value == null ? null : value.castImplicit(position, scope, returnType));
@@ -40,6 +46,12 @@ public class ReturnStatement extends Statement {
 		return visitor.visitReturn(this);
 	}
 
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		Expression tValue = value.transform(transformer);
+		return tValue == value ? this : new ReturnStatement(position, tValue);
+	}
+
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
 		Expression tValue = value.transform(transformer);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/Statement.java

@@ -6,7 +6,9 @@
 package org.openzen.zenscript.codemodel.statement;
 
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
+import org.openzen.zenscript.codemodel.annotations.StatementAnnotation;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.shared.CodePosition;
@@ -21,6 +23,7 @@ import org.openzen.zenscript.shared.Taggable;
 public abstract class Statement extends Taggable {
 	public final CodePosition position;
 	public final ITypeID thrownType;
+	public StatementAnnotation[] annotations = StatementAnnotation.NONE;
 	
 	public Statement(CodePosition position, ITypeID thrownType) {
 		this.position = position;
@@ -37,6 +40,14 @@ public abstract class Statement extends Taggable {
 	
 	public abstract <T> T accept(StatementVisitor<T> visitor);
 	
+	public abstract void forEachStatement(Consumer<Statement> consumer);
+	
+	public final Statement transform(StatementTransformer transformer) {
+		return transform(transformer, ConcatMap.empty());
+	}
+	
+	public abstract Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified);
+	
 	public abstract Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified);
 	
 	public static List<Statement> withReturnType(TypeScope scope, List<Statement> statements, ITypeID returnType) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/StatementTransformer.java

@@ -0,0 +1,14 @@
+/*
+ * 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.statement;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface StatementTransformer {
+	Statement transform(Statement original);
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/SwitchCase.java

@@ -24,6 +24,14 @@ public class SwitchCase {
 		this.statements = statements;
 	}
 	
+	public SwitchCase transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		List<Statement> tStatements = new ArrayList<>();
+		for (Statement statement : statements) {
+			tStatements.add(statement.transform(transformer, modified));
+		}
+		return new SwitchCase(value, tStatements);
+	}
+	
 	public SwitchCase transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
 		List<Statement> tStatements = new ArrayList<>();
 		for (Statement statement : statements) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/SwitchStatement.java

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.statement;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.shared.CodePosition;
@@ -30,6 +31,26 @@ public class SwitchStatement extends LoopStatement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitSwitch(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+		for (SwitchCase switchCase : cases) {
+			for (Statement statement : switchCase.statements)
+				statement.forEachStatement(consumer);
+		}
+	}
+
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		Expression tValue = value.transform(transformer);
+		SwitchStatement result = new SwitchStatement(position, label, tValue);
+		ConcatMap<LoopStatement, LoopStatement> tModified = modified.concat(this, result);
+		for (SwitchCase case_ : cases) {
+			result.cases.add(case_.transform(transformer, tModified));
+		}
+		return result;
+	}
 
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/ThrowStatement.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.shared.CodePosition;
@@ -27,6 +28,17 @@ public class ThrowStatement extends Statement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitThrow(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+	}
+
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		Expression tValue = value.transform(transformer);
+		return tValue == value ? this : new ThrowStatement(position, value);
+	}
 
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/TryCatchStatement.java

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.statement;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.shared.ConcatMap;
@@ -39,6 +40,27 @@ public class TryCatchStatement extends Statement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitTryCatch(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+		for (CatchClause catchClause : catchClauses) {
+			catchClause.content.forEachStatement(consumer);
+		}
+		if (finallyClause != null)
+			finallyClause.forEachStatement(consumer);
+	}
+
+	@Override
+	public Statement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		VarStatement tResource = resource == null ? null : resource.transform(transformer, modified);
+		Statement tContent = content.transform(transformer, modified);
+		List<CatchClause> tCatchClauses = new ArrayList<>();
+		for (CatchClause clause : catchClauses)
+			tCatchClauses.add(clause.transform(transformer, modified));
+		Statement tFinallyClause = finallyClause == null ? null : finallyClause.transform(transformer, modified);
+		return new TryCatchStatement(position, tResource, tContent, tCatchClauses, tFinallyClause);
+	}
 
 	@Override
 	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/VarStatement.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -34,6 +35,17 @@ public class VarStatement extends Statement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitVar(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+	}
+
+	@Override
+	public VarStatement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		Expression tInitializer = initializer == null ? null : initializer.transform(transformer);
+		return tInitializer == initializer ? this : new VarStatement(position, name, type, tInitializer, isFinal);
+	}
 
 	@Override
 	public VarStatement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/WhileStatement.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.function.Consumer;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.shared.CodePosition;
@@ -28,11 +29,33 @@ public class WhileStatement extends LoopStatement {
 	public <T> T accept(StatementVisitor<T> visitor) {
 		return visitor.visitWhile(this);
 	}
+	
+	@Override
+	public void forEachStatement(Consumer<Statement> consumer) {
+		consumer.accept(this);
+		content.forEachStatement(consumer);
+	}
 
 	@Override
-	public Statement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+	public WhileStatement transform(StatementTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
 		Expression tCondition = condition.transform(transformer);
-		WhileStatement result = new WhileStatement(position, label, condition);
+		Statement tContent = content.transform(transformer, modified);
+		if (condition == tCondition && content == tContent)
+			return this;
+		
+		WhileStatement result = new WhileStatement(position, label, tCondition);
+		result.content = content.transform(transformer, modified.concat(this, result));
+		return result;
+	}
+
+	@Override
+	public WhileStatement transform(ExpressionTransformer transformer, ConcatMap<LoopStatement, LoopStatement> modified) {
+		Expression tCondition = condition.transform(transformer);
+		Statement tContent = content.transform(transformer, modified);
+		if (condition == tCondition && content == tContent)
+			return this;
+		
+		WhileStatement result = new WhileStatement(position, label, tCondition);
 		result.content = content.transform(transformer, modified.concat(this, result));
 		return result;
 	}

Linker/src/main/java/org/openzen/zenscript/linker/symbol/ISymbol.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/ISymbol.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker.symbol;
+package org.openzen.zenscript.codemodel.type;
 
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;

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

@@ -15,6 +15,8 @@ import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
  * @author Hoofdgebruiker
  */
 public interface ITypeID {
+	public static final ITypeID[] NONE = new ITypeID[0];
+	
 	public ITypeID getUnmodified();
 	
 	public <T> T accept(ITypeVisitor<T> visitor);

Linker/src/main/java/org/openzen/zenscript/linker/symbol/TypeSymbol.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/TypeSymbol.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.linker.symbol;
+package org.openzen.zenscript.codemodel.type;
 
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;

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

@@ -19,13 +19,15 @@ import org.openzen.zenscript.codemodel.expression.SetterExpression;
 import org.openzen.zenscript.codemodel.expression.StaticSetterExpression;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.member.FieldMember;
-import org.openzen.zenscript.codemodel.member.ICallableMember;
-import org.openzen.zenscript.codemodel.member.IGettableMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.CompareType;
 import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.expression.ConstExpression;
 import org.openzen.zenscript.codemodel.expression.PostCallExpression;
+import org.openzen.zenscript.codemodel.member.ConstMember;
+import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.shared.CompileException;
@@ -37,16 +39,17 @@ import org.openzen.zenscript.codemodel.scope.TypeScope;
  * @author Hoofdgebruiker
  */
 public class DefinitionMemberGroup {
-	public static DefinitionMemberGroup forMethod(ICallableMember member) {
+	public static DefinitionMemberGroup forMethod(FunctionalMember member) {
 		DefinitionMemberGroup instance = new DefinitionMemberGroup(member.isStatic(), member.getInformalName());
 		instance.addMethod(member, TypeMemberPriority.SPECIFIED);
 		return instance;
 	}
 	
+	private TypeMember<ConstMember> constant;
 	private TypeMember<FieldMember> field;
-	private TypeMember<IGettableMember> getter;
+	private TypeMember<GetterMember> getter;
 	private TypeMember<SetterMember> setter;
-	private final List<TypeMember<ICallableMember>> methods = new ArrayList<>();
+	private final List<TypeMember<FunctionalMember>> methods = new ArrayList<>();
 	public final boolean isStatic;
 	public final String name;
 	
@@ -56,6 +59,8 @@ public class DefinitionMemberGroup {
 	}
 	
 	public void merge(CodePosition position, DefinitionMemberGroup other, TypeMemberPriority priority) {
+		if (other.constant != null)
+			setConst(other.constant.member, priority);
 		if (other.field != null)
 			setField(other.field.member, priority);
 		if (other.getter != null)
@@ -63,7 +68,7 @@ public class DefinitionMemberGroup {
 		if (other.setter != null)
 			setSetter(other.setter.member, priority);
 		
-		for (TypeMember<ICallableMember> method : other.methods)
+		for (TypeMember<FunctionalMember> method : other.methods)
 			addMethod(method.member, priority);
 	}
 	
@@ -71,7 +76,7 @@ public class DefinitionMemberGroup {
 		return this.field == null ? null : this.field.member;
 	}
 	
-	public IGettableMember getGetter() {
+	public GetterMember getGetter() {
 		return this.getter == null ? null : this.getter.member;
 	}
 	
@@ -84,18 +89,26 @@ public class DefinitionMemberGroup {
 	}
 	
 	public boolean hasMethod(FunctionHeader header) {
-		for (TypeMember<ICallableMember> method : methods) {
-			if (method.member.getHeader().isEquivalentTo(header))
+		for (TypeMember<FunctionalMember> method : methods) {
+			if (method.member.header.isEquivalentTo(header))
 				return true;
 		}
 		
 		return false;
 	}
 	
-	public List<TypeMember<ICallableMember>> getMethodMembers() {
+	public List<TypeMember<FunctionalMember>> getMethodMembers() {
 		return this.methods;
 	}
 	
+	public void setConst(ConstMember constant, TypeMemberPriority priority) {
+		if (this.constant != null) {
+			this.constant = this.constant.resolve(new TypeMember<>(priority, constant));
+		} else {
+			this.constant = new TypeMember<>(priority, constant);
+		}
+	}
+	
 	public void setField(FieldMember field, TypeMemberPriority priority) {
 		if (this.field != null) {
 			this.field = this.field.resolve(new TypeMember<>(priority, field));
@@ -104,7 +117,7 @@ public class DefinitionMemberGroup {
 		}
 	}
 	
-	public void setGetter(IGettableMember getter, TypeMemberPriority priority) {
+	public void setGetter(GetterMember getter, TypeMemberPriority priority) {
 		if (this.getter != null) {
 			this.getter = this.getter.resolve(new TypeMember<>(priority, getter));
 		} else {
@@ -120,9 +133,9 @@ public class DefinitionMemberGroup {
 		}
 	}
 	
-	public void addMethod(ICallableMember method, TypeMemberPriority priority) {
+	public void addMethod(FunctionalMember method, TypeMemberPriority priority) {
 		for (int i = 0; i < methods.size(); i++) {
-			if (methods.get(i).member.getHeader().isEquivalentTo(method.getHeader())) {
+			if (methods.get(i).member.header.isEquivalentTo(method.header)) {
 				methods.set(i, methods.get(i).resolve(new TypeMember<>(priority, method)));
 				return;
 			}
@@ -183,7 +196,9 @@ public class DefinitionMemberGroup {
 	}
 	
 	public Expression staticGetter(CodePosition position) {
-		if (getter != null) {
+		if (constant != null) {
+			return new ConstExpression(position, constant.member);
+		} else if (getter != null) {
 			if (!getter.member.isStatic())
 				throw new CompileException(position, CompileExceptionCode.MEMBER_NOT_STATIC, "This getter is not static");
 			
@@ -221,8 +236,8 @@ public class DefinitionMemberGroup {
 		for (int i = 0; i < result.length; i++)
 			result[i] = new ArrayList<>();
 		
-		for (TypeMember<ICallableMember> method : methods) {
-			FunctionHeader header = method.member.getHeader();
+		for (TypeMember<FunctionalMember> method : methods) {
+			FunctionHeader header = method.member.header;
 			if (header.parameters.length != arguments)
 				continue;
 			
@@ -246,8 +261,8 @@ 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);
+		FunctionalMember method = selectMethod(position, scope, arguments, true, allowStaticUsage);
+		FunctionHeader instancedHeader = method.header.withGenericArguments(scope.getTypeRegistry(), arguments.typeArguments);
 		for (int i = 0; i < arguments.arguments.length; i++) {
 			arguments.arguments[i] = arguments.arguments[i].castImplicit(position, scope, instancedHeader.parameters[i].type);
 		}
@@ -259,7 +274,7 @@ public class DefinitionMemberGroup {
 		if (methods.isEmpty())
 			throw new CompileException(position, CompileExceptionCode.NO_SUCH_MEMBER, "There is no such operator");
 		
-		ICallableMember method = methods.get(0).member;
+		FunctionalMember method = methods.get(0).member;
 		if (!(method instanceof OperatorMember)) {
 			throw new CompileException(position, CompileExceptionCode.NO_SUCH_MEMBER, "Member is not an operator");
 		}
@@ -273,24 +288,24 @@ public class DefinitionMemberGroup {
 			Expression target,
 			CallArguments arguments,
 			CompareType compareType) {
-		ICallableMember method = selectMethod(position, scope, arguments, true, false);
-		FunctionHeader instancedHeader = method.getHeader().withGenericArguments(scope.getTypeRegistry(), arguments.typeArguments);
+		FunctionalMember method = selectMethod(position, scope, arguments, true, false);
+		FunctionHeader instancedHeader = method.header.withGenericArguments(scope.getTypeRegistry(), arguments.typeArguments);
 		return method.callWithComparator(position, compareType, target, instancedHeader, arguments, scope);
 	}
 	
 	public Expression callStatic(CodePosition position, ITypeID target, TypeScope scope, CallArguments arguments) {
-		ICallableMember method = selectMethod(position, scope, arguments, false, true);
-		FunctionHeader instancedHeader = method.getHeader().withGenericArguments(scope.getTypeRegistry(), arguments.typeArguments);
+		FunctionalMember method = selectMethod(position, scope, arguments, false, true);
+		FunctionHeader instancedHeader = method.header.withGenericArguments(scope.getTypeRegistry(), arguments.typeArguments);
 		return method.callStatic(position, target, instancedHeader, arguments, scope);
 	}
 	
-	public ICallableMember selectMethod(CodePosition position, TypeScope scope, CallArguments arguments, boolean allowNonStatic, boolean allowStatic) {
+	public FunctionalMember selectMethod(CodePosition position, TypeScope scope, CallArguments arguments, boolean allowNonStatic, boolean allowStatic) {
 		// try to match with exact types
-		outer: for (TypeMember<ICallableMember> method : methods) {
+		outer: for (TypeMember<FunctionalMember> method : methods) {
 			if (!(method.member.isStatic() ? allowStatic : allowNonStatic))
 				continue;
 			
-			FunctionHeader header = method.member.getHeader();
+			FunctionHeader header = method.member.header;
 			if (header.parameters.length != arguments.arguments.length)
 				continue;
 			if (header.getNumberOfTypeParameters() != arguments.getNumberOfTypeArguments())
@@ -309,12 +324,12 @@ public class DefinitionMemberGroup {
 		}
 		
 		// try to match with approximate types
-		ICallableMember selected = null;
-		outer: for (TypeMember<ICallableMember> method : methods) {
+		FunctionalMember selected = null;
+		outer: for (TypeMember<FunctionalMember> method : methods) {
 			if (!(method.member.isStatic() ? allowStatic : allowNonStatic))
 				continue;
 			
-			FunctionHeader header = method.member.getHeader();
+			FunctionHeader header = method.member.header;
 			if (header.parameters.length != arguments.arguments.length)
 				continue;
 			if (header.getNumberOfTypeParameters() != arguments.getNumberOfTypeArguments())
@@ -331,8 +346,8 @@ public class DefinitionMemberGroup {
 			
 			if (selected != null) {
 				StringBuilder explanation = new StringBuilder();
-				explanation.append("Function A: ").append(selected.getHeader().toString()).append("\n");
-				explanation.append("Function B: ").append(method.member.getHeader().toString());
+				explanation.append("Function A: ").append(selected.header.toString()).append("\n");
+				explanation.append("Function B: ").append(method.member.header.toString());
 				throw new CompileException(position, CompileExceptionCode.CALL_AMBIGUOUS, "Ambiguous call; multiple methods match:\n" + explanation.toString());
 			}
 			
@@ -346,13 +361,13 @@ public class DefinitionMemberGroup {
 				throw new CompileException(position, CompileExceptionCode.CALL_NO_VALID_METHOD, "This type has no " + name);
 			}
 			
-			outer: for (TypeMember<ICallableMember> method : methods) {
+			outer: for (TypeMember<FunctionalMember> method : methods) {
 				if (!(method.member.isStatic() ? allowStatic : allowNonStatic)) {
 					message.append(method.member.isStatic() ? "Method must not be static" : "Method must be static").append('\n');
 					continue;
 				}
 				
-				message.append(method.member.getHeader().explainWhyIncompatible(scope, arguments)).append("\n");
+				message.append(method.member.header.explainWhyIncompatible(scope, arguments)).append("\n");
 			}
 			
 			throw new CompileException(position, CompileExceptionCode.CALL_NO_VALID_METHOD, "No matching method found for " + name + ":\n" + message.toString());

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

@@ -20,17 +20,30 @@ import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.definition.FunctionDefinition;
 import org.openzen.zenscript.codemodel.definition.StructDefinition;
 import org.openzen.zenscript.codemodel.definition.VariantDefinition;
+import org.openzen.zenscript.codemodel.expression.ArrayExpression;
 import org.openzen.zenscript.codemodel.expression.CallTranslator;
+import org.openzen.zenscript.codemodel.expression.ConstantByteExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantDoubleExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantFloatExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantIntExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantLongExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantSByteExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantShortExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantUIntExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantULongExpression;
+import org.openzen.zenscript.codemodel.expression.ConstantUShortExpression;
+import org.openzen.zenscript.codemodel.expression.EnumConstantExpression;
+import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.generic.GenericParameterBound;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
+import org.openzen.zenscript.codemodel.member.ConstMember;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.member.GetterMember;
-import org.openzen.zenscript.codemodel.member.ICallableMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.member.MethodMember;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
@@ -96,9 +109,9 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		if (members.hasOperator(OperatorType.EQUALS)) {
 			DefinitionMemberGroup group = members.getOrCreateGroup(OperatorType.EQUALS);
 			DefinitionMemberGroup inverse = members.getOrCreateGroup(OperatorType.NOTEQUALS);
-			for (TypeMember<ICallableMember> method : group.getMethodMembers()) {
-				if (!inverse.hasMethod(method.member.getHeader())) {
-					inverse.addMethod(notequals(definition, BuiltinID.AUTOOP_NOTEQUALS, method.member.getHeader().parameters[0].type), TypeMemberPriority.SPECIFIED);
+			for (TypeMember<FunctionalMember> method : group.getMethodMembers()) {
+				if (!inverse.hasMethod(method.member.header)) {
+					inverse.addMethod(notequals(definition, BuiltinID.AUTOOP_NOTEQUALS, method.member.header.parameters[0].type), TypeMemberPriority.SPECIFIED);
 				}
 			}
 		}
@@ -481,7 +494,13 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		if (definition instanceof EnumDefinition) {
 			members.addGetter(getter(definition, ENUM_NAME, "name", STRING));
 			members.addGetter(getter(definition, ENUM_ORDINAL, "ordinal", INT));
-			members.addGetter(staticGetter(definition, ENUM_VALUES, "values", registry.getArray(type, 1)));
+			
+			List<EnumConstantMember> enumConstants = ((EnumDefinition) definition).enumConstants;
+			Expression[] constValues = new Expression[enumConstants.size()];
+			for (int i = 0; i < constValues.length; i++)
+				constValues[i] = new EnumConstantExpression(BUILTIN, type, enumConstants.get(i));
+			
+			members.addConst(constant(definition, ENUM_VALUES, "values", new ArrayExpression(BUILTIN, constValues, registry.getArray(type, 1))));
 			members.addOperator(compare(definition, ENUM_COMPARE, type));
 			
 			if (!members.canCast(BasicTypeID.STRING)) {
@@ -599,8 +618,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addMethod(staticMethod(builtin, BYTE_PARSE, "parse", BYTE, STRING));
 		members.addMethod(staticMethod(builtin, BYTE_PARSE_WITH_BASE, "parse", BYTE, STRING, INT));
 		
-		members.addGetter(staticGetter(builtin, BYTE_GET_MIN_VALUE, "MIN_VALUE", BYTE));
-		members.addGetter(staticGetter(builtin, BYTE_GET_MAX_VALUE, "MAX_VALUE", BYTE));
+		members.addConst(constant(builtin, BYTE_GET_MIN_VALUE, "MIN_VALUE", new ConstantByteExpression(BUILTIN, 0)));
+		members.addConst(constant(builtin, BYTE_GET_MAX_VALUE, "MAX_VALUE", new ConstantByteExpression(BUILTIN, 255)));
 		
 		processType(builtin, BYTE);
 	}
@@ -637,8 +656,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addMethod(staticMethod(builtin, SBYTE_PARSE, "parse", SBYTE, STRING));
 		members.addMethod(staticMethod(builtin, SBYTE_PARSE_WITH_BASE, "parse", SBYTE, STRING, INT));
 		
-		members.addGetter(staticGetter(builtin, SBYTE_GET_MIN_VALUE, "MIN_VALUE", SBYTE));
-		members.addGetter(staticGetter(builtin, SBYTE_GET_MAX_VALUE, "MAX_VALUE", SBYTE));
+		members.addConst(constant(builtin, SBYTE_GET_MIN_VALUE, "MIN_VALUE", new ConstantSByteExpression(BUILTIN, Byte.MIN_VALUE)));
+		members.addConst(constant(builtin, SBYTE_GET_MAX_VALUE, "MAX_VALUE", new ConstantSByteExpression(BUILTIN, Byte.MAX_VALUE)));
 		
 		processType(builtin, SBYTE);
 	}
@@ -675,8 +694,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addMethod(staticMethod(builtin, SHORT_PARSE, "parse", SHORT, STRING));
 		members.addMethod(staticMethod(builtin, SHORT_PARSE_WITH_BASE, "parse", SHORT, STRING, INT));
 		
-		members.addGetter(staticGetter(builtin, SHORT_GET_MIN_VALUE, "MIN_VALUE", SHORT));
-		members.addGetter(staticGetter(builtin, SHORT_GET_MAX_VALUE, "MAX_VALUE", SHORT));
+		members.addConst(constant(builtin, SHORT_GET_MIN_VALUE, "MIN_VALUE", new ConstantShortExpression(BUILTIN, Short.MIN_VALUE)));
+		members.addConst(constant(builtin, SHORT_GET_MAX_VALUE, "MAX_VALUE", new ConstantShortExpression(BUILTIN, Short.MAX_VALUE)));
 		
 		processType(builtin, SHORT);
 	}
@@ -712,8 +731,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addMethod(staticMethod(builtin, USHORT_PARSE, "parse", USHORT, STRING));
 		members.addMethod(staticMethod(builtin, USHORT_PARSE_WITH_BASE, "parse", USHORT, STRING, INT));
 		
-		members.addGetter(staticGetter(builtin, USHORT_GET_MIN_VALUE, "MIN_VALUE", USHORT));
-		members.addGetter(staticGetter(builtin, USHORT_GET_MAX_VALUE, "MAX_VALUE", USHORT));
+		members.addConst(constant(builtin, USHORT_GET_MIN_VALUE, "MIN_VALUE", new ConstantUShortExpression(BUILTIN, 0)));
+		members.addConst(constant(builtin, USHORT_GET_MAX_VALUE, "MAX_VALUE", new ConstantUShortExpression(BUILTIN, 65535)));
 		
 		processType(builtin, USHORT);
 	}
@@ -765,8 +784,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addOperator(compare(builtin, FLOAT_COMPARE, FLOAT, INT_TO_FLOAT));
 		members.addOperator(compare(builtin, DOUBLE_COMPARE, DOUBLE, INT_TO_DOUBLE));
 		
-		members.addGetter(staticGetter(builtin, INT_GET_MIN_VALUE, "MIN_VALUE", INT));
-		members.addGetter(staticGetter(builtin, INT_GET_MAX_VALUE, "MAX_VALUE", INT));
+		members.addConst(constant(builtin, INT_GET_MIN_VALUE, "MIN_VALUE", new ConstantIntExpression(BUILTIN, Integer.MIN_VALUE)));
+		members.addConst(constant(builtin, INT_GET_MAX_VALUE, "MAX_VALUE", new ConstantIntExpression(BUILTIN, Integer.MAX_VALUE)));
 		
 		members.addCaster(castExplicit(builtin, INT_TO_BYTE, BYTE));
 		members.addCaster(castExplicit(builtin, INT_TO_SBYTE, SBYTE));
@@ -843,8 +862,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addOperator(compare(builtin, FLOAT_COMPARE, FLOAT, UINT_TO_FLOAT));
 		members.addOperator(compare(builtin, DOUBLE_COMPARE, DOUBLE, UINT_TO_DOUBLE));
 		
-		members.addGetter(staticGetter(builtin, UINT_GET_MIN_VALUE, "MIN_VALUE", UINT));
-		members.addGetter(staticGetter(builtin, UINT_GET_MAX_VALUE, "MAX_VALUE", UINT));
+		members.addConst(constant(builtin, UINT_GET_MIN_VALUE, "MIN_VALUE", new ConstantUIntExpression(BUILTIN, 0)));
+		members.addConst(constant(builtin, UINT_GET_MAX_VALUE, "MAX_VALUE", new ConstantUIntExpression(BUILTIN, -1)));
 		
 		members.addCaster(castExplicit(builtin, UINT_TO_BYTE, BYTE));
 		members.addCaster(castExplicit(builtin, UINT_TO_SBYTE, SBYTE));
@@ -914,8 +933,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addOperator(compare(builtin, FLOAT_COMPARE, FLOAT, LONG_TO_FLOAT));
 		members.addOperator(compare(builtin, DOUBLE_COMPARE, DOUBLE, LONG_TO_DOUBLE));
 		
-		members.addGetter(staticGetter(builtin, LONG_GET_MIN_VALUE, "MIN_VALUE", LONG));
-		members.addGetter(staticGetter(builtin, LONG_GET_MAX_VALUE, "MAX_VALUE", LONG));
+		members.addConst(constant(builtin, LONG_GET_MIN_VALUE, "MIN_VALUE", new ConstantLongExpression(BUILTIN, Long.MIN_VALUE)));
+		members.addConst(constant(builtin, LONG_GET_MAX_VALUE, "MAX_VALUE", new ConstantLongExpression(BUILTIN, Long.MAX_VALUE)));
 		
 		members.addCaster(castExplicit(builtin, LONG_TO_BYTE, BYTE));
 		members.addCaster(castExplicit(builtin, LONG_TO_SBYTE, SBYTE));
@@ -983,8 +1002,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addOperator(compare(builtin, FLOAT_COMPARE, FLOAT, ULONG_TO_FLOAT));
 		members.addOperator(compare(builtin, DOUBLE_COMPARE, DOUBLE, ULONG_TO_DOUBLE));
 		
-		members.addGetter(staticGetter(builtin, ULONG_GET_MIN_VALUE, "MIN_VALUE", ULONG));
-		members.addGetter(staticGetter(builtin, ULONG_GET_MAX_VALUE, "MAX_VALUE", ULONG));
+		members.addConst(constant(builtin, ULONG_GET_MIN_VALUE, "MIN_VALUE", new ConstantULongExpression(BUILTIN, 0)));
+		members.addConst(constant(builtin, ULONG_GET_MAX_VALUE, "MAX_VALUE", new ConstantULongExpression(BUILTIN, -1L)));
 		
 		members.addCaster(castExplicit(builtin, ULONG_TO_BYTE, BYTE));
 		members.addCaster(castExplicit(builtin, ULONG_TO_SBYTE, SBYTE));
@@ -1038,8 +1057,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addOperator(compare(builtin, FLOAT_COMPARE, FLOAT));
 		members.addOperator(compare(builtin, DOUBLE_COMPARE, DOUBLE, LONG_TO_DOUBLE));
 		
-		members.addGetter(staticGetter(builtin, FLOAT_GET_MIN_VALUE, "MIN_VALUE", FLOAT));
-		members.addGetter(staticGetter(builtin, FLOAT_GET_MAX_VALUE, "MAX_VALUE", FLOAT));
+		members.addConst(constant(builtin, FLOAT_GET_MIN_VALUE, "MIN_VALUE", new ConstantFloatExpression(BUILTIN, Float.MIN_VALUE)));
+		members.addConst(constant(builtin, FLOAT_GET_MAX_VALUE, "MAX_VALUE", new ConstantFloatExpression(BUILTIN, Float.MAX_VALUE)));
 		
 		members.addCaster(castExplicit(builtin, FLOAT_TO_BYTE, BYTE));
 		members.addCaster(castExplicit(builtin, FLOAT_TO_SBYTE, SBYTE));
@@ -1073,8 +1092,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addOperator(div(builtin, DOUBLE_DIV_DOUBLE, DOUBLE, DOUBLE));
 		members.addOperator(compare(builtin, DOUBLE_COMPARE, DOUBLE));
 		
-		members.addGetter(staticGetter(builtin, DOUBLE_GET_MIN_VALUE, "MIN_VALUE", DOUBLE));
-		members.addGetter(staticGetter(builtin, DOUBLE_GET_MAX_VALUE, "MAX_VALUE", DOUBLE));
+		members.addConst(constant(builtin, DOUBLE_GET_MIN_VALUE, "MIN_VALUE", new ConstantDoubleExpression(BUILTIN, Double.MIN_VALUE)));
+		members.addConst(constant(builtin, DOUBLE_GET_MAX_VALUE, "MAX_VALUE", new ConstantDoubleExpression(BUILTIN, Double.MAX_VALUE)));
 		
 		members.addCaster(castExplicit(builtin, DOUBLE_TO_BYTE, BYTE));
 		members.addCaster(castExplicit(builtin, DOUBLE_TO_SBYTE, SBYTE));
@@ -1148,7 +1167,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 	}
 	
 	private static CallTranslator castedTargetCall(HighLevelDefinition definition, FunctionalMember member, BuiltinID casterBuiltin) {
-		CasterMember caster = castImplicit(definition, casterBuiltin, member.getHeader().parameters[0].type);
+		CasterMember caster = castImplicit(definition, casterBuiltin, member.header.parameters[0].type);
 		return call -> member.call(call.position, caster.cast(call.position, call.target, true), call.arguments, call.scope);
 	}
 	
@@ -1484,14 +1503,16 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 				id);
 	}
 	
-	private static GetterMember staticGetter(HighLevelDefinition cls, BuiltinID id, String name, ITypeID type) {
-		return new GetterMember(
+	private static ConstMember constant(HighLevelDefinition cls, BuiltinID id, String name, Expression value) {
+		ConstMember result = new ConstMember(
 				BUILTIN,
 				cls,
 				Modifiers.STATIC | Modifiers.PUBLIC,
 				name,
-				type,
+				value.type,
 				id);
+		result.value = value;
+		return result;
 	}
 	
 	private static ConstructorMember constructor(

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

@@ -18,18 +18,17 @@ import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.InterfaceCastExpression;
 import org.openzen.zenscript.codemodel.expression.MakeConstExpression;
 import org.openzen.zenscript.codemodel.expression.NullExpression;
-import org.openzen.zenscript.codemodel.expression.SameObjectExpression;
 import org.openzen.zenscript.codemodel.expression.SupertypeCastExpression;
 import org.openzen.zenscript.codemodel.expression.WrapOptionalExpression;
 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.DestructorMember;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
 import org.openzen.zenscript.codemodel.member.FieldMember;
-import org.openzen.zenscript.codemodel.member.ICallableMember;
-import org.openzen.zenscript.codemodel.member.ICasterMember;
-import org.openzen.zenscript.codemodel.member.IGettableMember;
+import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.IIteratorMember;
 import org.openzen.zenscript.codemodel.member.ImplementationMember;
 import org.openzen.zenscript.codemodel.member.InnerDefinition;
@@ -61,7 +60,7 @@ public final class TypeMembers {
 	private final LocalMemberCache cache;
 	public final ITypeID type;
 	
-	private final List<TypeMember<ICasterMember>> casters = new ArrayList<>();
+	private final List<TypeMember<CasterMember>> casters = new ArrayList<>();
 	private final List<TypeMember<ImplementationMember>> implementations = new ArrayList<>();
 	private final List<TypeMember<IIteratorMember>> iterators = new ArrayList<>();
 	
@@ -72,6 +71,9 @@ public final class TypeMembers {
 	private final Map<OperatorType, DefinitionMemberGroup> operators = new HashMap<>();
 	
 	public TypeMembers(LocalMemberCache cache, ITypeID type) {
+		if (type == null)
+			throw new NullPointerException("Type must not be null!");
+		
 		this.cache = cache;
 		this.type = type;
 	}
@@ -174,6 +176,11 @@ public final class TypeMembers {
 		casters.add(new TypeMember<>(priority, caster));
 	}
 	
+	public void addConst(ConstMember member) {
+		DefinitionMemberGroup group = getOrCreateGroup(member.name, true);
+		group.setConst(member, TypeMemberPriority.SPECIFIED);
+	}
+	
 	public void addField(FieldMember member) {
 		addField(member, TypeMemberPriority.SPECIFIED);
 	}
@@ -183,12 +190,12 @@ public final class TypeMembers {
 		group.setField(member, priority);
 	}
 	
-	public void addGetter(IGettableMember member) {
+	public void addGetter(GetterMember member) {
 		addGetter(member, TypeMemberPriority.SPECIFIED);
 	}
 	
-	public void addGetter(IGettableMember member, TypeMemberPriority priority) {
-		DefinitionMemberGroup group = getOrCreateGroup(member.getName(), member.isStatic());
+	public void addGetter(GetterMember member, TypeMemberPriority priority) {
+		DefinitionMemberGroup group = getOrCreateGroup(member.name, member.isStatic());
 		group.setGetter(member, priority);
 	}
 	
@@ -223,7 +230,7 @@ public final class TypeMembers {
 		group.addMethod(member, priority);
 	}
 	
-	public void addOperator(OperatorType operator, ICallableMember member, TypeMemberPriority priority) {
+	public void addOperator(OperatorType operator, FunctionalMember member, TypeMemberPriority priority) {
 		DefinitionMemberGroup group = getOrCreateGroup(operator);
 		group.addMethod(member, priority);
 	}
@@ -290,14 +297,14 @@ public final class TypeMembers {
 	public Expression compare(CodePosition position, TypeScope scope, CompareType operator, Expression left, Expression right) {
 		if (operator == CompareType.EQ) {
 			DefinitionMemberGroup equal = getOrCreateGroup(OperatorType.EQUALS);
-			for (TypeMember<ICallableMember> member : equal.getMethodMembers()) {
-				if (member.member.getHeader().accepts(scope, right))
+			for (TypeMember<FunctionalMember> member : equal.getMethodMembers()) {
+				if (member.member.header.accepts(scope, right))
 					return equal.call(position, scope, left, new CallArguments(right), false);
 			}
 		} else if (operator == CompareType.NE) {
 			DefinitionMemberGroup equal = getOrCreateGroup(OperatorType.NOTEQUALS);
-			for (TypeMember<ICallableMember> member : equal.getMethodMembers()) {
-				if (member.member.getHeader().accepts(scope, right)) {
+			for (TypeMember<FunctionalMember> member : equal.getMethodMembers()) {
+				if (member.member.header.accepts(scope, right)) {
 					return equal.call(position, scope, left, new CallArguments(right), false);
 				}
 			}
@@ -350,7 +357,7 @@ public final class TypeMembers {
 		if (type.isOptional() && type.unwrap() == toType)
 			return true;
 		
-		for (TypeMember<ICasterMember> caster : casters) {
+		for (TypeMember<CasterMember> caster : casters) {
 			if (caster.member.isImplicit() && toType == caster.member.getTargetType())
 				return true;
 		}
@@ -362,7 +369,7 @@ public final class TypeMembers {
 		if (canCastImplicit(toType))
 			return true;
 		
-		for (TypeMember<ICasterMember> caster : casters) {
+		for (TypeMember<CasterMember> caster : casters) {
 			if (toType == caster.member.getTargetType())
 				return true;
 		}
@@ -385,7 +392,7 @@ public final class TypeMembers {
 		if (type.isOptional() && type.unwrap() == toType)
 			return new CheckNullExpression(position, value);
 		
-		for (TypeMember<ICasterMember> caster : casters) {
+		for (TypeMember<CasterMember> caster : casters) {
 			if (caster.member.isImplicit() && toType == caster.member.getTargetType())
 				return caster.member.cast(position, value, implicit);
 		}
@@ -403,7 +410,7 @@ public final class TypeMembers {
 		if (this.canCastImplicit(toType))
 			return castImplicit(position, value, toType, false);
 		
-		for (TypeMember<ICasterMember> caster : casters)
+		for (TypeMember<CasterMember> caster : casters)
 			if (toType == caster.member.getTargetType())
 				return caster.member.cast(position, value, false);
 		

CompilerShared/build.gradle

@@ -16,5 +16,5 @@ if (!hasProperty('mainClass')) {
 dependencies {
 	compile 'org.json:json:20180130'
 	compile project(':CodeModel')
-	compile project(':Linker')
+	compile project(':Validator')
 }

CompilerShared/src/main/java/org/openzen/zenscript/compiler/CompileScope.java

@@ -5,8 +5,11 @@
  */
 package org.openzen.zenscript.compiler;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import org.openzen.zenscript.codemodel.AccessScope;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
@@ -22,11 +25,16 @@ public class CompileScope implements TypeScope {
 	private final GlobalTypeRegistry globalRegistry;
 	private final List<ExpansionDefinition> expansions;
 	private final LocalMemberCache cache;
+	private final Map<String, AnnotationDefinition> annotations = new HashMap<>();
 	
-	public CompileScope(AccessScope access, GlobalTypeRegistry globalRegistry, List<ExpansionDefinition> expansions) {
+	public CompileScope(AccessScope access, GlobalTypeRegistry globalRegistry, List<ExpansionDefinition> expansions, List<AnnotationDefinition> annotations) {
 		this.globalRegistry = globalRegistry;
 		this.expansions = expansions;
 		this.cache = new LocalMemberCache(access, globalRegistry, expansions);
+		
+		for (AnnotationDefinition annotation : annotations) {
+			this.annotations.put(annotation.getAnnotationName(), annotation);
+		}
 	}
 
 	@Override
@@ -43,4 +51,9 @@ public class CompileScope implements TypeScope {
 	public TypeMembers getTypeMembers(ITypeID type) {
 		return cache.get(type);
 	}
+
+	@Override
+	public AnnotationDefinition getAnnotation(String name) {
+		return annotations.get(name);
+	}
 }

CompilerShared/src/main/java/org/openzen/zenscript/compiler/SemanticModule.java

@@ -5,15 +5,20 @@
  */
 package org.openzen.zenscript.compiler;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.PackageDefinitions;
 import org.openzen.zenscript.codemodel.ScriptBlock;
+import org.openzen.zenscript.codemodel.annotations.AnnotationProcessor;
 import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
-import org.openzen.zenscript.linker.symbol.ISymbol;
+import org.openzen.zenscript.codemodel.type.ISymbol;
+import org.openzen.zenscript.validator.ValidationLogEntry;
+import org.openzen.zenscript.validator.Validator;
 
 /**
  *
@@ -23,38 +28,97 @@ public class SemanticModule {
 	public final String name;
 	public final String[] dependencies;
 	
-	public final boolean isValid;
-	public final ZSPackage pkg;
+	private State state;
+	public final ZSPackage rootPackage;
+	public final ZSPackage modulePackage;
 	public final PackageDefinitions definitions;
 	public final List<ScriptBlock> scripts;
 	public final Map<String, ISymbol> globals = new HashMap<>();
 	
 	public final CompilationUnit compilationUnit;
 	public final List<ExpansionDefinition> expansions;
+	public final List<AnnotationDefinition> annotations;
 	
 	public SemanticModule(
 			String name,
 			String[] dependencies,
-			boolean isValid,
-			ZSPackage pkg,
+			State state,
+			ZSPackage rootPackage,
+			ZSPackage modulePackage,
 			PackageDefinitions definitions,
 			List<ScriptBlock> scripts,
 			CompilationUnit compilationUnit,
-			List<ExpansionDefinition> expansions)
+			List<ExpansionDefinition> expansions,
+			List<AnnotationDefinition> annotations)
 	{
 		this.name = name;
 		this.dependencies = dependencies;
 		
-		this.isValid = isValid;
-		this.pkg = pkg;
+		this.state = state;
+		this.rootPackage = rootPackage;
+		this.modulePackage = modulePackage;
 		this.definitions = definitions;
 		this.scripts = scripts;
 		
 		this.compilationUnit = compilationUnit;
 		this.expansions = expansions;
+		this.annotations = annotations;
+	}
+	
+	public boolean isValid() {
+		return state != State.INVALID;
+	}
+	
+	public SemanticModule normalize() {
+		if (state != State.SEMANTIC)
+			throw new IllegalStateException("Module is invalid");
+		
+		AnnotationProcessor annotationProcessor = new AnnotationProcessor(rootPackage, definitions, compilationUnit.globalTypeRegistry, expansions, annotations);
+		List<ScriptBlock> processedScripts = new ArrayList<>();
+		for (ScriptBlock block : scripts)
+			processedScripts.add(annotationProcessor.process(block));
+		for (HighLevelDefinition definition : definitions.getAll())
+			annotationProcessor.process(definition);
+		
+		return new SemanticModule(
+				name,
+				dependencies,
+				State.NORMALIZED,
+				rootPackage,
+				modulePackage,
+				definitions,
+				processedScripts,
+				compilationUnit,
+				expansions,
+				annotations);
+	}
+	
+	public boolean validate() {
+		if (state != State.NORMALIZED)
+			throw new IllegalStateException("Module is not yet normalized");
+		
+		Validator validator = new Validator();
+		boolean isValid = true;
+		for (ScriptBlock script : scripts) {
+			isValid &= validator.validate(script);
+		}
+		for (HighLevelDefinition definition : definitions.getAll()) {
+			isValid &= validator.validate(definition);
+		}
+		
+		for (ValidationLogEntry entry : validator.getLog()) {
+			System.out.println(entry.kind + " " + entry.position.toString() + ": " + entry.message);
+		}
+		state = isValid ? State.VALIDATED : State.INVALID;
+		if (!isValid && validator.getLog().isEmpty())
+			System.out.println("ERROR: module is invalid but no errors have been generated");
+		return isValid;
 	}
 	
 	public void compile(ZenCodeCompiler compiler) {
+		if (state != State.VALIDATED)
+			throw new IllegalStateException("Module is not yet validated");
+		
 		for (HighLevelDefinition definition : definitions.getAll()) {
 			compiler.addDefinition(definition, this);
 		}
@@ -63,4 +127,11 @@ public class SemanticModule {
 		}
 		compiler.finish();
 	}
+	
+	public enum State {
+		INVALID,
+		SEMANTIC,
+		NORMALIZED,
+		VALIDATED
+	}
 }

Constructor/build.gradle

@@ -17,7 +17,6 @@ dependencies {
 	compile 'org.json:json:20180130'
 	compile project(':CodeModel')
 	compile project(':Parser')
-	compile project(':Linker')
 	compile project(':Validator')
 	compile project(':CompilerShared')
 	compile project(':JavaBytecodeCompiler')

Constructor/libraries/stdlib/module.json

@@ -8,6 +8,7 @@
 		"IllegalArgumentException": {"type": "Definition", "definition": "IllegalArgumentException"},
 		"StringBuilder": {"type": "Definition", "definition": "StringBuilder"},
 		"StringBuildable": {"type": "Definition", "definition": "StringBuildable"},
-		"panic": {"type": "Definition", "definition": "panic"}
+		"panic": {"type": "Definition", "definition": "panic"},
+		"Result": {"type": "Definition", "definition": "Result"}
 	}
 }

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

@@ -16,18 +16,15 @@ import java.util.Map;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.json.JSONTokener;
-import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.PackageDefinitions;
 import org.openzen.zenscript.codemodel.ScriptBlock;
 import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.constructor.module.ModuleSpace;
 import org.openzen.zenscript.compiler.SemanticModule;
-import org.openzen.zenscript.linker.symbol.ISymbol;
+import org.openzen.zenscript.codemodel.type.ISymbol;
 import org.openzen.zenscript.parser.ParsedFile;
 import org.openzen.zenscript.shared.CompileException;
-import org.openzen.zenscript.validator.ValidationLogEntry;
-import org.openzen.zenscript.validator.Validator;
 
 /**
  *
@@ -107,7 +104,7 @@ public class Module {
 			// respective definitions, such as fields, constructors, methods...
 			// It doesn't yet compile the method contents.
 			try {
-				file.compileTypes(rootPackage, pkg, definitions, registry.compilationUnit.globalTypeRegistry, expansions, globals);
+				file.compileTypes(rootPackage, pkg, definitions, registry.compilationUnit.globalTypeRegistry, expansions, globals, registry.getAnnotations());
 			} catch (CompileException ex) {
 				System.out.println(ex.getMessage());
 				failed = true;
@@ -115,14 +112,14 @@ public class Module {
 		}
 		
 		if (failed)
-			return new SemanticModule(name, dependencies, false, pkg, definitions, Collections.emptyList(), registry.compilationUnit, expansions);
+			return new SemanticModule(name, dependencies, SemanticModule.State.INVALID, rootPackage, pkg, definitions, Collections.emptyList(), registry.compilationUnit, expansions, registry.getAnnotations());
 		
 		for (ParsedFile file : files) {
 			// compileMembers will register all definition members to their
 			// respective definitions, such as fields, constructors, methods...
 			// It doesn't yet compile the method contents.
 			try {
-				file.compileMembers(rootPackage, pkg, definitions, registry.compilationUnit.globalTypeRegistry, expansions, globals);
+				file.compileMembers(rootPackage, pkg, definitions, registry.compilationUnit.globalTypeRegistry, expansions, globals, registry.getAnnotations());
 			} catch (CompileException ex) {
 				System.out.println(ex.getMessage());
 				failed = true;
@@ -130,7 +127,7 @@ public class Module {
 		}
 		
 		if (failed)
-			return new SemanticModule(name, dependencies, false, pkg, definitions, Collections.emptyList(), registry.compilationUnit, expansions);
+			return new SemanticModule(name, dependencies, SemanticModule.State.INVALID, rootPackage, pkg, definitions, Collections.emptyList(), registry.compilationUnit, expansions, registry.getAnnotations());
 		
 		// scripts will store all the script blocks encountered in the files
 		List<ScriptBlock> scripts = new ArrayList<>();
@@ -139,29 +136,13 @@ public class Module {
 			// into semantic code. This semantic code can then be compiled
 			// to various targets.
 			try {
-				file.compileCode(rootPackage, pkg, definitions, registry.compilationUnit.globalTypeRegistry, expansions, scripts, globals);
+				file.compileCode(rootPackage, pkg, definitions, registry.compilationUnit.globalTypeRegistry, expansions, scripts, globals, registry.getAnnotations());
 			} catch (CompileException ex) {
 				System.out.println(ex.getMessage());
 				failed = true;
 			}
 		}
 		
-		if (failed)
-			return new SemanticModule(name, dependencies, false, pkg, definitions, Collections.emptyList(), registry.compilationUnit, expansions);
-		
-		Validator validator = new Validator();
-		boolean isValid = true;
-		for (ScriptBlock script : scripts) {
-			isValid &= validator.validate(script);
-		}
-		for (HighLevelDefinition definition : definitions.getAll()) {
-			isValid &= validator.validate(definition);
-		}
-		
-		for (ValidationLogEntry entry : validator.getLog()) {
-			System.out.println(entry.kind + " " + entry.position.toString() + ": " + entry.message);
-		}
-		
-		return new SemanticModule(name, dependencies, isValid, pkg, definitions, scripts, registry.compilationUnit, expansions);
+		return new SemanticModule(name, dependencies, SemanticModule.State.SEMANTIC, rootPackage, pkg, definitions, Collections.emptyList(), registry.compilationUnit, expansions, registry.getAnnotations());
 	}
 }

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

@@ -18,7 +18,7 @@ import org.openzen.zenscript.constructor.ConstructorException;
 import org.openzen.zenscript.constructor.JSONUtils;
 import org.openzen.zenscript.constructor.Module;
 import org.openzen.zenscript.constructor.ModuleLoader;
-import org.openzen.zenscript.linker.symbol.TypeSymbol;
+import org.openzen.zenscript.codemodel.type.TypeSymbol;
 import org.openzen.zenscript.parser.ParsedFile;
 
 /**
@@ -72,7 +72,7 @@ public class DirectoryModuleLoader implements ModuleReference {
 				space.addModule(dependencyName, loader.getModule(dependencyName));
 
 			Module module = new Module(moduleName, directory, jsonFile);
-			ZSPackage pkg = new ZSPackage(null, module.packageName);
+			ZSPackage pkg = isStdlib ? unit.globalTypeRegistry.stdlib : new ZSPackage(null, module.packageName);
 
 			ParsedFile[] parsedFiles = module.parse(pkg);
 			SemanticModule result = Module.compileSyntaxToSemantic(module.name, module.dependencies, pkg, parsedFiles, space);

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

@@ -10,29 +10,40 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
+import org.openzen.zenscript.codemodel.annotations.NativeAnnotationDefinition;
+import org.openzen.zenscript.codemodel.annotations.PreconditionAnnotationDefinition;
 import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.compiler.CompilationUnit;
 import org.openzen.zenscript.constructor.ConstructorException;
-import org.openzen.zenscript.linker.symbol.ISymbol;
+import org.openzen.zenscript.codemodel.type.ISymbol;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class ModuleSpace {
+public final class ModuleSpace {
 	private final ZSPackage rootPackage = new ZSPackage(null, "");
 	public final CompilationUnit compilationUnit;
 	public final ZSPackage globalsPackage = new ZSPackage(null, "");
 	private final List<ExpansionDefinition> expansions = new ArrayList<>();
 	private final Map<String, ISymbol> globals = new HashMap<>();
+	private final List<AnnotationDefinition> annotations = new ArrayList<>();
 	
 	public ModuleSpace(CompilationUnit compilationUnit) {
 		this.compilationUnit = compilationUnit;
+		
+		addAnnotation(NativeAnnotationDefinition.INSTANCE);
+		addAnnotation(PreconditionAnnotationDefinition.INSTANCE);
+	}
+	
+	public void addAnnotation(AnnotationDefinition annotation) {
+		annotations.add(annotation);
 	}
 	
 	public void addModule(String name, SemanticModule dependency) {
-		rootPackage.add(name, dependency.pkg);
+		rootPackage.add(name, dependency.modulePackage);
 		dependency.definitions.registerExpansionsTo(expansions);
 		
 		for (Map.Entry<String, ISymbol> globalEntry : dependency.globals.entrySet()) {
@@ -54,4 +65,8 @@ public class ModuleSpace {
 	public Map<String, ISymbol> collectGlobals() {
 		return globals;
 	}
+	
+	public List<AnnotationDefinition> getAnnotations() {
+		return annotations;
+	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/host/local/LocalTarget.java

@@ -77,10 +77,24 @@ public class LocalTarget implements IDETarget {
 			}
 			
 			SemanticModule module = moduleLoader.getModule(target.getModule());
+			module = module.normalize();
+			module.validate();
+			
 			ZenCodeCompiler compiler = target.createCompiler(module);
-			moduleLoader.getModule("stdlib").compile(compiler);
+			if (!module.isValid())
+				return compiler;
+			
+			SemanticModule stdlib = moduleLoader.getModule("stdlib");
+			stdlib = stdlib.normalize();
+			stdlib.validate();
+			if (!stdlib.isValid())
+				return compiler;
+			stdlib.compile(compiler);
+			
+			boolean isValid = compileDependencies(moduleLoader, compiler, compiledModules, module);
+			if (!isValid)
+				return compiler;
 			
-			compileDependencies(moduleLoader, compiler, compiledModules, module);
 			module.compile(compiler);
 			return compiler;
 		} catch (IOException ex) {
@@ -89,15 +103,24 @@ public class LocalTarget implements IDETarget {
 		}
 	}
 	
-	private void compileDependencies(ModuleLoader loader, ZenCodeCompiler compiler, Set<String> compiledModules, SemanticModule module) {
+	private boolean compileDependencies(ModuleLoader loader, ZenCodeCompiler compiler, Set<String> compiledModules, SemanticModule module) {
 		for (String dependency : module.dependencies) {
 			if (compiledModules.contains(module.name))
 				continue;
 			
 			SemanticModule dependencyModule = loader.getModule(dependency);
-			compileDependencies(loader, compiler, compiledModules, dependencyModule);
+			module = module.normalize();
+			module.validate();
+			if (!module.isValid())
+				return false;
+			
+			if (!compileDependencies(loader, compiler, compiledModules, dependencyModule))
+				return false;
+			
 			module.compile(compiler);
 			compiledModules.add(module.name);
 		}
+		
+		return true;
 	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/WindowView.java

@@ -5,13 +5,10 @@
  */
 package org.openzen.zenscript.ide.ui.view;
 
-import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
-import org.openzen.drawablegui.DDrawable;
 import org.openzen.drawablegui.DEmptyView;
 import org.openzen.drawablegui.scroll.DScrollPane;
 import org.openzen.drawablegui.DSideLayout;
-import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.tree.DTreeView;
 import org.openzen.drawablegui.tree.DTreeViewStyle;

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

@@ -1342,6 +1342,96 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
         javaWriter.label(end);
         return null;
     }
+	
+	@Override
+	public Void visitConst(ConstExpression expression) {
+		BuiltinID builtin = expression.constant.builtin;
+		if (builtin == null) {
+			if (!checkAndGetFieldInfo(expression.constant, true))
+	            throw new IllegalStateException("Call target has no field info!");
+			
+			return null;
+		}
+		
+		switch (builtin) {
+			case BYTE_GET_MIN_VALUE:
+				javaWriter.iConst0();
+				break;
+			case BYTE_GET_MAX_VALUE:
+				javaWriter.constant(0xFF);
+				break;
+			case SBYTE_GET_MIN_VALUE:
+				javaWriter.getStaticField(BYTE_MIN_VALUE);
+				break;
+			case SBYTE_GET_MAX_VALUE:
+				javaWriter.getStaticField(BYTE_MAX_VALUE);
+				break;
+			case SHORT_GET_MIN_VALUE:
+				javaWriter.getStaticField(SHORT_MIN_VALUE);
+				break;
+			case SHORT_GET_MAX_VALUE:
+				javaWriter.getStaticField(SHORT_MAX_VALUE);
+				break;
+			case USHORT_GET_MIN_VALUE:
+				javaWriter.iConst0();
+				break;
+			case USHORT_GET_MAX_VALUE:
+				javaWriter.constant(0xFFFF);
+				break;
+			case INT_GET_MIN_VALUE:
+				javaWriter.getStaticField(INTEGER_MIN_VALUE);
+				break;
+			case INT_GET_MAX_VALUE:
+				javaWriter.getStaticField(INTEGER_MAX_VALUE);
+				break;
+			case UINT_GET_MIN_VALUE:
+				javaWriter.iConst0();
+				break;
+			case UINT_GET_MAX_VALUE:
+				javaWriter.constant(-1);
+				break;
+			case LONG_GET_MIN_VALUE:
+				javaWriter.getStaticField(LONG_MIN_VALUE);
+				break;
+			case LONG_GET_MAX_VALUE:
+				javaWriter.getStaticField(LONG_MAX_VALUE);
+				break;
+			case ULONG_GET_MIN_VALUE:
+				javaWriter.iConst0();
+				break;
+			case ULONG_GET_MAX_VALUE:
+				javaWriter.constant(-1L);
+				break;
+			case FLOAT_GET_MIN_VALUE:
+				javaWriter.getStaticField(FLOAT_MIN_VALUE);
+				break;
+			case FLOAT_GET_MAX_VALUE:
+				javaWriter.getStaticField(FLOAT_MAX_VALUE);
+				break;
+			case DOUBLE_GET_MIN_VALUE:
+				javaWriter.getStaticField(DOUBLE_MIN_VALUE);
+				break;
+			case DOUBLE_GET_MAX_VALUE:
+				javaWriter.getStaticField(DOUBLE_MAX_VALUE);
+				break;
+			case CHAR_GET_MIN_VALUE:
+				javaWriter.getStaticField(CHARACTER_MIN_VALUE);
+				break;
+			case CHAR_GET_MAX_VALUE:
+				javaWriter.getStaticField(CHARACTER_MAX_VALUE);
+				break;
+			case ENUM_VALUES: {
+				DefinitionTypeID type = (DefinitionTypeID) expression.type;
+				JavaClassInfo cls = type.definition.getTag(JavaClassInfo.class);
+				javaWriter.invokeStatic(new JavaMethodInfo(cls, "values", "()[L" + cls.internalClassName + ";", PUBLIC_STATIC));
+				break;
+			}
+			default:
+				throw new UnsupportedOperationException("Unknown builtin: " + builtin);
+		}
+		
+		return null;
+	}
 
     @Override
     public Void visitConstantBool(ConstantBoolExpression expression) {
@@ -1354,7 +1444,7 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 
     @Override
     public Void visitConstantByte(ConstantByteExpression expression) {
-        getJavaWriter().biPush(expression.value);
+        getJavaWriter().constant(expression.value);
         return null;
     }
 
@@ -1973,7 +2063,7 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 				throw new UnsupportedOperationException("Unknown builtin: " + builtin);
 		}
 		
-        return null;
+		throw new UnsupportedOperationException("Unknown builtin: " + builtin);
     }
 
     @Override

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

@@ -20,6 +20,7 @@ import org.openzen.zenscript.codemodel.expression.CastExpression;
 import org.openzen.zenscript.codemodel.expression.CheckNullExpression;
 import org.openzen.zenscript.codemodel.expression.CoalesceExpression;
 import org.openzen.zenscript.codemodel.expression.ConditionalExpression;
+import org.openzen.zenscript.codemodel.expression.ConstExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantBoolExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantByteExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantCharExpression;
@@ -156,6 +157,11 @@ public class JavaPreDecrementVisitor implements ExpressionVisitor<Void> {
 	public Void visitConditional(ConditionalExpression expression) {
 		throw new UnsupportedOperationException("Invalid increment target");
 	}
+	
+	@Override
+	public Void visitConst(ConstExpression expression) {
+		throw new UnsupportedOperationException("Invalid increment target");
+	}
 
 	@Override
 	public Void visitConstantBool(ConstantBoolExpression expression) {

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

@@ -20,6 +20,7 @@ import org.openzen.zenscript.codemodel.expression.CastExpression;
 import org.openzen.zenscript.codemodel.expression.CheckNullExpression;
 import org.openzen.zenscript.codemodel.expression.CoalesceExpression;
 import org.openzen.zenscript.codemodel.expression.ConditionalExpression;
+import org.openzen.zenscript.codemodel.expression.ConstExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantBoolExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantByteExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantCharExpression;
@@ -156,6 +157,11 @@ public class JavaPreIncrementVisitor implements ExpressionVisitor<Void> {
 	public Void visitConditional(ConditionalExpression expression) {
 		throw new UnsupportedOperationException("Invalid increment target");
 	}
+	
+	@Override
+	public Void visitConst(ConstExpression expression) {
+		throw new UnsupportedOperationException("Invalid increment target");
+	}
 
 	@Override
 	public Void visitConstantBool(ConstantBoolExpression expression) {

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

@@ -19,7 +19,6 @@ import org.openzen.zenscript.javabytecode.compiler.*;
 import java.util.List;
 
 public class JavaMemberVisitor implements MemberVisitor<Void> {
-
     private final ClassWriter writer;
     private final JavaClassInfo toClass;
     private final HighLevelDefinition definition;
@@ -36,6 +35,16 @@ public class JavaMemberVisitor implements MemberVisitor<Void> {
         this.clinitStatementVisitor.start();
         CompilerUtils.writeDefaultFieldInitializers(javaWriter, definition, true);
     }
+	
+	@Override
+	public Void visitConst(ConstMember member) {
+        //TODO calc signature
+        String signature = null;
+        final String descriptor = Type.getDescriptor(member.type.accept(JavaTypeClassVisitor.INSTANCE));
+        writer.visitField(CompilerUtils.calcAccess(member.modifiers), member.name, descriptor, signature, null).visitEnd();
+        member.setTag(JavaFieldInfo.class, new JavaFieldInfo(toClass, member.name, descriptor));
+        return null;
+	}
 
     @Override
     public Void visitField(FieldMember member) {