Added MemberVisitor and moved some calls there

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

@@ -1,16 +1,16 @@
 package org.openzen.zenscript.javabytecode.compiler;
 
 import org.openzen.zenscript.codemodel.expression.*;
-import org.openzen.zenscript.javabytecode.JavaBytecodeImplementation;
-import org.openzen.zenscript.javabytecode.JavaFieldInfo;
-import org.openzen.zenscript.javabytecode.JavaMethodInfo;
+import org.openzen.zenscript.codemodel.statement.StatementVisitor;
 
 public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 
+    final StatementVisitor<?> statementVisitor;
     private final JavaWriter javaWriter;
 
-    public JavaExpressionVisitor(final JavaWriter javaWriter) {
+    public JavaExpressionVisitor(final JavaWriter javaWriter, StatementVisitor<?> statementVisitor) {
         this.javaWriter = javaWriter;
+        this.statementVisitor = statementVisitor;
     }
 
     @Override
@@ -34,29 +34,8 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
         for (Expression argument : expression.arguments.arguments) {
             argument.accept(this);
         }
-		
-		JavaBytecodeImplementation implementation = expression.member.getTag(JavaBytecodeImplementation.class);
-		if (implementation != null) {
-			implementation.compile(javaWriter);
-			return null;
-		}
-		
-		JavaMethodInfo methodInfo = expression.member.getTag(JavaMethodInfo.class);
-		if (methodInfo == null)
-			throw new IllegalStateException("Call target has no method info!");
-		
-		if (methodInfo.isStatic) {
-			javaWriter.invokeStatic(
-					methodInfo.javaClass.internalClassName,
-					methodInfo.name,
-					methodInfo.signature);
-		} else {
-			javaWriter.invokeVirtual(
-					methodInfo.javaClass.internalClassName,
-					methodInfo.name,
-					methodInfo.signature);
-		}
-		
+        expression.member.accept(new JavaMemberVisitor(javaWriter, this));
+
         return null;
     }
 
@@ -225,15 +204,7 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 
     @Override
     public Void visitGetStaticField(GetStaticFieldExpression expression) {
-		JavaFieldInfo fieldInfo = expression.field.getTag(JavaFieldInfo.class);
-		if (fieldInfo == null)
-			throw new IllegalStateException("Missing field info on a field member!");
-		
-		javaWriter.getStaticField(
-				fieldInfo.javaClass.internalClassName,
-				fieldInfo.name,
-				fieldInfo.signature);
-		
+        expression.field.accept(new JavaMemberVisitor(javaWriter, this));
         return null;
     }
 

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

@@ -0,0 +1,123 @@
+package org.openzen.zenscript.javabytecode.compiler;
+
+import org.openzen.zenscript.codemodel.member.*;
+import org.openzen.zenscript.javabytecode.JavaBytecodeImplementation;
+import org.openzen.zenscript.javabytecode.JavaFieldInfo;
+import org.openzen.zenscript.javabytecode.JavaMethodInfo;
+
+public class JavaMemberVisitor implements MemberVisitor<Void> {
+
+    private final JavaWriter javaWriter;
+    private final JavaExpressionVisitor expressionVisitor;
+
+    public JavaMemberVisitor(JavaWriter javaWriter, JavaExpressionVisitor expressionVisitor) {
+        this.javaWriter = javaWriter;
+        this.expressionVisitor = expressionVisitor;
+    }
+
+
+    @Override
+    public Void visitField(FieldMember member) {
+        JavaFieldInfo fieldInfo = member.getTag(JavaFieldInfo.class);
+        if (fieldInfo == null)
+            throw new IllegalStateException("Missing field info on a field member!");
+
+        javaWriter.getStaticField(
+                fieldInfo.javaClass.internalClassName,
+                fieldInfo.name,
+                fieldInfo.signature);
+        return null;
+    }
+
+    @Override
+    public Void visitConstructor(ConstructorMember member) {
+        return null;
+    }
+
+    @Override
+    public Void visitMethod(MethodMember member) {
+        if(!checkAndExecuteByteCodeImplementation(member) && !checkAndExecuteMethodInfo(member))
+            throw new IllegalStateException("Call target has no method info!");
+
+        return null;
+    }
+
+    @Override
+    public Void visitGetter(GetterMember member) {
+        return null;
+    }
+
+    @Override
+    public Void visitSetter(SetterMember member) {
+        return null;
+    }
+
+    @Override
+    public Void visitEnumConstant(EnumConstantMember member) {
+        return null;
+    }
+
+    @Override
+    public Void visitOperator(OperatorMember member) {
+        if(!checkAndExecuteByteCodeImplementation(member) && !checkAndExecuteMethodInfo(member))
+            throw new IllegalStateException("Call target has no method info!");
+        return null;
+    }
+
+    @Override
+    public Void visitCaster(CasterMember member) {
+        if(!checkAndExecuteByteCodeImplementation(member) && !checkAndExecuteMethodInfo(member))
+            throw new IllegalStateException("Call target has no method info!");
+        return null;
+    }
+
+    @Override
+    public Void visitCustomIterator(CustomIteratorMember member) {
+        return null;
+    }
+
+    @Override
+    public Void visitCaller(CallerMember member) {
+        if(!checkAndExecuteByteCodeImplementation(member) && !checkAndExecuteMethodInfo(member))
+            throw new IllegalStateException("Call target has no method info!");
+        return null;
+    }
+
+    @Override
+    public Void visitImplementation(ImplementationMember member) {
+        return null;
+    }
+
+    @Override
+    public Void visitInnerDefinition(InnerDefinitionMember member) {
+        return null;
+    }
+
+
+    private boolean checkAndExecuteByteCodeImplementation(DefinitionMember member) {
+        JavaBytecodeImplementation implementation = member.getTag(JavaBytecodeImplementation.class);
+        if (implementation != null) {
+            implementation.compile(javaWriter);
+            return true;
+        }
+        return false;
+    }
+
+    private boolean checkAndExecuteMethodInfo(DefinitionMember member) {
+        JavaMethodInfo methodInfo = member.getTag(JavaMethodInfo.class);
+        if (methodInfo == null)
+            return false;
+        if (methodInfo.isStatic) {
+            javaWriter.invokeStatic(
+                    methodInfo.javaClass.internalClassName,
+                    methodInfo.name,
+                    methodInfo.signature);
+        } else {
+            javaWriter.invokeVirtual(
+                    methodInfo.javaClass.internalClassName,
+                    methodInfo.name,
+                    methodInfo.signature);
+        }
+        return true;
+    }
+}

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

@@ -12,6 +12,9 @@ public class JavaStatementVisitor implements StatementVisitor<Void> {
 
     @Override
     public Void visitBlock(BlockStatement statement) {
+        for (Statement statement1 : statement.statements) {
+            statement1.accept(this);
+        }
         return null;
     }
 
@@ -37,7 +40,7 @@ public class JavaStatementVisitor implements StatementVisitor<Void> {
 
     @Override
     public Void visitExpression(ExpressionStatement statement) {
-        statement.expression.accept(new JavaExpressionVisitor(javaWriter));
+        statement.expression.accept(new JavaExpressionVisitor(javaWriter, this));
         return null;
     }
 

ScriptingExample/scripts/moreHellos.zs

@@ -3,3 +3,4 @@ println("Hello world!");
 println("Hello world!");
 println("Hello world!");
 println("Hello world!");
+println(1 as string);

Shared/out/production/resources/org/openzen/zenscript/shared/characterEntities.properties

@@ -0,0 +1,266 @@
+quot=34
+amp=38
+apos=39
+lt=60
+gt=62
+
+nbsp=160
+iexcl=161
+cent=162
+pound=163
+curren=164
+yen=165
+brvbar=166
+sect=167
+uml=168
+copy=169
+ordf=170
+laquo=171
+not=172
+shy=173
+reg=174
+macr=175
+deg=176
+plusmn=177
+sup2=178
+sup3=179
+acute=180
+micro=181
+para=182
+middot=183
+cedil=184
+sup1=185
+ordm=186
+raquo=187
+frac14=188
+frac12=189
+frac34=190
+iquest=191
+
+Agrave=192
+Aacute=193
+Acirc=194
+Atilde=195
+Auml=196
+Aring=197
+AElig=198
+Ccedil=199
+Egrave=200
+Eacute=201
+Ecirc=202
+Euml=203
+lgrave=204
+lacute=205
+lcirc=206
+luml=207
+ETH=208
+Ntilde=209
+Ograve=210
+Oacute=211
+Ocirc=212
+Otilde=213
+Ouml=214
+times=215
+Oslash=216
+Ugrave=217
+Uacute=218
+Ucirc=219
+Uuml=220
+Yacute=221
+THORN=222
+szlig=223
+agrave=224
+aacute=225
+acirc=226
+atilde=227
+auml=228
+aring=229
+aelig=230
+ccedil=231
+egrave=232
+eacute=233
+ecirc=234
+euml=235
+igrave=236
+iacute=237
+icirc=238
+iuml=239
+eth=240
+ntilde=241
+ograve=242
+oacute=243
+ocirc=244
+otilde=245
+ouml=246
+divide=247
+oslash=248
+ugrave=249
+uacute=250
+ucirc=251
+uuml=252
+yacute=253
+thorn=254
+yuml=255
+
+OElig=338
+oelig=339
+Scaron=352
+scaron=353
+Yuml=376
+
+fnof=402
+
+circ=710
+tilde=732
+
+Alpha=913
+Beta=914
+Gamma=915
+Delta=916
+Epsilon=917
+Zeta=918
+Eta=919
+Theta=920
+Iota=921
+Kappa=922
+Lambda=923
+Mu=924
+Nu=925
+Xi=926
+Omicron=927
+Pi=928
+Rho=929
+Sigma=931
+Tau=932
+Upsilon=933
+Phi=934
+Chi=935
+Psi=936
+Omega=937
+
+alpha=945
+beta=946
+gamma=947
+delta=948
+epsilon=949
+zeta=950
+eta=951
+theta=952
+iota=953
+kappa=954
+lambda=955
+mu=956
+nu=957
+xi=958
+omicron=959
+pi=960
+rho=961
+sigmaf=962
+sigma=963
+tau=964
+upsilon=965
+phi=966
+chi=967
+psi=968
+omega=969
+thetasym=977
+upsih=978
+piv=982
+
+ensp=8194
+emsp=8195
+thinsp=8201
+zwnj=8204
+zwj=8205
+lrm=8206
+rlm=8207
+ndash=8211
+mdash=8212
+lsquo=8216
+rsquo=8217
+sbquo=8218
+ldquo=8220
+rdquo=8221
+bdquo=8222
+dagger=8224
+Dagger=8225
+bull=8226
+hellip=8230
+permil=8240
+prime=8242
+Prime=8243
+lsaquo=8249
+rsaquo=8250
+oline=8254
+frasl=8260
+
+euro=8364
+
+image=8465
+weierp=8472
+real=8476
+trade=8482
+alefsym=8501
+
+larr=8592
+uarr=8593
+rarr=8594
+darr=8595
+harr=8596
+crarr=8629
+lArr=8656
+uArr=8657
+rArr=8658
+dArr=8659
+hArr=8660
+
+forall=8704
+part=8706
+exist=8707
+empty=8709
+nabla=8711
+isin=8712
+notin=8713
+ni=8715
+prod=8719
+sum=8721
+minus=8722
+lowast=8727
+radic=8730
+prop=8733
+infin=8734
+ang=8736
+and=8743
+or=8744
+cap=8745
+cup=8746
+int=8747
+there4=8756
+sim=8764
+cong=8773
+asymp=8776
+ne=8800
+equiv=8801
+le=8804
+ge=8805
+sub=8834
+sup=8835
+nsub=8836
+sube=8838
+supe=8839
+oplus=8853
+otimes=8855
+perp=8869
+sdot=8901
+
+lceil=8968
+rceil=8969
+lfloor=8970
+rfloor=8971
+lang=9001
+rang=9002
+loz=9674
+spades=9824
+clubs=8927
+hearts=9829
+diams=9830

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

@@ -5,21 +5,30 @@
  */
 package org.openzen.zenscript.shared;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- *
  * @author Hoofdgebruiker
  */
+@SuppressWarnings("unchecked")
 public class TagDictionary {
-	private final Map<Class<?>, Object> tags = new HashMap<>();
-	
-	public <T> void put(Class<T> cls, T tag) {
-		tags.put(cls, tag);
-	}
-	
-	public <T> T get(Class<T> cls) {
-		return (T) tags.get(cls);
-	}
+    private Map<Class<?>, Object> tags = Collections.EMPTY_MAP;
+
+    public <T> void put(Class<T> cls, T tag) {
+        if (tags == Collections.EMPTY_MAP) {
+            tags = Collections.singletonMap(cls, tag);
+        } else if (tags.size() == 1) {
+            Map<Class<?>, Object> newTags = new HashMap<>(tags);
+            newTags.put(cls, tag);
+            this.tags = newTags;
+        } else {
+            tags.put(cls, tag);
+        }
+    }
+
+    public <T> T get(Class<T> cls) {
+        return (T) tags.get(cls);
+    }
 }