More java stuff

- If/Else
- While do and do While
- For

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

@@ -12,9 +12,9 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class BreakStatement extends Statement {
-	public final Statement target;
+	public final LoopStatement target;
 	
-	public BreakStatement(CodePosition position, Statement target) {
+	public BreakStatement(CodePosition position, LoopStatement target) {
 		super(position);
 		
 		this.target = target;

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

@@ -12,9 +12,9 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class ContinueStatement extends Statement {
-	public final Statement target;
+	public final LoopStatement target;
 	
-	public ContinueStatement(CodePosition position, Statement target) {
+	public ContinueStatement(CodePosition position, LoopStatement target) {
 		super(position);
 		
 		this.target = target;

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

@@ -13,14 +13,14 @@ import org.openzen.zenscript.shared.CodePosition;
  *
  * @author Hoofdgebruiker
  */
-public class ForeachStatement extends Statement {
+public class ForeachStatement extends LoopStatement {
 	public final VarStatement[] loopVariables;
 	public final Expression list;
 	public final IIteratorMember iterator;
 	public Statement content;
 	
 	public ForeachStatement(CodePosition position, VarStatement[] loopVariables, IIteratorMember iterator, Expression list) {
-		super(position);
+		super(position, loopVariables[0].name);
 		
 		this.loopVariables = loopVariables;
 		this.list = list;

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

@@ -12,7 +12,7 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public abstract class LoopStatement extends Statement {
-	public final String label;
+	public String label;
 	
 	public LoopStatement(CodePosition position, String label) {
 		super(position);

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/implementations/IntRange.java

@@ -0,0 +1,12 @@
+package org.openzen.zenscript.implementations;
+
+public class IntRange {
+    public final int min;
+    public final int max;
+
+
+    public IntRange(int min, int max) {
+        this.min = min;
+        this.max = max;
+    }
+}

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

@@ -1,9 +1,11 @@
 package org.openzen.zenscript.javabytecode.compiler;
 
+import com.sun.javafx.image.IntPixelGetter;
 import org.objectweb.asm.Type;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.codemodel.expression.*;
 import org.openzen.zenscript.codemodel.member.DefinitionMember;
+import org.openzen.zenscript.implementations.IntRange;
 import org.openzen.zenscript.javabytecode.JavaBytecodeImplementation;
 import org.openzen.zenscript.javabytecode.JavaFieldInfo;
 import org.openzen.zenscript.javabytecode.JavaLocalVariableInfo;
@@ -308,6 +310,15 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 
     @Override
     public Void visitRange(RangeExpression expression) {
+        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);
+        expression.to.accept(this);
+        System.out.println(IntRange.class.getName());
+        javaWriter.invokeSpecial("org/openzen/zenscript/implementations/IntRange", "<init>", "(II)V");
+
         return null;
     }
 

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

@@ -0,0 +1,85 @@
+package org.openzen.zenscript.javabytecode.compiler;
+
+import org.objectweb.asm.Label;
+import org.openzen.zenscript.codemodel.iterator.ForeachIteratorVisitor;
+import org.openzen.zenscript.codemodel.member.CustomIteratorMember;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.VarStatement;
+import org.openzen.zenscript.javabytecode.JavaLocalVariableInfo;
+
+public class JavaForeachVisitor implements ForeachIteratorVisitor<Void> {
+
+    private final JavaWriter javaWriter;
+    private final VarStatement[] variables;
+    private final Statement content;
+    private final Label startLabel;
+    private final Label endLabel;
+    private final JavaStatementVisitor statementVisitor;
+
+    public JavaForeachVisitor(JavaStatementVisitor statementVisitor, VarStatement[] variables, Statement content, Label start, Label end) {
+        this.statementVisitor = statementVisitor;
+        this.javaWriter = statementVisitor.getJavaWriter();
+        this.variables = variables;
+        this.content = content;
+        this.startLabel = start;
+        this.endLabel = end;
+    }
+
+    @Override
+    public Void visitIntRange() {
+        javaWriter.dup();
+        javaWriter.getField("org/openzen/zenscript/implementations/IntRange", "max", "I");
+        javaWriter.swap();
+        javaWriter.getField("org/openzen/zenscript/implementations/IntRange", "min", "I");
+
+        final int z = variables[0].getTag(JavaLocalVariableInfo.class).local;
+        javaWriter.storeInt(z);
+        javaWriter.label(startLabel);
+        javaWriter.dup();
+        javaWriter.loadInt(z);
+        javaWriter.ifICmpLE(endLabel);
+
+        content.accept(statementVisitor);
+        javaWriter.iinc(z);
+
+
+        return null;
+    }
+
+    @Override
+    public Void visitArrayValueIterator() {
+        handleArray(javaWriter.local(int.class), variables[0].getTag(JavaLocalVariableInfo.class));
+        return null;
+    }
+
+    @Override
+    public Void visitArrayKeyValueIterator() {
+        handleArray(variables[0].getTag(JavaLocalVariableInfo.class).local, variables[1].getTag(JavaLocalVariableInfo.class));
+        return null;
+    }
+
+    private void handleArray(final int z, final JavaLocalVariableInfo arrayTypeInfo) {
+        javaWriter.iConst0();
+        javaWriter.storeInt(z);
+
+        javaWriter.label(startLabel);
+        javaWriter.dup();
+        javaWriter.dup();
+        javaWriter.arrayLength();
+        javaWriter.loadInt(z);
+
+        javaWriter.ifICmpLE(endLabel);
+        javaWriter.loadInt(z);
+
+
+        javaWriter.arrayLoad(arrayTypeInfo.type);
+        javaWriter.store(arrayTypeInfo.type, arrayTypeInfo.local);
+        content.accept(statementVisitor);
+        javaWriter.iinc(z);
+    }
+
+    @Override
+    public Void visitCustomIterator() {
+        return null;
+    }
+}

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

@@ -1,5 +1,6 @@
 package org.openzen.zenscript.javabytecode.compiler;
 
+import org.objectweb.asm.Label;
 import org.objectweb.asm.Type;
 import org.openzen.zenscript.codemodel.statement.*;
 import org.openzen.zenscript.javabytecode.JavaLocalVariableInfo;
@@ -11,7 +12,7 @@ public class JavaStatementVisitor implements StatementVisitor<Void> {
     public JavaStatementVisitor(final JavaWriter javaWriter) {
 
         this.javaWriter = javaWriter;
-        this.expressionVisitor = new JavaExpressionVisitor( javaWriter);
+        this.expressionVisitor = new JavaExpressionVisitor(javaWriter);
     }
 
     @Override
@@ -24,21 +25,38 @@ public class JavaStatementVisitor implements StatementVisitor<Void> {
 
     @Override
     public Void visitBreak(BreakStatement statement) {
+        javaWriter.goTo(javaWriter.getNamedLabel(statement.target.label + "_end"));
         return null;
     }
 
     @Override
     public Void visitContinue(ContinueStatement statement) {
+        javaWriter.goTo(javaWriter.getNamedLabel(statement.target.label + "_start"));
         return null;
     }
 
     @Override
     public Void visitDoWhile(DoWhileStatement statement) {
+        Label start = new Label();
+        Label end = new Label();
+        if (statement.label == null)
+            statement.label = javaWriter.createLabelName() + "DoWhile";
+        javaWriter.putNamedLabel(start, statement.label + "_start");
+        javaWriter.putNamedLabel(end, statement.label + "_end");
+        javaWriter.label(start);
+        statement.content.accept(this);
+
+        statement.condition.accept(expressionVisitor);
+        javaWriter.ifNE(start);
+
+        //Only needed for break statements, should be nop if not used
+        javaWriter.label(end);
         return null;
     }
 
     @Override
     public Void visitEmpty(EmptyStatement statement) {
+        //No-Op
         return null;
     }
 
@@ -50,11 +68,51 @@ public class JavaStatementVisitor implements StatementVisitor<Void> {
 
     @Override
     public Void visitForeach(ForeachStatement statement) {
+        //Create Labels
+        Label start = new Label();
+        Label end = new Label();
+        if (statement.label == null) {
+            statement.label = javaWriter.createLabelName() + "ForEach";
+        }
+        javaWriter.putNamedLabel(start, statement.label + "_start");
+        javaWriter.putNamedLabel(end, statement.label + "_end");
+
+
+        //Compile Array/Collection
+        statement.list.accept(expressionVisitor);
+
+        //Create local variables
+        for (VarStatement variable : statement.loopVariables) {
+            final Type type = Type.getType(variable.type.accept(JavaTypeClassVisitor.INSTANCE));
+            variable.setTag(JavaLocalVariableInfo.class, new JavaLocalVariableInfo(type, javaWriter.local(type)));
+        }
+
+        //javaWriter.label(min);
+        statement.iterator.acceptForIterator(new JavaForeachVisitor(this, statement.loopVariables, statement.content, start, end));
+        javaWriter.goTo(start);
+        javaWriter.label(end);
         return null;
     }
 
     @Override
     public Void visitIf(IfStatement statement) {
+        statement.condition.accept(expressionVisitor);
+        Label onElse = null;
+        Label end = new Label();
+        final boolean hasElse = statement.onElse != null;
+        if (hasElse) {
+            onElse = new Label();
+            javaWriter.ifEQ(onElse);
+        } else {
+            javaWriter.ifEQ(end);
+        }
+        statement.onThen.accept(this);
+        if (hasElse) {
+            javaWriter.goTo(end);
+            javaWriter.label(onElse);
+            statement.onElse.accept(this);
+        }
+        javaWriter.label(end);
         return null;
     }
 
@@ -65,11 +123,15 @@ public class JavaStatementVisitor implements StatementVisitor<Void> {
 
     @Override
     public Void visitReturn(ReturnStatement statement) {
+        statement.value.accept(expressionVisitor);
+        javaWriter.returnType(Type.getType(statement.value.type.accept(JavaTypeClassVisitor.INSTANCE)));
         return null;
     }
 
     @Override
     public Void visitThrow(ThrowStatement statement) {
+        statement.value.accept(expressionVisitor);
+        javaWriter.aThrow();
         return null;
     }
 
@@ -80,17 +142,33 @@ public class JavaStatementVisitor implements StatementVisitor<Void> {
 
     @Override
     public Void visitVar(VarStatement statement) {
-        if(statement.initializer != null)
-            statement.initializer.accept(expressionVisitor);
         Type type = Type.getType(statement.type.accept(JavaTypeClassVisitor.INSTANCE));
         int local = javaWriter.local(type);
-        javaWriter.store(type, local);
+        if (statement.initializer != null) {
+            statement.initializer.accept(expressionVisitor);
+            javaWriter.store(type, local);
+        }
         statement.setTag(JavaLocalVariableInfo.class, new JavaLocalVariableInfo(type, local));
         return null;
     }
 
     @Override
     public Void visitWhile(WhileStatement statement) {
+        Label start = new Label();
+        Label end = new Label();
+
+        if (statement.label == null) {
+            statement.label = javaWriter.createLabelName() + "WhileDo";
+        }
+        javaWriter.putNamedLabel(start, statement.label + "_start");
+        javaWriter.putNamedLabel(end, statement.label + "_end");
+
+        javaWriter.label(start);
+        statement.condition.accept(expressionVisitor);
+        javaWriter.ifEQ(end);
+        statement.content.accept(this);
+        javaWriter.goTo(start);
+        javaWriter.label(end);
         return null;
     }
 

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

@@ -1,8 +1,8 @@
 package org.openzen.zenscript.javabytecode.compiler;
 
-import org.objectweb.asm.Type;
 import org.openzen.zenscript.codemodel.type.*;
 
+import java.lang.reflect.Array;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -47,12 +47,7 @@ public class JavaTypeClassVisitor implements ITypeVisitor<Class> {
 
     @Override
     public Class visitArray(ArrayTypeID array) {
-        try {
-            return Class.forName("[" + Type.getInternalName(array.elementType.accept(this)));
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-            return Object[].class;
-        }
+        return Array.newInstance(array.elementType.accept(this), 0).getClass();
     }
 
     @Override

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

@@ -12,7 +12,7 @@ import static org.objectweb.asm.Opcodes.*;
 
 public class JavaWriter {
     final LocalVariablesSorter visitor;
-    private boolean debug = false;
+    private boolean debug = true;
     private int labelIndex = 1;
     private Map<Label, String> labelNames = new HashMap<>();
 
@@ -1065,7 +1065,25 @@ public class JavaWriter {
         return labelNames.get(lbl);
     }
 
+    public String createLabelName() {
+        return "L" + labelIndex++;
+    }
+
+    public void putNamedLabel(Label lbl, String name) {
+        if(labelNames == null)
+            labelNames = new HashMap<>();
+        labelNames.put(lbl, name);
+    }
+
     public void stringAdd() {
-        invokeVirtual(String.class, "concat", String.class, String.class);
+        invokeVirtual("java/lang/String", "concat", "(Ljava/lang/String;)Ljava/lang/String;");
+    }
+
+    public Label getNamedLabel(String label) {
+        for (Map.Entry<Label, String> entry : labelNames.entrySet()) {
+            if(entry.getValue().matches(label))
+                return entry.getKey();
+        }
+        throw new RuntimeException("Label " + label + " not found!");
     }
 }

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

@@ -11,7 +11,7 @@ import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
-import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -30,7 +30,7 @@ public abstract class BaseScope implements TypeScope {
 	
 	public abstract ITypeID getType(CodePosition position, List<GenericName> name);
 	
-	public abstract Statement getLoop(String name);
+	public abstract LoopStatement getLoop(String name);
 	
 	public abstract FunctionHeader getFunctionHeader();
 	

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

@@ -10,7 +10,7 @@ import java.util.function.Function;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
-import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
@@ -42,7 +42,7 @@ public class BlockScope extends StatementScope {
 	}
 
 	@Override
-	public Statement getLoop(String name) {
+	public LoopStatement getLoop(String name) {
 		return parent.getLoop(name);
 	}
 

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

@@ -10,6 +10,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.shared.CompileException;
 import org.openzen.zenscript.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.FunctionHeader;
@@ -20,7 +22,6 @@ import org.openzen.zenscript.codemodel.expression.ThisExpression;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.partial.PartialTypeExpression;
-import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
@@ -90,7 +91,7 @@ public class DefinitionScope extends BaseScope {
 	}
 
 	@Override
-	public Statement getLoop(String name) {
+	public LoopStatement getLoop(String name) {
 		return null;
 	}
 

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

@@ -14,7 +14,7 @@ import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
-import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
@@ -106,7 +106,7 @@ public class ExpressionScope extends BaseScope {
 	}
 	
 	@Override
-	public Statement getLoop(String name) {
+	public LoopStatement getLoop(String name) {
 		return outer.getLoop(name);
 	}
 	

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

@@ -18,7 +18,7 @@ import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.partial.PartialTypeExpression;
-import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
@@ -121,7 +121,7 @@ public class FileScope extends BaseScope {
 	}
 
 	@Override
-	public Statement getLoop(String name) {
+	public LoopStatement getLoop(String name) {
 		return null;
 	}
 

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

@@ -12,7 +12,7 @@ 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.ForeachStatement;
-import org.openzen.zenscript.codemodel.statement.Statement;
+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;
@@ -59,7 +59,7 @@ public class ForeachScope extends StatementScope {
 	}
 
 	@Override
-	public Statement getLoop(String name) {
+	public LoopStatement getLoop(String name) {
 		if (name == null)
 			return statement;
 		

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

@@ -14,7 +14,7 @@ import org.openzen.zenscript.codemodel.expression.GetFunctionParameterExpression
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.partial.PartialTypeExpression;
-import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
@@ -39,7 +39,7 @@ public class FunctionScope extends StatementScope {
 	}
 
 	@Override
-	public Statement getLoop(String name) {
+	public LoopStatement getLoop(String name) {
 		return null; // not in a loop
 	}
 

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

@@ -14,7 +14,7 @@ import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.partial.PartialTypeExpression;
-import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
@@ -57,7 +57,7 @@ public class GenericFunctionScope extends BaseScope {
 	}
 
 	@Override
-	public Statement getLoop(String name) {
+	public LoopStatement getLoop(String name) {
 		return outer.getLoop(name);
 	}
 

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

@@ -10,7 +10,7 @@ import java.util.function.Function;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
-import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
@@ -47,7 +47,7 @@ public class GlobalScriptScope extends StatementScope {
 	}
 
 	@Override
-	public Statement getLoop(String name) {
+	public LoopStatement getLoop(String name) {
 		return null;
 	}
 

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

@@ -14,7 +14,7 @@ import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.member.ImplementationMember;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.partial.PartialTypeExpression;
-import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
@@ -73,7 +73,7 @@ public class ImplementationScope extends BaseScope {
 	}
 
 	@Override
-	public Statement getLoop(String name) {
+	public LoopStatement getLoop(String name) {
 		return null;
 	}
 

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

@@ -13,7 +13,7 @@ import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.GetFunctionParameterExpression;
 import org.openzen.zenscript.codemodel.expression.LambdaClosure;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
-import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
@@ -57,7 +57,7 @@ public class LambdaScope extends StatementScope {
 	}
 
 	@Override
-	public Statement getLoop(String name) {
+	public LoopStatement getLoop(String name) {
 		return null;
 	}
 

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

@@ -11,7 +11,6 @@ import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.statement.LoopStatement;
-import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
@@ -50,7 +49,7 @@ public class LoopScope extends StatementScope {
 	}
 
 	@Override
-	public Statement getLoop(String name) {
+	public LoopStatement getLoop(String name) {
 		if (name == null)
 			return statement;
 		

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.parser.statements;
 
 import org.openzen.zenscript.codemodel.statement.BreakStatement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.linker.StatementScope;
 import org.openzen.zenscript.shared.CodePosition;
@@ -27,7 +28,7 @@ public class ParsedStatementBreak extends ParsedStatement {
 
 	@Override
 	public Statement compile(StatementScope scope) {
-		Statement target = scope.getLoop(name);
+		LoopStatement target = scope.getLoop(name);
 		if (target == null)
 			throw new CompileException(position, CompileExceptionCode.BREAK_OUTSIDE_LOOP, name == null ? "Not in a loop" : "No such loop: " + name);
 		return new BreakStatement(position, target);

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.parser.statements;
 
 import org.openzen.zenscript.codemodel.statement.ContinueStatement;
+import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.linker.StatementScope;
 import org.openzen.zenscript.shared.CodePosition;
@@ -27,7 +28,7 @@ public class ParsedStatementContinue extends ParsedStatement {
 
 	@Override
 	public Statement compile(StatementScope scope) {
-		Statement target = scope.getLoop(name);
+		LoopStatement target = scope.getLoop(name);
 		if (target == null)
 			throw new CompileException(position, CompileExceptionCode.CONTINUE_OUTSIDE_LOOP, name == null ? "Not in a loop" : "No such loop: " + name);
 		return new ContinueStatement(position, target);

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

@@ -34,7 +34,7 @@ public class ParsedStatementDoWhile extends ParsedStatement {
 
 	@Override
 	public Statement compile(StatementScope scope) {
-		Statement content = this.content.compile(scope);
+		//Statement content = this.content.compile(scope);
 		Expression condition = this.condition
 				.compile(new ExpressionScope(scope, BasicTypeID.HINT_BOOL))
 				.eval()

ScriptingExample/scripts/moreHellos.zs

@@ -13,4 +13,72 @@ test = 13;
 println(test);
 
 val test2 = 14;
-println(test2);
+println(test2);
+
+
+if true 
+    println("ifTest");
+else
+    println("elseTest");
+
+
+if false 
+    println("testIf");
+else
+    println("testElse");
+
+
+if (true) {
+
+    while :testLable true {
+        println("trueee");
+        if true
+            break testLable;
+        else
+            println("nobreak");
+    }
+    
+    
+    do {
+        println("tru"); 
+        if(false){
+        	println("brea");
+            continue;
+        }
+        else{
+            println("");
+            break;
+        }
+    } while true;
+}
+
+var test = ["1", "2", "3"];
+
+for item in test {
+	println("test");
+	println(item);
+}
+
+println("");
+
+var test2 = [1, 2, 3];
+
+for item in test2 {
+	println(item);
+}
+
+for i, item in ["5", "ttt"] {
+	println(item + i);
+}
+
+for i, item in [1, 5, 7] {
+	println(item + i);
+}
+
+for i in 10 .. 20 {
+	println(i);
+}
+
+var lateInit as string;
+lateInit = "initialized later";
+println(lateInit);

ScriptingExample/scripts/statements.zs

@@ -1,2 +1,2 @@
-while true
-	println("Hello!");
+//while true
+//	println("Hello!");