- Added example project

- Added some utility methods

CodeModel/src/main/java/org/openzen/zenscript/codemodel/partial/PartialMemberGroupExpression.java

@@ -12,6 +12,7 @@ import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.LambdaClosure;
+import org.openzen.zenscript.codemodel.member.ICallableMember;
 import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
@@ -34,6 +35,13 @@ public class PartialMemberGroupExpression implements IPartialExpression {
 		this.group = group;
 		this.allowStaticUsage = allowStaticMembers;
 	}
+	
+	public PartialMemberGroupExpression(CodePosition position, Expression target, ICallableMember member, boolean allowStaticMembers) {
+		this.position = position;
+		this.target = target;
+		this.group = DefinitionMemberGroup.forMethod(member);
+		this.allowStaticUsage = allowStaticMembers;
+	}
 
 	@Override
 	public Expression eval() {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/partial/PartialStaticMemberGroupExpression.java

@@ -10,17 +10,25 @@ import java.util.stream.Collectors;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
+import org.openzen.zenscript.codemodel.member.ICallableMember;
 import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.ITypeID;
 import org.openzen.zenscript.shared.CodePosition;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class PartialStaticMemberGroupExpression implements IPartialExpression {
+	public static PartialStaticMemberGroupExpression forMethod(CodePosition position, ICallableMember method) {
+		DefinitionMemberGroup group = new DefinitionMemberGroup();
+		group.addMethod(method, TypeMemberPriority.SPECIFIED);
+		return new PartialStaticMemberGroupExpression(position, group);
+	}
+	
 	private final CodePosition position;
 	private final DefinitionMemberGroup group;
 	
@@ -28,7 +36,7 @@ public class PartialStaticMemberGroupExpression implements IPartialExpression {
 		this.position = position;
 		this.group = group;
 	}
-
+	
 	@Override
 	public Expression eval() {
 		return group.staticGetter(position);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/DefinitionTypeID.java

@@ -20,7 +20,15 @@ import org.openzen.zenscript.codemodel.generic.TypeParameter;
  * @author Hoofdgebruiker
  */
 public class DefinitionTypeID implements ITypeID {
+	public static DefinitionTypeID forType(HighLevelDefinition definition) {
+		if (!definition.genericParameters.isEmpty())
+			throw new IllegalArgumentException("Definition has type arguments!");
+		
+		return new DefinitionTypeID(definition, NO_TYPE_PARAMETERS);
+	}
+	
 	private static final OuterTypeEntry[] NO_OUTER_ENTRIES = new OuterTypeEntry[0];
+	private static final ITypeID[] NO_TYPE_PARAMETERS = new ITypeID[0];
 	
 	public final HighLevelDefinition definition;
 	public final ITypeID[] typeParameters;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/DefinitionMemberGroup.java

@@ -35,6 +35,12 @@ import org.openzen.zenscript.codemodel.scope.TypeScope;
  * @author Hoofdgebruiker
  */
 public class DefinitionMemberGroup {
+	public static DefinitionMemberGroup forMethod(ICallableMember member) {
+		DefinitionMemberGroup instance = new DefinitionMemberGroup();
+		instance.addMethod(member, TypeMemberPriority.SPECIFIED);
+		return instance;
+	}
+	
 	private TypeMember<FieldMember> field;
 	private TypeMember<IGettableMember> getter;
 	private TypeMember<SetterMember> setter;

ScriptingExample/build.gradle

@@ -0,0 +1,18 @@
+// 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 = 'org.openzen.zenscript.scriptingexample.Main'
+}
+
+dependencies {
+	compile project(':Parser')
+}

ScriptingExample/scripts/helloworld.zs

@@ -0,0 +1 @@
+println("Hello world!");

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

@@ -0,0 +1,96 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.openzen.zenscript.codemodel.FunctionHeader;
+import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.Modifiers;
+import org.openzen.zenscript.codemodel.definition.ClassDefinition;
+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.partial.IPartialExpression;
+import org.openzen.zenscript.codemodel.partial.PartialMemberGroupExpression;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
+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.linker.symbol.ISymbol;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class GlobalRegistry {
+	
+	
+	public ZSPackage collectPackages() {
+		ZSPackage rootPackage = new ZSPackage();
+		
+		// register packages here
+		
+		{
+			// 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;"));
+
+			ZSPackage packageMyPackage = rootPackage.getOrCreatePackage("my").getOrCreatePackage("package");
+			packageMyPackage.register(myClassDefinition);
+		}
+		
+		return rootPackage;
+	}
+	
+	public List<ExpansionDefinition> collectExpansions() {
+		List<ExpansionDefinition> expansions = new ArrayList<>();
+		
+		return expansions;
+	}
+	
+	public Map<String, ISymbol> collectGlobals() {
+		Map<String, ISymbol> globals = new HashMap<>();
+		
+		// for example, let's add a println global so we can call println("Hello world!") from anywhere
+		globals.put("println", new PrintlnSymbol());
+		
+		return globals;
+	}
+	
+	private static final ClassDefinition printStream = new ClassDefinition("PrintStream", Modifiers.MODIFIER_EXPORT, null);
+	private static final NativeMethodMember printStreamPrintln = new NativeMethodMember(
+			Modifiers.MODIFIER_EXPORT,
+			"println",
+			new FunctionHeader(BasicTypeID.VOID, new FunctionParameter(BasicTypeID.STRING)),
+			"Ljava/io/PrintStream;",
+			"(Ljava/lang/String;)V");
+	
+	private static final NativeFieldMember systemOut = new NativeFieldMember(Modifiers.MODIFIER_EXPORT, "out", DefinitionTypeID.forType(printStream), true, "java/lang/System");
+	
+	private class PrintlnSymbol implements ISymbol {
+
+		@Override
+		public IPartialExpression getExpression(CodePosition position, GlobalTypeRegistry types, List<ITypeID> typeArguments) {
+			return new PartialMemberGroupExpression(
+					position,
+					new GetStaticFieldExpression(position, systemOut),
+					printStreamPrintln,
+					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);
+		}
+	}
+}

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

@@ -0,0 +1,52 @@
+/*
+ * 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 java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class JavaModule {
+	private Map<String, byte[]> classes = new HashMap<>();
+	
+	public JavaModule() {
+		
+	}
+	
+	public void register(String classname, byte[] bytecode) {
+		classes.put(classname, bytecode);
+	}
+	
+	public void execute() {
+		ScriptClassLoader classLoader = new ScriptClassLoader();
+		
+		try {
+			classLoader.loadClass("Scripts").getMethod("run").invoke(null);
+		} catch (ClassNotFoundException ex) {
+			Logger.getLogger(JavaModule.class.getName()).log(Level.SEVERE, null, ex);
+		} catch (NoSuchMethodException ex) {
+			Logger.getLogger(JavaModule.class.getName()).log(Level.SEVERE, null, ex);
+		} catch (SecurityException ex) {
+			Logger.getLogger(JavaModule.class.getName()).log(Level.SEVERE, null, ex);
+		} catch (IllegalAccessException ex) {
+			Logger.getLogger(JavaModule.class.getName()).log(Level.SEVERE, null, ex);
+		} catch (IllegalArgumentException ex) {
+			Logger.getLogger(JavaModule.class.getName()).log(Level.SEVERE, null, ex);
+		} catch (InvocationTargetException ex) {
+			Logger.getLogger(JavaModule.class.getName()).log(Level.SEVERE, null, ex);
+		}
+	}
+	
+	private class ScriptClassLoader extends ClassLoader {
+		
+	}
+}

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

@@ -0,0 +1,95 @@
+package org.openzen.zenscript.scriptingexample;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+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.type.GlobalTypeRegistry;
+import org.openzen.zenscript.linker.symbol.ISymbol;
+import org.openzen.zenscript.parser.ParsedFile;
+
+public class Main {
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) throws IOException {
+		File inputDirectory = new File("scripts");
+		File[] inputFiles = inputDirectory.listFiles((dir, name) -> name.endsWith(".zs"));
+		
+		ParsedFile[] parsedFiles = parse(inputFiles);
+		
+		GlobalRegistry registry = new GlobalRegistry();
+		SemanticModule module = compileSyntaxToSemantic(parsedFiles, registry);
+		
+		JavaModule javaModule = compileSemanticToJava(module);
+		javaModule.execute();
+    }
+	
+	private static ParsedFile[] parse(File[] files) throws IOException {
+		ParsedFile[] parsedFiles = new ParsedFile[files.length];
+		for (int i = 0; i < files.length; i++) {
+			parsedFiles[i] = ParsedFile.parse(files[i]);
+		}
+		return parsedFiles;
+	}
+	
+	private static SemanticModule compileSyntaxToSemantic(ParsedFile[] files, GlobalRegistry registry) {
+		// We are considering all these files to be in the same package, so make
+		// a single PackageDefinition instance. If these files were in multiple
+		// packages, we'd need an instance for every package.
+		PackageDefinitions definitions = new PackageDefinitions();
+		for (ParsedFile file : files) {
+			// listDefinitions will merely register all definitions (classes,
+			// interfaces, functions ...) so they can later be available to
+			// the other files as well. It doesn't yet compile anything.
+			file.listDefinitions(definitions);
+		}
+		
+		ZSPackage rootPackage = registry.collectPackages();
+		List<ExpansionDefinition> expansions = registry.collectExpansions();
+		Map<String, ISymbol> globals = registry.collectGlobals();
+		
+		GlobalTypeRegistry globalRegistry = new GlobalTypeRegistry();
+		for (ParsedFile file : files) {
+			// compileMembers will register all definition members to their
+			// respective definitions, such as fields, constructors, methods...
+			// It doesn't yet compile the method contents.
+			file.compileMembers(rootPackage, definitions, globalRegistry, expansions, globals);
+		}
+		
+		// scripts will store all the script blocks encountered in the files
+		List<ScriptBlock> scripts = new ArrayList<>();
+		for (ParsedFile file : files) {
+			// compileCode will convert the parsed statements and expressions
+			// into semantic code. This semantic code can then be compiled
+			// to various targets.
+			file.compileCode(rootPackage, definitions, globalRegistry, expansions, scripts, globals);
+		}
+		
+		return new SemanticModule(definitions, scripts);
+	}
+	
+	private static JavaModule compileSemanticToJava(SemanticModule module) {
+		JavaModule result = new JavaModule();
+		
+		// TODO: java bytecode compilation
+		for (HighLevelDefinition definition : module.definitions.getAll()) {
+			// convert definitions into java classes
+		}
+		
+		for (ScriptBlock script : module.scripts) {
+			// convert scripts into methods (add them to a Scripts class?)
+			// (TODO: can we break very long scripts into smaller methods? for the extreme scripts)
+		}
+		
+		// create a Scripts.run() method to run all scripts compiled above
+		
+		return result;
+	}
+}

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

@@ -0,0 +1,24 @@
+/*
+ * 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

@@ -0,0 +1,26 @@
+/*
+ * 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/SemanticModule.java

@@ -0,0 +1,24 @@
+/*
+ * 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 java.util.List;
+import org.openzen.zenscript.codemodel.PackageDefinitions;
+import org.openzen.zenscript.codemodel.ScriptBlock;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class SemanticModule {
+	public final PackageDefinitions definitions;
+	public final List<ScriptBlock> scripts;
+
+	public SemanticModule(PackageDefinitions definitions, List<ScriptBlock> scripts) {
+		this.definitions = definitions;
+		this.scripts = scripts;
+	}
+}