- Fix bug in TypeFormatter with optional types

- Added virtual modifier
- Optimized parsing of modifiers
-

CodeFormatter/src/main/java/org/openzen/zenscript/formatter/TypeFormatter.java

@@ -133,7 +133,7 @@ public class TypeFormatter implements ITypeVisitor<String>, GenericParameterBoun
 
 	@Override
 	public String visitOptional(OptionalTypeID optional) {
-		return optional.accept(this) + "?";
+		return optional.baseType.accept(this) + "?";
 	}
 	
 	private void formatTypeParameters(StringBuilder result, TypeParameter[] parameters) {

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

@@ -22,6 +22,7 @@ public class Modifiers {
 	public static final int STATIC = 128;
 	public static final int PROTECTED = 256;
 	public static final int IMPLICIT = 512;
+	public static final int VIRTUAL = 1024;
 	
 	public static boolean isAbstract(int modifiers) {
 		return (modifiers & ABSTRACT) > 0;
@@ -42,4 +43,8 @@ public class Modifiers {
 	public static boolean isImplicit(int modifiers) {
 		return (modifiers & IMPLICIT) > 0;
 	}
+	
+	public static boolean isVirtual(int modifiers) {
+		return (modifiers & VIRTUAL) > 0;
+	}
 }

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

@@ -44,6 +44,7 @@ public class ZSTokenStream extends TokenStream<ZSToken, ZSTokenType> {
 		KEYWORDS.put("static", K_STATIC);
 		KEYWORDS.put("protected", K_PROTECTED);
 		KEYWORDS.put("implicit", K_IMPLICIT);
+		KEYWORDS.put("virtual", K_VIRTUAL);
 		
 		KEYWORDS.put("val", K_VAL);
 		KEYWORDS.put("var", K_VAR);

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

@@ -90,6 +90,7 @@ public enum ZSTokenType implements TokenType {
 	K_STATIC,
 	K_PROTECTED,
 	K_IMPLICIT,
+	K_VIRTUAL,
 	
 	K_VAL,
 	K_VAR,

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

@@ -62,24 +62,36 @@ public class ParsedFile {
 		while (true) {
 			CodePosition position = tokens.peek().position;
 			int modifiers = 0;
-			while (true) {
-				if (tokens.optional(K_PUBLIC) != null) {
-					modifiers |= Modifiers.PUBLIC;
-				} else if (tokens.optional(K_PRIVATE) != null) {
-					modifiers |= Modifiers.PRIVATE;
-				} else if (tokens.optional(K_EXPORT) != null) {
-					modifiers |= Modifiers.EXPORT;
-				} else if (tokens.optional(K_ABSTRACT) != null) {
-					modifiers |= Modifiers.ABSTRACT;
-				} else if (tokens.optional(K_FINAL) != null) {
-					modifiers |= Modifiers.FINAL;
-				} else if (tokens.optional(K_PROTECTED) != null) {
-					modifiers |= Modifiers.PROTECTED;
-				} else if (tokens.optional(K_IMPLICIT) != null) {
-					modifiers |= Modifiers.IMPLICIT;
-				} else {
-					break;
+			outer: while (true) {
+				switch (tokens.peek().type) {
+					case K_PUBLIC:
+						modifiers |= Modifiers.PUBLIC;
+						break;
+					case K_PRIVATE:
+						modifiers |= Modifiers.PRIVATE;
+						break;
+					case K_EXPORT:
+						modifiers |= Modifiers.EXPORT;
+						break;
+					case K_ABSTRACT:
+						modifiers |= Modifiers.ABSTRACT;
+						break;
+					case K_FINAL:
+						modifiers |= Modifiers.FINAL;
+						break;
+					case K_PROTECTED:
+						modifiers |= Modifiers.PROTECTED;
+						break;
+					case K_IMPLICIT:
+						modifiers |= Modifiers.IMPLICIT;
+						break;
+					case K_VIRTUAL:
+						modifiers |= Modifiers.VIRTUAL;
+						break;
+					default:
+						break outer;
 				}
+				tokens.next();
 			}
 
 			if (tokens.optional(K_IMPORT) != null) {

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

@@ -457,7 +457,7 @@ public abstract class ParsedExpression {
 	}
 	
 	public final CodePosition position;
-
+	
 	public ParsedExpression(CodePosition position) {
 		this.position = position;
 	}

ScriptingExample/scripts/enums.zs

@@ -1,15 +0,0 @@
-enum TestEnum {
-	HELLO,
-	WORLD
-}
-
-enum TestEnum2 {
-	HELLO("Hello"),
-	WORLD("World");
-	
-	val value as string;
-	
-	this(value as string) {
-		this.value = value;
-	}
-}