Improved implementation of global expressions.

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

@@ -45,6 +45,8 @@ import org.openzen.zenscript.codemodel.expression.GetFunctionParameterExpression
 import org.openzen.zenscript.codemodel.expression.GetLocalVariableExpression;
 import org.openzen.zenscript.codemodel.expression.GetStaticFieldExpression;
 import org.openzen.zenscript.codemodel.expression.GetterExpression;
+import org.openzen.zenscript.codemodel.expression.GlobalCallExpression;
+import org.openzen.zenscript.codemodel.expression.GlobalExpression;
 import org.openzen.zenscript.codemodel.expression.InterfaceCastExpression;
 import org.openzen.zenscript.codemodel.expression.IsExpression;
 import org.openzen.zenscript.codemodel.expression.MakeConstExpression;
@@ -471,6 +473,19 @@ public class ExpressionFormatter implements ExpressionVisitor<ExpressionString>
 		result.append(expression.getter.name);
 		return new ExpressionString(result.toString(), OperatorPriority.MEMBER);
 	}
+	
+	@Override
+	public ExpressionString visitGlobal(GlobalExpression expression) {
+		return new ExpressionString(expression.name, OperatorPriority.PRIMARY);
+	}
+	
+	@Override
+	public ExpressionString visitGlobalCall(GlobalCallExpression expression) {
+		StringBuilder result = new StringBuilder();
+		result.append(expression.name);
+		format(result, expression.arguments);
+		return new ExpressionString(result.toString(), OperatorPriority.PRIMARY);
+	}
 
 	@Override
 	public ExpressionString visitInterfaceCast(InterfaceCastExpression expression) {

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

@@ -84,6 +84,10 @@ public interface ExpressionVisitor<T> {
 	
 	public T visitGetter(GetterExpression expression);
 	
+	public T visitGlobal(GlobalExpression expression);
+	
+	public T visitGlobalCall(GlobalCallExpression expression);
+	
 	public T visitInterfaceCast(InterfaceCastExpression expression);
 	
 	public T visitIs(IsExpression expression);

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

@@ -0,0 +1,31 @@
+/*
+ * 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.codemodel.expression;
+
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class GlobalCallExpression extends Expression {
+	public final String name;
+	public final CallArguments arguments;
+	public final Expression resolution;
+	
+	public GlobalCallExpression(CodePosition position, String name, CallArguments arguments, Expression resolution) {
+		super(position, resolution.type);
+		
+		this.name = name;
+		this.arguments = arguments;
+		this.resolution = resolution;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitGlobalCall(this);
+	}
+}

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

@@ -0,0 +1,29 @@
+/*
+ * 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.codemodel.expression;
+
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class GlobalExpression extends Expression {
+	public final String name;
+	public final Expression resolution;
+	
+	public GlobalExpression(CodePosition position, String name, Expression resolution) {
+		super(position, resolution.type);
+		
+		this.name = name;
+		this.resolution = resolution;
+	}
+
+	@Override
+	public <T> T accept(ExpressionVisitor<T> visitor) {
+		return visitor.visitGlobal(this);
+	}
+}

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

@@ -0,0 +1,58 @@
+/*
+ * 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.codemodel.partial;
+
+import java.util.List;
+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.GlobalCallExpression;
+import org.openzen.zenscript.codemodel.expression.GlobalExpression;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.type.GenericName;
+import org.openzen.zenscript.codemodel.type.ITypeID;
+import org.openzen.zenscript.shared.CodePosition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class PartialGlobalExpression implements IPartialExpression {
+	private final CodePosition position;
+	private final String name;
+	private final IPartialExpression resolution;
+	
+	public PartialGlobalExpression(CodePosition position, String name, IPartialExpression resolution) {
+		this.position = position;
+		this.name = name;
+		this.resolution = resolution;
+	}
+	
+	@Override
+	public Expression eval() {
+		return new GlobalExpression(position, name, resolution.eval());
+	}
+
+	@Override
+	public List<ITypeID>[] predictCallTypes(TypeScope scope, List<ITypeID> hints, int arguments) {
+		return resolution.predictCallTypes(scope, hints, arguments);
+	}
+
+	@Override
+	public List<FunctionHeader> getPossibleFunctionHeaders(TypeScope scope, List<ITypeID> hints, int arguments) {
+		return resolution.getPossibleFunctionHeaders(scope, hints, arguments);
+	}
+
+	@Override
+	public IPartialExpression getMember(CodePosition position, TypeScope scope, List<ITypeID> hints, GenericName name) {
+		return eval().getMember(position, scope, hints, name);
+	}
+
+	@Override
+	public Expression call(CodePosition position, TypeScope scope, List<ITypeID> hints, CallArguments arguments) {
+		return new GlobalCallExpression(position, name, arguments, resolution.call(position, scope, hints, arguments));
+	}
+}

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaExpressionVisitor.java

@@ -262,6 +262,16 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
     public Void visitGetter(GetterExpression expression) {
         return null;
     }
+	
+	@Override
+	public Void visitGlobal(GlobalExpression expression) {
+		return expression.resolution.accept(this);
+	}
+	
+	@Override
+	public Void visitGlobalCall(GlobalCallExpression expression) {
+		return expression.resolution.accept(this);
+	}
 
     @Override
     public Void visitInterfaceCast(InterfaceCastExpression expression) {

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

@@ -17,6 +17,7 @@ import org.openzen.zenscript.codemodel.definition.ExpansionDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.codemodel.expression.Expression;
 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.type.DefinitionTypeID;
@@ -74,8 +75,10 @@ public class FileScope extends BaseScope {
 		if (localDefinition != null)
 			return new PartialTypeExpression(position, globalRegistry.getForDefinition(localDefinition, name.arguments));
 		
-		if (globalSymbols.containsKey(name.name))
-			return globalSymbols.get(name.name).getExpression(position, globalRegistry, name.arguments);
+		if (globalSymbols.containsKey(name.name)) {
+			IPartialExpression resolution = globalSymbols.get(name.name).getExpression(position, globalRegistry, name.arguments);
+			return new PartialGlobalExpression(position, name.name, resolution);
+		}
 		
 		return rootPackage.getMember(position, globalRegistry, name);
 	}

Validator/src/main/java/org/openzen/zenscript/validator/visitors/ExpressionValidator.java

@@ -47,6 +47,8 @@ import org.openzen.zenscript.codemodel.expression.GetFunctionParameterExpression
 import org.openzen.zenscript.codemodel.expression.GetLocalVariableExpression;
 import org.openzen.zenscript.codemodel.expression.GetStaticFieldExpression;
 import org.openzen.zenscript.codemodel.expression.GetterExpression;
+import org.openzen.zenscript.codemodel.expression.GlobalCallExpression;
+import org.openzen.zenscript.codemodel.expression.GlobalExpression;
 import org.openzen.zenscript.codemodel.expression.InterfaceCastExpression;
 import org.openzen.zenscript.codemodel.expression.IsExpression;
 import org.openzen.zenscript.codemodel.expression.MakeConstExpression;
@@ -382,6 +384,16 @@ public class ExpressionValidator implements ExpressionVisitor<Boolean> {
 	public Boolean visitGetter(GetterExpression expression) {
 		return expression.target.accept(this);
 	}
+	
+	@Override
+	public Boolean visitGlobal(GlobalExpression expression) {
+		return expression.resolution.accept(this);
+	}
+	
+	@Override
+	public Boolean visitGlobalCall(GlobalCallExpression expression) {
+		return expression.resolution.accept(this);
+	}
 
 	@Override
 	public Boolean visitInterfaceCast(InterfaceCastExpression expression) {