- Moved Java bytecode generation to its own project.

- Added some utility methods to ParsedFile to parse from different sources.

JavaBytecodeCompiler/build.gradle

@@ -0,0 +1,19 @@
+// Note: "common.gradle" in the root project contains additional initialization
+//   for this project. This initialization is applied in the "build.gradle"
+//   of the root project.
+
+// NetBeans will automatically add "run" and "debug" tasks relying on the
+// "mainClass" property. You may however define the property prior executing
+// tasks by passing a "-PmainClass=<QUALIFIED_CLASS_NAME>" argument.
+//
+// Note however, that you may define your own "run" and "debug" task if you
+// prefer. In this case NetBeans will not add these tasks but you may rely on
+// your own implementation.
+if (!hasProperty('mainClass')) {
+    ext.mainClass = ''
+}
+
+dependencies {
+	compile 'org.ow2.asm:asm-debug-all:6.0_BETA'
+	compile project(':CodeModel')
+}

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/JavaClassInfo.java → JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/JavaClassInfo.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.scriptingexample;
+package org.openzen.zenscript.javabytecode;
 
 /**
  *

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

@@ -0,0 +1,84 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.javabytecode;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Opcodes;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.ScriptBlock;
+import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.javabytecode.compiler.JavaStatementVisitor;
+import org.openzen.zenscript.javabytecode.compiler.JavaWriter;
+import org.openzen.zenscript.shared.SourceFile;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class JavaCompiler {
+	private final JavaModule target;
+	private final List<String> scriptBlockNames = new ArrayList<>();
+	private final ClassWriter scriptsClassWriter;
+	private int generatedScriptBlockCounter = 0;
+	private boolean finished = false;
+	
+	public JavaCompiler() {
+		this(false);
+	}
+	
+	public JavaCompiler(boolean debug) {
+		target = new JavaModule();
+		
+		scriptsClassWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+		scriptsClassWriter.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC, "Scripts", null, "java/lang/Object", null);
+	}
+	
+	public void addDefinition(HighLevelDefinition definition) {
+		// convert definition into java class
+	}
+	
+	public void addScriptBlock(ScriptBlock script) {
+		SourceFile sourceFile = script.getTag(SourceFile.class);
+		String methodName;
+		if (sourceFile == null) {
+			methodName = "generatedBlock" + (generatedScriptBlockCounter++);
+		} else {
+			// TODO: remove special characters
+			methodName = sourceFile.filename.substring(0, sourceFile.filename.lastIndexOf('.')).replace("/", "_");
+		}
+
+		scriptBlockNames.add(methodName);
+
+		// convert scripts into methods (add them to a Scripts class?)
+		// (TODO: can we break very long scripts into smaller methods? for the extreme scripts)
+		final JavaStatementVisitor statementVisitor = new JavaStatementVisitor(new JavaWriter(scriptsClassWriter, Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, methodName, "()V", null, null));
+		statementVisitor.start();
+		for (Statement statement : script.statements) {
+			statement.accept(statementVisitor);
+		}
+		statementVisitor.end();
+	}
+	
+	public JavaModule finish() {
+		if (finished)
+			throw new IllegalStateException("Already finished!");
+		finished = true;
+		
+		final JavaWriter runWriter = new JavaWriter(scriptsClassWriter, Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "run", "()V", null, null);
+		runWriter.start();
+		for (String scriptBlockName : scriptBlockNames) {
+			runWriter.invokeStatic("Scripts", scriptBlockName, "()V");
+		}
+		runWriter.ret();
+		runWriter.end();
+		
+		target.register("Scripts", scriptsClassWriter.toByteArray());
+		
+		return target;
+	}
+}

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/JavaFieldInfo.java → JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/JavaFieldInfo.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.scriptingexample;
+package org.openzen.zenscript.javabytecode;
 
 /**
  *

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/JavaMethodInfo.java → JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/JavaMethodInfo.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.scriptingexample;
+package org.openzen.zenscript.javabytecode;
 
 /**
  *

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/JavaModule.java → JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/JavaModule.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.scriptingexample;
+package org.openzen.zenscript.javabytecode;
 
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/writer/JavaExpressionVisitor.java → JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaExpressionVisitor.java

@@ -1,8 +1,8 @@
-package org.openzen.zenscript.scriptingexample.writer;
+package org.openzen.zenscript.javabytecode.compiler;
 
 import org.openzen.zenscript.codemodel.expression.*;
-import org.openzen.zenscript.scriptingexample.JavaFieldInfo;
-import org.openzen.zenscript.scriptingexample.JavaMethodInfo;
+import org.openzen.zenscript.javabytecode.JavaFieldInfo;
+import org.openzen.zenscript.javabytecode.JavaMethodInfo;
 
 public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/writer/JavaStatementVisitor.java → JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaStatementVisitor.java

@@ -1,4 +1,4 @@
-package org.openzen.zenscript.scriptingexample.writer;
+package org.openzen.zenscript.javabytecode.compiler;
 
 import org.openzen.zenscript.codemodel.statement.*;
 

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/writer/JavaTypeVisitor.java → JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaTypeVisitor.java

@@ -1,4 +1,4 @@
-package org.openzen.zenscript.scriptingexample.writer;
+package org.openzen.zenscript.javabytecode.compiler;
 
 import org.openzen.zenscript.codemodel.type.*;
 

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/writer/JavaWriter.java → JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaWriter.java

@@ -1,4 +1,4 @@
-package org.openzen.zenscript.scriptingexample.writer;
+package org.openzen.zenscript.javabytecode.compiler;
 
 import org.objectweb.asm.*;
 import org.objectweb.asm.commons.LocalVariablesSorter;

Parser/src/main/java/org/openzen/zenscript/parser/ParsedFile.java

@@ -8,6 +8,8 @@ package org.openzen.zenscript.parser;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -39,48 +41,60 @@ import org.openzen.zenscript.shared.SourceFile;
 public class ParsedFile {
 	public static ParsedFile parse(File file) throws IOException {
 		String filename = file.toString();
-		ParsedFile result = new ParsedFile(file.getName());
-		
 		try (FileReader reader = new FileReader(file)) {
-			ZSTokenStream tokens = new ZSTokenStream(filename, reader);
-			
+			return parse(filename, reader);
+		}
+	}
+	
+	public static ParsedFile parse(String filename, String content) {
+		try (StringReader reader = new StringReader(content)) {
+			return parse(filename, reader);
+		} catch (IOException ex) {
+			throw new AssertionError(); // supposed to never happen in a StringReader
+		}
+	}
+	
+	public static ParsedFile parse(String filename, Reader reader) throws IOException {
+		ParsedFile result = new ParsedFile(filename);
+		
+		ZSTokenStream tokens = new ZSTokenStream(filename, reader);
+
+		while (true) {
+			CodePosition position = tokens.peek().position;
+			int modifiers = 0;
 			while (true) {
-				CodePosition position = tokens.peek().position;
-				int modifiers = 0;
-				while (true) {
-					if (tokens.optional(K_PUBLIC) != null) {
-						modifiers |= Modifiers.MODIFIER_PUBLIC;
-					} else if (tokens.optional(K_PRIVATE) != null) {
-						modifiers |= Modifiers.MODIFIER_PRIVATE;
-					} else if (tokens.optional(K_EXPORT) != null) {
-						modifiers |= Modifiers.MODIFIER_EXPORT;
-					} else if (tokens.optional(K_ABSTRACT) != null) {
-						modifiers |= Modifiers.MODIFIER_ABSTRACT;
-					} else if (tokens.optional(K_FINAL) != null) {
-						modifiers |= Modifiers.MODIFIER_FINAL;
-					} else if (tokens.optional(K_PROTECTED) != null) {
-						modifiers |= Modifiers.MODIFIER_PROTECTED;
-					} else if (tokens.optional(K_IMPLICIT) != null) {
-						modifiers |= Modifiers.MODIFIER_IMPLICIT;
-					} else {
-						break;
-					}
-				}
-				
-				if (tokens.optional(K_IMPORT) != null) {
-					result.imports.add(ParsedImport.parse(position, tokens));
-				} else if (tokens.optional(EOF) != null) {
-					break;
+				if (tokens.optional(K_PUBLIC) != null) {
+					modifiers |= Modifiers.MODIFIER_PUBLIC;
+				} else if (tokens.optional(K_PRIVATE) != null) {
+					modifiers |= Modifiers.MODIFIER_PRIVATE;
+				} else if (tokens.optional(K_EXPORT) != null) {
+					modifiers |= Modifiers.MODIFIER_EXPORT;
+				} else if (tokens.optional(K_ABSTRACT) != null) {
+					modifiers |= Modifiers.MODIFIER_ABSTRACT;
+				} else if (tokens.optional(K_FINAL) != null) {
+					modifiers |= Modifiers.MODIFIER_FINAL;
+				} else if (tokens.optional(K_PROTECTED) != null) {
+					modifiers |= Modifiers.MODIFIER_PROTECTED;
+				} else if (tokens.optional(K_IMPLICIT) != null) {
+					modifiers |= Modifiers.MODIFIER_IMPLICIT;
 				} else {
-					ParsedDefinition definition = ParsedDefinition.parse(position, modifiers, tokens, null);
-					if (definition == null) {
-						result.statements.add(ParsedStatement.parse(tokens));
-					} else {
-						result.definitions.add(definition);
-					}
+					break;
+				}
+			}
 
-			//tokens.required(EOF, "An import, class, interface, enum, struct, function or alias expected.");
+			if (tokens.optional(K_IMPORT) != null) {
+				result.imports.add(ParsedImport.parse(position, tokens));
+			} else if (tokens.optional(EOF) != null) {
+				break;
+			} else {
+				ParsedDefinition definition = ParsedDefinition.parse(position, modifiers, tokens, null);
+				if (definition == null) {
+					result.statements.add(ParsedStatement.parse(tokens));
+				} else {
+					result.definitions.add(definition);
 				}
+
+				//tokens.required(EOF, "An import, class, interface, enum, struct, function or alias expected.");
 			}
 		}
 		

ScriptingExample/build.gradle

@@ -14,6 +14,6 @@ if (!hasProperty('mainClass')) {
 }
 
 dependencies {
-	compile 'org.ow2.asm:asm-debug-all:6.0_BETA'
 	compile project(':Parser')
+	compile project(':JavaBytecodeCompiler')
 }

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

@@ -25,6 +25,9 @@ import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.javabytecode.JavaClassInfo;
+import org.openzen.zenscript.javabytecode.JavaFieldInfo;
+import org.openzen.zenscript.javabytecode.JavaMethodInfo;
 import org.openzen.zenscript.linker.symbol.ISymbol;
 import org.openzen.zenscript.shared.CodePosition;
 

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

@@ -6,21 +6,17 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Opcodes;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+
 import org.openzen.zenscript.codemodel.PackageDefinitions;
 import org.openzen.zenscript.codemodel.ScriptBlock;
 import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
-import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
+import org.openzen.zenscript.javabytecode.JavaCompiler;
+import org.openzen.zenscript.javabytecode.JavaModule;
 import org.openzen.zenscript.linker.symbol.ISymbol;
 import org.openzen.zenscript.parser.ParsedFile;
-import org.openzen.zenscript.scriptingexample.writer.JavaStatementVisitor;
-import org.openzen.zenscript.scriptingexample.writer.JavaWriter;
-import org.openzen.zenscript.shared.SourceFile;
 
 public class Main {
     /**
@@ -85,54 +81,13 @@ public class Main {
 	}
 	
 	private static JavaModule compileSemanticToJava(SemanticModule module) {
-		JavaModule result = new JavaModule();
-		final ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
-		classWriter.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC, "Scripts", null, "java/lang/Object", null);
-
-		// TODO: java bytecode compilation
+		JavaCompiler compiler = new JavaCompiler(true);
 		for (HighLevelDefinition definition : module.definitions.getAll()) {
-			// convert definitions into java classes
-
+			compiler.addDefinition(definition);
 		}
-		int statementNo = 0;
-		List<String> scriptBlockNames = new ArrayList<>();
 		for (ScriptBlock script : module.scripts) {
-			SourceFile sourceFile = script.getTag(SourceFile.class);
-			String methodName;
-			if (sourceFile == null) {
-				methodName = "generatedBlock" + (statementNo++);
-			} else {
-				// TODO: remove special characters
-				methodName = sourceFile.filename.substring(0, sourceFile.filename.lastIndexOf('.')).replace("/", "_");
-			}
-			
-			scriptBlockNames.add(methodName);
-			
-			// convert scripts into methods (add them to a Scripts class?)
-			// (TODO: can we break very long scripts into smaller methods? for the extreme scripts)
-			final JavaStatementVisitor statementVisitor = new JavaStatementVisitor(new JavaWriter(classWriter, Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, methodName, "()V", null, null));
-			statementVisitor.start();
-			for (Statement statement : script.statements) {
-				statement.accept(statementVisitor);
-			}
-			statementVisitor.end();
-		}
-
-		// create a Scripts.run() method to run all scripts compiled above
-		final JavaWriter runWriter = new JavaWriter(classWriter, Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "run", "()V", null, null);
-		runWriter.start();
-		for (String scriptBlockName : scriptBlockNames) {
-			runWriter.invokeStatic("Scripts", scriptBlockName, "()V");
+			compiler.addScriptBlock(script);
 		}
-		runWriter.ret();
-		runWriter.end();
-		result.register("Scripts", classWriter.toByteArray());
-
-		
-		return result;
-	}
-
-	private static String makeName(int i) {
-    	return "scriptBlock" + i;
+		return compiler.finish();
 	}
 }