Fixed some after-merge issues

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

@@ -61,7 +61,7 @@ public class JavaTypeGenericVisitor implements ITypeVisitor<String> {
 	public String getGenericMethodSignature(FunctionHeader header) {
 		return "(" + getGenericSignature(header.parameters) +
 				")" +
-				getGenericSignature(header.returnType);
+				getGenericSignature(header.getReturnType());
 	}
 
 

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

@@ -173,6 +173,8 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<byte[]> {
 		final JavaClass toClass = variant.getTag(JavaClass.class);
 		final JavaClassWriter writer = new JavaClassWriter(ClassWriter.COMPUTE_FRAMES);
 
+		final String variantName = variant.name;
+
 
 		final String ss = "<" + javaTypeGenericVisitor.getGenericSignature(variant.genericParameters) + ">Ljava/lang/Object;";
 		JavaClassWriter.registerSuperClass(variantName, "java/lang/Object");
@@ -187,6 +189,7 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<byte[]> {
 		for (final VariantDefinition.Option option : options) {
 			JavaVariantOption optionTag = option.getTag(JavaVariantOption.class);
 			final JavaClassWriter optionWriter = new JavaClassWriter(ClassWriter.COMPUTE_FRAMES);
+			final String optionClassName = variantName + "$" + option.name;
 			JavaClassWriter.registerSuperClass(optionClassName, variantName);
 
 			writer.visitInnerClass(optionTag.variantOptionClass.internalName, optionTag.variantClass.internalName, option.name, Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL);
@@ -232,7 +235,7 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<byte[]> {
 				final String descriptor = context.getDescriptor(types[i]);
 				optionInitDescBuilder.append(descriptor);
 				optionInitSignatureBuilder.append("T").append(((GenericTypeID) types[i]).parameter.name).append(";");
-				optionWriter.visitField(Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL, "Field" + i, descriptor, "T" + ((GenericTypeID) types[i]).parameter.name + ";", null).visitEnd();
+				optionWriter.visitField(Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL, "field" + i, descriptor, "T" + ((GenericTypeID) types[i]).parameter.name + ";", null).visitEnd();
 			}
 			optionInitDescBuilder.append(")V");
 			optionInitSignatureBuilder.append(")V");

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaSynthesizedClassNamer.java

@@ -29,8 +29,7 @@ public class JavaSynthesizedClassNamer {
 	
 	public static JavaSynthesizedClass createRangeName(RangeTypeID range) {
 		String signature = getRangeSignature(range);
-		String className = signature;
-		JavaClass cls = new JavaClass("zsynthetic", className, JavaClass.Kind.CLASS);
+		JavaClass cls = new JavaClass("zsynthetic", signature, JavaClass.Kind.CLASS);
 		return new JavaSynthesizedClass(cls, extractTypeParameters(range));
 	}
 	

ScriptingExample/build.gradle

@@ -18,5 +18,5 @@ dependencies {
 	compile project(':JavaBytecodeCompiler')
 	compile project(':JavaShared')
 	compile project(':CodeFormatter')
-	compile project(':ScriptingHost')
+//	compile project(':ScriptingHost')
 }