[WIP] Compile default values in functions

CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/FileScope.java

@@ -5,24 +5,21 @@
  */
 package org.openzen.zenscript.codemodel.scope;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.CompileException;
 import org.openzen.zencode.shared.CompileExceptionCode;
-import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.GenericMapper;
+import org.openzen.zenscript.codemodel.GenericName;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
 import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
 import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
+import org.openzen.zenscript.codemodel.definition.ZSPackage;
+import org.openzen.zenscript.codemodel.expression.InvalidExpression;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.partial.PartialGlobalExpression;
 import org.openzen.zenscript.codemodel.partial.PartialTypeExpression;
 import org.openzen.zenscript.codemodel.statement.LoopStatement;
-import org.openzen.zenscript.codemodel.GenericName;
-import org.openzen.zenscript.codemodel.definition.ZSPackage;
-import org.openzen.zenscript.codemodel.expression.InvalidExpression;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.ISymbol;
 import org.openzen.zenscript.codemodel.type.StoredType;
@@ -32,6 +29,10 @@ import org.openzen.zenscript.codemodel.type.member.TypeMemberPreparer;
 import org.openzen.zenscript.codemodel.type.storage.StaticExpressionStorageTag;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 /**
  *
  * @author Hoofdgebruiker
@@ -42,7 +43,15 @@ public class FileScope extends BaseScope {
 	private final LocalMemberCache memberCache;
 	private final Map<String, ISymbol> globals;
 	private final TypeMemberPreparer preparer;
-	
+
+	public FileScope(
+			TypeResolutionContext context,
+			List<ExpansionDefinition> expansions,
+			Map<String, ISymbol> globals) {
+		this(context, expansions, globals, member -> {
+		});
+	}
+
 	public FileScope(
 			TypeResolutionContext context,
 			List<ExpansionDefinition> expansions,

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedFunctionParameter.java

@@ -7,12 +7,18 @@ import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.InvalidExpression;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
+import org.openzen.zenscript.codemodel.scope.FileScope;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.parser.ParsedAnnotation;
 import org.openzen.zenscript.parser.PrecompilationState;
 import org.openzen.zenscript.parser.expression.ParsedExpression;
 import org.openzen.zenscript.parser.type.IParsedType;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+
 /**
  *
  * @author Stanneke
@@ -23,9 +29,9 @@ public class ParsedFunctionParameter {
 	public final IParsedType type;
 	public final ParsedExpression defaultValue;
 	public final boolean variadic;
-	
+
 	private FunctionParameter compiled;
-	
+
 	public ParsedFunctionParameter(ParsedAnnotation[] annotations, String name, IParsedType type, ParsedExpression defaultValue, boolean variadic) {
 		this.annotations = annotations;
 		this.name = name;
@@ -33,14 +39,18 @@ public class ParsedFunctionParameter {
 		this.defaultValue = defaultValue;
 		this.variadic = variadic;
 	}
-	
+
 	public FunctionParameter compile(TypeResolutionContext context) {
 		if (compiled != null)
 			return compiled;
-		
+
 		StoredType cType = type.compile(context);
 		Expression cDefaultValue = null;
-		return compiled = new FunctionParameter(cType, name, null, variadic);
+
+
+		this.compiled = new FunctionParameter(cType, name, null, variadic);
+		compileInitializer(new FileScope(context, Collections.emptyList(), Collections.emptyMap()), new PrecompilationState());
+		return compiled;
 	}
 
 	// TODO: this isn't called!