Statements now Extend Taggable and added local variables

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

@@ -10,12 +10,13 @@ import java.util.stream.Collectors;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.shared.Taggable;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public abstract class Statement {
+public abstract class Statement extends Taggable {
 	public final CodePosition position;
 	
 	public Statement(CodePosition position) {

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/JavaLocalVariableInfo.java

@@ -0,0 +1,13 @@
+package org.openzen.zenscript.javabytecode;
+
+import org.objectweb.asm.Type;
+
+public class JavaLocalVariableInfo {
+    public final Type type;
+    public final int local;
+
+    public JavaLocalVariableInfo(Type type, int local) {
+        this.type = type;
+        this.local = local;
+    }
+}

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

@@ -4,7 +4,10 @@ import org.openzen.zenscript.codemodel.expression.*;
 import org.openzen.zenscript.codemodel.member.DefinitionMember;
 import org.openzen.zenscript.javabytecode.JavaBytecodeImplementation;
 import org.openzen.zenscript.javabytecode.JavaFieldInfo;
+import org.openzen.zenscript.javabytecode.JavaLocalVariableInfo;
 import org.openzen.zenscript.javabytecode.JavaMethodInfo;
+import org.openzen.zenscript.shared.CompileException;
+import org.openzen.zenscript.shared.CompileExceptionCode;
 
 public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 
@@ -203,6 +206,8 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 
     @Override
     public Void visitGetLocalVariable(GetLocalVariableExpression expression) {
+        final JavaLocalVariableInfo tag = expression.variable.getTag(JavaLocalVariableInfo.class);
+        javaWriter.load(tag.type, tag.local);
         return null;
     }
 
@@ -275,6 +280,13 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 
     @Override
     public Void visitSetLocalVariable(SetLocalVariableExpression expression) {
+        if(expression.variable.isFinal)
+            throw new CompileException(expression.position, CompileExceptionCode.CANNOT_SET_FINAL_VARIABLE, "Cannot set a final variable!");
+        expression.value.accept(this);
+        final JavaLocalVariableInfo tag = expression.variable.getTag(JavaLocalVariableInfo.class);
+
+        javaWriter.store(tag.type, tag.local);
+
         return null;
     }
 

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

@@ -1,6 +1,8 @@
 package org.openzen.zenscript.javabytecode.compiler;
 
+import org.objectweb.asm.Type;
 import org.openzen.zenscript.codemodel.statement.*;
+import org.openzen.zenscript.javabytecode.JavaLocalVariableInfo;
 
 public class JavaStatementVisitor implements StatementVisitor<Void> {
     private final JavaWriter javaWriter;
@@ -78,6 +80,12 @@ 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);
+        statement.setTag(JavaLocalVariableInfo.class, new JavaLocalVariableInfo(type, local));
         return null;
     }
 

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

@@ -0,0 +1,97 @@
+package org.openzen.zenscript.javabytecode.compiler;
+
+import org.objectweb.asm.Type;
+import org.openzen.zenscript.codemodel.type.*;
+
+import java.util.Iterator;
+import java.util.Map;
+
+public class JavaTypeClassVisitor implements ITypeVisitor<Class> {
+
+    public static final JavaTypeClassVisitor INSTANCE = new JavaTypeClassVisitor();
+
+    @Override
+    public Class visitBasic(BasicTypeID basic) {
+        switch (basic) {
+            case VOID:
+                return void.class;
+            case ANY:
+            case NULL:
+            case UNDETERMINED:
+                return Object.class;
+            case BOOL:
+                return boolean.class;
+            case BYTE:
+            case SBYTE:
+                return byte.class;
+            case SHORT:
+            case USHORT:
+                return short.class;
+            case INT:
+            case UINT:
+                return int.class;
+            case LONG:
+            case ULONG:
+                return long.class;
+            case FLOAT:
+                return float.class;
+            case DOUBLE:
+                return double.class;
+            case CHAR:
+                return char.class;
+            case STRING:
+                return String.class;
+        }
+        return Object.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;
+        }
+    }
+
+    @Override
+    public Class visitAssoc(AssocTypeID assoc) {
+        return Map.class;
+    }
+
+    @Override
+    public Class visitIterator(IteratorTypeID iterator) {
+        return Iterator.class;
+    }
+
+    @Override
+    public Class visitFunction(FunctionTypeID function) {
+        return null;
+    }
+
+    @Override
+    public Class visitDefinition(DefinitionTypeID definition) {
+        return null;
+    }
+
+    @Override
+    public Class visitGeneric(GenericTypeID generic) {
+        return null;
+    }
+
+    @Override
+    public Class visitRange(RangeTypeID range) {
+        return null;
+    }
+
+    @Override
+    public Class visitConst(ConstTypeID type) {
+        return type.baseType.accept(this);
+    }
+
+    @Override
+    public Class visitOptional(OptionalTypeID optional) {
+        return null;
+    }
+}

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

@@ -1,92 +0,0 @@
-package org.openzen.zenscript.javabytecode.compiler;
-
-import org.openzen.zenscript.codemodel.type.*;
-import org.openzen.zenscript.javabytecode.JavaClassInfo;
-import org.openzen.zenscript.shared.CompileException;
-
-public class JavaTypeSignatureVisitor implements ITypeVisitor<String> {
-    @Override
-    public String visitBasic(BasicTypeID basic) {
-        switch (basic) {
-            case VOID:
-                return "V";
-            case NULL:
-            case ANY:
-            case UNDETERMINED:
-                return "Ljava/lang/Object;";
-            case BOOL:
-                return "Z";
-            case BYTE:
-            case SBYTE:
-                return "B";
-            case SHORT:
-            case USHORT:
-                return "S";
-            case INT:
-            case UINT:
-                return "I";
-            case LONG:
-            case ULONG:
-                return "J";
-            case FLOAT:
-                return "F";
-            case DOUBLE:
-                return "D";
-            case CHAR:
-                return "C";
-            case STRING:
-                return "Ljava/lang/String;";
-        }
-        return "";
-    }
-
-    @Override
-    public String visitArray(ArrayTypeID array) {
-        return "[" + array.elementType.accept(this);
-    }
-
-    @Override
-    public String visitAssoc(AssocTypeID assoc) {
-        return "Ljava/util/Map;";
-    }
-
-    @Override
-    public String visitIterator(IteratorTypeID iterator) {
-        return "java/lang/Iterable";
-    }
-
-    @Override
-    public String visitFunction(FunctionTypeID function) {
-        return null;
-    }
-
-    @Override
-    public String visitDefinition(DefinitionTypeID definition) {
-		JavaClassInfo classInfo = definition.definition.getTag(JavaClassInfo.class);
-		if (classInfo == null)
-			throw CompileException.internalError("Definition is missing java class tag!");
-		
-        return "L" + classInfo.internalClassName + ";";
-    }
-
-    @Override
-    public String visitGeneric(GenericTypeID generic) {
-		// TODO: type erasure
-        return null;
-    }
-
-    @Override
-    public String visitRange(RangeTypeID range) {
-        return null;
-    }
-
-    @Override
-    public String visitConst(ConstTypeID type) {
-		return type.baseType.accept(this);
-    }
-
-    @Override
-    public String visitOptional(OptionalTypeID optional) {
-        return null;
-    }
-}

ScriptingExample/scripts/moreHellos.zs

@@ -1,6 +1,16 @@
 println("Hello world!");
-println("Hello world!");
-println("Hello world!");
-println("Hello world!");
-println("Hello world!");
 println(1 as string);
+
+
+var test = "test";
+println(test);
+
+
+test = "testMore";
+println(test);
+
+test = 13;
+println(test);
+
+val test2 = 14;
+println(test2);

Shared/src/main/java/org/openzen/zenscript/shared/CompileExceptionCode.java

@@ -55,5 +55,6 @@ public enum CompileExceptionCode {
 	RETURN_VALUE_REQUIRED,
 	RETURN_VALUE_VOID,
 	INVALID_CONDITION,
-	INTERNAL_ERROR
+	INTERNAL_ERROR,
+	CANNOT_SET_FINAL_VARIABLE
 }