This commit at least fixes that some classes have the same name, e.g. the name of an expansion class and the name of the script block part within the file.

WIP since it still needs more doing and a way to properly store already generated names.

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/JavaCompiler.java

@@ -36,7 +36,8 @@ import org.openzen.zenscript.javashared.prepare.JavaPrepareDefinitionVisitor;
  */
 public class JavaCompiler {
 	private int generatedScriptBlockCounter = 0;
-	
+	private int expansionCounter = 0;
+
 	public JavaCompiler() {}
 	
 	public JavaBytecodeModule compile(String packageName, SemanticModule module, JavaCompileSpace space) {
@@ -47,7 +48,7 @@ public class JavaCompiler {
 		context.addModule(module.module, target);
 		
 		for (HighLevelDefinition definition : module.definitions.getAll()) {
-			String filename = getFilename(definition);
+			String filename = getFilename(definition) + "_" + (definition.name == null ? "generated" : definition.name) + "_" + expansionCounter++;
 			JavaPrepareDefinitionVisitor definitionPreparer = new JavaPrepareDefinitionVisitor(context, target, filename, null);
 			definition.accept(definitionPreparer);
 		}

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

@@ -21,8 +21,6 @@ import org.openzen.zenscript.javabytecode.JavaLocalVariableInfo;
 import org.openzen.zenscript.javabytecode.compiler.JavaModificationExpressionVisitor.PushOption;
 import org.openzen.zenscript.javashared.*;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
@@ -2086,12 +2084,6 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativ
 
 		context.register(className, lambdaCW.toByteArray());
 
-		try (FileOutputStream out = new FileOutputStream(className + ".class")) {
-			out.write(lambdaCW.toByteArray());
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
 		return null;
 	}
 
@@ -4119,15 +4111,6 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativ
 		javaWriter.dupX1();
 		javaWriter.swap();
 		javaWriter.invokeSpecial(className, "<init>", constructorDesc);
-
-		//Debug-only, remove later
-		if(true) {
-			try (FileOutputStream out = new FileOutputStream(className + ".class")) {
-				out.write(lambdaCW.toByteArray());
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
 	}
 
 	@Override

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

@@ -28,8 +28,6 @@ import org.openzen.zenscript.javashared.JavaModifiers;
 import org.openzen.zenscript.javashared.JavaTypeGenericVisitor;
 import org.openzen.zenscript.javashared.JavaVariantOption;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -186,15 +184,7 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<byte[]> {
 		writer.visitEnd();
 
 
-		final byte[] classBytes = writer.toByteArray();
-
-		try (FileOutputStream out = new FileOutputStream("ttt.class")) {
-			out.write(classBytes);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		return classBytes;
+		return writer.toByteArray();
 	}
 
 	@Override
@@ -303,13 +293,6 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<byte[]> {
 			optionWriter.visitEnd();
 			final byte[] byteArray = optionWriter.toByteArray();
 			context.register(optionTag.variantOptionClass.internalName, byteArray);
-
-			//Print the option files, won't be in production
-			try (FileOutputStream out = new FileOutputStream(optionTag.variantOptionClass.internalName.replace('/', '_') + ".class")) {
-				out.write(byteArray);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
 		}