- Added visitors for generic parameter bounds

- Separated this vs super base call into separate classes

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

@@ -6,12 +6,18 @@ package org.openzen.zenscript.codemodel;
  * @author Stan Hebben
  */
 public enum CompareType {
-	LT,
-	GT,
-	EQ,
-	NE,
-	LE,
-	GE,
-	SAME,
-	NOTSAME
+	LT("<"),
+	GT(">"),
+	EQ("=="),
+	NE("!="),
+	LE("<="),
+	GE(">="),
+	SAME("==="),
+	NOTSAME("!==");
+	
+	public final String str;
+	
+	CompareType(String str) {
+		this.str = str;
+	}
 }

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

@@ -25,6 +25,10 @@ public class CallExpression extends Expression {
 		this.member = member;
 		this.arguments = arguments;
 	}
+	
+	public Expression getFirstArgument() {
+		return arguments.arguments[0];
+	}
 
 	@Override
 	public <T> T accept(ExpressionVisitor<T> visitor) {

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

@@ -0,0 +1,34 @@
+/*
+ * 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.member.ConstructorMember;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ConstructorSuperCallExpression extends Expression {
+	public final ITypeID objectType;
+	public final ConstructorMember constructor;
+	public final CallArguments arguments;
+	
+	public ConstructorSuperCallExpression(CodePosition position, ITypeID type, ConstructorMember constructor, CallArguments arguments) {
+		super(position, BasicTypeID.VOID);
+		
+		this.objectType = type;
+		this.constructor = constructor;
+		this.arguments = arguments;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitConstructorSuperCall(this);
+	}
+}

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

@@ -14,12 +14,12 @@ import org.openzen.zenscript.shared.CodePosition;
  *
  * @author Hoofdgebruiker
  */
-public class ConstructorCallExpression extends Expression {
+public class ConstructorThisCallExpression extends Expression {
 	public final ITypeID objectType;
 	public final ConstructorMember constructor;
 	public final CallArguments arguments;
 	
-	public ConstructorCallExpression(CodePosition position, ITypeID type, ConstructorMember constructor, CallArguments arguments) {
+	public ConstructorThisCallExpression(CodePosition position, ITypeID type, ConstructorMember constructor, CallArguments arguments) {
 		super(position, BasicTypeID.VOID);
 		
 		this.objectType = type;
@@ -29,6 +29,6 @@ public class ConstructorCallExpression extends Expression {
 
 	@Override
 	public <T> T accept(ExpressionVisitor<T> visitor) {
-		return visitor.visitConstructorCall(this);
+		return visitor.visitConstructorThisCall(this);
 	}
 }

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

@@ -62,7 +62,9 @@ public interface ExpressionVisitor<T> {
 	
 	public T visitConstantUShort(ConstantUShortExpression expression);
 	
-	public T visitConstructorCall(ConstructorCallExpression expression);
+	public T visitConstructorThisCall(ConstructorThisCallExpression expression);
+	
+	public T visitConstructorSuperCall(ConstructorSuperCallExpression expression);
 	
 	public T visitEnumConstant(EnumConstantExpression expression);
 	

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 <T> T accept(GenericParameterBoundVisitor<T> visitor);
+	
 	public abstract void registerMembers(LocalMemberCache cache, TypeMembers type);
 	
 	public abstract boolean matches(ITypeID type);

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

@@ -0,0 +1,16 @@
+/*
+ * 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.generic;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface GenericParameterBoundVisitor<T> {
+	public T visitSuper(ParameterSuperBound bound);
+	
+	public T visitType(ParameterTypeBound bound);
+}

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

@@ -36,4 +36,9 @@ public class ParameterSuperBound extends GenericParameterBound {
 	public GenericParameterBound withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
 		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
 	}
+
+	@Override
+	public <T> T accept(GenericParameterBoundVisitor<T> visitor) {
+		return visitor.visitSuper(this);
+	}
 }

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

@@ -40,4 +40,9 @@ public class ParameterTypeBound extends GenericParameterBound {
 	public GenericParameterBound withGenericArguments(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> arguments) {
 		return new ParameterTypeBound(position, type.withGenericArguments(registry, arguments));
 	}
+
+	@Override
+	public <T> T accept(GenericParameterBoundVisitor<T> visitor) {
+		return visitor.visitType(this);
+	}
 }

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

@@ -20,7 +20,7 @@ import org.openzen.zenscript.shared.CodePosition;
  */
 public class CallerMember extends FunctionalMember {
 	public CallerMember(CodePosition position, int modifiers, FunctionHeader header) {
-		super(position, modifiers, header);
+		super(position, modifiers, "()", header);
 	}
 
 	@Override

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

@@ -26,7 +26,7 @@ public class CasterMember extends FunctionalMember implements ICasterMember {
 	public final ITypeID toType;
 	
 	public CasterMember(CodePosition position, int modifiers, ITypeID toType) {
-		super(position, modifiers, new FunctionHeader(toType));
+		super(position, modifiers, "as", new FunctionHeader(toType));
 		
 		this.toType = toType;
 	}

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

@@ -21,7 +21,7 @@ import org.openzen.zenscript.shared.CodePosition;
  */
 public class ConstructorMember extends FunctionalMember {
 	public ConstructorMember(CodePosition position, int modifiers, FunctionHeader header) {
-		super(position, modifiers, new FunctionHeader(header.typeParameters, BasicTypeID.VOID, header.parameters));
+		super(position, modifiers, "this", new FunctionHeader(header.typeParameters, BasicTypeID.VOID, header.parameters));
 	}
 
 	@Override

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

@@ -22,11 +22,13 @@ import org.openzen.zenscript.shared.CodePosition;
  */
 public abstract class FunctionalMember extends DefinitionMember implements ICallableMember {
 	public final FunctionHeader header;
+	public final String name;
 	public List<Statement> body;
 	
-	public FunctionalMember(CodePosition position, int modifiers, FunctionHeader header) {
+	public FunctionalMember(CodePosition position, int modifiers, String name, FunctionHeader header) {
 		super(position, modifiers);
 		
+		this.name = name;
 		this.header = header;
 	}
 	

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

@@ -28,7 +28,7 @@ public class GetterMember extends FunctionalMember implements IGettableMember {
 	public String compiledName;
 	
 	public GetterMember(CodePosition position, int modifiers, String name, ITypeID type) {
-		super(position, modifiers, new FunctionHeader(type));
+		super(position, modifiers, name, new FunctionHeader(type));
 		
 		this.name = name;
 		this.type = type;

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

@@ -19,14 +19,8 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class MethodMember extends FunctionalMember {
-	public final String name;
-	
-	public String compiledName;
-	
 	public MethodMember(CodePosition position, int modifiers, String name, FunctionHeader header) {
-		super(position, modifiers, header);
-		
-		this.name = name;
+		super(position, modifiers, name, header);
 	}
 
 	@Override

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

@@ -23,7 +23,7 @@ public class OperatorMember extends FunctionalMember {
 	public final OperatorType operator;
 	
 	public OperatorMember(CodePosition position, int modifiers, OperatorType operator, FunctionHeader header) {
-		super(position, modifiers, header);
+		super(position, modifiers, operator.operator, header);
 		
 		this.operator = operator;
 	}

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

@@ -25,7 +25,7 @@ public class SetterMember extends FunctionalMember {
 	public final ITypeID type;
 	
 	public SetterMember(CodePosition position, int modifiers, String name, ITypeID type) {
-		super(position, modifiers, new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(type, "$")));
+		super(position, modifiers, name, new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(type, "$")));
 		
 		this.name = name;
 		this.type = type;

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

@@ -36,8 +36,8 @@ public enum BasicTypeID implements ITypeID {
 	
 	public static final List<ITypeID> HINT_BOOL = Collections.singletonList(BOOL);
 	
-	private final String name;
-	private final String camelCaseName;
+	public final String name;
+	public final String camelCaseName;
 	
 	BasicTypeID(String name, String camelCaseName) {
 		this.name = name;

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

@@ -184,7 +184,12 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
     }
 
     @Override
-    public Void visitConstructorCall(ConstructorCallExpression expression) {
+    public Void visitConstructorThisCall(ConstructorThisCallExpression expression) {
+        return null;
+    }
+
+    @Override
+    public Void visitConstructorSuperCall(ConstructorSuperCallExpression expression) {
         return null;
     }
 

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

@@ -10,7 +10,7 @@ package org.openzen.zenscript.lexer;
  */
 public class CharStream
 {
-    private char[] data;
+    private final char[] data;
     private int index;
 
     /**

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedClass.java

@@ -19,7 +19,7 @@ import org.openzen.zenscript.shared.CodePosition;
 
 /**
  *
- * @author Hoofdgebruiker
+ * @author Stan Hebben
  */
 public class ParsedClass extends BaseParsedDefinition {
 	public static ParsedClass parseClass(CodePosition position, int modifiers, ZSTokenStream tokens, HighLevelDefinition outerDefinition) {
@@ -40,7 +40,6 @@ public class ParsedClass extends BaseParsedDefinition {
 		return result;
 	}
 	
-	private final String name;
 	private final List<ParsedGenericParameter> genericParameters;
 	private final IParsedType superclass;
 	
@@ -48,7 +47,7 @@ public class ParsedClass extends BaseParsedDefinition {
 	
 	public ParsedClass(CodePosition position, int modifiers, String name, List<ParsedGenericParameter> genericParameters, IParsedType superclass, HighLevelDefinition outerDefinition) {
 		super(position, modifiers);
-		this.name = name;
+		
 		this.genericParameters = genericParameters;
 		this.superclass = superclass;
 		

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

@@ -10,7 +10,7 @@ import java.util.List;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
-import org.openzen.zenscript.codemodel.expression.ConstructorCallExpression;
+import org.openzen.zenscript.codemodel.expression.ConstructorThisCallExpression;
 import org.openzen.zenscript.codemodel.member.ConstructorMember;
 import org.openzen.zenscript.codemodel.member.ICallableMember;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
@@ -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 ConstructorCallExpression(position, scope.getThisType().getSuperType(), (ConstructorMember) member, callArguments);
+			return new ConstructorThisCallExpression(position, scope.getThisType().getSuperType(), (ConstructorMember) member, callArguments);
 		} 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 ConstructorCallExpression(position, scope.getThisType().getSuperType(), (ConstructorMember) member, callArguments);
+			return new ConstructorThisCallExpression(position, scope.getThisType(), (ConstructorMember) member, callArguments);
 		}
 
 		List<FunctionHeader> headers = cReceiver.getPossibleFunctionHeaders(scope, scope.hints, arguments.arguments.size());

ScriptingExample/scripts/statements.zs

@@ -1,2 +1,5 @@
-while true
+var i = 0;
+while i < 10 {
 	println("Hello!");
+	i = i + 1;
+}