Merge remote-tracking branch 'jared/stdlib' into development

JavaIntegration/src/main/java/org/openzen/zencode/java/ScriptingEngine.java

@@ -43,11 +43,12 @@ public class ScriptingEngine {
 		space = new ModuleSpace(registry, new ArrayList<>(), StorageType.getStandard());
 		
 		try {
-			ZippedPackage stdlibs = new ZippedPackage(ScriptingEngine.class.getResourceAsStream("/StdLibs.zip"));
-			SemanticModule stdlibModule = stdlibs.loadModule(space, "stdlib", null, new SemanticModule[0], FunctionParameter.NONE, stdlib);
+            ZippedPackage stdlibs = new ZippedPackage(ScriptingEngine.class.getResourceAsStream("/StdLibs.jar"));
+            SemanticModule stdlibModule = stdlibs.loadModule(space, "stdlib", null, new SemanticModule[0], FunctionParameter.NONE, stdlib);
 			stdlibModule = Validator.validate(stdlibModule, error -> System.out.println(error.toString()));
 			space.addModule("stdlib", stdlibModule);
-		} catch (IOException | CompileException | ParseException ex) {
+			registerCompiled(stdlibModule);
+		} catch (CompileException | ParseException | IOException ex) {
 			throw new RuntimeException(ex);
 		}
 		this.logger = new EmptyLogger();

JavaShared/src/main/java/org/openzen/zenscript/javashared/prepare/JavaPrepareDefinitionVisitor.java

@@ -5,10 +5,6 @@
  */
 package org.openzen.zenscript.javashared.prepare;
 
-import org.openzen.zenscript.javashared.JavaNativeClass;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.annotations.NativeTag;
 import org.openzen.zenscript.codemodel.definition.AliasDefinition;
@@ -33,8 +29,13 @@ import org.openzen.zenscript.javashared.JavaCompiledModule;
 import org.openzen.zenscript.javashared.JavaContext;
 import org.openzen.zenscript.javashared.JavaMethod;
 import org.openzen.zenscript.javashared.JavaModifiers;
+import org.openzen.zenscript.javashared.JavaNativeClass;
 import org.openzen.zenscript.javashared.JavaVariantOption;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  *
  * @author Hoofdgebruiker

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

@@ -0,0 +1,86 @@
+package org.openzen.zenscript.parser;
+
+import org.openzen.zencode.shared.LiteralSourceFile;
+import org.openzen.zencode.shared.SourceFile;
+import org.openzen.zenscript.codemodel.FunctionParameter;
+import org.openzen.zenscript.codemodel.Module;
+import org.openzen.zenscript.codemodel.ModuleSpace;
+import org.openzen.zenscript.codemodel.SemanticModule;
+import org.openzen.zenscript.codemodel.context.CompilingPackage;
+import org.openzen.zenscript.codemodel.definition.ZSPackage;
+import org.openzen.zenscript.lexer.ParseException;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class FolderPackage {
+    
+    private Map<String, List<SourceFile>> files = new HashMap<>();
+    
+    public FolderPackage(File file) {
+        ArrayList<File> foundFiles = new ArrayList<>();
+        getFiles(file, foundFiles);
+    
+        String srcString = File.separator + "src" + File.separator;
+        foundFiles.stream().filter(fil -> (fil.getPath()+File.separator).substring(file.getPath().length()+ File.separator.length()).indexOf(srcString) > 0).forEach(fil -> {
+            String name = (fil.getPath() + File.separator).substring(file.getPath().length() + File.separator.length());
+            int slash = name.indexOf(srcString);
+            String moduleName = name.substring(0, slash);
+            String filename = name.substring(slash + srcString.length());
+            if(!files.containsKey(moduleName))
+                files.put(moduleName, new ArrayList<>());
+            
+            try {
+                if(!fil.isDirectory())
+                    files.get(moduleName).add(new LiteralSourceFile(filename, new BufferedReader(new FileReader(fil)).lines().collect(Collectors.joining("\n"))));
+                else
+                    files.get(moduleName).add(new LiteralSourceFile(filename, ""));
+            } catch(FileNotFoundException e) {
+                e.printStackTrace();
+            }
+            
+        });
+    }
+    
+    public void getFiles(File parent, List<File> files) {
+        if(parent.isDirectory()) {
+            for(File file : parent.listFiles()) {
+                if(file.isDirectory()) {
+                    getFiles(file, files);
+                }
+            }
+        }
+        files.add(parent);
+    }
+	
+	public SemanticModule loadModule(ModuleSpace space, String name, BracketExpressionParser bracketParser, SemanticModule[] dependencies, FunctionParameter[] scriptParameters) throws ParseException {
+		return loadModule(space, name, bracketParser, dependencies, scriptParameters, new ZSPackage(space.rootPackage, name));
+	}
+	
+	public SemanticModule loadModule(ModuleSpace space, String name, BracketExpressionParser bracketParser, SemanticModule[] dependencies, FunctionParameter[] scriptParameters, ZSPackage pkg) throws ParseException {
+		List<SourceFile> sourceFiles = files.get(name);
+		if (sourceFiles == null)
+			return null; // no such module
+		
+		Module scriptModule = new Module(name);
+		CompilingPackage scriptPackage = new CompilingPackage(pkg, scriptModule);
+		ParsedFile[] files = new ParsedFile[sourceFiles.size()];
+		for (int i = 0; i < files.length; i++)
+			files[i] = ParsedFile.parse(scriptPackage, bracketParser, sourceFiles.get(i));
+		
+		SemanticModule scripts = ParsedFile.compileSyntaxToSemantic(
+				dependencies,
+				scriptPackage,
+				files,
+				space,
+				scriptParameters, Throwable::printStackTrace);
+		return scripts.normalize();
+	}
+}

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedConstructor.java

@@ -14,6 +14,7 @@ import org.openzen.zenscript.codemodel.member.ConstructorMember;
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
+import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.parser.ParsedAnnotation;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
 import org.openzen.zenscript.parser.statements.ParsedFunctionBody;
@@ -34,7 +35,7 @@ public class ParsedConstructor extends ParsedFunctionalMember {
 
 	@Override
 	public void linkTypes(TypeResolutionContext context) {
-		compiled = new ConstructorMember(position, definition, modifiers, header.compile(context), null);
+        compiled = new ConstructorMember(position, definition, modifiers, header.compile(context), header.parameters.isEmpty() ? BuiltinID.CLASS_DEFAULT_CONSTRUCTOR : null);
 	}
 
 	@Override