Fixed enum constants

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

@@ -7,6 +7,8 @@ package org.openzen.zenscript.codemodel.member;
 
 import java.util.Map;
 import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.expression.CallExpression;
+import org.openzen.zenscript.codemodel.expression.NewExpression;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -20,11 +22,15 @@ import org.openzen.zenscript.shared.CodePosition;
  */
 public class EnumConstantMember extends DefinitionMember {
 	public final String name;
+	public final int value;
 	
-	public EnumConstantMember(CodePosition position, String name) {
+	public NewExpression constructor;
+	
+	public EnumConstantMember(CodePosition position, String name, int value) {
 		super(position, Modifiers.MODIFIER_STATIC);
 		
 		this.name = name;
+		this.value = value;
 	}
 
 	@Override

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

@@ -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, 0, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
+				constructors.addMethod(new ConstructorMember(BUILTIN, Modifiers.MODIFIER_PUBLIC, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
 			} else if (definition instanceof StructDefinition) {
 				// add default struct constructors
-				constructors.addMethod(new ConstructorMember(BUILTIN, 0, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
+				constructors.addMethod(new ConstructorMember(BUILTIN, Modifiers.MODIFIER_PUBLIC, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
 				
 				List<FieldMember> fields = ((StructDefinition)definition).getFields();
 				if (!fields.isEmpty()) {
@@ -225,6 +225,9 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 					}
 					constructors.addMethod(new ConstructorMember(BUILTIN, 0, new FunctionHeader(VOID, parameters)), TypeMemberPriority.SPECIFIED);
 				}
+			} else if (definition instanceof EnumDefinition) {
+				// add default constructor
+				constructors.addMethod(new ConstructorMember(BUILTIN, Modifiers.MODIFIER_PRIVATE, new FunctionHeader(VOID)), TypeMemberPriority.SPECIFIED);
 			}
 		}
 		

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

@@ -1,6 +1,5 @@
 package org.openzen.zenscript.javabytecode.compiler;
 
-import com.sun.istack.internal.Nullable;
 import org.objectweb.asm.*;
 import org.objectweb.asm.commons.LocalVariablesSorter;
 import org.openzen.zenscript.javabytecode.JavaLocalVariableInfo;
@@ -1114,7 +1113,7 @@ public class JavaWriter {
             visitor.visitLocalVariable(name, type.getDescriptor(), null, start, end, local);
     }
 
-    public void nameParameter(int modifier, @Nullable String name) {
+    public void nameParameter(int modifier, String name) {
         if (nameVariables)
             visitor.visitParameter(name, modifier);
     }

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

@@ -10,8 +10,12 @@ import java.util.List;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.definition.EnumDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
+import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.lexer.ZSTokenStream;
 import org.openzen.zenscript.lexer.ZSTokenType;
+import org.openzen.zenscript.linker.BaseScope;
+import org.openzen.zenscript.linker.ExpressionScope;
 import org.openzen.zenscript.parser.member.ParsedDefinitionMember;
 import org.openzen.zenscript.shared.CodePosition;
 
@@ -26,7 +30,7 @@ public class ParsedEnum extends BaseParsedDefinition {
 		
 		List<ParsedEnumConstant> enumValues = new ArrayList<>();
 		while (!tokens.isNext(ZSTokenType.T_ACLOSE) && !tokens.isNext(ZSTokenType.T_SEMICOLON)) {
-			enumValues.add(ParsedEnumConstant.parse(tokens));
+			enumValues.add(ParsedEnumConstant.parse(tokens, enumValues.size()));
 			if (tokens.optional(ZSTokenType.T_COMMA) == null)
 				break;
 		}
@@ -58,4 +62,24 @@ public class ParsedEnum extends BaseParsedDefinition {
 	public HighLevelDefinition getCompiled() {
 		return compiled;
 	}
+	
+	@Override
+	public void compileMembers(BaseScope scope) {
+		super.compileMembers(scope);
+		
+		for (ParsedEnumConstant constant : enumValues) {
+			compiled.addMember(constant.getCompiled());
+		}
+	}
+
+	@Override
+	public void compileCode(BaseScope scope) {
+		super.compileCode(scope);
+		
+		DefinitionTypeID type = new DefinitionTypeID(compiled, new ITypeID[0]);
+		ExpressionScope evalScope = new ExpressionScope(scope);
+		for (ParsedEnumConstant constant : enumValues) {
+			constant.compileCode(type, evalScope);
+		}
+	}
 }

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

@@ -8,10 +8,14 @@ package org.openzen.zenscript.parser.definitions;
 import java.util.ArrayList;
 import java.util.List;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
+import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.lexer.ZSToken;
 import org.openzen.zenscript.lexer.ZSTokenStream;
 import org.openzen.zenscript.lexer.ZSTokenType;
+import org.openzen.zenscript.linker.ExpressionScope;
+import org.openzen.zenscript.parser.expression.ParsedCallArguments;
 import org.openzen.zenscript.parser.expression.ParsedExpression;
+import org.openzen.zenscript.parser.expression.ParsedNewExpression;
 import org.openzen.zenscript.shared.CodePosition;
 
 /**
@@ -19,7 +23,7 @@ import org.openzen.zenscript.shared.CodePosition;
  * @author Hoofdgebruiker
  */
 public class ParsedEnumConstant {
-	public static ParsedEnumConstant parse(ZSTokenStream tokens) {
+	public static ParsedEnumConstant parse(ZSTokenStream tokens, int value) {
 		ZSToken name = tokens.required(ZSTokenType.T_IDENTIFIER, "identifier expected");
 		List<ParsedExpression> arguments = new ArrayList<>();
 		if (tokens.optional(ZSTokenType.T_BROPEN) != null) {
@@ -29,7 +33,7 @@ public class ParsedEnumConstant {
 			tokens.required(ZSTokenType.T_BRCLOSE, ") expected");
 		}
 		
-		return new ParsedEnumConstant(name.position, name.content, arguments);
+		return new ParsedEnumConstant(name.position, name.content, value, arguments);
 	}
 	
 	public final CodePosition position;
@@ -38,11 +42,20 @@ public class ParsedEnumConstant {
 	
 	private final EnumConstantMember compiled;
 	
-	public ParsedEnumConstant(CodePosition position, String name, List<ParsedExpression> arguments) {
+	public ParsedEnumConstant(CodePosition position, String name, int value, List<ParsedExpression> arguments) {
 		this.position = position;
 		this.name = name;
 		this.arguments = arguments;
 		
-		compiled = new EnumConstantMember(position, name);
+		compiled = new EnumConstantMember(position, name, value);
+	}
+	
+	public EnumConstantMember getCompiled() {
+		return compiled;
+	}
+	
+	public void compileCode(DefinitionTypeID type, ExpressionScope scope) {
+		ParsedCallArguments arguments = new ParsedCallArguments(this.arguments);
+		compiled.constructor = ParsedNewExpression.compile(position, type, arguments, scope);
 	}
 }

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

@@ -47,7 +47,7 @@ public class ParsedNewExpression extends ParsedExpression{
 		return true;
 	}
 	
-	public static Expression compile(CodePosition position, ITypeID type, ParsedCallArguments arguments, ExpressionScope scope) {
+	public static NewExpression compile(CodePosition position, ITypeID type, ParsedCallArguments arguments, ExpressionScope scope) {
 		DefinitionMemberGroup constructors = scope.getTypeMembers(type).getOrCreateGroup(OperatorType.CONSTRUCTOR);
 		List<ITypeID>[] predictedTypes = constructors.predictCallTypes(scope, scope.hints, arguments.arguments.size());
 		CallArguments compiledArguments = arguments.compileCall(position, scope, constructors);

ScriptingExample/scripts/enums.zs

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