Simplified handling of switch cases.

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/SwitchCase.java

@@ -6,17 +6,17 @@
 package org.openzen.zenscript.codemodel.statement;
 
 import java.util.List;
-import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.expression.switchvalue.SwitchValue;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class SwitchCase {
-	public final Expression value;
+	public final SwitchValue value;
 	public final List<Statement> statements;
 	
-	public SwitchCase(Expression value, List<Statement> statements) {
+	public SwitchCase(SwitchValue value, List<Statement> statements) {
 		this.value = value;
 		this.statements = statements;
 	}

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

@@ -7,6 +7,13 @@ import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.expression.*;
+import org.openzen.zenscript.codemodel.expression.switchvalue.CharSwitchValue;
+import org.openzen.zenscript.codemodel.expression.switchvalue.EnumConstantSwitchValue;
+import org.openzen.zenscript.codemodel.expression.switchvalue.IntSwitchValue;
+import org.openzen.zenscript.codemodel.expression.switchvalue.StringSwitchValue;
+import org.openzen.zenscript.codemodel.expression.switchvalue.SwitchValue;
+import org.openzen.zenscript.codemodel.expression.switchvalue.SwitchValueVisitor;
+import org.openzen.zenscript.codemodel.expression.switchvalue.VariantOptionSwitchValue;
 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
@@ -116,54 +123,35 @@ public class CompilerUtils {
     }
 
 
-    public static int getKeyForSwitch(Expression expression) {
-        if (expression.type instanceof BasicTypeID)
-            switch ((BasicTypeID) expression.type) {
-                case BOOL:
-                    if (expression instanceof ConstantBoolExpression)
-                        return ((ConstantBoolExpression) expression).value ? 1 : 0;
-                    break;
-                case BYTE:
-                    if (expression instanceof ConstantByteExpression)
-                        return ((ConstantByteExpression) expression).value;
-                    break;
-                case SBYTE:
-                    if (expression instanceof ConstantSByteExpression)
-                        return ((ConstantSByteExpression) expression).value;
-                    break;
-                case SHORT:
-                    if(expression instanceof ConstantShortExpression)
-                        return ((ConstantShortExpression) expression).value;
-                    break;
-                case USHORT:
-                    if (expression instanceof ConstantUShortExpression)
-                        return ((ConstantUShortExpression) expression).value;
-                    break;
-                case INT:
-                    if (expression instanceof ConstantIntExpression)
-                        return ((ConstantIntExpression) expression).value;
-                    break;
-                case UINT:
-                    if (expression instanceof ConstantUIntExpression)
-                        return ((ConstantUIntExpression) expression).value;
-                    break;
-                case LONG:
-                    if(expression instanceof ConstantLongExpression)
-                        return (int)((ConstantLongExpression) expression).value;
-                    break;
-                case ULONG:
-                    if(expression instanceof ConstantULongExpression)
-                        return (int)((ConstantULongExpression) expression).value;
-                    break;
-                case CHAR:
-                    if(expression instanceof ConstantCharExpression)
-                        return ((ConstantCharExpression) expression).value;
-                    break;
-                case STRING:
-                    if(expression instanceof ConstantStringExpression)
-                        return ((ConstantStringExpression) expression).value.hashCode();
-                    break;
-            }
-            throw new RuntimeException("Cannot switch over expression " + expression);
+    public static int getKeyForSwitch(SwitchValue expression) {
+		return expression.accept(new SwitchKeyVisitor());
     }
+	
+	private static class SwitchKeyVisitor implements SwitchValueVisitor<Integer> {
+
+		@Override
+		public Integer acceptInt(IntSwitchValue value) {
+			return value.value;
+		}
+
+		@Override
+		public Integer acceptChar(CharSwitchValue value) {
+			return (int)value.value;
+		}
+
+		@Override
+		public Integer acceptString(StringSwitchValue value) {
+			return value.value.hashCode();
+		}
+
+		@Override
+		public Integer acceptEnumConstant(EnumConstantSwitchValue value) {
+			return value.constant.value;
+		}
+
+		@Override
+		public Integer acceptVariantOption(VariantOptionSwitchValue value) {
+			throw new UnsupportedOperationException("Not there yet");
+		}
+	}
 }

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

@@ -15,10 +15,16 @@ import org.openzen.zenscript.codemodel.expression.ConstantUIntExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantULongExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantUShortExpression;
 import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.expression.switchvalue.CharSwitchValue;
+import org.openzen.zenscript.codemodel.expression.switchvalue.IntSwitchValue;
+import org.openzen.zenscript.codemodel.expression.switchvalue.StringSwitchValue;
+import org.openzen.zenscript.codemodel.expression.switchvalue.SwitchValue;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.linker.ExpressionScope;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.CompileException;
+import org.openzen.zenscript.shared.CompileExceptionCode;
 
 /**
  *
@@ -66,6 +72,14 @@ public class ParsedExpressionInt extends ParsedExpression {
 		else
 			return new ConstantLongExpression(position, value);
 	}
+	
+	@Override
+	public SwitchValue compileToSwitchValue(ITypeID type, ExpressionScope scope) {
+		if (value < Integer.MIN_VALUE || value > Integer.MAX_VALUE)
+			throw new CompileException(position, CompileExceptionCode.INVALID_SWITCH_CASE, "value is too large for a switch case");
+		
+		return new IntSwitchValue((int) value);
+	}
 
 	@Override
 	public boolean hasStrongType() {

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

@@ -7,10 +7,16 @@ package org.openzen.zenscript.parser.expression;
 
 import org.openzen.zenscript.codemodel.expression.ConstantCharExpression;
 import org.openzen.zenscript.codemodel.expression.ConstantStringExpression;
+import org.openzen.zenscript.codemodel.expression.switchvalue.CharSwitchValue;
+import org.openzen.zenscript.codemodel.expression.switchvalue.StringSwitchValue;
+import org.openzen.zenscript.codemodel.expression.switchvalue.SwitchValue;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.linker.ExpressionScope;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.CompileException;
+import org.openzen.zenscript.shared.CompileExceptionCode;
 
 /**
  *
@@ -38,6 +44,20 @@ public class ParsedExpressionString extends ParsedExpression {
 		
 		return new ConstantStringExpression(position, value);
 	}
+	
+	@Override
+	public SwitchValue compileToSwitchValue(ITypeID type, ExpressionScope scope) {
+		if (type == BasicTypeID.CHAR) {
+			if (value.length() != 1)
+				throw new CompileException(position, CompileExceptionCode.INVALID_SWITCH_CASE, "char value expected but string given");
+			
+			return new CharSwitchValue(value.charAt(0));
+		} else if (type == BasicTypeID.STRING) {
+			return new StringSwitchValue(value);
+		} else {
+			throw new CompileException(position, CompileExceptionCode.INVALID_SWITCH_CASE, "Can only use string keys for string values");
+		}
+	}
 
 	@Override
 	public boolean hasStrongType() {

Parser/src/main/java/org/openzen/zenscript/parser/statements/ParsedStatementSwitch.java

@@ -10,7 +10,6 @@ import java.util.function.Function;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.WhitespaceInfo;
 import org.openzen.zenscript.codemodel.expression.Expression;
-import org.openzen.zenscript.codemodel.expression.GetLocalVariableExpression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.statement.Statement;
@@ -46,7 +45,7 @@ public class ParsedStatementSwitch extends ParsedStatement {
 		SwitchScope innerScope = new SwitchScope(scope, result);
 		
 		for (ParsedSwitchCase switchCase : cases) {
-			result.cases.add(switchCase.compile(innerScope));
+			result.cases.add(switchCase.compile(result.value.type, innerScope));
 		}
 		
 		return result;

Parser/src/main/java/org/openzen/zenscript/parser/statements/ParsedSwitchCase.java

@@ -7,9 +7,10 @@ package org.openzen.zenscript.parser.statements;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.expression.switchvalue.SwitchValue;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.statement.SwitchCase;
+import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.linker.ExpressionScope;
 import org.openzen.zenscript.linker.StatementScope;
 import org.openzen.zenscript.parser.expression.ParsedExpression;
@@ -26,8 +27,8 @@ public class ParsedSwitchCase {
 		this.value = value;
 	}
 	
-	public SwitchCase compile(StatementScope scope) {
-		Expression cValue = value == null ? null : value.compile(new ExpressionScope(scope)).eval();
+	public SwitchCase compile(ITypeID type, StatementScope scope) {
+		SwitchValue cValue = value == null ? null : value.compileToSwitchValue(type, new ExpressionScope(scope));
 		List<Statement> cStatements = new ArrayList<>();
 		for (ParsedStatement statement : statements) {
 			cStatements.add(statement.compile(scope));