Feature/refactor capturing

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

@@ -3,6 +3,10 @@
 import org.openzen.zencode.shared.StringExpansion;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.expression.*;
+import org.openzen.zenscript.codemodel.expression.captured.CapturedClosureExpression;
+import org.openzen.zenscript.codemodel.expression.captured.CapturedLocalVariableExpression;
+import org.openzen.zenscript.codemodel.expression.captured.CapturedParameterExpression;
+import org.openzen.zenscript.codemodel.expression.captured.CapturedThisExpression;
 import org.openzen.zenscript.codemodel.identifiers.MethodID;
 import org.openzen.zenscript.codemodel.statement.ExpressionStatement;
 import org.openzen.zenscript.codemodel.statement.ReturnStatement;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/impl/capture/LocalCapturedExpression.java

@@ -2,8 +2,8 @@
 
 import org.openzen.zenscript.codemodel.compilation.CompilingExpression;
 import org.openzen.zenscript.codemodel.compilation.ExpressionCompiler;
-import org.openzen.zenscript.codemodel.expression.CapturedClosureExpression;
-import org.openzen.zenscript.codemodel.expression.CapturedExpression;
+import org.openzen.zenscript.codemodel.expression.captured.CapturedClosureExpression;
+import org.openzen.zenscript.codemodel.expression.captured.CapturedExpression;
 import org.openzen.zenscript.codemodel.expression.LambdaClosure;
 
 public class LocalCapturedExpression implements LocalExpression {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/impl/capture/LocalParameterExpression.java

@@ -5,7 +5,7 @@
 import org.openzen.zenscript.codemodel.compilation.CompilingExpression;
 import org.openzen.zenscript.codemodel.compilation.ExpressionCompiler;
 import org.openzen.zenscript.codemodel.compilation.expression.AbstractCompilingExpression;
-import org.openzen.zenscript.codemodel.expression.CapturedParameterExpression;
+import org.openzen.zenscript.codemodel.expression.captured.CapturedParameterExpression;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.LambdaClosure;
 import org.openzen.zenscript.codemodel.expression.modifiable.ModifiableExpression;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/impl/capture/LocalThisExpression.java

@@ -1,11 +1,11 @@
 package org.openzen.zenscript.codemodel.compilation.impl.capture;
 
 import org.openzen.zencode.shared.CodePosition;
-import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.compilation.CompilingExpression;
 import org.openzen.zenscript.codemodel.compilation.ExpressionCompiler;
 import org.openzen.zenscript.codemodel.compilation.expression.AbstractCompilingExpression;
 import org.openzen.zenscript.codemodel.expression.*;
+import org.openzen.zenscript.codemodel.expression.captured.CapturedThisExpression;
 import org.openzen.zenscript.codemodel.ssa.CodeBlockStatement;
 import org.openzen.zenscript.codemodel.ssa.SSAVariableCollector;
 import org.openzen.zenscript.codemodel.type.TypeID;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/impl/capture/LocalVariableExpression.java

@@ -6,8 +6,7 @@
 import org.openzen.zenscript.codemodel.compilation.expression.AbstractCompilingExpression;
 import org.openzen.zenscript.codemodel.compilation.expression.InstanceMemberCompilingExpression;
 import org.openzen.zenscript.codemodel.compilation.expression.SSACompilingVariable;
-import org.openzen.zenscript.codemodel.expression.CapturedExpression;
-import org.openzen.zenscript.codemodel.expression.CapturedLocalVariableExpression;
+import org.openzen.zenscript.codemodel.expression.captured.CapturedLocalVariableExpression;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.LambdaClosure;
 import org.openzen.zenscript.codemodel.expression.modifiable.ModifiableExpression;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/impl/compiler/ExpressionCompilerImpl.java

@@ -9,7 +9,6 @@
 import org.openzen.zenscript.codemodel.compilation.impl.capture.LocalThisExpression;
 import org.openzen.zenscript.codemodel.expression.*;
 import org.openzen.zenscript.codemodel.expression.modifiable.ModifiableExpression;
-import org.openzen.zenscript.codemodel.globals.IGlobal;
 import org.openzen.zenscript.codemodel.identifiers.instances.FieldInstance;
 import org.openzen.zenscript.codemodel.identifiers.instances.MethodInstance;
 import org.openzen.zenscript.codemodel.member.ref.ImplementationMemberInstance;
@@ -62,7 +61,7 @@ public Optional<TypeID> getThisType() {
 
 	@Override
 	public Optional<CompilingExpression> getThis(CodePosition position) {
-		return getThisType().map(thisType -> locals.capture(position, new LocalThisExpression(position, thisType)).compile(this));
+		return getThisType().map(thisType -> locals.capture(new LocalThisExpression(position, thisType)).compile(this));
 	}
 
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/impl/compiler/LocalSymbols.java

@@ -46,22 +46,22 @@ private LocalSymbols(LocalSymbols parent, FunctionHeader header, LambdaClosure c
 
 	private LocalSymbols(LocalSymbols parent, CompilingLoopStatement loop, String... loopName) {
 		this.parent = parent;
-		this.closure = parent.closure;
+		this.closure = null;
 		this.loop = loop;
 		this.loopName = loopName;
-		this.header = parent.header;
-		this.dollar = parent.dollar;
+		this.header = null;
+		this.dollar = null;
 
 		for (CompilingVariable loopVariable : loop.getLoopVariables())
 			localVariables.put(loopVariable.name, loopVariable);
 	}
 
 	private LocalSymbols(LocalSymbols parent, CompilingExpression dollar) {
 		this.parent = parent;
-		this.closure = parent.closure;
+		this.closure = null;
 		this.loop = null;
 		this.loopName = null;
-		this.header = parent.header;
+		this.header = null;
 		this.dollar = dollar;
 	}
 
@@ -118,18 +118,19 @@ public Optional<LocalExpression> findLocalVariable(CodePosition position, String
 		if (parent == null)
 			return Optional.empty();
 		else if (closure != null)
-			return parent.findLocalVariable(position, name).map(var -> var.capture(closure));
+			return parent.findLocalVariable(position, name).map(variable -> variable.capture(closure));
 		else
 			return parent.findLocalVariable(position, name);
 	}
 
-	public LocalExpression capture(CodePosition position, LocalExpression local) {
-		if (this.parent == null)
-			return local;
-		else if (closure != null)
-			return local.capture(closure);
-		else
-			return parent.capture(position, local);
+	public LocalExpression capture(LocalExpression local) {
+		if(parent != null) {
+			local = parent.capture(local);
+		}
+		if(closure != null) {
+			local = local.capture(closure);
+		}
+		return local;
 	}
 
 	public Optional<CompilingExpression> getDollar() {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/impl/compiler/MemberCompilerImpl.java

@@ -2,7 +2,6 @@
 
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.compilation.*;
-import org.openzen.zenscript.codemodel.identifiers.TypeSymbol;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
 public class MemberCompilerImpl implements MemberCompiler {

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

@@ -1,5 +1,7 @@
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zenscript.codemodel.expression.captured.CapturedExpression;
+
 public interface ExpressionVisitor<T> {
 	T visitAndAnd(AndAndExpression expression);
 
@@ -13,13 +15,7 @@ public interface ExpressionVisitor<T> {
 
 	T visitCallSuper(CallSuperExpression expression);
 
-	T visitCapturedClosure(CapturedClosureExpression expression);
-
-	T visitCapturedLocalVariable(CapturedLocalVariableExpression expression);
-
-	T visitCapturedParameter(CapturedParameterExpression expression);
-
-	T visitCapturedThis(CapturedThisExpression expression);
+	T visitCaptured(CapturedExpression expression);
 
 	T visitCheckNull(CheckNullExpression expression);
 

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

@@ -1,5 +1,7 @@
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zenscript.codemodel.expression.captured.CapturedExpression;
+
 public interface ExpressionVisitorWithContext<C, R> {
 	R visitAndAnd(C context, AndAndExpression expression);
 
@@ -13,13 +15,7 @@ public interface ExpressionVisitorWithContext<C, R> {
 
 	R visitCallSuper(C context, CallSuperExpression expression);
 
-	R visitCapturedClosure(C context, CapturedClosureExpression expression);
-
-	R visitCapturedLocalVariable(C context, CapturedLocalVariableExpression expression);
-
-	R visitCapturedParameter(C context, CapturedParameterExpression expression);
-
-	R visitCapturedThis(C context, CapturedThisExpression expression);
+	R visitCaptured(C context, CapturedExpression expression);
 
 	R visitCheckNull(C context, CheckNullExpression expression);
 

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

@@ -1,5 +1,7 @@
 package org.openzen.zenscript.codemodel.expression;
 
+import org.openzen.zenscript.codemodel.expression.captured.CapturedExpression;
+
 import java.util.*;
 
 public class LambdaClosure {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/CapturedClosureExpression.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/captured/CapturedClosureExpression.java

@@ -1,6 +1,9 @@
-package org.openzen.zenscript.codemodel.expression;
+package org.openzen.zenscript.codemodel.expression.captured;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
+import org.openzen.zenscript.codemodel.expression.LambdaClosure;
 
 import java.util.Objects;
 
@@ -13,21 +16,11 @@ public CapturedClosureExpression(CodePosition position, CapturedExpression value
 		this.value = value;
 	}
 
-	@Override
-	public <T> T accept(ExpressionVisitor<T> visitor) {
-		return visitor.visitCapturedClosure(this);
-	}
-
 	@Override
 	public <T> T accept(CapturedExpressionVisitor<T> visitor) {
 		return visitor.visitRecaptured(this);
 	}
 
-	@Override
-	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
-		return visitor.visitCapturedClosure(context, this);
-	}
-
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		Expression tValue = transformer.transform(value);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/captured/CapturedExpression.java

@@ -0,0 +1,30 @@
+package org.openzen.zenscript.codemodel.expression.captured;
+
+import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.expression.ExpressionVisitor;
+import org.openzen.zenscript.codemodel.expression.ExpressionVisitorWithContext;
+import org.openzen.zenscript.codemodel.expression.LambdaClosure;
+import org.openzen.zenscript.codemodel.type.TypeID;
+
+public abstract class CapturedExpression extends Expression {
+	public final LambdaClosure closure;
+
+	protected CapturedExpression(CodePosition position, TypeID type, LambdaClosure closure) {
+		super(position, type, null);
+
+		this.closure = closure;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitCaptured(this);
+	}
+
+	@Override
+	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
+		return visitor.visitCaptured(context, this);
+	}
+
+	public abstract <T> T accept(CapturedExpressionVisitor<T> visitor);
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/CapturedExpressionVisitor.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/captured/CapturedExpressionVisitor.java

@@ -1,4 +1,4 @@
-package org.openzen.zenscript.codemodel.expression;
+package org.openzen.zenscript.codemodel.expression.captured;
 
 public interface CapturedExpressionVisitor<T> {
 	T visitCapturedThis(CapturedThisExpression expression);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/CapturedLocalVariableExpression.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/captured/CapturedLocalVariableExpression.java

@@ -1,7 +1,8 @@
-package org.openzen.zenscript.codemodel.expression;
+package org.openzen.zenscript.codemodel.expression.captured;
 
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.VariableDefinition;
+import org.openzen.zenscript.codemodel.expression.*;
 
 import java.util.Objects;
 
@@ -14,21 +15,11 @@ public CapturedLocalVariableExpression(CodePosition position, VariableDefinition
 		this.variable = variable;
 	}
 
-	@Override
-	public <T> T accept(ExpressionVisitor<T> visitor) {
-		return visitor.visitCapturedLocalVariable(this);
-	}
-
 	@Override
 	public <T> T accept(CapturedExpressionVisitor<T> visitor) {
 		return visitor.visitCapturedLocal(this);
 	}
 
-	@Override
-	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
-		return visitor.visitCapturedLocalVariable(context, this);
-	}
-
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/CapturedParameterExpression.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/captured/CapturedParameterExpression.java

@@ -1,7 +1,10 @@
-package org.openzen.zenscript.codemodel.expression;
+package org.openzen.zenscript.codemodel.expression.captured;
 
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
+import org.openzen.zenscript.codemodel.expression.LambdaClosure;
 
 import java.util.Objects;
 
@@ -14,21 +17,11 @@ public CapturedParameterExpression(CodePosition position, FunctionParameter para
 		this.parameter = parameter;
 	}
 
-	@Override
-	public <T> T accept(ExpressionVisitor<T> visitor) {
-		return visitor.visitCapturedParameter(this);
-	}
-
 	@Override
 	public <T> T accept(CapturedExpressionVisitor<T> visitor) {
 		return visitor.visitCapturedParameter(this);
 	}
 
-	@Override
-	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
-		return visitor.visitCapturedParameter(context, this);
-	}
-
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/CapturedThisExpression.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/captured/CapturedThisExpression.java

@@ -1,6 +1,9 @@
-package org.openzen.zenscript.codemodel.expression;
+package org.openzen.zenscript.codemodel.expression.captured;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
+import org.openzen.zenscript.codemodel.expression.LambdaClosure;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
 import java.util.Objects;
@@ -10,21 +13,11 @@ public CapturedThisExpression(CodePosition position, TypeID type, LambdaClosure
 		super(position, type, closure);
 	}
 
-	@Override
-	public <T> T accept(ExpressionVisitor<T> visitor) {
-		return visitor.visitCapturedThis(this);
-	}
-
 	@Override
 	public <T> T accept(CapturedExpressionVisitor<T> visitor) {
 		return visitor.visitCapturedThis(this);
 	}
 
-	@Override
-	public <C, R> R accept(C context, ExpressionVisitorWithContext<C, R> visitor) {
-		return visitor.visitCapturedThis(context, this);
-	}
-
 	@Override
 	public Expression transform(ExpressionTransformer transformer) {
 		return this;