- Added arithmetic support for int

- Fixed character entities

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/BuiltinTypeMembers.java

@@ -5,9 +5,13 @@
  */
 package org.openzen.zenscript.codemodel.type.member;
 
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.expression.ConstantIntExpression;
 import org.openzen.zenscript.codemodel.member.CasterMember;
+import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.member.builtin.ConstantGetterMember;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.shared.CodePosition;
@@ -20,6 +24,29 @@ public class BuiltinTypeMembers {
 	public static final ConstantGetterMember INT_GET_MIN_VALUE = new ConstantGetterMember("MIN_VALUE", position -> new ConstantIntExpression(position, Integer.MIN_VALUE));
 	public static final ConstantGetterMember INT_GET_MAX_VALUE = new ConstantGetterMember("MAX_VALUE", position -> new ConstantIntExpression(position, Integer.MAX_VALUE));
 	
+	public static final OperatorMember INT_ADD_INT = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.ADD, new FunctionHeader(BasicTypeID.INT, new FunctionParameter(BasicTypeID.INT)));
+	public static final OperatorMember INT_ADD_LONG = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.ADD, new FunctionHeader(BasicTypeID.LONG, new FunctionParameter(BasicTypeID.LONG)));
+	public static final OperatorMember INT_ADD_FLOAT = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.ADD, new FunctionHeader(BasicTypeID.FLOAT, new FunctionParameter(BasicTypeID.FLOAT)));
+	public static final OperatorMember INT_ADD_DOUBLE = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.ADD, new FunctionHeader(BasicTypeID.DOUBLE, new FunctionParameter(BasicTypeID.DOUBLE)));
+	
+	public static final OperatorMember INT_SUB_INT = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.SUB, new FunctionHeader(BasicTypeID.INT, new FunctionParameter(BasicTypeID.INT)));
+	public static final OperatorMember INT_SUB_LONG = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.SUB, new FunctionHeader(BasicTypeID.LONG, new FunctionParameter(BasicTypeID.LONG)));
+	public static final OperatorMember INT_SUB_FLOAT = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.SUB, new FunctionHeader(BasicTypeID.FLOAT, new FunctionParameter(BasicTypeID.FLOAT)));
+	public static final OperatorMember INT_SUB_DOUBLE = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.SUB, new FunctionHeader(BasicTypeID.DOUBLE, new FunctionParameter(BasicTypeID.DOUBLE)));
+	
+	public static final OperatorMember INT_MUL_INT = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.MUL, new FunctionHeader(BasicTypeID.INT, new FunctionParameter(BasicTypeID.INT)));
+	public static final OperatorMember INT_MUL_LONG = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.MUL, new FunctionHeader(BasicTypeID.LONG, new FunctionParameter(BasicTypeID.LONG)));
+	public static final OperatorMember INT_MUL_FLOAT = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.MUL, new FunctionHeader(BasicTypeID.FLOAT, new FunctionParameter(BasicTypeID.FLOAT)));
+	public static final OperatorMember INT_MUL_DOUBLE = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.MUL, new FunctionHeader(BasicTypeID.DOUBLE, new FunctionParameter(BasicTypeID.DOUBLE)));
+	
+	public static final OperatorMember INT_DIV_INT = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.DIV, new FunctionHeader(BasicTypeID.INT, new FunctionParameter(BasicTypeID.INT)));
+	public static final OperatorMember INT_DIV_LONG = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.DIV, new FunctionHeader(BasicTypeID.LONG, new FunctionParameter(BasicTypeID.LONG)));
+	public static final OperatorMember INT_DIV_FLOAT = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.DIV, new FunctionHeader(BasicTypeID.FLOAT, new FunctionParameter(BasicTypeID.FLOAT)));
+	public static final OperatorMember INT_DIV_DOUBLE = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.DIV, new FunctionHeader(BasicTypeID.DOUBLE, new FunctionParameter(BasicTypeID.DOUBLE)));
+	
+	public static final OperatorMember INT_MOD_INT = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.MOD, new FunctionHeader(BasicTypeID.INT, new FunctionParameter(BasicTypeID.INT)));
+	public static final OperatorMember INT_MOD_LONG = new OperatorMember(CodePosition.BUILTIN, 0, OperatorType.MOD, new FunctionHeader(BasicTypeID.LONG, new FunctionParameter(BasicTypeID.LONG)));
+	
 	public static final CasterMember INT_TO_BYTE = new CasterMember(CodePosition.BUILTIN, 0, BasicTypeID.BYTE);
 	public static final CasterMember INT_TO_SBYTE = new CasterMember(CodePosition.BUILTIN, 0, BasicTypeID.SBYTE);
 	public static final CasterMember INT_TO_SHORT = new CasterMember(CodePosition.BUILTIN, 0, BasicTypeID.SHORT);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/TypeMemberBuilder.java

@@ -266,10 +266,30 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 	
 	private void visitInt() {
 		registerUnaryOperations();
-		registerArithmeticOperations(INT, INT);
-		registerArithmeticOperations(LONG, LONG);
-		registerArithmeticOperations(FLOAT, FLOAT);
-		registerArithmeticOperations(DOUBLE, DOUBLE);
+		
+		members.addOperator(BuiltinTypeMembers.INT_ADD_INT);
+		members.addOperator(BuiltinTypeMembers.INT_ADD_LONG);
+		members.addOperator(BuiltinTypeMembers.INT_ADD_FLOAT);
+		members.addOperator(BuiltinTypeMembers.INT_ADD_DOUBLE);
+		
+		members.addOperator(BuiltinTypeMembers.INT_SUB_INT);
+		members.addOperator(BuiltinTypeMembers.INT_SUB_LONG);
+		members.addOperator(BuiltinTypeMembers.INT_SUB_FLOAT);
+		members.addOperator(BuiltinTypeMembers.INT_SUB_DOUBLE);
+		
+		members.addOperator(BuiltinTypeMembers.INT_MUL_INT);
+		members.addOperator(BuiltinTypeMembers.INT_MUL_LONG);
+		members.addOperator(BuiltinTypeMembers.INT_MUL_FLOAT);
+		members.addOperator(BuiltinTypeMembers.INT_MUL_DOUBLE);
+		
+		members.addOperator(BuiltinTypeMembers.INT_DIV_INT);
+		members.addOperator(BuiltinTypeMembers.INT_DIV_LONG);
+		members.addOperator(BuiltinTypeMembers.INT_DIV_FLOAT);
+		members.addOperator(BuiltinTypeMembers.INT_DIV_DOUBLE);
+		
+		members.addOperator(BuiltinTypeMembers.INT_MOD_INT);
+		members.addOperator(BuiltinTypeMembers.INT_MOD_LONG);
+		
 		members.addGetter(BuiltinTypeMembers.INT_GET_MIN_VALUE, TypeMemberPriority.SPECIFIED);
 		members.addGetter(BuiltinTypeMembers.INT_GET_MAX_VALUE, TypeMemberPriority.SPECIFIED);
 		

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/TypeMembers.java

@@ -126,26 +126,46 @@ public final class TypeMembers {
 		casters.add(new TypeMember<>(priority, caster));
 	}
 	
+	public void addField(FieldMember member) {
+		addField(member, TypeMemberPriority.SPECIFIED);
+	}
+	
 	public void addField(FieldMember member, TypeMemberPriority priority) {
 		DefinitionMemberGroup group = getOrCreateGroup(member.name);
 		group.setField(member, priority);
 	}
 	
+	public void addGetter(IGettableMember member) {
+		addGetter(member, TypeMemberPriority.SPECIFIED);
+	}
+	
 	public void addGetter(IGettableMember member, TypeMemberPriority priority) {
 		DefinitionMemberGroup group = getOrCreateGroup(member.getName());
 		group.setGetter(member, priority);
 	}
 	
+	public void addSetter(SetterMember member) {
+		addSetter(member, TypeMemberPriority.SPECIFIED);
+	}
+	
 	public void addSetter(SetterMember member, TypeMemberPriority priority) {
 		DefinitionMemberGroup group = getOrCreateGroup(member.name);
 		group.setSetter(member, priority);
 	}
 	
+	public void addMethod(MethodMember member) {
+		addMethod(member, TypeMemberPriority.SPECIFIED);
+	}
+	
 	public void addMethod(MethodMember member, TypeMemberPriority priority) {
 		DefinitionMemberGroup group = getOrCreateGroup(member.name);
 		group.addMethod(member, priority);
 	}
 	
+	public void addOperator(OperatorMember member) {
+		addOperator(member, TypeMemberPriority.SPECIFIED);
+	}
+	
 	public void addOperator(OperatorMember member, TypeMemberPriority priority) {
 		DefinitionMemberGroup group = getOrCreateGroup(member.operator);
 		group.addMethod(member, priority);

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

@@ -27,6 +27,12 @@ public class JavaCompiler {
 		BuiltinTypeMembers.INT_GET_MIN_VALUE.setTag(JavaFieldInfo.class, new JavaFieldInfo(jInteger, "MIN_VALUE", "I"));
 		BuiltinTypeMembers.INT_GET_MAX_VALUE.setTag(JavaFieldInfo.class, new JavaFieldInfo(jInteger, "MAX_VALUE", "I"));
 		
+		BuiltinTypeMembers.INT_ADD_INT.setTag(JavaBytecodeImplementation.class, writer -> writer.iAdd());
+		BuiltinTypeMembers.INT_SUB_INT.setTag(JavaBytecodeImplementation.class, writer -> writer.iSub());
+		BuiltinTypeMembers.INT_MUL_INT.setTag(JavaBytecodeImplementation.class, writer -> writer.iMul());
+		BuiltinTypeMembers.INT_DIV_INT.setTag(JavaBytecodeImplementation.class, writer -> writer.iDiv());
+		BuiltinTypeMembers.INT_MOD_INT.setTag(JavaBytecodeImplementation.class, writer -> writer.iRem());
+		
 		BuiltinTypeMembers.INT_TO_BYTE.setTag(JavaBytecodeImplementation.class, writer -> writer.i2b());
 		BuiltinTypeMembers.INT_TO_SBYTE.setTag(JavaBytecodeImplementation.class, writer -> writer.i2b());
 		BuiltinTypeMembers.INT_TO_SHORT.setTag(JavaBytecodeImplementation.class, writer -> writer.i2s());

ScriptingExample/scripts/helloworld.zs

@@ -1,2 +1,3 @@
 println("Hello world!");
 println(5);
+println(1 + 3);

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

@@ -18,7 +18,7 @@ public class CompileException extends RuntimeException {
 	public final CompileExceptionCode code;
 	
 	public CompileException(CodePosition position, CompileExceptionCode code, String message) {
-		super(position.toString() + ": [" + code + "]" + message);
+		super(position.toString() + ": [" + code + "] " + message);
 		
 		this.position = position;
 		this.code = code;