- Added tagging system to tag classes and members with compile-time information

- Improved scripting example to use those tags
- Generated script block methods use script names
- Minor code improvements

CodeModel/src/main/java/org/openzen/zenscript/codemodel/HighLevelDefinition.java

 import org.openzen.zenscript.codemodel.member.FieldMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.Taggable;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public abstract class HighLevelDefinition {
+public abstract class HighLevelDefinition extends Taggable {
 	public final String name;
 	public final int modifiers;
 	public final List<IDefinitionMember> members = new ArrayList<>();

CodeModel/src/main/java/org/openzen/zenscript/codemodel/ScriptBlock.java

 
 import java.util.List;
 import org.openzen.zenscript.codemodel.statement.Statement;
+import org.openzen.zenscript.shared.Taggable;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class ScriptBlock {
+public class ScriptBlock extends Taggable {
 	public final List<Statement> statements;
 	
 	public ScriptBlock(List<Statement> statements) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/definition/ClassDefinition.java

  * @author Hoofdgebruiker
  */
 public class ClassDefinition extends HighLevelDefinition {
+	public ClassDefinition(String name, int modifiers) {
+		this(name, modifiers, null);
+	}
+	
 	public ClassDefinition(String name, int modifiers, HighLevelDefinition outerDefinition) {
 		super(name, modifiers, outerDefinition);
 	}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/DefinitionMember.java

 
 import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.Taggable;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public abstract class DefinitionMember implements IDefinitionMember {
+public abstract class DefinitionMember extends Taggable implements IDefinitionMember {
 	public final CodePosition position;
 	public final int modifiers;
 	

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/EqualsMember.java

 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.Taggable;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class EqualsMember implements ICallableMember {
+public class EqualsMember extends Taggable implements ICallableMember {
 	private final ITypeID type;
 	private final FunctionHeader header;
 	

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/IDefinitionMember.java

 	public IDefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping);
 	
 	public <T> T accept(MemberVisitor<T> visitor);
+	
+	public <T> T getTag(Class<T> tag);
+	
+	public <T> void setTag(Class<T> tag, T value);
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/ArrayIteratorKeyValues.java

 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.Taggable;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class ArrayIteratorKeyValues implements IIteratorMember {
+public class ArrayIteratorKeyValues extends Taggable implements IIteratorMember {
 	private final ArrayTypeID type;
 	private final ITypeID[] loopVariableTypes;
 	

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/ArrayIteratorValues.java

 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.Taggable;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class ArrayIteratorValues implements IIteratorMember {
+public class ArrayIteratorValues extends Taggable implements IIteratorMember {
 	private final ArrayTypeID type;
 	private final ITypeID[] loopVariableTypes;
 	

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/ComparatorMember.java

 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.Taggable;
 
 /*
  * To change this license header, choose License Headers in Project Properties.
  *
  * @author Hoofdgebruiker
  */
-public class ComparatorMember implements ICallableMember {
+public class ComparatorMember extends Taggable implements ICallableMember {
 	private final FunctionHeader header;
 	
 	public ComparatorMember(ITypeID type) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/ConstantGetterMember.java

 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.Taggable;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class ConstantGetterMember implements IGettableMember {
+public class ConstantGetterMember extends Taggable implements IGettableMember {
 	private final String name;
 	private final Function<CodePosition, Expression> value;
 	private final ITypeID type;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/RangeIterator.java

 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.Taggable;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class RangeIterator implements IIteratorMember {
+public class RangeIterator extends Taggable implements IIteratorMember {
 	private final ITypeID[] loopVariableTypes;
 	
 	public RangeIterator(RangeTypeID type) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/StringConcatMember.java

 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.Taggable;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class StringConcatMember implements ICallableMember {
+public class StringConcatMember extends Taggable implements ICallableMember {
 	private final FunctionHeader header;
 	
 	public StringConcatMember(FunctionHeader header) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/SubstringMember.java

 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.Taggable;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class SubstringMember implements ICallableMember {
+public class SubstringMember extends Taggable implements ICallableMember {
 	private final FunctionHeader header;
 	
 	public SubstringMember(FunctionHeader header) {

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

 import org.openzen.zenscript.linker.symbol.ISymbol;
 import org.openzen.zenscript.linker.StatementScope;
 import org.openzen.zenscript.parser.statements.ParsedStatement;
+import org.openzen.zenscript.shared.SourceFile;
 
 /**
  *
 			for (ParsedStatement statement : this.statements) {
 				statements.add(statement.compile(statementScope));
 			}
-			scripts.add(new ScriptBlock(statements));
+			
+			ScriptBlock block = new ScriptBlock(statements);
+			block.setTag(SourceFile.class, new SourceFile(filename));
+			scripts.add(block);
 		}
 	}
 	

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

 import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.codemodel.expression.GetStaticFieldExpression;
+import org.openzen.zenscript.codemodel.member.FieldMember;
+import org.openzen.zenscript.codemodel.member.MethodMember;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.partial.PartialMemberGroupExpression;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 			// eg. package my.package with a class MyClass with a single native method test() returning a string
 			// the visitors can then during compilation check if a method is an instance of NativeMethodMember and treat it accordingly
 			ClassDefinition myClassDefinition = new ClassDefinition("MyClass", Modifiers.MODIFIER_PUBLIC, null);
-			myClassDefinition.addMember(new NativeMethodMember(Modifiers.MODIFIER_PUBLIC, "test", new FunctionHeader(BasicTypeID.STRING), "Lmy/test/MyClass;", "()Ljava/lang/String;"));
-
+			JavaClassInfo myClassInfo = new JavaClassInfo("my/test/MyClass");
+			
+			MethodMember member = new MethodMember(CodePosition.NATIVE, Modifiers.MODIFIER_PUBLIC, "test", new FunctionHeader(BasicTypeID.STRING));
+			member.setTag(JavaMethodInfo.class, new JavaMethodInfo(myClassInfo, "test", "()Ljava/lang/String;"));
+			myClassDefinition.addMember(member);
+			
 			ZSPackage packageMyPackage = rootPackage.getOrCreatePackage("my").getOrCreatePackage("package");
 			packageMyPackage.register(myClassDefinition);
 		}
 		return globals;
 	}
 	
-	private static final ClassDefinition printStream = new ClassDefinition("Ljava/io/PrintStream;", Modifiers.MODIFIER_EXPORT, null);
-	private static final NativeMethodMember printStreamPrintln = new NativeMethodMember(
+	private static final ClassDefinition PRINTSTREAM = new ClassDefinition("PrintStream", Modifiers.MODIFIER_EXPORT);
+	private static final MethodMember PRINTSTREAM_PRINTLN = new MethodMember(
+			CodePosition.NATIVE,
 			Modifiers.MODIFIER_EXPORT,
 			"println",
-			new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(BasicTypeID.STRING)),
-			"Ljava/io/PrintStream;",
-			"(Ljava/lang/String;)V");
+			new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(BasicTypeID.STRING)));
+	
+	private static final FieldMember SYSTEM_OUT = new FieldMember(
+			CodePosition.NATIVE,
+			Modifiers.MODIFIER_EXPORT,
+			"out",
+			DefinitionTypeID.forType(PRINTSTREAM),
+			true);
 	
-	private static final NativeFieldMember systemOut = new NativeFieldMember(Modifiers.MODIFIER_EXPORT, "out", DefinitionTypeID.forType(printStream), true, "java/lang/System");
+	static {
+		JavaClassInfo jPrintStream = new JavaClassInfo("java/io/PrintStream");
+		PRINTSTREAM_PRINTLN.setTag(JavaMethodInfo.class, new JavaMethodInfo(jPrintStream, "println", "(Ljava/lang/String;)V"));
+		
+		JavaClassInfo jSystem = new JavaClassInfo("java/lang/System");
+		SYSTEM_OUT.setTag(JavaFieldInfo.class, new JavaFieldInfo(jSystem, "out", "Ljava/io/PrintStream;"));
+	}
 	
 	private class PrintlnSymbol implements ISymbol {
 
 		public IPartialExpression getExpression(CodePosition position, GlobalTypeRegistry types, List<ITypeID> typeArguments) {
 			return new PartialMemberGroupExpression(
 					position,
-					new GetStaticFieldExpression(position, systemOut),
-					printStreamPrintln,
+					new GetStaticFieldExpression(position, SYSTEM_OUT),
+					PRINTSTREAM_PRINTLN,
 					false);
 		}
 
 		@Override
 		public ITypeID getType(CodePosition position, GlobalTypeRegistry types, List<ITypeID> typeArguments) {
 			// don't be fooled! this symbol is the System.out.println bound method and thus its type is a function
-			return new FunctionTypeID(printStreamPrintln.header);
+			return new FunctionTypeID(PRINTSTREAM_PRINTLN.header);
 		}
 	}
 }

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

+/*
+ * 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.scriptingexample;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class JavaClassInfo {
+	public final String internalClassName;
+	
+	public JavaClassInfo(String internalClassName) {
+		this.internalClassName = internalClassName;
+	}
+}

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

+/*
+ * 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.scriptingexample;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class JavaFieldInfo {
+	public final JavaClassInfo javaClass;
+	public final String name;
+	public final String signature;
+	
+	public JavaFieldInfo(JavaClassInfo javaClass, String name, String signature) {
+		this.javaClass = javaClass;
+		this.name = name;
+		this.signature = signature;
+	}
+}

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

+/*
+ * 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.scriptingexample;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class JavaMethodInfo {
+	public final JavaClassInfo javaClass;
+	public final String name;
+	public final String signature;
+	
+	public JavaMethodInfo(JavaClassInfo javaClass, String name, String signature) {
+		this.javaClass = javaClass;
+		this.name = name;
+		this.signature = signature;
+	}
+}

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

 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.statement.StatementVisitor;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 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 {
     /**
 
 		}
 		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, makeName(statementNo++), "()V", null, null));
+			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);
 		// 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 (int i = 0; i < statementNo; i++) {
-			runWriter.invokeStatic("Scripts", makeName(i), "()V");
+		for (String scriptBlockName : scriptBlockNames) {
+			runWriter.invokeStatic("Scripts", scriptBlockName, "()V");
 		}
 		runWriter.ret();
 		runWriter.end();

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

-/*
- * 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.scriptingexample;
-
-import org.openzen.zenscript.codemodel.member.FieldMember;
-import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.shared.CodePosition;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class NativeFieldMember extends FieldMember {
-	public final String className;
-	
-	public NativeFieldMember(int modifiers, String name, ITypeID type, boolean isFinal, String className) {
-		super(CodePosition.NATIVE, modifiers, name, type, isFinal);
-		
-		this.className = className;
-	}
-}

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

-/*
- * 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.scriptingexample;
-
-import org.openzen.zenscript.codemodel.FunctionHeader;
-import org.openzen.zenscript.codemodel.member.MethodMember;
-import org.openzen.zenscript.shared.CodePosition;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class NativeMethodMember extends MethodMember {
-	public final String className;
-	public final String signature;
-
-	public NativeMethodMember(int modifiers, String name, FunctionHeader header, String className, String signature) {
-		super(CodePosition.NATIVE, modifiers, name, header);
-
-		this.className = className;
-		this.signature = signature;
-	}
-}

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/writer/JavaExpressionVisitor.java

 package org.openzen.zenscript.scriptingexample.writer;
 
-import org.objectweb.asm.Type;
 import org.openzen.zenscript.codemodel.expression.*;
-import org.openzen.zenscript.scriptingexample.NativeFieldMember;
-import org.openzen.zenscript.scriptingexample.NativeMethodMember;
+import org.openzen.zenscript.scriptingexample.JavaFieldInfo;
+import org.openzen.zenscript.scriptingexample.JavaMethodInfo;
 
 public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 
         for (Expression argument : expression.arguments.arguments) {
             argument.accept(this);
         }
-        if (expression.member instanceof NativeMethodMember) {
-            javaWriter.invokeVirtual(((NativeMethodMember) expression.member).className.replaceFirst("L", "").replace(";", ""), ((NativeMethodMember) expression.member).name, ((NativeMethodMember) expression.member).signature);
-        }
+		
+		JavaMethodInfo methodInfo = expression.member.getTag(JavaMethodInfo.class);
+		if (methodInfo == null)
+			throw new IllegalStateException("Call target has no method info!");
+		
+        javaWriter.invokeVirtual(
+				methodInfo.javaClass.internalClassName,
+				methodInfo.name,
+				methodInfo.signature);
+		
         return null;
     }
 
 
     @Override
     public Void visitGetStaticField(GetStaticFieldExpression expression) {
-
-        if (expression.field instanceof NativeFieldMember)
-
-            javaWriter.getStaticField(((NativeFieldMember) expression.field).className, expression.field.name, Type.getType(expression.type.accept(new JavaTypeVisitor())).getDescriptor());
+		JavaFieldInfo fieldInfo = expression.field.getTag(JavaFieldInfo.class);
+		if (fieldInfo == null)
+			throw new IllegalStateException("Missing field info on a field member!");
+		
+		javaWriter.getStaticField(
+				fieldInfo.javaClass.internalClassName,
+				fieldInfo.name,
+				fieldInfo.signature);
+		
         return null;
     }
 

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/writer/JavaWriter.java

 package org.openzen.zenscript.scriptingexample.writer;
 
-import com.sun.istack.internal.Nullable;
 import org.objectweb.asm.*;
 import org.objectweb.asm.commons.LocalVariablesSorter;
 import org.openzen.zenscript.shared.CodePosition;
     private int labelIndex = 1;
     private Map<Label, String> labelNames = new HashMap<>();
 
-    public JavaWriter(ClassVisitor visitor, int access, String name, String description, @Nullable String signature, @Nullable String[] exceptions, String... annotations) {
+    public JavaWriter(ClassVisitor visitor, int access, String name, String description, String signature, String[] exceptions, String... annotations) {
         final MethodVisitor methodVisitor = visitor.visitMethod(access, name, description, signature, exceptions);
 
         for (String annotation : annotations) {

Shared/src/main/java/org/openzen/zenscript/shared/SourceFile.java

+/*
+ * 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.shared;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class SourceFile {
+	public final String filename;
+	
+	public SourceFile(String filename) {
+		this.filename = filename;
+	}
+}

Shared/src/main/java/org/openzen/zenscript/shared/TagDictionary.java

+/*
+ * 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.shared;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class TagDictionary {
+	private final Map<Class<?>, Object> tags = new HashMap<>();
+	
+	public <T> void put(Class<T> cls, T tag) {
+		tags.put(cls, tag);
+	}
+	
+	public <T> T get(Class<T> cls) {
+		return (T) tags.get(cls);
+	}
+}

Shared/src/main/java/org/openzen/zenscript/shared/Taggable.java

+/*
+ * 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.shared;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public abstract class Taggable {
+	private final TagDictionary tags = new TagDictionary();
+	
+	public final <T> void setTag(Class<T> cls, T tag) {
+		tags.put(cls, tag);
+	}
+	
+	public final <T> T getTag(Class<T> cls) {
+		return tags.get(cls);
+	}
+}