Renamed values in Modifiers

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

@@ -65,7 +65,7 @@ public abstract class HighLevelDefinition extends Taggable {
 	}
 	
 	public boolean isStatic() {
-		return (modifiers & Modifiers.MODIFIER_STATIC) > 0;
+		return (modifiers & Modifiers.STATIC) > 0;
 	}
 	
 	public abstract <T> T accept(DefinitionVisitor<T> visitor);

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

@@ -10,34 +10,36 @@ package org.openzen.zenscript.codemodel;
  * @author Hoofdgebruiker
  */
 public class Modifiers {
-	public static final int MODIFIER_PUBLIC = 1;
-	public static final int MODIFIER_EXPORT = 2;
-	public static final int MODIFIER_PRIVATE = 4;
-	public static final int MODIFIER_ABSTRACT = 8;
-	public static final int MODIFIER_FINAL = 16;
-	public static final int MODIFIER_CONST = 32;
-	public static final int MODIFIER_CONST_OPTIONAL = 64;
-	public static final int MODIFIER_STATIC = 128;
-	public static final int MODIFIER_PROTECTED = 256;
-	public static final int MODIFIER_IMPLICIT = 512;
+	private Modifiers() {}
+	
+	public static final int PUBLIC = 1;
+	public static final int EXPORT = 2;
+	public static final int PRIVATE = 4;
+	public static final int ABSTRACT = 8;
+	public static final int FINAL = 16;
+	public static final int CONST = 32;
+	public static final int CONST_OPTIONAL = 64;
+	public static final int STATIC = 128;
+	public static final int PROTECTED = 256;
+	public static final int IMPLICIT = 512;
 	
 	public static boolean isAbstract(int modifiers) {
-		return (modifiers & MODIFIER_ABSTRACT) > 0;
+		return (modifiers & ABSTRACT) > 0;
 	}
 	
 	public static boolean isFinal(int modifiers) {
-		return (modifiers & MODIFIER_FINAL) > 0;
+		return (modifiers & FINAL) > 0;
 	}
 	
 	public static boolean isConst(int modifiers) {
-		return (modifiers & MODIFIER_CONST) > 0;
+		return (modifiers & CONST) > 0;
 	}
 	
 	public static boolean isStatic(int modifiers) {
-		return (modifiers & MODIFIER_STATIC) > 0;
+		return (modifiers & STATIC) > 0;
 	}
 	
 	public static boolean isImplicit(int modifiers) {
-		return (modifiers & MODIFIER_IMPLICIT) > 0;
+		return (modifiers & IMPLICIT) > 0;
 	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/definition/FunctionDefinition.java

@@ -37,7 +37,7 @@ public class FunctionDefinition extends HighLevelDefinition {
 	
 	public void setHeader(FunctionHeader header) {
 		this.header = header;
-		addMember(caller = new OperatorMember(position, modifiers | Modifiers.MODIFIER_STATIC, OperatorType.CALL, header));
+		addMember(caller = new OperatorMember(position, modifiers | Modifiers.STATIC, OperatorType.CALL, header));
 		callerGroup.addMethod(caller, TypeMemberPriority.SPECIFIED);
 	}
 	

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

@@ -27,7 +27,7 @@ public class EnumConstantMember extends DefinitionMember {
 	public NewExpression constructor;
 	
 	public EnumConstantMember(CodePosition position, String name, int value) {
-		super(position, Modifiers.MODIFIER_STATIC);
+		super(position, Modifiers.STATIC);
 		
 		this.name = name;
 		this.value = value;

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

@@ -136,8 +136,8 @@ public class BuiltinTypeMembers {
 	
 	public static final GetterMember FLOAT_BITS = new GetterMember(BUILTIN, 0, "bits", UINT);
 	public static final GetterMember DOUBLE_BITS = new GetterMember(BUILTIN, 0, "bits", ULONG);
-	public static final MethodMember FLOAT_FROMBITS = new MethodMember(BUILTIN, Modifiers.MODIFIER_STATIC, "fromBits", new FunctionHeader(FLOAT, new FunctionParameter(UINT)));
-	public static final MethodMember DOUBLE_FROMBITS = new MethodMember(BUILTIN, Modifiers.MODIFIER_STATIC, "fromBits", new FunctionHeader(DOUBLE, new FunctionParameter(ULONG)));
+	public static final MethodMember FLOAT_FROMBITS = new MethodMember(BUILTIN, Modifiers.STATIC, "fromBits", new FunctionHeader(FLOAT, new FunctionParameter(UINT)));
+	public static final MethodMember DOUBLE_FROMBITS = new MethodMember(BUILTIN, Modifiers.STATIC, "fromBits", new FunctionHeader(DOUBLE, new FunctionParameter(ULONG)));
 	
 	private static OperatorMember not(ITypeID result) {
 		return new OperatorMember(BUILTIN, 0, OperatorType.NOT, new FunctionHeader(result));
@@ -172,6 +172,6 @@ public class BuiltinTypeMembers {
 	}
 	
 	private static CasterMember castImplicit(ITypeID result) {
-		return new CasterMember(CodePosition.BUILTIN, Modifiers.MODIFIER_IMPLICIT, result);
+		return new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, result);
 	}
 }

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

@@ -143,7 +143,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 			FunctionHeader addHeader = new FunctionHeader(VOID, new FunctionParameter(baseType, "value"));
 			members.addMethod(new MethodMember(CodePosition.BUILTIN, 0, "add", addHeader), TypeMemberPriority.SPECIFIED);
 
-			members.addField(new FieldMember(CodePosition.BUILTIN, Modifiers.MODIFIER_FINAL, "length", INT), TypeMemberPriority.SPECIFIED);
+			members.addField(new FieldMember(CodePosition.BUILTIN, Modifiers.FINAL, "length", INT), TypeMemberPriority.SPECIFIED);
 		}
 
 		members.addGetter(new GetterMember(CodePosition.BUILTIN, 0, "empty", BOOL), TypeMemberPriority.SPECIFIED);
@@ -171,7 +171,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		
 		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.CONTAINS, new FunctionHeader(BOOL, new FunctionParameter(keyType, "key"))), TypeMemberPriority.SPECIFIED);
 
-		members.addField(new FieldMember(BUILTIN, Modifiers.MODIFIER_FINAL, "length", INT), TypeMemberPriority.SPECIFIED);
+		members.addField(new FieldMember(BUILTIN, Modifiers.FINAL, "length", INT), TypeMemberPriority.SPECIFIED);
 		members.addGetter(new GetterMember(BUILTIN, 0, "empty", BOOL), TypeMemberPriority.SPECIFIED);
 		members.addGetter(new GetterMember(BUILTIN, 0, "keys", cache.getRegistry().getArray(keyType, 1)), TypeMemberPriority.SPECIFIED);
 		return null;
@@ -211,10 +211,10 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		if (constructors.getMethodMembers().isEmpty()) {
 			if (definition instanceof ClassDefinition) {
 				// add default constructor
-				constructors.addMethod(new ConstructorMember(BUILTIN, Modifiers.MODIFIER_PUBLIC, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
+				constructors.addMethod(new ConstructorMember(BUILTIN, Modifiers.PUBLIC, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
 			} else if (definition instanceof StructDefinition) {
 				// add default struct constructors
-				constructors.addMethod(new ConstructorMember(BUILTIN, Modifiers.MODIFIER_PUBLIC, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
+				constructors.addMethod(new ConstructorMember(BUILTIN, Modifiers.PUBLIC, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
 				
 				List<FieldMember> fields = ((StructDefinition)definition).getFields();
 				if (!fields.isEmpty()) {
@@ -227,7 +227,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 				}
 			} else if (definition instanceof EnumDefinition) {
 				// add default constructor
-				constructors.addMethod(new ConstructorMember(BUILTIN, Modifiers.MODIFIER_PRIVATE, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
+				constructors.addMethod(new ConstructorMember(BUILTIN, Modifiers.PRIVATE, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
 			}
 		}
 		
@@ -254,8 +254,8 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		ITypeID fromType = range.from;
 		ITypeID toType = range.to;
 
-		members.addField(new FieldMember(BUILTIN, Modifiers.MODIFIER_FINAL, "from", fromType), TypeMemberPriority.SPECIFIED);
-		members.addField(new FieldMember(BUILTIN, Modifiers.MODIFIER_FINAL, "to", toType), TypeMemberPriority.SPECIFIED);
+		members.addField(new FieldMember(BUILTIN, Modifiers.FINAL, "from", fromType), TypeMemberPriority.SPECIFIED);
+		members.addField(new FieldMember(BUILTIN, Modifiers.FINAL, "to", toType), TypeMemberPriority.SPECIFIED);
 		members.addIterator(new RangeIterator(range), TypeMemberPriority.SPECIFIED);
 		return null;
 	}
@@ -395,15 +395,15 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		
 		members.addCaster(new CasterMember(CodePosition.BUILTIN, 0, BasicTypeID.BYTE), TypeMemberPriority.SPECIFIED);
 		members.addCaster(new CasterMember(CodePosition.BUILTIN, 0, BasicTypeID.SBYTE), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.MODIFIER_IMPLICIT, BasicTypeID.SHORT), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.MODIFIER_IMPLICIT, BasicTypeID.USHORT), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.MODIFIER_IMPLICIT, BasicTypeID.INT), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.MODIFIER_IMPLICIT, BasicTypeID.UINT), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.MODIFIER_IMPLICIT, BasicTypeID.LONG), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.MODIFIER_IMPLICIT, BasicTypeID.ULONG), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.MODIFIER_IMPLICIT, BasicTypeID.FLOAT), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.MODIFIER_IMPLICIT, BasicTypeID.DOUBLE), TypeMemberPriority.SPECIFIED);
-		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.MODIFIER_IMPLICIT, BasicTypeID.STRING), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.SHORT), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.USHORT), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.INT), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.UINT), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.LONG), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.ULONG), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.FLOAT), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.DOUBLE), TypeMemberPriority.SPECIFIED);
+		members.addCaster(new CasterMember(CodePosition.BUILTIN, Modifiers.IMPLICIT, BasicTypeID.STRING), TypeMemberPriority.SPECIFIED);
 	}
 
 	private void visitString() {

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

@@ -69,8 +69,6 @@ public class JavaCompiler {
 		implement(ULONG_ADD_ULONG, JavaWriter::lAdd);
 		implement(FLOAT_ADD_FLOAT, JavaWriter::fAdd);
 		implement(DOUBLE_ADD_DOUBLE, JavaWriter::dAdd);
-		// TODO: STRING_ADD_STRING
-
 		implement(STRING_ADD_STRING, JavaWriter::stringAdd);
 		
 		implement(BYTE_SUB_BYTE, JavaWriter::iSub);

Parser/src/main/java/org/openzen/zenscript/parser/ParsedFile.java

@@ -64,19 +64,19 @@ public class ParsedFile {
 			int modifiers = 0;
 			while (true) {
 				if (tokens.optional(K_PUBLIC) != null) {
-					modifiers |= Modifiers.MODIFIER_PUBLIC;
+					modifiers |= Modifiers.PUBLIC;
 				} else if (tokens.optional(K_PRIVATE) != null) {
-					modifiers |= Modifiers.MODIFIER_PRIVATE;
+					modifiers |= Modifiers.PRIVATE;
 				} else if (tokens.optional(K_EXPORT) != null) {
-					modifiers |= Modifiers.MODIFIER_EXPORT;
+					modifiers |= Modifiers.EXPORT;
 				} else if (tokens.optional(K_ABSTRACT) != null) {
-					modifiers |= Modifiers.MODIFIER_ABSTRACT;
+					modifiers |= Modifiers.ABSTRACT;
 				} else if (tokens.optional(K_FINAL) != null) {
-					modifiers |= Modifiers.MODIFIER_FINAL;
+					modifiers |= Modifiers.FINAL;
 				} else if (tokens.optional(K_PROTECTED) != null) {
-					modifiers |= Modifiers.MODIFIER_PROTECTED;
+					modifiers |= Modifiers.PROTECTED;
 				} else if (tokens.optional(K_IMPLICIT) != null) {
-					modifiers |= Modifiers.MODIFIER_IMPLICIT;
+					modifiers |= Modifiers.IMPLICIT;
 				} else {
 					break;
 				}

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedDefinitionMember.java

@@ -37,27 +37,27 @@ public abstract class ParsedDefinitionMember {
 		int modifiers = 0;
 		while (true) {
 			if (tokens.optional(ZSTokenType.K_EXPORT) != null) {
-				modifiers |= Modifiers.MODIFIER_EXPORT;
+				modifiers |= Modifiers.EXPORT;
 			} else if (tokens.optional(ZSTokenType.K_PUBLIC) != null) {
-				modifiers |= Modifiers.MODIFIER_PUBLIC;
+				modifiers |= Modifiers.PUBLIC;
 			} else if (tokens.optional(ZSTokenType.K_PRIVATE) != null) {
-				modifiers |= Modifiers.MODIFIER_PRIVATE;
+				modifiers |= Modifiers.PRIVATE;
 			} else if (tokens.optional(ZSTokenType.K_CONST) != null) {
 				if (tokens.optional(ZSTokenType.T_QUEST) != null) {
-					modifiers |= Modifiers.MODIFIER_CONST_OPTIONAL;
+					modifiers |= Modifiers.CONST_OPTIONAL;
 				} else {
-					modifiers |= Modifiers.MODIFIER_CONST;
+					modifiers |= Modifiers.CONST;
 				}
 			} else if (tokens.optional(ZSTokenType.K_ABSTRACT) != null) {
-				modifiers |= Modifiers.MODIFIER_ABSTRACT;
+				modifiers |= Modifiers.ABSTRACT;
 			} else if (tokens.optional(ZSTokenType.K_FINAL) != null) {
-				modifiers |= Modifiers.MODIFIER_FINAL;
+				modifiers |= Modifiers.FINAL;
 			} else if (tokens.optional(ZSTokenType.K_STATIC) != null) {
-				modifiers |= Modifiers.MODIFIER_STATIC;
+				modifiers |= Modifiers.STATIC;
 			} else if (tokens.optional(ZSTokenType.K_PROTECTED) != null) {
-				modifiers |= Modifiers.MODIFIER_PROTECTED;
+				modifiers |= Modifiers.PROTECTED;
 			} else if (tokens.optional(ZSTokenType.K_IMPLICIT) != null) {
-				modifiers |= Modifiers.MODIFIER_IMPLICIT;
+				modifiers |= Modifiers.IMPLICIT;
 			} else {
 				break;
 			}

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedField.java

@@ -45,7 +45,7 @@ public class ParsedField extends ParsedDefinitionMember {
 
 	@Override
 	public void linkTypes(BaseScope scope) {
-		compiled = new FieldMember(position, modifiers | (isFinal ? Modifiers.MODIFIER_FINAL : 0), name, type.compile(scope));
+		compiled = new FieldMember(position, modifiers | (isFinal ? Modifiers.FINAL : 0), name, type.compile(scope));
 	}
 
 	@Override

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/GlobalRegistry.java

@@ -64,10 +64,10 @@ public class GlobalRegistry {
 			// eg. package my.package with a class MyClass with a single native method test() returning a string
 			// the visitors can then during compilation check if a method is an instance of NativeMethodMember and treat it accordingly
 			ZSPackage packageMyPackage = rootPackage.getOrCreatePackage("my").getOrCreatePackage("package");
-			ClassDefinition myClassDefinition = new ClassDefinition(CodePosition.NATIVE, packageMyPackage, "MyClass", Modifiers.MODIFIER_PUBLIC, null);
+			ClassDefinition myClassDefinition = new ClassDefinition(CodePosition.NATIVE, packageMyPackage, "MyClass", Modifiers.PUBLIC, null);
 			JavaClassInfo myClassInfo = new JavaClassInfo("my/test/MyClass");
 			
-			MethodMember member = new MethodMember(CodePosition.NATIVE, Modifiers.MODIFIER_PUBLIC, "test", new FunctionHeader(BasicTypeID.STRING));
+			MethodMember member = new MethodMember(CodePosition.NATIVE, Modifiers.PUBLIC, "test", new FunctionHeader(BasicTypeID.STRING));
 			member.setTag(JavaMethodInfo.class, new JavaMethodInfo(myClassInfo, "test", "()Ljava/lang/String;"));
 			myClassDefinition.addMember(member);
 			
@@ -92,17 +92,17 @@ public class GlobalRegistry {
 		return globals;
 	}
 	
-	private final ClassDefinition PRINTSTREAM = new ClassDefinition(CodePosition.NATIVE, javaIo, "PrintStream", Modifiers.MODIFIER_EXPORT);
-	private final ClassDefinition SYSTEM = new ClassDefinition(CodePosition.NATIVE, javaLang, "System", Modifiers.MODIFIER_EXPORT);
+	private final ClassDefinition PRINTSTREAM = new ClassDefinition(CodePosition.NATIVE, javaIo, "PrintStream", Modifiers.EXPORT);
+	private final ClassDefinition SYSTEM = new ClassDefinition(CodePosition.NATIVE, javaLang, "System", Modifiers.EXPORT);
 	private final MethodMember PRINTSTREAM_PRINTLN = new MethodMember(
 			CodePosition.NATIVE,
-			Modifiers.MODIFIER_EXPORT,
+			Modifiers.EXPORT,
 			"println",
 			new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(BasicTypeID.STRING)));
 	
 	private final FieldMember SYSTEM_OUT = new FieldMember(
 			CodePosition.NATIVE,
-			Modifiers.MODIFIER_EXPORT | Modifiers.MODIFIER_FINAL,
+			Modifiers.EXPORT | Modifiers.FINAL,
 			"out",
 			DefinitionTypeID.forType(SYSTEM));
 	
@@ -111,7 +111,7 @@ public class GlobalRegistry {
 			CodePosition.NATIVE,
 			globals,
 			"println",
-			Modifiers.MODIFIER_EXPORT,
+			Modifiers.EXPORT,
 			new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(BasicTypeID.STRING)));
 	
 	private class PrintlnSymbol implements ISymbol {