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

@@ -5,32 +5,19 @@
  */
 package org.openzen.zenscript.javabytecode;
 
-import java.util.*;
-
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Opcodes;
-import org.openzen.zencode.shared.CodePosition;
-import org.openzen.zencode.shared.SourceFile;
+import org.objectweb.asm.*;
+import org.openzen.zencode.shared.*;
 import org.openzen.zencode.shared.logging.*;
-import org.openzen.zenscript.codemodel.FunctionHeader;
-import org.openzen.zenscript.codemodel.FunctionParameter;
-import org.openzen.zenscript.codemodel.HighLevelDefinition;
-import org.openzen.zenscript.codemodel.ScriptBlock;
-import org.openzen.zenscript.codemodel.SemanticModule;
-import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
-import org.openzen.zenscript.codemodel.statement.Statement;
-import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.javabytecode.compiler.JavaClassWriter;
-import org.openzen.zenscript.javabytecode.compiler.JavaScriptFile;
-import org.openzen.zenscript.javabytecode.compiler.JavaStatementVisitor;
-import org.openzen.zenscript.javabytecode.compiler.JavaWriter;
-import org.openzen.zenscript.javabytecode.compiler.definitions.JavaDefinitionVisitor;
-import org.openzen.zenscript.javashared.JavaClass;
-import org.openzen.zenscript.javashared.JavaCompileSpace;
-import org.openzen.zenscript.javashared.JavaMethod;
-import org.openzen.zenscript.javashared.JavaParameterInfo;
-import org.openzen.zenscript.javashared.prepare.JavaPrepareDefinitionMemberVisitor;
-import org.openzen.zenscript.javashared.prepare.JavaPrepareDefinitionVisitor;
+import org.openzen.zenscript.codemodel.*;
+import org.openzen.zenscript.codemodel.definition.*;
+import org.openzen.zenscript.codemodel.statement.*;
+import org.openzen.zenscript.codemodel.type.*;
+import org.openzen.zenscript.javabytecode.compiler.*;
+import org.openzen.zenscript.javabytecode.compiler.definitions.*;
+import org.openzen.zenscript.javashared.*;
+import org.openzen.zenscript.javashared.prepare.*;
+
+import java.util.*;
 
 /**
  * @author Hoofdgebruiker
@@ -55,22 +42,37 @@ public class JavaCompiler {
 		
 		for (HighLevelDefinition definition : module.definitions.getAll()) {
 			final String className = getClassName(getFilename(definition));
-			String filename = className + "_" + (definition.name == null ? "generated" : definition.name) + "_" + expansionCounter++;
-			JavaPrepareDefinitionVisitor definitionPreparer = new JavaPrepareDefinitionVisitor(context, target, filename, null, filename);
-			definition.accept(definitionPreparer);
+			final String filename;
+            if(definition instanceof FunctionDefinition) {
+                filename = className;
+            } else {
+                filename = className + "_" + (definition.name == null ? "generated" : definition.name) + "_" + expansionCounter++;
+            }
+            JavaPrepareDefinitionVisitor definitionPreparer = new JavaPrepareDefinitionVisitor(context, target, filename, null, filename);
+            definition.accept(definitionPreparer);
 		}
 		
 		for (HighLevelDefinition definition : module.definitions.getAll()) {
 			JavaPrepareDefinitionMemberVisitor memberPreparer = new JavaPrepareDefinitionMemberVisitor(context, target);
 			definition.accept(memberPreparer);
 		}
-		
-		for (HighLevelDefinition definition : module.definitions.getAll()) {
-            JavaClass cls = definition instanceof ExpansionDefinition ? context.getJavaExpansionClass(definition) : context.getJavaClass(definition);
-            JavaScriptFile scriptFile = getScriptFile(scriptBlocks, cls.fullName);
+        
+        for(HighLevelDefinition definition : module.definitions.getAll()) {
+            final String internalName;
+            final JavaScriptFile scriptFile;
+            if(definition instanceof FunctionDefinition) {
+                internalName = getClassName(getFilename(definition));
+                scriptFile = getScriptFile(scriptBlocks, module.modulePackage.fullName + "/" + internalName);
+                scriptFilesThatAreActuallyUsedInScripts.add(scriptFile);
+            } else {
+                JavaClass cls = definition instanceof ExpansionDefinition ? context.getJavaExpansionClass(definition) : context
+                        .getJavaClass(definition);
+                scriptFile = getScriptFile(scriptBlocks, cls.fullName);
+                internalName = cls.internalName;
+            }
             scriptFile.classWriter.visitSource(definition.position.getFilename(), null);
-			target.addClass(cls.internalName, definition.accept(new JavaDefinitionVisitor(context, scriptFile.classWriter)));
-		}
+            target.addClass(internalName, definition.accept(new JavaDefinitionVisitor(context, scriptFile.classWriter)));
+        }
 		
 		FunctionHeader scriptHeader = new FunctionHeader(BasicTypeID.VOID, module.parameters);
 		String scriptDescriptor = context.getMethodDescriptor(scriptHeader);

ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/actual_test/expansions/GenericExpansions.java

@@ -0,0 +1,44 @@
+package org.openzen.zenscript.scriptingexample.tests.actual_test.expansions;
+
+import org.junit.jupiter.api.*;
+import org.openzen.zenscript.scriptingexample.tests.helpers.*;
+
+public class GenericExpansions extends ZenCodeTest {
+    
+    @Test
+    public void TestThatSameTypeParameterWorks() {
+        ScriptBuilder.create()
+                .add("public class MyClass<T> {")
+                .add("    public this() {}")
+                .add("}")
+                .add("")
+                .add("public expand MyClass<string> {")
+                .add("    public printMe() as void {println(\"Hello World\");}")
+                .add("}")
+                .add("")
+                .add("new MyClass<string>().printMe();")
+                .execute(this);
+        
+        logger.assertPrintOutputSize(1);
+        logger.assertPrintOutput(0, "Hello World");
+    }
+    
+    @Test
+    public void TestThatDifferentTypeParameterWorks() {
+        ScriptBuilder.create()
+                .add("public class MyClass<T> {")
+                .add("    public this() {}")
+                .add("}")
+                .add("")
+                .add("public expand MyClass<string> {")
+                .add("    public printMe() as void {println(\"Hello World\");}")
+                .add("}")
+                .add("")
+                .add("new MyClass<bool>().printMe();")
+                .execute(this, ScriptBuilder.LogTolerance.ALLOW_ERRORS);
+        
+        logger.assertPrintOutputSize(0);
+        logger.errors().assertSize(1);
+        logger.errors().assertLineContains(0, "No such member: printMe");
+    }
+}

ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/actual_test/functions/Function.java

@@ -0,0 +1,35 @@
+package org.openzen.zenscript.scriptingexample.tests.actual_test.functions;
+
+import org.junit.jupiter.api.*;
+import org.openzen.zenscript.scriptingexample.tests.helpers.*;
+
+public class Function extends ZenCodeTest {
+    
+    @Test
+    public void testCallSameFile() {
+        ScriptBuilder.create()
+                .add("public function addSomeRecipe() as void {")
+                .add("    println('Hello World');")
+                .add("}")
+                .add("")
+                .add("addSomeRecipe();")
+                .execute(this);
+        
+        logger.assertPrintOutputSize(1);
+        logger.assertPrintOutput(0, "Hello World");
+    }
+    
+    @Test
+    public void testCallDifferentFile() {
+        ScriptBuilder.create()
+                .add("public function addSomeRecipe() as void {")
+                .add("    println('Hello World');")
+                .add("}")
+                .startNewScript()
+                .add("addSomeRecipe();")
+                .execute(this);
+        
+        logger.assertPrintOutputSize(1);
+        logger.assertPrintOutput(0, "Hello World");
+    }
+}

ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/actual_test/joined_tests/ConwaysGame.java

@@ -0,0 +1,41 @@
+package org.openzen.zenscript.scriptingexample.tests.actual_test.joined_tests;
+
+import org.junit.jupiter.api.*;
+import org.openzen.zenscript.scriptingexample.tests.helpers.*;
+
+public class ConwaysGame extends ZenCodeTest {
+    
+    private static final String expandUsizeZs;
+    private static final String cellZs;
+    private static final String conwayGridZs;
+    private static final String gridTestZs;
+    private static final int[] aliveCellsAtGeneration;
+    
+    static {
+        aliveCellsAtGeneration = new int[] {4, 7, 6, 6, 8, 8, 12, 12, 20, 12, 12, 12};
+        
+        expandUsizeZs = "public expand usize .. usize {\n" + "    public withBounds(bounds as usize .. usize) as usize .. usize {\n" + "        return (from < bounds.from ? bounds.from : from) .. (to > bounds.to ? bounds.to : to);\n" + "    }\n" + "}";
+        gridTestZs = "var height = 25;\n" + "var width = 25;\n" + "\n" + "var conwayGrid = new ConwayGrid(height, width);\n" + "\n" + "conwayGrid[4,5] = true;\n" + "conwayGrid[5,4] = true;\n" + "conwayGrid[5,5] = true;\n" + "conwayGrid[5,6] = true;\n" + "\n" + "\n" + "\n" + "for i in 0 .. " + aliveCellsAtGeneration.length + " {\n" + "    println(\"Generation \" + i);\n" + "    println(\"Number of alive cells: \" + conwayGrid.totalNumberOfAliveCells);" + "    conwayGrid.update();\n" + "}";
+        cellZs = "public class Cell {\n" + "\n" + "    public var alive as bool;\n" + "    private var row as usize;\n" + "    private var column as usize;\n" + "\n" + "    public this(row as usize, column as usize) {\n" + "        this(row, column, false);\n" + "    }\n" + "\n" + "    public this(row as usize, column as usize, alive as bool) {\n" + "            this.row = row;\n" + "            this.column = column;\n" + "            this.alive = alive;\n" + "    }\n" + "\n" + "    public getCellNextTick(currentGrid as ConwayGrid) as Cell {\n" + "        //+2 because upperbound exclusive\n" + "        var range = currentGrid[(row - 1) .. (row + 2), (column - 1) .. (column + 2)];\n" + "        var aliveCellsIn3x3Grid = range.filter(element => element.alive).length;\n" + "\n" + "\n" + "        if(!alive) {\n" + "            return new Cell(row, column, aliveCellsIn3x3Grid == 3);\n" + "        }\n" + "\n" + "        //2. Any live cell with two or three live neighbours lives on to the next generation.\n" + "        return new Cell(row, column, aliveCellsIn3x3Grid == 3 || aliveCellsIn3x3Grid == 4);\n" + "    }\n" + "}";
+        conwayGridZs = "public class ConwayGrid {\n" + "    public var cells as Cell[,];\n" + "    private var width as usize;\n" + "    private var height as usize;\n" + "\n" + "    public this(width as usize, height as usize) {\n" + "        this.cells = new Cell[,](width, height, (row, column) => new Cell(row, column));\n" + "        this.width = width;\n" + "        this.height = height;\n" + "    }\n" + "\n" + "    public []=(row as int, column as int, alive as bool) as void {\n" + "        this.cells[row,column].alive = alive;\n" + "    }\n" + "\n" + "    public update() as void {\n" + "        var gridCapture = this;\n" + "        this.cells = new Cell[,](width, height, (row, column) => gridCapture.cells[row, column].getCellNextTick(gridCapture));\n" + "    }\n" + "\n" + "    //public [](row as usize, column as usize) as Cell => cells[row,column];\n" + "\n" + "    public [](rows as usize .. usize, columns as usize .. usize) as Cell[]{\n" + "        var usedRows = rows.withBounds(0 .. height);\n" + "        var usedColumns = columns.withBounds(0 .. width);\n" + "\n" + "        var rowSpan = usedRows.to - usedRows.from;\n" + "        var columnSpan = usedColumns.to - usedColumns.from;\n" + "        var cells = this.cells;\n" + "        return new Cell[](rowSpan * columnSpan, cellNo => cells[usedRows.from + (cellNo / columnSpan), usedColumns.from + (cellNo % columnSpan)]);\n" + "    }\n" + "\n" + "    public get totalNumberOfAliveCells as usize => this[0 .. height + 1, 0 .. width + 1].filter(element => element.alive).length;\n" + "}";
+    }
+    
+    @Test
+    public void doTheTest() {
+        ScriptBuilder.create()
+                .add(expandUsizeZs)
+                .startNewScript()
+                .add(cellZs)
+                .startNewScript()
+                .add(conwayGridZs)
+                .startNewScript()
+                .add(gridTestZs)
+                .execute(this);
+        
+        logger.assertPrintOutputSize(aliveCellsAtGeneration.length * 2);
+        for(int generation = 0; generation < aliveCellsAtGeneration.length; generation++) {
+            logger.assertPrintOutput(generation * 2, "Generation " + generation);
+            logger.assertPrintOutput(generation * 2 + 1, "Number of alive cells: " + aliveCellsAtGeneration[generation]);
+        }
+    }
+}

ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/helpers/ScriptBuilder.java

@@ -44,15 +44,12 @@ public class ScriptBuilder {
     
     public void execute(ZenCodeTest test, LogTolerance logTolerance) {
         appendScriptsToTest(test);
-        test.executeEngine();
+        test.executeEngine(logTolerance != LogTolerance.NO_ERRORS);
         switch(logTolerance) {
             case NO_WARNINGS:
-                test.logger.assertNoWarnings();
+                test.logger.assertNoWarnings(); //Fallthrough intended
             case NO_ERRORS:
                 test.logger.assertNoErrors();
-                break;
-            case ALLOW_ERRORS:
-                break;
         }
     }
     

ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/helpers/ZenCodeTest.java

@@ -8,7 +8,6 @@ import org.openzen.zenscript.codemodel.type.*;
 import org.openzen.zenscript.lexer.*;
 import org.openzen.zenscript.parser.*;
 import org.openzen.zenscript.scriptingexample.tests.*;
-import org.openzen.zenscript.scriptingexample.tests.helpers.*;
 
 import java.util.*;
 
@@ -40,12 +39,23 @@ public abstract class ZenCodeTest {
     }
     
     public void executeEngine() {
+        executeEngine(false);
+    }
+    
+    public void executeEngine(boolean allowError) {
         try {
             final FunctionParameterList parameters = getParameters();
             final SemanticModule script_tests = engine.createScriptedModule("script_tests", sourceFiles
                     .toArray(new SourceFile[0]), getBEP(), parameters.getParameters());
-            
-            Assertions.assertTrue(script_tests.isValid(), "Scripts are not valid!");
+            final boolean scriptsValid = script_tests.isValid();
+            if(allowError) {
+                if(!scriptsValid) {
+                    logger.setEngineComplete();
+                    return;
+                }
+            } else {
+                Assertions.assertTrue(scriptsValid, "Scripts are not valid!");
+            }
             engine.registerCompiled(script_tests);
             engine.run(parameters.getParameterMap());
         } catch(ParseException e) {

ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/helpers/ZenCodeTestLogger.java

@@ -3,16 +3,20 @@ package org.openzen.zenscript.scriptingexample.tests.helpers;
 import org.junit.jupiter.api.*;
 import org.openzen.zencode.java.logger.*;
 
-import java.util.*;
-
 public class ZenCodeTestLogger extends ScriptingEngineStreamLogger {
     
     private static final boolean logDebug = false;
-    private final List<String> printlnOutputs = new ArrayList<>();
-    private final List<String> errors = new ArrayList<>();
-    private final List<String> warnings = new ArrayList<>();
+    private final ZenCodeTestLoggerOutput printlnOutputs;
+    private final ZenCodeTestLoggerOutput errors;
+    private final ZenCodeTestLoggerOutput warnings;
     private boolean isEngineComplete = false;
     
+    public ZenCodeTestLogger() {
+        this.printlnOutputs = new ZenCodeTestLoggerOutput();
+        this.errors = new ZenCodeTestLoggerOutput();
+        this.warnings = new ZenCodeTestLoggerOutput();
+    }
+    
     @Override
     public void debug(String message) {
         if(logDebug) {
@@ -34,7 +38,7 @@ public class ZenCodeTestLogger extends ScriptingEngineStreamLogger {
     
     public void logPrintln(String line) {
         info(line);
-        this.printlnOutputs.addAll(Arrays.asList(String.valueOf(line).split(System.lineSeparator())));
+        this.printlnOutputs.add(line);
     }
     
     @Override
@@ -57,21 +61,33 @@ public class ZenCodeTestLogger extends ScriptingEngineStreamLogger {
         if(!isEngineComplete) {
             Assertions.fail("Trying to call an assertion before the engine ran, probably a fault in the test!");
         }
-        Assertions.assertEquals(content, printlnOutputs.get(line));
+        printlnOutputs.assertLine(line, content);
     }
     
     public void assertPrintOutputSize(int size) {
         if(!isEngineComplete) {
             Assertions.fail("Trying to call an assertion before the engine ran, probably a fault in the test!");
         }
-        Assertions.assertEquals(size, printlnOutputs.size());
+        printlnOutputs.assertSize(size);
     }
     
     public void assertNoErrors() {
-        Assertions.assertEquals(0, errors.size());
+        errors.assertEmpty();
     }
     
     public void assertNoWarnings() {
-        Assertions.assertEquals(0, warnings.size());
+        warnings.assertEmpty();
+    }
+    
+    public ZenCodeTestLoggerOutput printlnOutputs() {
+        return printlnOutputs;
+    }
+    
+    public ZenCodeTestLoggerOutput errors() {
+        return errors;
+    }
+    
+    public ZenCodeTestLoggerOutput warnings() {
+        return warnings;
     }
 }

ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/helpers/ZenCodeTestLoggerOutput.java

@@ -0,0 +1,31 @@
+package org.openzen.zenscript.scriptingexample.tests.helpers;
+
+import org.junit.jupiter.api.*;
+
+import java.util.*;
+
+public class ZenCodeTestLoggerOutput {
+    
+    private final List<String> lines = new ArrayList<>();
+    
+    void add(String line) {
+        lines.addAll(Arrays.asList(String.valueOf(line).split(System.lineSeparator())));
+    }
+    
+    public void assertEmpty() {
+        assertSize(0);
+    }
+    
+    public void assertSize(int size) {
+        Assertions.assertEquals(size, lines.size());
+    }
+    
+    public void assertLine(int line, String content) {
+        Assertions.assertEquals(content, lines.get(line));
+    }
+    
+    public void assertLineContains(int line, String content) {
+        final String foundLine = lines.get(line);
+        Assertions.assertTrue(foundLine.contains(content), "Expected this line to contain '" + content + "' but found '" + line + "'!");
+    }
+}