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

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaContext.java

@@ -13,6 +13,7 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
+import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.Module;
 import org.openzen.zenscript.codemodel.definition.VariantDefinition;
 import org.openzen.zenscript.codemodel.definition.ZSPackage;
@@ -100,6 +101,25 @@ public abstract class JavaContext {
 		return getPackageName(pkg.parent) + "/" + pkg.name;
 	}
 	
+	public JavaMethod getFunctionalInterface(StoredType type) {
+		if (type.getSpecifiedStorage() instanceof JavaFunctionalInterfaceStorageTag) {
+			JavaFunctionalInterfaceStorageTag tag = (JavaFunctionalInterfaceStorageTag)type.getSpecifiedStorage();
+			return tag.method;
+		} else {
+			FunctionTypeID functionType = (FunctionTypeID)type.type;
+			JavaSynthesizedFunctionInstance function = getFunction(functionType);
+			
+			return new JavaMethod(
+					function.getCls(),
+					JavaMethod.Kind.INTERFACE,
+					function.getMethod(),
+					false,
+					getMethodDescriptor(function.getHeader()),
+					Modifiers.PUBLIC | Modifiers.ABSTRACT,
+					function.getHeader().getReturnType().isGeneric());
+		}
+	}
+	
 	protected abstract JavaSyntheticClassGenerator getTypeGenerator();
 		
 	public abstract String getDescriptor(TypeID type);

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaFunctionalInterfaceStorageTag.java

@@ -15,9 +15,11 @@ import org.openzen.zenscript.codemodel.type.storage.UniqueStorageTag;
 
 public class JavaFunctionalInterfaceStorageTag implements StorageTag {
 	public final Method functionalInterfaceMethod;
+	public final JavaMethod method;
 	
-	public JavaFunctionalInterfaceStorageTag(Method functionalInterfaceMethod) {
+	public JavaFunctionalInterfaceStorageTag(Method functionalInterfaceMethod, JavaMethod method) {
 		this.functionalInterfaceMethod = functionalInterfaceMethod;
+		this.method = method;
 	}
 
 	@Override

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaSynthesizedFunctionInstance.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.javashared;
 
+import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
 /**
@@ -27,4 +28,8 @@ public class JavaSynthesizedFunctionInstance {
 	public String getMethod() {
 		return function.method;
 	}
+	
+	public FunctionHeader getHeader() {
+		return function.header;
+	}
 }