- Added destructors

- Added === and !== operator support
- Fixed some cases where arguments aren't casted properly during call
- Continued some work on stdlib

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

@@ -56,6 +56,7 @@ import org.openzen.zenscript.codemodel.expression.NullExpression;
 import org.openzen.zenscript.codemodel.expression.OrOrExpression;
 import org.openzen.zenscript.codemodel.expression.PostCallExpression;
 import org.openzen.zenscript.codemodel.expression.RangeExpression;
+import org.openzen.zenscript.codemodel.expression.SameObjectExpression;
 import org.openzen.zenscript.codemodel.expression.SetFieldExpression;
 import org.openzen.zenscript.codemodel.expression.SetFunctionParameterExpression;
 import org.openzen.zenscript.codemodel.expression.SetLocalVariableExpression;
@@ -63,6 +64,7 @@ import org.openzen.zenscript.codemodel.expression.SetStaticFieldExpression;
 import org.openzen.zenscript.codemodel.expression.SetterExpression;
 import org.openzen.zenscript.codemodel.expression.StaticGetterExpression;
 import org.openzen.zenscript.codemodel.expression.StaticSetterExpression;
+import org.openzen.zenscript.codemodel.expression.SupertypeCastExpression;
 import org.openzen.zenscript.codemodel.expression.ThisExpression;
 import org.openzen.zenscript.codemodel.expression.WrapOptionalExpression;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
@@ -532,6 +534,11 @@ public class ExpressionFormatter implements ExpressionVisitor<ExpressionString>
 	public ExpressionString visitRange(RangeExpression expression) {
 		return binary(expression.from, expression.to, OperatorPriority.RANGE, " .. ");
 	}
+	
+	@Override
+	public ExpressionString visitSameObject(SameObjectExpression expression) {
+		return binary(expression.left, expression.right, OperatorPriority.COMPARE, expression.inverted ? " !== " : " === ");
+	}
 
 	@Override
 	public ExpressionString visitSetField(SetFieldExpression expression) {
@@ -581,6 +588,11 @@ public class ExpressionFormatter implements ExpressionVisitor<ExpressionString>
 				expression.type.accept(typeFormatter) + "." + expression.setter.name + " = " + expression.setter.name,
 				OperatorPriority.ASSIGN);
 	}
+	
+	@Override
+	public ExpressionString visitSupertypeCast(SupertypeCastExpression expression) {
+		return expression.value.accept(this);
+	}
 
 	@Override
 	public ExpressionString visitThis(ThisExpression expression) {

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

@@ -10,6 +10,7 @@ import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 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;
@@ -81,6 +82,15 @@ public class MemberFormatter implements MemberVisitor<Void> {
 		return null;
 	}
 
+	@Override
+	public Void visitDestructor(DestructorMember member) {
+		visit(false);
+		FormattingUtils.formatModifiers(output, member.modifiers & ~Modifiers.FINAL);
+		output.append("this");
+		formatBody(member.body);
+		return null;
+	}
+
 	@Override
 	public Void visitMethod(MethodMember member) {
 		visit(false);

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

@@ -27,7 +27,6 @@ import org.openzen.zenscript.codemodel.statement.ThrowStatement;
 import org.openzen.zenscript.codemodel.statement.TryCatchStatement;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.codemodel.statement.WhileStatement;
-import org.openzen.zenscript.codemodel.type.BasicTypeID;
 
 /**
  *
@@ -252,12 +251,8 @@ public class StatementFormatter implements StatementVisitor<Void> {
 		
 		for (CatchClause catchClause : statement.catchClauses) {
 			output.append(indent).append("catch ");
-			if (catchClause.exceptionName != null)
-				output.append(catchClause.exceptionName);
-			if (catchClause.exceptionType != BasicTypeID.ANY) {
-				output.append(" as ");
-				catchClause.exceptionType.accept(expressionFormatter.typeFormatter);
-			}
+			if (catchClause.exceptionVariable != null)
+				output.append(catchClause.exceptionVariable.name).append(" as ").append(catchClause.exceptionVariable.type.accept(expressionFormatter.typeFormatter));
 			
 			format(ParentStatementType.CATCH, catchClause.content);
 		}

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

@@ -237,7 +237,7 @@ public class FunctionHeader {
 		if (this.parameters.length != arguments.arguments.length)
 			return parameters.length + " parameters expected but " + arguments.arguments.length + " given.";
 		
-		if (typeParameters.length != arguments.typeArguments.length)
+		if (getNumberOfTypeParameters() != arguments.getNumberOfTypeArguments())
 			return typeParameters.length + " type parameters expected but " + arguments.typeArguments.length + " given.";
 		
 		for (int i = 0; i < parameters.length; i++) {

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

@@ -47,6 +47,7 @@ public enum OperatorType {
 	RANGE("..", "rangeTo"),
 	
 	CONSTRUCTOR("this", "construct"),
+	DESTRUCTOR("~this", "destruct"),
 	CALL("()", "call"),
 	CAST("as", "cast");
 	

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.zenscript.codemodel.definition;
 
-import java.util.List;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
@@ -24,10 +23,11 @@ public class FunctionDefinition extends HighLevelDefinition {
 	public FunctionHeader header;
 	public Statement statement;
 	public OperatorMember caller;
-	public DefinitionMemberGroup callerGroup = new DefinitionMemberGroup(true);
+	public final DefinitionMemberGroup callerGroup;
 	
 	public FunctionDefinition(CodePosition position, ZSPackage pkg, String name, int modifiers, HighLevelDefinition outerDefinition) {
 		super(position, pkg, name, modifiers, outerDefinition);
+		callerGroup = new DefinitionMemberGroup(true, name);
 	}
 	
 	public FunctionDefinition(CodePosition position, ZSPackage pkg, String name, int modifiers, FunctionHeader header) {

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

@@ -5,7 +5,13 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import java.util.Arrays;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.CompileException;
+import org.openzen.zenscript.shared.CompileExceptionCode;
 
 /**
  *
@@ -36,4 +42,23 @@ public class CallArguments {
 	public int getNumberOfTypeArguments() {
 		return typeArguments.length;
 	}
+	
+	public CallArguments normalize(CodePosition position, TypeScope scope, FunctionHeader header) {
+		CallArguments result = this;
+		
+		for (int i = 0; i < arguments.length; i++) {
+			arguments[i] = arguments[i].castImplicit(position, scope, header.parameters[i].type);
+		}
+		
+		if (arguments.length < header.parameters.length) {
+			Expression[] newArguments = Arrays.copyOf(arguments, header.parameters.length);
+			for (int i = arguments.length; i < header.parameters.length; i++) {
+				if (header.parameters[i].defaultValue == null)
+					throw new CompileException(position, CompileExceptionCode.MISSING_PARAMETER, "Parameter missing and no default value specified");
+				newArguments[i] = header.parameters[i].defaultValue;
+			}
+			result = new CallArguments(typeArguments, newArguments);
+		}
+		return result;
+	}
 }

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

@@ -5,12 +5,10 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
-import java.util.Arrays;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.shared.CodePosition;
-import org.openzen.zenscript.shared.CompileException;
-import org.openzen.zenscript.shared.CompileExceptionCode;
 
 /**
  *
@@ -22,22 +20,12 @@ public class CallExpression extends Expression {
 	public final CallArguments arguments;
 	public final FunctionHeader instancedHeader;
 	
-	public CallExpression(CodePosition position, Expression target, FunctionalMember member, FunctionHeader instancedHeader, CallArguments arguments) {
+	public CallExpression(CodePosition position, Expression target, FunctionalMember member, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		super(position, instancedHeader.returnType);
 		
-		if (arguments.arguments.length < instancedHeader.parameters.length) {
-			Expression[] newArguments = Arrays.copyOf(arguments.arguments, instancedHeader.parameters.length);
-			for (int i = arguments.arguments.length; i < instancedHeader.parameters.length; i++) {
-				if (instancedHeader.parameters[i].defaultValue == null)
-					throw new CompileException(position, CompileExceptionCode.MISSING_PARAMETER, "Parameter missing and no default value specified");
-				newArguments[i] = instancedHeader.parameters[i].defaultValue;
-			}
-			arguments = new CallArguments(arguments.typeArguments, newArguments);
-		}
-		
 		this.target = target;
 		this.member = member;
-		this.arguments = arguments;
+		this.arguments = arguments.normalize(position, scope, instancedHeader);
 		this.instancedHeader = instancedHeader;
 	}
 	

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

@@ -7,6 +7,7 @@ package org.openzen.zenscript.codemodel.expression;
 
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.shared.CodePosition;
 
@@ -20,12 +21,12 @@ public class CallStaticExpression extends Expression {
 	public final CallArguments arguments;
 	public final FunctionHeader instancedHeader;
 	
-	public CallStaticExpression(CodePosition position, ITypeID target, FunctionalMember member, CallArguments arguments, FunctionHeader instancedHeader) {
+	public CallStaticExpression(CodePosition position, ITypeID target, FunctionalMember member, CallArguments arguments, FunctionHeader instancedHeader, TypeScope scope) {
 		super(position, member.header.returnType);
 		
 		this.member = member;
 		this.target = target;
-		this.arguments = arguments;
+		this.arguments = arguments.normalize(position, scope, instancedHeader);
 		this.instancedHeader = instancedHeader;
 	}
 

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.codemodel.expression;
 
 import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.shared.CodePosition;
 
 /**
@@ -18,12 +19,14 @@ public interface CallTranslator {
 		public final Expression target;
 		public final FunctionHeader instancedHeader;
 		public final CallArguments arguments;
+		public final TypeScope scope;
 		
-		public Call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
+		public Call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 			this.position = position;
 			this.target = target;
 			this.instancedHeader = instancedHeader;
 			this.arguments = arguments;
+			this.scope = scope;
 		}
 	}
 	

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.codemodel.expression;
 
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.shared.CodePosition;
@@ -19,12 +20,12 @@ public class ConstructorSuperCallExpression extends Expression {
 	public final ConstructorMember constructor;
 	public final CallArguments arguments;
 	
-	public ConstructorSuperCallExpression(CodePosition position, ITypeID type, ConstructorMember constructor, CallArguments arguments) {
+	public ConstructorSuperCallExpression(CodePosition position, ITypeID type, ConstructorMember constructor, CallArguments arguments, TypeScope scope) {
 		super(position, BasicTypeID.VOID);
 		
 		this.objectType = type;
 		this.constructor = constructor;
-		this.arguments = arguments;
+		this.arguments = arguments.normalize(position, scope, constructor.header);
 	}
 
 	@Override

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.codemodel.expression;
 
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.shared.CodePosition;
@@ -19,9 +20,11 @@ public class ConstructorThisCallExpression extends Expression {
 	public final ConstructorMember constructor;
 	public final CallArguments arguments;
 	
-	public ConstructorThisCallExpression(CodePosition position, ITypeID type, ConstructorMember constructor, CallArguments arguments) {
+	public ConstructorThisCallExpression(CodePosition position, ITypeID type, ConstructorMember constructor, CallArguments arguments, TypeScope scope) {
 		super(position, BasicTypeID.VOID);
 		
+		arguments = arguments.normalize(position, scope, constructor.header);
+		
 		this.objectType = type;
 		this.constructor = constructor;
 		this.arguments = arguments;

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

@@ -106,6 +106,8 @@ public interface ExpressionVisitor<T> {
 	
 	public T visitRange(RangeExpression expression);
 	
+	public T visitSameObject(SameObjectExpression expression);
+	
 	public T visitSetField(SetFieldExpression expression);
 	
 	public T visitSetFunctionParameter(SetFunctionParameterExpression expression);
@@ -120,6 +122,8 @@ public interface ExpressionVisitor<T> {
 	
 	public T visitStaticSetter(StaticSetterExpression expression);
 	
+	public T visitSupertypeCast(SupertypeCastExpression expression);
+	
 	public T visitThis(ThisExpression expression);
 	
 	public T visitWrapOptional(WrapOptionalExpression expression);

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

@@ -8,8 +8,11 @@ package org.openzen.zenscript.codemodel.expression;
 import java.util.Collections;
 import java.util.List;
 import org.openzen.zenscript.codemodel.member.FieldMember;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.CompileException;
+import org.openzen.zenscript.shared.CompileExceptionCode;
 
 /**
  *
@@ -35,6 +38,11 @@ public class GetFieldExpression extends Expression {
 	public CapturedExpression capture(CodePosition position, LambdaClosure closure) {
 		return new CapturedDirectExpression(position, closure, this);
 	}
+	
+	@Override
+	public Expression assign(CodePosition position, TypeScope scope, Expression value) {
+		return new SetFieldExpression(position, target, field, value);
+	}
 
 	@Override
 	public <T> T accept(ExpressionVisitor<T> visitor) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/SameObjectExpression.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.expression;
+
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class SameObjectExpression extends Expression {
+	public final Expression left;
+	public final Expression right;
+	public final boolean inverted;
+	
+	public SameObjectExpression(CodePosition position, Expression left, Expression right, boolean inverted) {
+		super(position, BasicTypeID.BOOL);
+		
+		this.left = left;
+		this.right = right;
+		this.inverted = inverted;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitSameObject(this);
+	}
+}

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

@@ -0,0 +1,29 @@
+/*
+ * 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.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ * Using to cast a class type to a base type.
+ * 
+ * @author Hoofdgebruiker
+ */
+public class SupertypeCastExpression extends Expression {
+	public final Expression value;
+	
+	public SupertypeCastExpression(CodePosition position, Expression value, ITypeID type) {
+		super(position, type);
+		
+		this.value = value;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitSupertypeCast(this);
+	}
+}

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

@@ -16,6 +16,8 @@ import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
  * @author Hoofdgebruiker
  */
 public abstract class GenericParameterBound {
+	public abstract boolean isObjectType();
+	
 	public abstract <T> T accept(GenericParameterBoundVisitor<T> visitor);
 	
 	public abstract void registerMembers(LocalMemberCache cache, TypeMembers type);

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

@@ -45,4 +45,9 @@ public class ParameterSuperBound extends GenericParameterBound {
 	public <T> T accept(GenericParameterBoundVisitor<T> visitor) {
 		return visitor.visitSuper(this);
 	}
+
+	@Override
+	public boolean isObjectType() {
+		return true;
+	}
 }

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

@@ -45,4 +45,9 @@ public class ParameterTypeBound extends GenericParameterBound {
 	public <T> T accept(GenericParameterBoundVisitor<T> visitor) {
 		return visitor.visitType(this);
 	}
+
+	@Override
+	public boolean isObjectType() {
+		return true;
+	}
 }

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

@@ -37,6 +37,14 @@ public class TypeParameter {
 		bounds.add(bound);
 	}
 	
+	public boolean isObjectType() {
+		for (GenericParameterBound bound : bounds)
+			if (bound.isObjectType())
+				return true;
+		
+		return false;
+	}
+	
 	public boolean matches(LocalMemberCache cache, ITypeID type) {
 		for (GenericParameterBound bound : bounds) {
 			if (!bound.matches(cache, type))

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

@@ -23,6 +23,11 @@ public class CallerMember extends FunctionalMember {
 	public CallerMember(CodePosition position, HighLevelDefinition definition, int modifiers, FunctionHeader header) {
 		super(position, definition, modifiers, "()", header);
 	}
+	
+	@Override
+	public String getInformalName() {
+		return "caller";
+	}
 
 	@Override
 	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
@@ -31,7 +36,7 @@ public class CallerMember extends FunctionalMember {
 
 	@Override
 	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		return new CallerMember(position, definition, modifiers, header.instance(registry, mapping));
 	}
 
 	@Override

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

@@ -13,6 +13,7 @@ import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.CastExpression;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -31,6 +32,11 @@ public class CasterMember extends FunctionalMember implements ICasterMember {
 		
 		this.toType = toType;
 	}
+	
+	@Override
+	public String getInformalName() {
+		return "caster to " + toType.toString();
+	}
 
 	@Override
 	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
@@ -53,7 +59,7 @@ public class CasterMember extends FunctionalMember implements ICasterMember {
 	}
 
 	@Override
-	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
+	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		throw new UnsupportedOperationException("Cannot call a caster!");
 	}
 

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

@@ -43,6 +43,11 @@ public class ConstructorMember extends FunctionalMember {
 				firstExpression.expression instanceof ConstructorSuperCallExpression
 				|| firstExpression.expression instanceof ConstructorThisCallExpression);
 	}
+	
+	@Override
+	public String getInformalName() {
+		return "constructor";
+	}
 
 	@Override
 	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
@@ -52,7 +57,10 @@ public class ConstructorMember extends FunctionalMember {
 
 	@Override
 	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
-		return new ConstructorMember(position, definition, modifiers, header.instance(registry, mapping));
+		ConstructorMember result = new ConstructorMember(position, definition, modifiers, header.instance(registry, mapping));
+		if (definition.name.equals("NFAState"))
+			System.out.println("X");
+		return result;
 	}
 
 	@Override

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

@@ -0,0 +1,55 @@
+/*
+ * 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.FunctionHeader;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
+import org.openzen.zenscript.codemodel.type.member.TypeMembers;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DestructorMember extends FunctionalMember {
+	private static final FunctionHeader HEADER = new FunctionHeader(BasicTypeID.VOID);
+	
+	public DestructorMember(CodePosition position, HighLevelDefinition definition, int modifiers) {
+		super(position, definition, modifiers, "~this", HEADER);
+	}
+	
+	@Override
+	public String getInformalName() {
+		return "destructor";
+	}
+
+	@Override
+	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
+		if (priority == TypeMemberPriority.SPECIFIED)
+			type.addDestructor(this, priority);
+	}
+
+	@Override
+	public DefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
+		return this;
+	}
+
+	@Override
+	public String describe() {
+		return "destructor";
+	}
+
+	@Override
+	public <T> T accept(MemberVisitor<T> visitor) {
+		return visitor.visitDestructor(this);
+	}
+}

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

@@ -14,6 +14,7 @@ import org.openzen.zenscript.codemodel.expression.BasicCompareExpression;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -35,6 +36,11 @@ public class EqualsMember extends Taggable implements ICallableMember {
 		this.header = new FunctionHeader(BasicTypeID.BOOL, new FunctionParameter(type));
 	}
 	
+	@Override
+	public String getInformalName() {
+		return "equals operator";
+	}
+	
 	@Override
 	public boolean isStatic() {
 		return false;
@@ -46,22 +52,22 @@ public class EqualsMember extends Taggable implements ICallableMember {
 	}
 
 	@Override
-	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
+	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		return new BasicCompareExpression(position, target, arguments.arguments[0], CompareType.EQ);
 	}
 
 	@Override
-	public Expression callWithComparator(CodePosition position, CompareType operator, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
+	public Expression callWithComparator(CodePosition position, CompareType operator, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		throw new UnsupportedOperationException("Comparator not supported here");
 	}
 
 	@Override
-	public Expression callStatic(CodePosition position, ITypeID target, FunctionHeader instancedHeader, CallArguments arguments) {
+	public Expression callStatic(CodePosition position, ITypeID target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		throw new UnsupportedOperationException("Cannot be called statically");
 	}
 
 	@Override
-	public Expression callStaticWithComparator(CodePosition position, ITypeID target, CompareType operator, FunctionHeader instancedHeader, CallArguments arguments) {
+	public Expression callStaticWithComparator(CodePosition position, ITypeID target, CompareType operator, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		throw new UnsupportedOperationException("Cannot be called statically");
 	}
 

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

@@ -13,6 +13,7 @@ import org.openzen.zenscript.codemodel.expression.CallExpression;
 import org.openzen.zenscript.codemodel.expression.CallStaticExpression;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.GenericCompareExpression;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.shared.CodePosition;
@@ -43,26 +44,26 @@ public abstract class FunctionalMember extends DefinitionMember implements ICall
 	}
 
 	@Override
-	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
-		return new CallExpression(position, target, this, instancedHeader, arguments);
+	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
+		return new CallExpression(position, target, this, instancedHeader, arguments, scope);
 	}
 	
-	public final Expression call(CodePosition position, Expression target, CallArguments arguments) {
-		return call(position, target, header, arguments);
+	public final Expression call(CodePosition position, Expression target, CallArguments arguments, TypeScope scope) {
+		return call(position, target, header, arguments, scope);
 	}
 	
 	@Override
-	public Expression callWithComparator(CodePosition position, CompareType operator, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
-		return new GenericCompareExpression(position, call(position, target, instancedHeader, arguments), operator);
+	public Expression callWithComparator(CodePosition position, CompareType operator, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
+		return new GenericCompareExpression(position, call(position, target, instancedHeader, arguments, scope), operator);
 	}
 	
 	@Override
-	public Expression callStatic(CodePosition position, ITypeID target, FunctionHeader instancedHeader, CallArguments arguments) {
-		return new CallStaticExpression(position, target, this, arguments, instancedHeader);
+	public Expression callStatic(CodePosition position, ITypeID target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
+		return new CallStaticExpression(position, target, this, arguments, instancedHeader, scope);
 	}
 	
 	@Override
-	public Expression callStaticWithComparator(CodePosition position, ITypeID target, CompareType operator, FunctionHeader instancedHeader, CallArguments arguments) {
-		return new GenericCompareExpression(position, callStatic(position, target, instancedHeader, arguments), operator);
+	public Expression callStaticWithComparator(CodePosition position, ITypeID target, CompareType operator, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
+		return new GenericCompareExpression(position, callStatic(position, target, instancedHeader, arguments, scope), operator);
 	}
 }

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

@@ -32,6 +32,11 @@ public class GetterMember extends FunctionalMember implements IGettableMember {
 		this.name = name;
 		this.type = type;
 	}
+	
+	@Override
+	public String getInformalName() {
+		return "getter " + name;
+	}
 
 	@Override
 	public String getName() {

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

@@ -9,6 +9,7 @@ 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;
 
@@ -19,13 +20,15 @@ import org.openzen.zenscript.shared.CodePosition;
 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);
+	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);
+	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);
+	public Expression callStatic(CodePosition position, ITypeID target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope);
 	
-	public Expression callStaticWithComparator(CodePosition position, ITypeID target, CompareType operator, FunctionHeader instancedHeader, CallArguments arguments);
+	public Expression callStaticWithComparator(CodePosition position, ITypeID target, CompareType operator, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope);
 }

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

@@ -14,6 +14,8 @@ public interface MemberVisitor<T> {
 	
 	public T visitConstructor(ConstructorMember member);
 	
+	public T visitDestructor(DestructorMember member);
+	
 	public T visitMethod(MethodMember member);
 	
 	public T visitGetter(GetterMember member);

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

@@ -23,6 +23,11 @@ public class MethodMember extends FunctionalMember {
 	public MethodMember(CodePosition position, HighLevelDefinition definition, int modifiers, String name, FunctionHeader header) {
 		super(position, definition, modifiers, name, header);
 	}
+	
+	@Override
+	public String getInformalName() {
+		return name + " method";
+	}
 
 	@Override
 	public void registerTo(TypeMembers type, TypeMemberPriority priority) {

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

@@ -28,6 +28,11 @@ public class OperatorMember extends FunctionalMember {
 		
 		this.operator = operator;
 	}
+	
+	@Override
+	public String getInformalName() {
+		return operator.operator + " operator";
+	}
 
 	@Override
 	public void registerTo(TypeMembers type, TypeMemberPriority priority) {

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

@@ -31,6 +31,11 @@ public class SetterMember extends FunctionalMember {
 		this.name = name;
 		this.type = type;
 	}
+	
+	@Override
+	public String getInformalName() {
+		return "setter " + name;
+	}
 
 	@Override
 	public void registerTo(TypeMembers type, TypeMemberPriority priority) {

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

@@ -11,6 +11,7 @@ import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.CallTranslator;
 import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.shared.CodePosition;
 
 /**
@@ -27,7 +28,7 @@ public class TranslatedOperatorMember extends OperatorMember {
 	}
 
 	@Override
-	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
-		return translator.translate(new CallTranslator.Call(position, target, instancedHeader, arguments));
+	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
+		return translator.translate(new CallTranslator.Call(position, target, instancedHeader, arguments, scope));
 	}
 }

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

@@ -12,6 +12,7 @@ import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.member.ICallableMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.member.MemberVisitor;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -36,6 +37,11 @@ public class ComparatorMember extends Taggable implements ICallableMember {
 	public ComparatorMember(ITypeID type) {
 		header = new FunctionHeader(BasicTypeID.BOOL, new FunctionParameter(type));
 	}
+	
+	@Override
+	public String getInformalName() {
+		return "comparator";
+	}
 
 	@Override
 	public boolean isStatic() {
@@ -48,22 +54,22 @@ public class ComparatorMember extends Taggable implements ICallableMember {
 	}
 
 	@Override
-	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
+	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		throw new UnsupportedOperationException("Can't call a comparator");
 	}
 
 	@Override
-	public Expression callWithComparator(CodePosition position, CompareType operator, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
+	public Expression callWithComparator(CodePosition position, CompareType operator, Expression target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		return new BasicCompareExpression(position, target, arguments.arguments[0], operator);
 	}
 
 	@Override
-	public Expression callStatic(CodePosition position, ITypeID target, FunctionHeader instancedHeader, CallArguments arguments) {
+	public Expression callStatic(CodePosition position, ITypeID target, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		throw new UnsupportedOperationException("Can't call a comparator");
 	}
 
 	@Override
-	public Expression callStaticWithComparator(CodePosition position, ITypeID target, CompareType operator, FunctionHeader instancedHeader, CallArguments arguments) {
+	public Expression callStaticWithComparator(CodePosition position, ITypeID target, CompareType operator, FunctionHeader instancedHeader, CallArguments arguments, TypeScope scope) {
 		throw new UnsupportedOperationException("Can't call a comparator statically");
 	}
 

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

@@ -24,7 +24,7 @@ import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
  */
 public class PartialStaticMemberGroupExpression implements IPartialExpression {
 	public static PartialStaticMemberGroupExpression forMethod(CodePosition position, ITypeID target, ICallableMember method, ITypeID[] typeArguments) {
-		DefinitionMemberGroup group = new DefinitionMemberGroup(true);
+		DefinitionMemberGroup group = new DefinitionMemberGroup(true, method.getInformalName());
 		group.addMethod(method, TypeMemberPriority.SPECIFIED);
 		return new PartialStaticMemberGroupExpression(position, target, group, typeArguments);
 	}

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

@@ -5,20 +5,18 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
-import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class CatchClause {
-	public final String exceptionName;
-	public final ITypeID exceptionType;
 	public final Statement content;
+	public final VarStatement exceptionVariable;
 	
-	public CatchClause(String exceptionName, ITypeID exceptionType, Statement content) {
-		this.exceptionName = exceptionName;
-		this.exceptionType = exceptionType;
+	public CatchClause(CodePosition position, VarStatement exceptionVariable, Statement content) {
+		this.exceptionVariable = exceptionVariable;
 		this.content = content;
 	}
 }

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

@@ -44,6 +44,11 @@ public class ArrayTypeID implements ITypeID {
 		return false;
 	}
 	
+	@Override
+	public boolean isObjectType() {
+		return true;
+	}
+	
 	@Override
 	public ArrayTypeID withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
 		return registry.getArray(elementType.withGenericArguments(registry, arguments), dimension);

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

@@ -48,6 +48,11 @@ public class AssocTypeID implements ITypeID {
 		return false;
 	}
 	
+	@Override
+	public boolean isObjectType() {
+		return true;
+	}
+	
 	@Override
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {
 		return keyType.hasInferenceBlockingTypeParameters(parameters) || valueType.hasInferenceBlockingTypeParameters(parameters);

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

@@ -71,6 +71,11 @@ public enum BasicTypeID implements ITypeID {
 	public boolean isConst() {
 		return false;
 	}
+	
+	@Override
+	public boolean isObjectType() {
+		return this == ANY || this == STRING;
+	}
 
 	@Override
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {

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

@@ -55,6 +55,11 @@ public class ConstTypeID implements ITypeID {
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {
 		return baseType.hasInferenceBlockingTypeParameters(parameters);
 	}
+	
+	@Override
+	public boolean isObjectType() {
+		return baseType.isObjectType();
+	}
 
 	@Override
 	public int hashCode() {

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

@@ -54,8 +54,8 @@ public class DefinitionTypeID implements ITypeID {
 			Arrays.sort(outerTypeEntries, (a, b) -> a.parameter.name.compareTo(b.parameter.name));
 		}
 		
-		if ((typeParameters == null ? 0 : typeParameters.length) != definition.getNumberOfGenericParameters())
-			throw new RuntimeException("Invalid number of type parameters");
+		//if ((typeParameters == null ? 0 : typeParameters.length) != definition.getNumberOfGenericParameters())
+		//	throw new RuntimeException("Invalid number of type parameters");
 	}
 	
 	public boolean hasTypeParameters() {
@@ -92,7 +92,9 @@ public class DefinitionTypeID implements ITypeID {
 		if (typeParameters != null) {
 			instancedArguments = new ITypeID[typeParameters.length];
 			for (int i = 0; i < typeParameters.length; i++) {
-				instancedArguments[i] = arguments.containsKey(definition.genericParameters[i]) ? arguments.get(definition.genericParameters[i]) : typeParameters[i].withGenericArguments(registry, arguments);
+				// TODO: why was this line written like this?
+				//instancedArguments[i] = arguments.containsKey(definition.genericParameters[i]) ? arguments.get(definition.genericParameters[i]) : typeParameters[i].withGenericArguments(registry, arguments);
+				instancedArguments[i] = typeParameters[i].withGenericArguments(registry, arguments);
 			}
 		}
 		
@@ -131,6 +133,11 @@ public class DefinitionTypeID implements ITypeID {
 	public boolean isConst() {
 		return false;
 	}
+	
+	@Override
+	public boolean isObjectType() {
+		return true;
+	}
 
 	@Override
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {

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

@@ -46,6 +46,11 @@ public class FunctionTypeID implements ITypeID {
 	public boolean isConst() {
 		return false;
 	}
+	
+	@Override
+	public boolean isObjectType() {
+		return true;
+	}
 
 	@Override
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {

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

@@ -58,6 +58,11 @@ public class GenericMapTypeID implements ITypeID {
 		return true;
 	}
 	
+	@Override
+	public boolean isObjectType() {
+		return true;
+	}
+	
 	@Override
 	public String toString() {
 		StringBuilder result = new StringBuilder();

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

@@ -48,6 +48,11 @@ public class GenericTypeID implements ITypeID {
 	public boolean isConst() {
 		return false;
 	}
+	
+	@Override
+	public boolean isObjectType() {
+		return parameter.isObjectType();
+	}
 
 	@Override
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {

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

@@ -13,8 +13,6 @@ import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import static org.openzen.zenscript.codemodel.type.member.TypeMembers.MODIFIER_CONST;
 import static org.openzen.zenscript.codemodel.type.member.TypeMembers.MODIFIER_OPTIONAL;
-import static org.openzen.zenscript.codemodel.type.member.TypeMembers.MODIFIER_SHARED;
-import static org.openzen.zenscript.codemodel.type.member.TypeMembers.MODIFIER_WEAK;
 
 /**
  *
@@ -160,10 +158,6 @@ public class GlobalTypeRegistry {
 			return getModified(modifiers & ~MODIFIER_OPTIONAL, getOptional(type));
 		if ((modifiers & MODIFIER_CONST) > 0)
 			return getModified(modifiers & ~MODIFIER_CONST, getConst(type));
-		if ((modifiers & MODIFIER_SHARED) > 0)
-			throw new UnsupportedOperationException();
-		if ((modifiers & MODIFIER_WEAK) > 0)
-			throw new UnsupportedOperationException();
 		
 		throw new UnsupportedOperationException();
 	}

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

@@ -36,6 +36,8 @@ public interface ITypeID {
 	
 	public boolean hasDefaultValue();
 	
+	public boolean isObjectType();
+	
 	public ITypeID withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments);
 	
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters);

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

@@ -40,6 +40,11 @@ public class IteratorTypeID implements ITypeID {
 	public boolean isConst() {
 		return false;
 	}
+	
+	@Override
+	public boolean isObjectType() {
+		return true;
+	}
 
 	@Override
 	public ITypeID withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {

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

@@ -51,6 +51,11 @@ public class OptionalTypeID implements ITypeID {
 		return false;
 	}
 	
+	@Override
+	public boolean isObjectType() {
+		return baseType.isObjectType();
+	}
+	
 	@Override
 	public ITypeID unwrap() {
 		return baseType;

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

@@ -49,6 +49,11 @@ public class RangeTypeID implements ITypeID {
 	public boolean isConst() {
 		return false;
 	}
+	
+	@Override
+	public boolean isObjectType() {
+		return false;
+	}
 
 	@Override
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {

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

@@ -38,7 +38,7 @@ import org.openzen.zenscript.codemodel.scope.TypeScope;
  */
 public class DefinitionMemberGroup {
 	public static DefinitionMemberGroup forMethod(ICallableMember member) {
-		DefinitionMemberGroup instance = new DefinitionMemberGroup(member.isStatic());
+		DefinitionMemberGroup instance = new DefinitionMemberGroup(member.isStatic(), member.getInformalName());
 		instance.addMethod(member, TypeMemberPriority.SPECIFIED);
 		return instance;
 	}
@@ -48,9 +48,11 @@ public class DefinitionMemberGroup {
 	private TypeMember<SetterMember> setter;
 	private final List<TypeMember<ICallableMember>> methods = new ArrayList<>();
 	public final boolean isStatic;
+	public final String name;
 	
-	public DefinitionMemberGroup(boolean isStatic) {
+	public DefinitionMemberGroup(boolean isStatic, String name) {
 		this.isStatic = isStatic;
+		this.name = name;
 	}
 	
 	public void merge(CodePosition position, DefinitionMemberGroup other, TypeMemberPriority priority) {
@@ -241,7 +243,7 @@ public class DefinitionMemberGroup {
 			arguments.arguments[i] = arguments.arguments[i].castImplicit(position, scope, instancedHeader.parameters[i].type);
 		}
 		
-		return method.call(position, target, instancedHeader, arguments);
+		return method.call(position, target, instancedHeader, arguments, scope);
 	}
 	
 	public Expression callPostfix(CodePosition position, TypeScope scope, Expression target) {
@@ -264,13 +266,13 @@ public class DefinitionMemberGroup {
 			CompareType compareType) {
 		ICallableMember method = selectMethod(position, scope, arguments, true, false);
 		FunctionHeader instancedHeader = method.getHeader().withGenericArguments(scope.getTypeRegistry(), arguments.typeArguments);
-		return method.callWithComparator(position, compareType, target, instancedHeader, arguments);
+		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);
-		return method.callStatic(position, target, instancedHeader, arguments);
+		return method.callStatic(position, target, instancedHeader, arguments, scope);
 	}
 	
 	public Expression callStaticWithComparator(
@@ -281,7 +283,7 @@ public class DefinitionMemberGroup {
 			CompareType compareType) {
 		ICallableMember method = selectMethod(position, scope, arguments, false, true);
 		FunctionHeader instancedHeader = method.getHeader().withGenericArguments(scope.getTypeRegistry(), arguments.typeArguments);
-		return method.callStaticWithComparator(position, target, compareType, instancedHeader, arguments);
+		return method.callStaticWithComparator(position, target, compareType, instancedHeader, arguments, scope);
 	}
 	
 	public ICallableMember selectMethod(CodePosition position, TypeScope scope, CallArguments arguments, boolean allowNonStatic, boolean allowStatic) {
@@ -342,6 +344,10 @@ public class DefinitionMemberGroup {
 		if (selected == null) {
 			// let's figure out why this didn't work out
 			StringBuilder message = new StringBuilder();
+			if (methods.isEmpty()) {
+				throw new CompileException(position, CompileExceptionCode.CALL_NO_VALID_METHOD, "This type has no " + name);
+			}
+			
 			outer: for (TypeMember<ICallableMember> method : methods) {
 				if (!(method.member.isStatic() ? allowStatic : allowNonStatic)) {
 					message.append(method.member.isStatic() ? "Method must not be static" : "Method must be static").append('\n');
@@ -351,7 +357,7 @@ public class DefinitionMemberGroup {
 				message.append(method.member.getHeader().explainWhyIncompatible(scope, arguments)).append("\n");
 			}
 			
-			throw new CompileException(position, CompileExceptionCode.CALL_NO_VALID_METHOD, "No matching method found:\n" + message.toString());
+			throw new CompileException(position, CompileExceptionCode.CALL_NO_VALID_METHOD, "No matching method found for " + name + ":\n" + message.toString());
 		}
 		
 		return selected;

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

@@ -40,6 +40,7 @@ import org.openzen.zenscript.codemodel.member.builtin.ComparatorMember;
 import org.openzen.zenscript.codemodel.member.builtin.ConstantGetterMember;
 import org.openzen.zenscript.codemodel.member.builtin.RangeIterator;
 import org.openzen.zenscript.codemodel.member.builtin.StringCharIterator;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.codemodel.type.AssocTypeID;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
@@ -161,6 +162,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		}
 
 		members.addGetter(new GetterMember(BUILTIN, definition, 0, "empty", BOOL), TypeMemberPriority.SPECIFIED);
+		members.addGetter(new GetterMember(BUILTIN, definition, Modifiers.PUBLIC | Modifiers.EXTERN, "objectHashCode", BasicTypeID.INT));
 		members.addIterator(new ArrayIteratorKeyValues(array), TypeMemberPriority.SPECIFIED);
 		members.addIterator(new ArrayIteratorValues(array), TypeMemberPriority.SPECIFIED);
 		members.addMethod(new MethodMember(BUILTIN, definition, 0, "clear", new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
@@ -190,6 +192,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addField(new FieldMember(BUILTIN, definition, Modifiers.FINAL, "size", INT));
 		members.addGetter(new GetterMember(BUILTIN, definition, 0, "empty", BOOL));
 		members.addGetter(new GetterMember(BUILTIN, definition, 0, "keys", cache.getRegistry().getArray(keyType, 1)));
+		members.addGetter(new GetterMember(BUILTIN, definition, Modifiers.PUBLIC | Modifiers.EXTERN, "objectHashCode", BasicTypeID.INT));
 		
 		members.addIterator(new AssocIterator(assoc), TypeMemberPriority.SPECIFIED);
 		return null;
@@ -204,6 +207,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addMethod(new MethodMember(BUILTIN, definition, 0, "getOptional", new FunctionHeader(map.keys, registry.getOptional(valueType), new FunctionParameter[0])));
 		members.addMethod(new MethodMember(BUILTIN, definition, 0, "put", new FunctionHeader(map.keys, BasicTypeID.VOID, new FunctionParameter(valueType))));
 		members.addMethod(new MethodMember(BUILTIN, definition, 0, "contains", new FunctionHeader(map.keys, BasicTypeID.BOOL, new FunctionParameter[0])));
+		members.addGetter(new GetterMember(BUILTIN, definition, Modifiers.PUBLIC | Modifiers.EXTERN, "objectHashCode", BasicTypeID.INT));
 		return null;
 	}
 	
@@ -228,8 +232,9 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 				for (int i = 0; i < type.typeParameters.length; i++)
 					mapping.put(definition.genericParameters[i], type.typeParameters[i]);
 			
-			for (Map.Entry<TypeParameter, ITypeID> entry : type.outerTypeParameters.entrySet())
-				mapping.put(entry.getKey(), entry.getValue());
+			if (!type.definition.isStatic())
+				for (Map.Entry<TypeParameter, ITypeID> entry : type.outerTypeParameters.entrySet())
+					mapping.put(entry.getKey(), entry.getValue());
 			
 			for (IDefinitionMember member : definition.members) {
 				member.instance(cache.getRegistry(), mapping).registerTo(members, TypeMemberPriority.SPECIFIED);
@@ -273,6 +278,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 			}
 		}
 		
+		members.addGetter(new GetterMember(BUILTIN, definition, Modifiers.PUBLIC | Modifiers.EXTERN, "objectHashCode", BasicTypeID.INT));
 		return null;
 	}
 
@@ -516,6 +522,6 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 	}
 	
 	private static CallTranslator castedTargetCall(FunctionalMember member, CasterMember caster) {
-		return call -> member.call(call.position, caster.cast(call.position, call.target, true), call.arguments);
+		return call -> member.call(call.position, caster.cast(call.position, call.target, true), call.arguments, call.scope);
 	}
 }

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

@@ -18,10 +18,13 @@ 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.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;
@@ -54,8 +57,6 @@ import org.openzen.zenscript.codemodel.scope.TypeScope;
 public final class TypeMembers {
 	public static final int MODIFIER_OPTIONAL = 1;
 	public static final int MODIFIER_CONST = 2;
-	public static final int MODIFIER_SHARED = 4;
-	public static final int MODIFIER_WEAK = 8;
 	
 	private final LocalMemberCache cache;
 	public final ITypeID type;
@@ -88,7 +89,7 @@ public final class TypeMembers {
 		}
 		
 		for (TypeMember<ImplementationMember> implementation : implementations) {
-			if (implementation.member.type == other)
+			if (implementation.member.type.equals(other)) // TODO: for some reason duplicate types are generated
 				return true;
 			if (cache.get(implementation.member.type).extendsOrImplements(other))
 				return true;
@@ -97,6 +98,18 @@ public final class TypeMembers {
 		return false;
 	}
 	
+	public boolean extendsType(ITypeID other) {
+		ITypeID superType = type.getSuperType();
+		if (superType != null) {
+			if (superType == other)
+				return true;
+			if (cache.get(superType).extendsType(other))
+				return true;
+		}
+		
+		return false;
+	}
+	
 	public GlobalTypeRegistry getTypeRegistry() {
 		return cache.getRegistry();
 	}
@@ -135,6 +148,10 @@ public final class TypeMembers {
 		getOrCreateGroup(OperatorType.CONSTRUCTOR).addMethod(constructor, TypeMemberPriority.SPECIFIED);
 	}
 	
+	public void addDestructor(DestructorMember destructor, TypeMemberPriority priority) {
+		getOrCreateGroup(OperatorType.DESTRUCTOR).addMethod(destructor, priority);
+	}
+	
 	public void addCaller(CallerMember caller, TypeMemberPriority priority) {
 		getOrCreateGroup(OperatorType.CALL).addMethod(caller, priority);
 	}
@@ -232,14 +249,14 @@ public final class TypeMembers {
 	
 	public DefinitionMemberGroup getOrCreateGroup(String name, boolean isStatic) {
 		if (!members.containsKey(name))
-			members.put(name, new DefinitionMemberGroup(isStatic));
+			members.put(name, new DefinitionMemberGroup(isStatic, name));
 		
 		return members.get(name);
 	}
 	
 	public DefinitionMemberGroup getOrCreateGroup(OperatorType operator) {
 		if (!operators.containsKey(operator))
-			operators.put(operator, new DefinitionMemberGroup(false));
+			operators.put(operator, new DefinitionMemberGroup(false, operator.operator + " operator"));
 		
 		return operators.get(operator);
 	}
@@ -256,7 +273,17 @@ public final class TypeMembers {
 	}
 	
 	public Expression compare(CodePosition position, TypeScope scope, CompareType operator, Expression left, Expression right) {
-		if (operator == CompareType.EQ) {
+		if (operator == CompareType.SAME) {
+			if (left.type.isObjectType() && right.type.isObjectType())
+				return new SameObjectExpression(position, left, right, false);
+			else
+				return compare(position, scope, CompareType.EQ, left, right);
+		} else if (operator == CompareType.NOTSAME) {
+			if (left.type.isObjectType() && right.type.isObjectType())
+				return new SameObjectExpression(position, left, right, true);
+			else
+				return compare(position, scope, CompareType.NE, left, right);
+		} else if (operator == CompareType.EQ) {
 			DefinitionMemberGroup equal = getOrCreateGroup(OperatorType.EQUALS);
 			for (TypeMember<ICallableMember> member : equal.getMethodMembers()) {
 				if (member.member.getHeader().accepts(scope, right))
@@ -267,7 +294,7 @@ public final class TypeMembers {
 			for (TypeMember<ICallableMember> member : equal.getMethodMembers()) {
 				if (member.member.getHeader().accepts(scope, right)) {
 					Expression equalExpression = equal.call(position, scope, left, new CallArguments(right), false);
-					return new CallExpression(position, equalExpression, BuiltinTypeMembers.BOOL_NOT, BuiltinTypeMembers.BOOL_NOT.header, CallArguments.EMPTY);
+					return new CallExpression(position, equalExpression, BuiltinTypeMembers.BOOL_NOT, BuiltinTypeMembers.BOOL_NOT.header, CallArguments.EMPTY, scope);
 				}
 			}
 		}
@@ -323,12 +350,8 @@ public final class TypeMembers {
 			if (caster.member.isImplicit() && toType == caster.member.getTargetType())
 				return true;
 		}
-		for (TypeMember<ImplementationMember> implementation : implementations) {
-			if (implementation.member.type == toType)
-				return true;
-		}
 		
-		return false;
+		return extendsOrImplements(toType);
 	}
 	
 	public boolean canCast(ITypeID toType) {
@@ -363,9 +386,11 @@ public final class TypeMembers {
 				return caster.member.cast(position, value, implicit);
 		}
 		for (TypeMember<ImplementationMember> implementation : implementations) {
-			if (implementation.member.type == toType)
+			if (implementation.member.type.equals(toType))
 				return new InterfaceCastExpression(position, value, toType);
 		}
+		if (extendsType(toType))
+			return new SupertypeCastExpression(position, value, toType);
 		
 		throw new CompileException(position, CompileExceptionCode.INVALID_CAST, "Could not cast " + toString() + " to " + toType);
 	}

Constructor/libraries/collections/src/HashSet.zs

@@ -3,6 +3,8 @@ export class HashSet<T> {
 		add(value as T) as bool;
 		remove(value as T) as bool;
 		
+		get size as int;
+		
 		in(value as T) as bool;
 		for(x as T);
 	}

Constructor/libraries/collections/src/LinkedList.zs

@@ -1,6 +1,7 @@
 export class LinkedList<T> {
 	var first as Node?;
 	var last as Node?;
+	var size as int : get;
 	
 	public get empty as bool
 		=> first == null;
@@ -14,16 +15,45 @@ export class LinkedList<T> {
 			node.prev = last;
 			last = node;
 		}
+		size++;
 	}
 	
-	public implements Queue<T> {
-		poll() as T?
-			=> first == null ? null : first.value;
+	public clear() as void {
+		first = last = null;
+		size = 0;
+	}
+	
+	public [](index as int) as T {
+		var node = first;
+		while index > 0 {
+			if node == null
+				throw new NoSuchElementException("index out of bounds");
+			
+			node = node.next;
+		}
+		
+		if node == null
+			throw new NoSuchElementException("index out of bounds");
 		
-		peek() as T {
+		return node.value;
+	}
+	
+	public implements Queue<T> {
+		poll() as T {
 			if first == null
-				throw new NoSuchElementException("Cannot peek an empty queue");
+				throw new NoSuchElementException("Cannot poll an empty queue");
 			
+			val result = first.value;
+			first = first.next;
+			if first == null
+				last = null;
+			else
+				first.prev = null;
+				
+			size--;
+		}
+		
+		peek() as T? {
 			return first.value;
 		}
 		

Constructor/libraries/collections/src/Set.zs

@@ -2,7 +2,11 @@ export interface Set<T> {
 	add(value as T) as bool;
 	remove(value as T) as bool;
 	
-	in(value as T) as bool;
+	get size as int;
+	
+	toArray();
+	toArray(comparator as function(a as T, b as T) as int);
 	
+	in(value as T) as bool;
 	for(x as T);
 }

Constructor/libraries/collections/src/Stack.zs

@@ -0,0 +1,21 @@
+export class Stack<T> {
+	var values as T[] = new T[](8);
+	var size as int : get = 0;
+	
+	public push(value as T) as void {
+		if size == values.length
+			values = values.copy(values.length * 2);
+			
+		values[size++] = value;
+	}
+	
+	public pop() as T {
+		if size == 0
+			throw new NoSuchElementException("Stack is empty!");
+		
+		return values[--size];
+	}
+	
+	public get empty as bool
+		=> size == 0;
+}

Constructor/libraries/io/module.json

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

Constructor/libraries/io/src/Reader.zs

@@ -0,0 +1,10 @@
+export interface Reader {
+	~this;
+	
+	read() as int;
+	
+	read(buffer as char[]) as int
+		=> read(buffer, 0, buffer.length);
+	
+	read(buffer as char[], offset as int, length as int) as int;
+}

Constructor/libraries/io/src/StringReader.zs

@@ -0,0 +1,22 @@
+export class StringReader {
+	val data as char[];
+	var offset as int;
+	
+	public this(value as string) {
+		data = value.characters;
+	}
+	
+	public implements Reader {
+		~this {}
+	
+		read() as int
+			=> offset == data.length ? -1 : data[offset++];
+	
+		read(buffer as char[], offset as int, length as int) as int {
+			length = int.min(data.length - this.offset, length);
+			data.copyTo(buffer, this.offset, offset, length);
+			this.offset += length;
+			return length;
+		}
+	}
+}

Constructor/libraries/stdlib/module.json

@@ -4,6 +4,7 @@
 	"globals": {
 		"Comparable": {"type": "Definition", "definition": "Comparable"},
 		"Exception": {"type": "Definition", "definition": "Exception"},
+		"Hashable": {"type": "Definition", "definition": "Hashable"},
 		"IllegalArgumentException": {"type": "Definition", "definition": "IllegalArgumentException"},
 		"StringBuilder": {"type": "Definition", "definition": "StringBuilder"},
 		"StringBuildable": {"type": "Definition", "definition": "StringBuildable"}

Constructor/libraries/stdlib/src/Arrays.zs

@@ -0,0 +1,19 @@
+export expand <T : Comparable<T>> T[] {
+	public extern sort() as void;
+	public extern sorted() as T[];
+}
+
+export expand <T : Hashable<T>> T[] {
+	public implements Hashable<T[]> {
+		public extern hashCode() as int;
+		public extern == (other as T) as bool;
+	}
+}
+
+export expand <T> T[] {
+	public extern sort(comparator as function(a as T, b as T) as int) as void;
+	public extern sorted(comparator as function(a as T, b as T) as int) as T[];
+	public extern copy() as T[];
+	public extern copy(newSize as int) as T[];
+	public extern copyTo(target as T[], sourceOffset as int, targetOffset as int, length as int) as void;
+}

Constructor/libraries/stdlib/src/Exception.zs

@@ -1,4 +1,4 @@
 export virtual class Exception {
-	public this(message as string) {
-	}
+	public this(message as string) {}
+	public this(message as string, cause as Exception) {}
 }

Constructor/libraries/stdlib/src/Hashable.zs

@@ -0,0 +1,4 @@
+public interface Hashable<T> {
+	hashCode() as int;
+	== (other as T) as bool;
+}

Constructor/libraries/stdlib/src/Integers.zs

@@ -2,4 +2,9 @@ expand int {
 	public extern toHexString() as string;
 	public static extern parse(value as string) as int;
 	public static extern parse(value as string, radix as int) as int;
+	
+	public static min(a as int, b as int) as int
+		=> a < b ? a : b;
+	public static max(a as int, b as int) as int
+		=> a > b ? a : b;
 }

Constructor/libraries/stdlib/src/StringBuilder.zs

@@ -3,6 +3,8 @@ export class StringBuilder {
 	public extern this(capacity as int);
 	public extern this(value as string);
 	
+	public extern get empty as bool;
+	
 	public extern <<(value as bool) as StringBuilder;
 	public extern <<(value as char) as StringBuilder;
 	public extern <<(value as byte) as StringBuilder;

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

@@ -20,7 +20,6 @@ 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.type.GlobalTypeRegistry;
 import org.openzen.zenscript.constructor.module.ModuleSpace;
 import org.openzen.zenscript.constructor.module.SemanticModule;
 import org.openzen.zenscript.linker.symbol.ISymbol;
@@ -88,13 +87,12 @@ public class Module {
 		Map<String, ISymbol> globals = registry.collectGlobals();
 		boolean failed = false;
 		
-		GlobalTypeRegistry globalRegistry = new GlobalTypeRegistry();
 		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.compileTypes(rootPackage, definitions, globalRegistry, expansions, globals);
+				file.compileTypes(rootPackage, definitions, registry.typeRegistry, expansions, globals);
 			} catch (CompileException ex) {
 				System.out.println(ex.getMessage());
 				failed = true;
@@ -109,7 +107,7 @@ public class Module {
 			// respective definitions, such as fields, constructors, methods...
 			// It doesn't yet compile the method contents.
 			try {
-				file.compileMembers(rootPackage, definitions, globalRegistry, expansions, globals);
+				file.compileMembers(rootPackage, definitions, registry.typeRegistry, expansions, globals);
 			} catch (CompileException ex) {
 				System.out.println(ex.getMessage());
 				failed = true;
@@ -126,7 +124,7 @@ public class Module {
 			// into semantic code. This semantic code can then be compiled
 			// to various targets.
 			try {
-				file.compileCode(rootPackage, definitions, globalRegistry, expansions, scripts, globals);
+				file.compileCode(rootPackage, definitions, registry.typeRegistry, expansions, scripts, globals);
 			} catch (CompileException ex) {
 				System.out.println(ex.getMessage());
 				failed = true;

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

@@ -11,6 +11,7 @@ import java.util.List;
 import java.util.Map;
 import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
+import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.constructor.ConstructorException;
 import org.openzen.zenscript.linker.symbol.ISymbol;
 
@@ -19,6 +20,7 @@ import org.openzen.zenscript.linker.symbol.ISymbol;
  * @author Hoofdgebruiker
  */
 public class ModuleSpace {
+	public final GlobalTypeRegistry typeRegistry = new GlobalTypeRegistry();
 	public final ZSPackage globalsPackage = new ZSPackage("");
 	private final ZSPackage rootPackage = new ZSPackage("");
 	private final List<ExpansionDefinition> expansions = new ArrayList<>();

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

@@ -468,8 +468,10 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 
     @Override
     public Void visitRange(RangeExpression expression) {
+		// TODO: there are other kinds of ranges also; there should be a Range<T, T> type with creation of synthetic types
         if (expression.from.type.accept(JavaTypeClassVisitor.INSTANCE) != int.class)
             throw new CompileException(expression.position, CompileExceptionCode.INTERNAL_ERROR, "Only integer ranges supported");
+		
         javaWriter.newObject(IntRange.class);
         javaWriter.dup();
         expression.from.accept(this);
@@ -479,6 +481,26 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 
         return null;
     }
+	
+	@Override
+	public Void visitSameObject(SameObjectExpression expression) {
+		expression.left.accept(this);
+		expression.right.accept(this);
+		
+		Label end = new Label();
+		Label equal = new Label();
+		
+		if (expression.inverted)
+			javaWriter.ifACmpNe(equal);
+		else
+			javaWriter.ifACmpEq(equal);
+		javaWriter.iConst0();
+		javaWriter.goTo(end);
+		javaWriter.label(equal);
+		javaWriter.iConst1();
+		javaWriter.label(end);
+		return null;
+	}
 
     @Override
     public Void visitSetField(SetFieldExpression expression) {
@@ -534,6 +556,11 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
     public Void visitStaticSetter(StaticSetterExpression expression) {
         return null;
     }
+	
+	@Override
+	public Void visitSupertypeCast(SupertypeCastExpression expression) {
+		return null; // nothing to do
+	}
 
     @Override
     public Void visitThis(ThisExpression expression) {

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

@@ -55,6 +55,7 @@ import org.openzen.zenscript.codemodel.expression.NullExpression;
 import org.openzen.zenscript.codemodel.expression.OrOrExpression;
 import org.openzen.zenscript.codemodel.expression.PostCallExpression;
 import org.openzen.zenscript.codemodel.expression.RangeExpression;
+import org.openzen.zenscript.codemodel.expression.SameObjectExpression;
 import org.openzen.zenscript.codemodel.expression.SetFieldExpression;
 import org.openzen.zenscript.codemodel.expression.SetFunctionParameterExpression;
 import org.openzen.zenscript.codemodel.expression.SetLocalVariableExpression;
@@ -62,6 +63,7 @@ import org.openzen.zenscript.codemodel.expression.SetStaticFieldExpression;
 import org.openzen.zenscript.codemodel.expression.SetterExpression;
 import org.openzen.zenscript.codemodel.expression.StaticGetterExpression;
 import org.openzen.zenscript.codemodel.expression.StaticSetterExpression;
+import org.openzen.zenscript.codemodel.expression.SupertypeCastExpression;
 import org.openzen.zenscript.codemodel.expression.ThisExpression;
 import org.openzen.zenscript.codemodel.expression.WrapOptionalExpression;
 import org.openzen.zenscript.javabytecode.JavaLocalVariableInfo;
@@ -347,6 +349,11 @@ public class JavaPreDecrementVisitor implements ExpressionVisitor<Void> {
 	public Void visitRange(RangeExpression expression) {
 		throw new UnsupportedOperationException("Invalid increment target");
 	}
+	
+	@Override
+	public Void visitSameObject(SameObjectExpression expression) {
+		throw new UnsupportedOperationException("Invalid increment target");
+	}
 
 	@Override
 	public Void visitSetField(SetFieldExpression expression) {
@@ -382,6 +389,11 @@ public class JavaPreDecrementVisitor implements ExpressionVisitor<Void> {
 	public Void visitStaticSetter(StaticSetterExpression expression) {
 		throw new UnsupportedOperationException("Invalid increment target");
 	}
+	
+	@Override
+	public Void visitSupertypeCast(SupertypeCastExpression expression) {
+		throw new UnsupportedOperationException("Invalid increment target");
+	}
 
 	@Override
 	public Void visitThis(ThisExpression expression) {

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

@@ -55,6 +55,7 @@ import org.openzen.zenscript.codemodel.expression.NullExpression;
 import org.openzen.zenscript.codemodel.expression.OrOrExpression;
 import org.openzen.zenscript.codemodel.expression.PostCallExpression;
 import org.openzen.zenscript.codemodel.expression.RangeExpression;
+import org.openzen.zenscript.codemodel.expression.SameObjectExpression;
 import org.openzen.zenscript.codemodel.expression.SetFieldExpression;
 import org.openzen.zenscript.codemodel.expression.SetFunctionParameterExpression;
 import org.openzen.zenscript.codemodel.expression.SetLocalVariableExpression;
@@ -62,6 +63,7 @@ import org.openzen.zenscript.codemodel.expression.SetStaticFieldExpression;
 import org.openzen.zenscript.codemodel.expression.SetterExpression;
 import org.openzen.zenscript.codemodel.expression.StaticGetterExpression;
 import org.openzen.zenscript.codemodel.expression.StaticSetterExpression;
+import org.openzen.zenscript.codemodel.expression.SupertypeCastExpression;
 import org.openzen.zenscript.codemodel.expression.ThisExpression;
 import org.openzen.zenscript.codemodel.expression.WrapOptionalExpression;
 import org.openzen.zenscript.javabytecode.JavaLocalVariableInfo;
@@ -353,6 +355,11 @@ public class JavaPreIncrementVisitor implements ExpressionVisitor<Void> {
 	public Void visitRange(RangeExpression expression) {
 		throw new UnsupportedOperationException("Invalid increment target");
 	}
+	
+	@Override
+	public Void visitSameObject(SameObjectExpression expression) {
+		throw new UnsupportedOperationException("Invalid increment target");
+	}
 
 	@Override
 	public Void visitSetField(SetFieldExpression expression) {
@@ -388,6 +395,11 @@ public class JavaPreIncrementVisitor implements ExpressionVisitor<Void> {
 	public Void visitStaticSetter(StaticSetterExpression expression) {
 		throw new UnsupportedOperationException("Invalid increment target");
 	}
+	
+	@Override
+	public Void visitSupertypeCast(SupertypeCastExpression expression) {
+		throw new UnsupportedOperationException("Invalid increment target");
+	}
 
 	@Override
 	public Void visitThis(ThisExpression expression) {

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

@@ -233,7 +233,7 @@ public class JavaStatementVisitor implements StatementVisitor<Boolean> {
             javaWriter.label(catchStart);
 
             //final Type exceptionType = Type.getType(RuntimeException.class);
-            final Type exceptionType = Type.getType(catchClause.exceptionType.accept(JavaTypeClassVisitor.INSTANCE));
+            final Type exceptionType = Type.getType(catchClause.exceptionVariable.type.accept(JavaTypeClassVisitor.INSTANCE));
             final int local = javaWriter.local(exceptionType);
             javaWriter.store(exceptionType, local);
 

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

@@ -94,6 +94,24 @@ public class JavaMemberVisitor implements MemberVisitor<Void> {
         statementVisitor.end();
         return null;
     }
+	
+	@Override
+	public Void visitDestructor(DestructorMember member) {
+		final JavaMethodInfo method = new JavaMethodInfo(toClass, "close", "()V", Opcodes.ACC_PUBLIC);
+
+        final Label constructorStart = new Label();
+        final Label constructorEnd = new Label();
+        final JavaWriter destructorWriter = new JavaWriter(writer, method, definition, null, null);
+        destructorWriter.label(constructorStart);
+
+        final JavaStatementVisitor statementVisitor = new JavaStatementVisitor(destructorWriter);
+        statementVisitor.start();
+		// TODO: destruction of members (to be done when memory tags are implemented)
+        member.body.accept(statementVisitor);
+        destructorWriter.label(constructorEnd);
+        statementVisitor.end();
+        return null;
+	}
 
     @Override
     public Void visitMethod(MethodMember member) {

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

@@ -37,8 +37,6 @@ public class ZSTokenStream extends TokenStream<ZSToken, ZSTokenType> {
 		KEYWORDS.put("final", K_FINAL);
 		KEYWORDS.put("override", K_OVERRIDE);
 		KEYWORDS.put("const", K_CONST);
-		KEYWORDS.put("shared", K_SHARED);
-		KEYWORDS.put("weak", K_WEAK);
 		KEYWORDS.put("private", K_PRIVATE);
 		KEYWORDS.put("public", K_PUBLIC);
 		KEYWORDS.put("export", K_EXPORT);

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

@@ -87,8 +87,6 @@ public enum ZSTokenType implements TokenType {
 	K_FINAL,
 	K_OVERRIDE,
 	K_CONST,
-	K_SHARED,
-	K_WEAK,
 	K_PRIVATE,
 	K_PUBLIC,
 	K_EXPORT,

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

@@ -38,7 +38,7 @@ public class ParsedExpressionArray extends ParsedExpression {
 		for (ITypeID hint : scope.hints) {
 			// TODO: what if multiple hints fit?
 			if (hint.getUnmodified() instanceof ArrayTypeID) {
-				ArrayTypeID arrayHint = (ArrayTypeID) hint;
+				ArrayTypeID arrayHint = (ArrayTypeID) hint.getUnmodified();
 				if (arrayHint.dimension == 1) {
 					asBaseType = arrayHint.elementType;
 					asType = arrayHint;

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

@@ -52,7 +52,7 @@ public class ParsedExpressionCall extends ParsedExpression {
 			if (!(member instanceof ConstructorMember))
 				throw new CompileException(position, CompileExceptionCode.INTERNAL_ERROR, "Constructor is not a constructor!");
 			
-			return new ConstructorThisCallExpression(position, scope.getThisType().getSuperType(), (ConstructorMember) member, callArguments);
+			return new ConstructorThisCallExpression(position, scope.getThisType().getSuperType(), (ConstructorMember) member, callArguments, scope);
 		} else if (receiver instanceof ParsedExpressionThis) {
 			// this call (intended as first call in constructor)
 			ITypeID targetType = scope.getThisType();
@@ -63,7 +63,7 @@ public class ParsedExpressionCall extends ParsedExpression {
 			if (!(member instanceof ConstructorMember))
 				throw new CompileException(position, CompileExceptionCode.INTERNAL_ERROR, "Constructor is not a constructor!");
 			
-			return new ConstructorThisCallExpression(position, scope.getThisType(), (ConstructorMember) member, callArguments);
+			return new ConstructorThisCallExpression(position, scope.getThisType(), (ConstructorMember) member, callArguments, scope);
 		}
 
 		List<FunctionHeader> headers = cReceiver.getPossibleFunctionHeaders(scope, scope.hints, arguments.arguments.size());

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

@@ -45,13 +45,14 @@ public class ParsedExpressionMap extends ParsedExpression {
 
 	@Override
 	public IPartialExpression compile(ExpressionScope scope) {
+		AssocTypeID assocHint = null;
 		List<ITypeID> keyHints = new ArrayList<>();
 		List<ITypeID> valueHints = new ArrayList<>();
 		
 		boolean hasAssocHint = false;
 		for (ITypeID hint : scope.hints) {
 			if (hint instanceof AssocTypeID) {
-				AssocTypeID assocHint = (AssocTypeID) hint;
+				assocHint = (AssocTypeID) hint;
 				if (!keyHints.contains(assocHint.keyType))
 					keyHints.add(assocHint.keyType);
 				if (!valueHints.contains(assocHint.valueType))
@@ -67,6 +68,14 @@ public class ParsedExpressionMap extends ParsedExpression {
 			}
 		}
 		
+		if (keys.isEmpty() && keyHints.size() == 1) {
+			ICallableMember constructor = scope
+						.getTypeMembers(assocHint)
+						.getOrCreateGroup(OperatorType.CONSTRUCTOR)
+						.selectMethod(position, scope, CallArguments.EMPTY, true, true);
+				return new NewExpression(position, assocHint, (ConstructorMember) constructor, CallArguments.EMPTY);
+		}
+		
 		if (!hasAssocHint && scope.hints.size() == 1 && scope.hints.get(0) != BasicTypeID.ANY) {
 			// compile as constructor call
 			ITypeID hint = scope.hints.get(0);

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

@@ -27,8 +27,13 @@ public class ParsedExpressionString extends ParsedExpression {
 
 	@Override
 	public IPartialExpression compile(ExpressionScope scope) {
-		if (scope.hints.contains(BasicTypeID.CHAR) && value.length() == 1) {
-			return new ConstantCharExpression(position, value.charAt(0));
+		if (value.length() == 1) {
+			if (scope.hints.contains(BasicTypeID.CHAR)) {
+				return new ConstantCharExpression(position, value.charAt(0));
+			} else if (!scope.hints.contains(BasicTypeID.STRING)) {
+				if (scope.hints.contains(BasicTypeID.INT))
+					return new ConstantCharExpression(position, value.charAt(0));
+			}
 		}
 		
 		return new ConstantStringExpression(position, value);

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

@@ -57,6 +57,9 @@ public class ParsedNewExpression extends ParsedExpression{
 		if (!(member instanceof ConstructorMember))
 			throw new CompileException(position, CompileExceptionCode.INTERNAL_ERROR, "COMPILER BUG: constructor is not a constructor");
 		
+		for (int i = 0; i < compiledArguments.arguments.length; i++) {
+			compiledArguments.arguments[i] = compiledArguments.arguments[i].castImplicit(position, scope, member.getHeader().parameters[i].type);
+		}
 		return new NewExpression(position, type, (ConstructorMember) member, compiledArguments);
 	}
 }

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

@@ -174,6 +174,7 @@ public abstract class ParsedDefinitionMember {
 				return new ParsedCaller(start, forDefinition, modifiers, header, body);
 			}
 			case T_SQOPEN: {
+				tokens.next();
 				tokens.required(ZSTokenType.T_SQCLOSE, "] expected");
 				OperatorType operator = OperatorType.INDEXGET;
 				if (tokens.optional(ZSTokenType.T_ASSIGN) != null) {
@@ -183,9 +184,20 @@ public abstract class ParsedDefinitionMember {
 				ParsedFunctionBody body = ParsedStatement.parseFunctionBody(tokens);
 				return new ParsedOperator(start, forDefinition, modifiers, operator, header, body);
 			}
+			case T_CAT:
+				tokens.pushMark();
+				tokens.next();
+				if (tokens.optional(ZSTokenType.K_THIS) != null) {
+					tokens.popMark();
+					
+					// destructor
+					ParsedFunctionBody body = ParsedStatement.parseFunctionBody(tokens);
+					return new ParsedDestructor(start, forDefinition, modifiers, body);
+				}
+				tokens.reset();
+				// else it is a ~ operator, continue...
 			case T_ADD:
 			case T_SUB:
-			case T_CAT:
 			case T_MUL:
 			case T_DIV:
 			case T_MOD:

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

@@ -0,0 +1,27 @@
+/*
+ * 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.parser.member;
+
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.member.DestructorMember;
+import org.openzen.zenscript.linker.BaseScope;
+import org.openzen.zenscript.parser.statements.ParsedFunctionBody;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ParsedDestructor extends ParsedFunctionalMember {
+	public ParsedDestructor(CodePosition position, HighLevelDefinition definition, int modifiers, ParsedFunctionBody body) {
+		super(position, definition, modifiers, body);
+	}
+
+	@Override
+	public void linkTypes(BaseScope scope) {
+		compiled = new DestructorMember(position, definition, modifiers);
+	}
+}

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

@@ -5,26 +5,95 @@
  */
 package org.openzen.zenscript.parser.statements;
 
+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.expression.GetLocalVariableExpression;
+import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.statement.CatchClause;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
+import org.openzen.zenscript.codemodel.statement.VarStatement;
+import org.openzen.zenscript.codemodel.type.GenericName;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
 import org.openzen.zenscript.linker.StatementScope;
 import org.openzen.zenscript.parser.type.IParsedType;
+import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class ParsedCatchClause {
+	public final CodePosition position;
 	public final String exceptionName;
 	public final IParsedType exceptionType;
 	public final ParsedStatement content;
 	
-	public ParsedCatchClause(String exceptionName, IParsedType exceptionType, ParsedStatement content) {
+	public ParsedCatchClause(CodePosition position, String exceptionName, IParsedType exceptionType, ParsedStatement content) {
+		this.position = position;
 		this.exceptionName = exceptionName;
 		this.exceptionType = exceptionType;
 		this.content = content;
 	}
 	
 	public CatchClause compile(StatementScope scope) {
-		return new CatchClause(exceptionName, exceptionType.compile(scope), content.compile(scope));
+		VarStatement exceptionVariable = new VarStatement(position, exceptionName, exceptionType.compile(scope), null, true);
+		CatchScope localScope = new CatchScope(scope, exceptionVariable);
+		return new CatchClause(position, exceptionVariable, content.compile(localScope));
+	}
+	
+	private class CatchScope extends StatementScope {
+		private final StatementScope outer;
+		private final VarStatement exceptionVariable;
+		
+		public CatchScope(StatementScope outer, VarStatement exceptionVariable) {
+			this.outer = outer;
+			this.exceptionVariable = exceptionVariable;
+		}
+	
+		@Override
+		public IPartialExpression get(CodePosition position, GenericName name) {
+			if (name.hasNoArguments() && exceptionVariable.name.equals(name.name))
+				return new GetLocalVariableExpression(position, exceptionVariable);
+
+			return outer.get(position, name);
+		}
+
+		@Override
+		public LocalMemberCache getMemberCache() {
+			return outer.getMemberCache();
+		}
+
+		@Override
+		public ITypeID getType(CodePosition position, List<GenericName> name) {
+			return outer.getType(position, name);
+		}
+
+		@Override
+		public LoopStatement getLoop(String name) {
+			return outer.getLoop(name);
+		}
+
+		@Override
+		public FunctionHeader getFunctionHeader() {
+			return outer.getFunctionHeader();
+		}
+
+		@Override
+		public ITypeID getThisType() {
+			return outer.getThisType();
+		}
+
+		@Override
+		public Function<CodePosition, Expression> getDollar() {
+			return outer.getDollar();
+		}
+
+		@Override
+		public IPartialExpression getOuterInstance(CodePosition position) {
+			return outer.getOuterInstance(position);
+		}
 	}
 }

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

@@ -197,6 +197,8 @@ public abstract class ParsedStatement {
 				ParsedStatement content = parse(parser);
 				List<ParsedCatchClause> catchClauses = new ArrayList<>();
 				while (parser.optional(K_CATCH) != null) {
+					CodePosition position = parser.getPosition();
+					
 					String catchName = null;
 					if (parser.isNext(ZSTokenType.T_IDENTIFIER))
 						catchName = parser.next().content;
@@ -206,7 +208,7 @@ public abstract class ParsedStatement {
 						catchType = IParsedType.parse(parser);
 					
 					ParsedStatement catchContent = ParsedStatement.parse(parser);
-					catchClauses.add(new ParsedCatchClause(catchName, catchType, catchContent));
+					catchClauses.add(new ParsedCatchClause(position, catchName, catchType, catchContent));
 				}
 				
 				ParsedStatement finallyClause = null;

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

@@ -51,8 +51,9 @@ public class ParsedStatementTryCatch extends ParsedStatement {
 		Expression resourceInitializer = this.resourceInitializer == null ? null : this.resourceInitializer.compile(new ExpressionScope(scope)).eval();
 		Statement statement = this.statement.compile(scope);
 		List<CatchClause> catches = new ArrayList<>();
-		for (ParsedCatchClause catchClause : catchClauses)
+		for (ParsedCatchClause catchClause : catchClauses) {
 			catches.add(catchClause.compile(scope));
+		}
 		
 		Statement finallyClause = this.finallyClause == null ? null : this.finallyClause.compile(scope);
 		VarStatement resource = null;

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

@@ -37,10 +37,6 @@ public interface IParsedType {
 		while (true) {
 			if (tokens.optional(ZSTokenType.K_CONST) != null) {
 				modifiers |= TypeMembers.MODIFIER_CONST;
-			} else if (tokens.optional(ZSTokenType.K_SHARED) != null) {
-				modifiers |= TypeMembers.MODIFIER_SHARED;
-			} else if (tokens.optional(ZSTokenType.K_WEAK) != null) {
-				modifiers |= TypeMembers.MODIFIER_WEAK;
 			} else {
 				break;
 			}

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

@@ -61,6 +61,7 @@ public class ValidationLogEntry {
 		INVALID_SOURCE_TYPE,
 		SETTING_FINAL_FIELD,
 		SETTING_FINAL_VARIABLE,
-		INVALID_SUPERTYPE
+		INVALID_SUPERTYPE,
+		MULTIPLE_DESTRUCTORS
 	}
 }

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

@@ -15,6 +15,7 @@ import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.CasterMember;
 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;
@@ -47,6 +48,7 @@ public class DefinitionMemberValidator implements MemberVisitor<Boolean> {
 	private final HighLevelDefinition definition;
 	private final Set<EnumConstantMember> initializedEnumConstants = new HashSet<>();
 	private final Set<ITypeID> implementedTypes = new HashSet<>();
+	private boolean hasDestructor = false;
 	
 	public DefinitionMemberValidator(Validator validator, HighLevelDefinition definition) {
 		this.validator = validator;
@@ -100,6 +102,21 @@ public class DefinitionMemberValidator implements MemberVisitor<Boolean> {
 		
 		return isValid;
 	}
+	
+	@Override
+	public Boolean visitDestructor(DestructorMember member) {
+		boolean isValid = true;
+		if (hasDestructor) {
+			validator.logError(ValidationLogEntry.Code.MULTIPLE_DESTRUCTORS, member.position, "A type have only a single destructor");
+			isValid = false;
+		}
+		hasDestructor = true;
+		if (member.body != null) {
+			StatementValidator statementValidator = new StatementValidator(validator, new ConstructorStatementScope(member.header));
+			isValid &= member.body.accept(statementValidator);
+		}
+		return isValid;
+	}
 
 	@Override
 	public Boolean visitMethod(MethodMember member) {

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

@@ -90,11 +90,15 @@ public class DefinitionValidator implements DefinitionVisitor<Boolean> {
 
 	@Override
 	public Boolean visitStruct(StructDefinition definition) {
+		int validModifiers = PUBLIC | EXPORT | PROTECTED | PRIVATE;
+		if (definition.outerDefinition != null)
+			validModifiers |= STATIC;
+		
 		boolean isValid = true;
 		isValid &= ValidationUtils.validateModifiers(
 				validator,
 				definition.modifiers,
-				PUBLIC | EXPORT | PROTECTED | PRIVATE,
+				validModifiers,
 				definition.position,
 				"Invalid struct modifier");
 		isValid &= ValidationUtils.validateIdentifier(

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

@@ -58,6 +58,7 @@ import org.openzen.zenscript.codemodel.expression.NullExpression;
 import org.openzen.zenscript.codemodel.expression.OrOrExpression;
 import org.openzen.zenscript.codemodel.expression.PostCallExpression;
 import org.openzen.zenscript.codemodel.expression.RangeExpression;
+import org.openzen.zenscript.codemodel.expression.SameObjectExpression;
 import org.openzen.zenscript.codemodel.expression.SetFieldExpression;
 import org.openzen.zenscript.codemodel.expression.SetFunctionParameterExpression;
 import org.openzen.zenscript.codemodel.expression.SetLocalVariableExpression;
@@ -65,6 +66,7 @@ import org.openzen.zenscript.codemodel.expression.SetStaticFieldExpression;
 import org.openzen.zenscript.codemodel.expression.SetterExpression;
 import org.openzen.zenscript.codemodel.expression.StaticGetterExpression;
 import org.openzen.zenscript.codemodel.expression.StaticSetterExpression;
+import org.openzen.zenscript.codemodel.expression.SupertypeCastExpression;
 import org.openzen.zenscript.codemodel.expression.ThisExpression;
 import org.openzen.zenscript.codemodel.expression.WrapOptionalExpression;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
@@ -496,6 +498,14 @@ public class ExpressionValidator implements ExpressionVisitor<Boolean> {
 		}
 		return isValid;
 	}
+	
+	@Override
+	public Boolean visitSameObject(SameObjectExpression expression) {
+		boolean isValid = true;
+		isValid &= expression.left.accept(this);
+		isValid &= expression.right.accept(this);
+		return isValid;
+	}
 
 	@Override
 	public Boolean visitSetField(SetFieldExpression expression) {
@@ -607,6 +617,12 @@ public class ExpressionValidator implements ExpressionVisitor<Boolean> {
 		return isValid;
 	}
 
+	@Override
+	public Boolean visitSupertypeCast(SupertypeCastExpression expression) {
+		boolean isValid = expression.value.accept(this);
+		return isValid;
+	}
+
 	@Override
 	public Boolean visitThis(ThisExpression expression) {
 		if (!scope.hasThis()) {