Fix calling of functions with generic parameters

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

@@ -15,7 +15,7 @@ import org.openzen.zenscript.codemodel.definition.FunctionDefinition;
 import org.openzen.zenscript.codemodel.definition.InterfaceDefinition;
 import org.openzen.zenscript.codemodel.definition.StructDefinition;
 import org.openzen.zenscript.codemodel.definition.VariantDefinition;
-import org.openzen.zenscript.codemodel.expression.CallArguments;
+import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.EnumConstantMember;
 import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 
@@ -140,11 +140,18 @@ public class DefinitionFormatter implements DefinitionVisitor<Void> {
 
 	@Override
 	public Void visitFunction(FunctionDefinition definition) {
-		FormattingUtils.formatModifiers(output, definition.modifiers);
-		output.append("function ");
-		output.append(definition.name);
-		FormattingUtils.formatHeader(output, settings, definition.header, typeFormatter);
-		FormattingUtils.formatBody(output, settings, indent, typeFormatter, definition.statement);
+		for (IDefinitionMember member : definition.members) {
+			if (member instanceof CallerMember) {
+				CallerMember caller = (CallerMember) member;
+				FormattingUtils.formatModifiers(output, definition.modifiers);
+				output.append("function ");
+				output.append(definition.name);
+				
+				FormattingUtils.formatHeader(output, settings, caller.header, typeFormatter);
+				FormattingUtils.formatBody(output, settings, indent, typeFormatter, caller.body);
+			}
+		}
+		
 		return null;
 	}
 

CodeModel/src/main/java/org/openzen/zenscript/codemodel/definition/FunctionDefinition.java

@@ -9,6 +9,7 @@ import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.OperatorType;
+import org.openzen.zenscript.codemodel.member.CallerMember;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.member.DefinitionMemberGroup;
@@ -22,7 +23,7 @@ import org.openzen.zenscript.shared.CodePosition;
 public class FunctionDefinition extends HighLevelDefinition {
 	public FunctionHeader header;
 	public Statement statement;
-	public OperatorMember caller;
+	public CallerMember caller;
 	public final DefinitionMemberGroup callerGroup;
 	
 	public FunctionDefinition(CodePosition position, ZSPackage pkg, String name, int modifiers, HighLevelDefinition outerDefinition) {
@@ -37,9 +38,7 @@ public class FunctionDefinition extends HighLevelDefinition {
 	
 	public void setHeader(FunctionHeader header) {
 		this.header = header;
-		this.genericParameters = header.typeParameters;
-		header = new FunctionHeader(null, header.returnType, header.thrownType, header.parameters);
-		addMember(caller = new OperatorMember(position, this, modifiers | Modifiers.STATIC, OperatorType.CALL, header));
+		addMember(caller = new CallerMember(position, this, modifiers | Modifiers.STATIC, header));
 		callerGroup.addMethod(caller, TypeMemberPriority.SPECIFIED);
 	}
 	

CodeModel/src/main/java/org/openzen/zenscript/codemodel/definition/ZSPackage.java

@@ -49,7 +49,7 @@ public class ZSPackage {
 			if (types.get(name.name).genericParameters.length != name.getNumberOfArguments())
 				throw new CompileException(position, CompileExceptionCode.TYPE_ARGUMENTS_INVALID_NUMBER, "Invalid number of type arguments");
 			
-			return new PartialTypeExpression(position, registry.getForDefinition(types.get(name.name), name.arguments));
+			return new PartialTypeExpression(position, registry.getForDefinition(types.get(name.name), name.arguments), name.arguments);
 		}
 		
 		return null;

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

@@ -22,7 +22,7 @@ public class CallStaticExpression extends Expression {
 	public final FunctionHeader instancedHeader;
 	
 	public CallStaticExpression(CodePosition position, ITypeID target, FunctionalMember member, CallArguments arguments, FunctionHeader instancedHeader, TypeScope scope) {
-		super(position, member.header.returnType, multiThrow(position, arguments.arguments));
+		super(position, instancedHeader.returnType, multiThrow(position, arguments.arguments));
 		
 		this.member = member;
 		this.target = target;

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

@@ -26,10 +26,12 @@ import org.openzen.zenscript.codemodel.scope.TypeScope;
 public class PartialTypeExpression implements IPartialExpression {
 	private final CodePosition position;
 	private final ITypeID type;
+	private final ITypeID[] typeParameters;
 	
-	public PartialTypeExpression(CodePosition position, ITypeID type) {
+	public PartialTypeExpression(CodePosition position, ITypeID type, ITypeID[] typeParameters) {
 		this.position = position;
 		this.type = type;
+		this.typeParameters = typeParameters;
 	}
 
 	@Override
@@ -64,7 +66,7 @@ public class PartialTypeExpression implements IPartialExpression {
 
 	@Override
 	public ITypeID[] getGenericCallTypes() {
-		return null;
+		return typeParameters;
 	}
 	
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/GlobalTypeRegistry.java

@@ -10,6 +10,7 @@ import java.util.HashMap;
 import java.util.Map;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.definition.FunctionDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import static org.openzen.zenscript.codemodel.type.member.TypeMembers.MODIFIER_CONST;
@@ -119,7 +120,7 @@ public class GlobalTypeRegistry {
 	
 	public DefinitionTypeID getForDefinition(HighLevelDefinition definition, ITypeID[] typeParameters, Map<TypeParameter, ITypeID> outerInstance) {
 		DefinitionTypeID id;
-		if (definition.genericParameters == null && typeParameters == null && outerInstance.isEmpty()) {
+		if ((definition instanceof FunctionDefinition) || (definition.genericParameters == null && typeParameters == null && outerInstance.isEmpty())) {
 			// make it a static one
 			id = new StaticDefinitionTypeID(definition);
 		} else {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/TypeMembers.java

@@ -439,7 +439,7 @@ public final class TypeMembers {
 		if (members.containsKey(name.name))
 			return new PartialStaticMemberGroupExpression(position, type, members.get(name.name), name.arguments);
 		if (innerTypes.containsKey(name.name))
-			return new PartialTypeExpression(position, innerTypes.get(name.name).instance(cache.getRegistry(), name.arguments));
+			return new PartialTypeExpression(position, innerTypes.get(name.name).instance(cache.getRegistry(), name.arguments), name.arguments);
 		
 		return null;
 	}

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

@@ -75,12 +75,12 @@ public class DefinitionScope extends BaseScope {
 	public IPartialExpression get(CodePosition position, GenericName name) {
 		if (members != null) {
 			if (members.hasInnerType(name.name))
-				return new PartialTypeExpression(position, members.getInnerType(position, name));
+				return new PartialTypeExpression(position, members.getInnerType(position, name), name.arguments);
 			if (members.hasMember(name.name) && !name.hasArguments())
 				return members.getMemberExpression(position, new ThisExpression(position, type), name, true);
 		}
 		if (genericParameters.containsKey(name.name) && !name.hasArguments())
-			return new PartialTypeExpression(position, getTypeRegistry().getGeneric(genericParameters.get(name.name)));
+			return new PartialTypeExpression(position, getTypeRegistry().getGeneric(genericParameters.get(name.name)), name.arguments);
 		
 		return outer.get(position, name);
 	}

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

@@ -69,11 +69,11 @@ public class FileScope extends BaseScope {
 	@Override
 	public IPartialExpression get(CodePosition position, GenericName name) {
 		if (importedTypes.containsKey(name.name))
-			return new PartialTypeExpression(position, getTypeRegistry().getForDefinition(importedTypes.get(name.name), name.arguments));
+			return new PartialTypeExpression(position, getTypeRegistry().getForDefinition(importedTypes.get(name.name), name.arguments), name.arguments);
 		
 		HighLevelDefinition localDefinition = packageDefinitions.getDefinition(name.name);
 		if (localDefinition != null)
-			return new PartialTypeExpression(position, globalRegistry.getForDefinition(localDefinition, name.arguments));
+			return new PartialTypeExpression(position, globalRegistry.getForDefinition(localDefinition, name.arguments), name.arguments);
 		
 		if (globalSymbols.containsKey(name.name)) {
 			IPartialExpression resolution = globalSymbols.get(name.name).getExpression(position, globalRegistry, name.arguments);

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

@@ -64,7 +64,7 @@ public class FunctionScope extends StatementScope {
 			if (header.typeParameters != null) {
 				for (TypeParameter parameter : header.typeParameters) {
 					if (parameter.name.equals(name.name))
-						return new PartialTypeExpression(position, getTypeRegistry().getGeneric(parameter));
+						return new PartialTypeExpression(position, getTypeRegistry().getGeneric(parameter), name.arguments);
 				}
 			}
 		}

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

@@ -44,7 +44,7 @@ public class GenericFunctionScope extends BaseScope {
 	@Override
 	public IPartialExpression get(CodePosition position, GenericName name) {
 		if (parameters.containsKey(name.name) && name.hasNoArguments())
-			return new PartialTypeExpression(position, getTypeRegistry().getGeneric(parameters.get(name.name)));
+			return new PartialTypeExpression(position, getTypeRegistry().getGeneric(parameters.get(name.name)), name.arguments);
 		
 		return outer.get(position, name);
 	}

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

@@ -52,7 +52,7 @@ public class ImplementationScope extends BaseScope {
 	@Override
 	public IPartialExpression get(CodePosition position, GenericName name) {
 		if (members.hasInnerType(name.name))
-			return new PartialTypeExpression(position, members.getInnerType(position, name));
+			return new PartialTypeExpression(position, members.getInnerType(position, name), name.arguments);
 		if (members.hasMember(name.name))
 			return members.getMemberExpression(position, new ThisExpression(position, outer.getThisType()), name, true);
 		

Linker/src/main/java/org/openzen/zenscript/linker/symbol/TypeSymbol.java

@@ -25,7 +25,7 @@ public class TypeSymbol implements ISymbol {
 	
 	@Override
 	public IPartialExpression getExpression(CodePosition position, GlobalTypeRegistry types, ITypeID[] typeArguments) {
-		return new PartialTypeExpression(position, types.getForDefinition(definition, typeArguments));
+		return new PartialTypeExpression(position, types.getForDefinition(definition, typeArguments), typeArguments);
 	}
 
 	@Override

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionSuper.java

@@ -28,7 +28,7 @@ public class ParsedExpressionSuper extends ParsedExpression {
 		if (type.getSuperType() == null)
 			throw new CompileException(position, CompileExceptionCode.SUPER_CALL_NO_SUPERCLASS, "Type has no superclass");
 		
-		return new PartialTypeExpression(position, scope.getThisType().getSuperType());
+		return new PartialTypeExpression(position, scope.getThisType().getSuperType(), null);
 	}
 
 	@Override

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedTypeExpression.java

@@ -26,7 +26,7 @@ public class ParsedTypeExpression extends ParsedExpression {
 
 	@Override
 	public IPartialExpression compile(ExpressionScope scope) {
-		return new PartialTypeExpression(position, type.compile(scope));
+		return new PartialTypeExpression(position, type.compile(scope), null);
 	}
 
 	@Override

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedTypeGenericMap.java

@@ -76,7 +76,7 @@ public class ParsedTypeGenericMap implements IParsedType {
 		@Override
 		public IPartialExpression get(CodePosition position, GenericName name) {
 			if (typeParameters.containsKey(name.name) && name.hasNoArguments())
-				return new PartialTypeExpression(position, getTypeRegistry().getGeneric(typeParameters.get(name.name)));
+				return new PartialTypeExpression(position, getTypeRegistry().getGeneric(typeParameters.get(name.name)), name.arguments);
 			
 			return outer.get(position, name);
 		}