Merge remote-tracking branch 'Stan/development' into development

CodeFormatter/src/main/java/org/openzen/zenscript/formatter/DefinitionFormatter.java

@@ -0,0 +1,71 @@
+/*
+ * 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.formatter;
+
+import org.openzen.zenscript.codemodel.definition.AliasDefinition;
+import org.openzen.zenscript.codemodel.definition.ClassDefinition;
+import org.openzen.zenscript.codemodel.definition.DefinitionVisitor;
+import org.openzen.zenscript.codemodel.definition.EnumDefinition;
+import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
+import org.openzen.zenscript.codemodel.definition.FunctionDefinition;
+import org.openzen.zenscript.codemodel.definition.InterfaceDefinition;
+import org.openzen.zenscript.codemodel.definition.StructDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DefinitionFormatter implements DefinitionVisitor<Void> {
+	private final FormattingSettings settings;
+	private final TypeFormatter typeFormatter;
+	private final StringBuilder builder = new StringBuilder();
+	private final String indent;
+	
+	public DefinitionFormatter(FormattingSettings settings, TypeFormatter typeFormatter, String indent) {
+		this.settings = settings;
+		this.typeFormatter = typeFormatter;
+		this.indent = indent;
+	}
+
+	@Override
+	public Void visitClass(ClassDefinition definition) {
+		return null;
+	}
+
+	@Override
+	public Void visitInterface(InterfaceDefinition definition) {
+		return null;
+	}
+
+	@Override
+	public Void visitEnum(EnumDefinition definition) {
+		return null;
+	}
+
+	@Override
+	public Void visitStruct(StructDefinition definition) {
+		return null;
+	}
+
+	@Override
+	public Void visitFunction(FunctionDefinition definition) {
+		return null;
+	}
+
+	@Override
+	public Void visitExpansion(ExpansionDefinition definition) {
+		return null;
+	}
+
+	@Override
+	public Void visitAlias(AliasDefinition definition) {
+		return null;
+	}
+	
+	public String toString() {
+		return builder.toString();
+	}
+}

CodeFormatter/src/main/java/org/openzen/zenscript/formatter/FileFormatter.java

@@ -34,6 +34,13 @@ public class FileFormatter {
 		TypeFormatter typeFormatter = new TypeFormatter(settings, importer);
 		ExpressionFormatter expressionFormatter = new ExpressionFormatter(settings, typeFormatter);
 		
+		List<DefinitionFormatter> definitionFormatters = new ArrayList<>();
+		for (HighLevelDefinition definition : definitions) {
+			DefinitionFormatter definitionFormatter = new DefinitionFormatter(settings, typeFormatter, "");
+			definition.accept(definitionFormatter);
+			definitionFormatters.add(definitionFormatter);
+		}
+		
 		StatementFormatter scriptFormatter = new StatementFormatter("", settings, expressionFormatter);
 		for (Statement statement : script.statements) {
 			statement.accept(scriptFormatter);
@@ -41,6 +48,11 @@ public class FileFormatter {
 		
 		StringBuilder output = new StringBuilder();
 		importer.write(output);
+		
+		for (DefinitionFormatter definition : definitionFormatters) {
+			output.append(definition.toString());
+		}
+		
 		output.append(scriptFormatter.toString().trim());
 		
 		WhitespacePostComment postComment = script.getTag(WhitespacePostComment.class);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/CallExpression.java

@@ -5,9 +5,12 @@
  */
 package org.openzen.zenscript.codemodel.expression;
 
+import java.util.Arrays;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.shared.CodePosition;
+import org.openzen.zenscript.shared.CompileException;
+import org.openzen.zenscript.shared.CompileExceptionCode;
 
 /**
  *
@@ -21,6 +24,16 @@ public class CallExpression extends Expression {
 	public CallExpression(CodePosition position, Expression target, FunctionalMember member, FunctionHeader instancedHeader, CallArguments arguments) {
 		super(position, instancedHeader.returnType);
 		
+		if (arguments.arguments.length < instancedHeader.parameters.length) {
+			Expression[] newArguments = Arrays.copyOf(arguments.arguments, instancedHeader.parameters.length);
+			for (int i = arguments.arguments.length; i < instancedHeader.parameters.length; i++) {
+				if (instancedHeader.parameters[i].defaultValue == null)
+					throw new CompileException(position, CompileExceptionCode.MISSING_PARAMETER, "Parameter missing and no default value specified");
+				newArguments[i] = instancedHeader.parameters[i].defaultValue;
+			}
+			arguments = new CallArguments(arguments.typeArguments, newArguments);
+		}
+		
 		this.target = target;
 		this.member = member;
 		this.arguments = arguments;

Linker/src/main/java/org/openzen/zenscript/linker/StatementScope.java

@@ -11,7 +11,6 @@ import org.openzen.zenscript.codemodel.expression.GetLocalVariableExpression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.codemodel.type.GenericName;
-import org.openzen.zenscript.linker.BaseScope;
 import org.openzen.zenscript.shared.CodePosition;
 
 /**

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

@@ -139,6 +139,7 @@ public class ParsedFile {
 	
 	public void listDefinitions(PackageDefinitions definitions) {
 		for (ParsedDefinition definition : this.definitions) {
+			definition.getCompiled().setTag(SourceFile.class, new SourceFile(filename));
 			definitions.add(definition.getCompiled());
 			definition.linkInnerTypes();
 		}

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

@@ -0,0 +1,25 @@
+/*
+ * 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.List;
+import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.ScriptBlock;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class FileContents {
+	public final String filename;
+	public ScriptBlock script;
+	public final List<HighLevelDefinition> definitions = new ArrayList<>();
+	
+	public FileContents(String filename) {
+		this.filename = filename;
+	}
+}

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

@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -40,12 +41,7 @@ public class Main {
 		GlobalRegistry registry = new GlobalRegistry(global);
 		SemanticModule module = compileSyntaxToSemantic(parsedFiles, registry);
 		
-		FormattingSettings settings = new FormattingSettings.Builder().build();
-		for (ScriptBlock block : module.scripts) {
-			FileFormatter formatter = new FileFormatter(settings);
-			System.out.println("== " + block.getTag(SourceFile.class).filename + " ==");
-			System.out.println(formatter.format(pkg, block, Collections.emptyList()));
-		}
+		formatFiles(pkg, module);
 		
 		if (module.isValid) {
 			JavaModule javaModule = compileSemanticToJava(module);
@@ -63,6 +59,41 @@ public class Main {
 		return parsedFiles;
 	}
 	
+	private static void formatFiles(ZSPackage pkg, SemanticModule module) {
+		Map<String, FileContents> files = new HashMap<>();
+		for (ScriptBlock block : module.scripts) {
+			SourceFile file = block.getTag(SourceFile.class);
+			if (file == null)
+				continue;
+			
+			FileContents contents = new FileContents(file.filename);
+			contents.script = block;
+			files.put(file.filename, contents);
+		}
+		
+		for (HighLevelDefinition definition : module.definitions.getAll()) {
+			SourceFile file = definition.getTag(SourceFile.class);
+			if (file == null)
+				continue;
+			
+			if (!files.containsKey(file.filename))
+				files.put(file.filename, new FileContents(file.filename));
+			
+			files.get(file.filename).definitions.add(definition);
+		}
+		
+		List<String> filenames = new ArrayList<>(files.keySet());
+		Collections.sort(filenames);
+		
+		FormattingSettings settings = new FormattingSettings.Builder().build();
+		for (String filename : filenames) {
+			FileContents contents = files.get(filename);
+			FileFormatter formatter = new FileFormatter(settings);
+			System.out.println("== " + filename + " ==");
+			System.out.println(formatter.format(pkg, contents.script, contents.definitions));
+		}
+	}
+	
 	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

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

@@ -56,5 +56,6 @@ public enum CompileExceptionCode {
 	RETURN_VALUE_VOID,
 	INVALID_CONDITION,
 	INTERNAL_ERROR,
-	CANNOT_SET_FINAL_VARIABLE
+	CANNOT_SET_FINAL_VARIABLE,
+	MISSING_PARAMETER
 }