Some variant stuff, commited so that I can merge stan's changes

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ref/VariantOptionRef.java

@@ -32,4 +32,12 @@ public class VariantOptionRef {
 	public <T> T getTag(Class<T> type) {
 		return option.getTag(type);
 	}
+
+	public int getOrdinal() {
+		return option.ordinal;
+	}
+
+	public VariantDefinition.Option getOption() {
+		return option;
+	}
 }

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

@@ -15,7 +15,6 @@ import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.javabytecode.JavaModule;
 import org.openzen.zenscript.javabytecode.JavaParameterInfo;
-import org.openzen.zenscript.javabytecode.compiler.definitions.JavaOptionInfoTag;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -196,7 +195,7 @@ public class CompilerUtils {
 
 		@Override
 		public Integer acceptVariantOption(VariantOptionSwitchValue value) {
-			return value.option.getTag(JavaOptionInfoTag.class).number;
+			return value.option.getOrdinal();
 		}
 	}
 }

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

@@ -13,10 +13,7 @@ import org.openzen.zenscript.codemodel.member.ref.ConstMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.DefinitionMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.FieldMemberRef;
 import org.openzen.zenscript.codemodel.statement.ReturnStatement;
-import org.openzen.zenscript.codemodel.type.ArrayTypeID;
-import org.openzen.zenscript.codemodel.type.AssocTypeID;
-import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
+import org.openzen.zenscript.codemodel.type.*;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.implementations.IntRange;
 import org.openzen.zenscript.javabytecode.*;
@@ -1736,7 +1733,11 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 
 	@Override
 	public Void visitGetMatchingVariantField(GetMatchingVariantField expression) {
-		throw new UnsupportedOperationException(); // TODO
+		javaWriter.loadObject(0);
+		final ITypeID type = expression.value.option.getParameterType(expression.index);
+		javaWriter.getField(new JavaFieldInfo(expression.value.option.getTag(JavaClassInfo.class), "Field" + expression.index, type.accept(JavaTypeVisitor.INSTANCE).getInternalName()));
+		return null;
+		//throw new UnsupportedOperationException(); // TODO
 	}
 
 	@Override
@@ -2033,7 +2034,7 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 				javaWriter.label(defaultLabel);
 			}
 			//switchCase.value.body.setTag(MatchExpression.class, expression);
-			switchCase.value.accept(new MatchExpressionVisitor(this.javaWriter));
+			switchCase.value.accept(this);
 			javaWriter.goTo(end);
 		}
 
@@ -2425,26 +2426,4 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 		return true;
 	}
 
-
-	private static final class MatchExpressionVisitor extends JavaExpressionVisitor {
-		public MatchExpressionVisitor(JavaWriter javaWriter) {
-			super(javaWriter);
-		}
-
-		@Override
-		public Void visitGetLocalVariable(GetLocalVariableExpression expression) {
-			final Label label = new Label();
-			final JavaLocalVariableInfo tag = expression.variable.getTag(JavaLocalVariableInfo.class);
-			if (tag != null) {
-				tag.end = label;
-				javaWriter.load(tag.type, tag.local);
-				javaWriter.label(label);
-				return null;
-			}
-
-			javaWriter.aConstNull();
-			return null;
-
-		}
-	}
 }

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/definitions/JavaDefinitionVisitor.java

@@ -195,28 +195,15 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<byte[]> {
 
 		final JavaMemberVisitor visitor = new JavaMemberVisitor(writer, toClass, variant);
 
-
 		final List<VariantDefinition.Option> options = variant.options;
-		for (int optionNo = 0, optionsSize = options.size(); optionNo < optionsSize; optionNo++) {
-			final VariantDefinition.Option option = options.get(optionNo);
-			option.setTag(JavaOptionInfoTag.class, new JavaOptionInfoTag(optionNo));
-		}
-
-		for (final IDefinitionMember member : variant.members) {
-			member.accept(visitor);
-		}
-
-
-
-
 		//Each option is one of the possible child classes
-		for (int optionNo = 0, optionsSize = options.size(); optionNo < optionsSize; ++optionNo) {
-			final VariantDefinition.Option option = options.get(optionNo);
-
+		for (final VariantDefinition.Option option : options) {
 			final String optionClassName = variantName + "$" + option.name;
-			final JavaClassInfo optionClass = new JavaClassInfo(variantName);
+			final JavaClassInfo optionClass = new JavaClassInfo(optionClassName);
 			final JavaClassWriter optionWriter = new JavaClassWriter(ClassWriter.COMPUTE_FRAMES);
 
+			option.setTag(JavaClassInfo.class, optionClass);
+
 
 			//Generic option signature
 			final String signature;
@@ -245,14 +232,13 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<byte[]> {
 
 
 			//Denominator for switch-cases
-			final JavaWriter getDenominator = new JavaWriter(optionWriter, new JavaMethodInfo(optionClass, "getDenominator", "()I", Modifiers.PUBLIC), null,null, null, "java/lang/Override");
+			final JavaWriter getDenominator = new JavaWriter(optionWriter, new JavaMethodInfo(optionClass, "getDenominator", "()I", Modifiers.PUBLIC), null, null, null, "java/lang/Override");
 			getDenominator.start();
-			getDenominator.constant(optionNo);
+			getDenominator.constant(option.ordinal);
 			getDenominator.returnInt();
 			getDenominator.end();
 
 
-
 			//Print the option files, won't be in production
 			optionVisitor.end();
 			optionWriter.visitEnd();
@@ -263,6 +249,12 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<byte[]> {
 				e.printStackTrace();
 			}
 		}
+
+
+		for (final IDefinitionMember member : variant.members) {
+			member.accept(visitor);
+		}
+
 		visitor.end();
 		writer.visitEnd();
 

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

@@ -123,7 +123,7 @@ public class Main {
 	}
 	
 	private static JavaModule compileSemanticToJava(SemanticModule module) {
-		JavaCompiler compiler = new JavaCompiler(false);
+		JavaCompiler compiler = new JavaCompiler(false, null);
 		for (HighLevelDefinition definition : module.definitions.getAll()) {
 			compiler.addDefinition(definition, module);
 		}