Merge pull request #124 from ZenCodeLang/bugfix/JFITI-issues

Fix issues with JFITI not compiling and just being weird in general.

Author: jaredlll08

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

@@ -8,11 +8,12 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Function;
 
 public class GlobalTypeRegistry {
 	public final ZSPackage stdlib;
 	// Allows for internalizing any TypeID not defined here.
-	private final Map<Class<? extends TypeID>, Map<? extends TypeID, ? extends TypeID>> identityMaps = new HashMap<>();
+	private final Map<Class<?>, Map<?, ? extends TypeID>> identityMaps = new HashMap<>();
 
 	private final Map<ArrayTypeID, ArrayTypeID> arrayTypes = new HashMap<>();
 	private final Map<AssocTypeID, AssocTypeID> assocTypes = new HashMap<>();
@@ -124,6 +125,18 @@ public <T extends TypeID> T internalize(Class<T> clazz, T id) {
 		}
 	}
 
+	public <ID, TYPE extends TypeID> TYPE internalize(Class<TYPE> typeClass, ID id, Function<ID, TYPE> generator) {
+
+		Map<ID, TYPE> identityMap = (Map<ID, TYPE>) identityMaps.computeIfAbsent(typeClass, aClass -> new HashMap<>());
+		if (identityMap.containsKey(id)) {
+			return identityMap.get(id);
+		} else {
+			TYPE value = generator.apply(id);
+			identityMap.put(id, value);
+			return value;
+		}
+	}
+
 	public Collection<DefinitionTypeID> getDefinitions() {
 		return definitionTypes.keySet();
 	}

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

@@ -559,16 +559,19 @@ public Expression castImplicit(CodePosition position, Expression value, TypeID t
 		if (type.isOptional() && type.withoutOptional() == toType)
 			return new CheckNullExpression(position, value);
 
-		for (TypeMember<CasterMemberRef> caster : casters) {
-			if (caster.member.isImplicit() && caster.member.toType == toType)
-				return caster.member.cast(position, value, implicit);
-		}
+		if (extendsOrImplements(toType))
+			return new SupertypeCastExpression(position, value, toType);
+
 		for (TypeMember<ImplementationMemberRef> implementation : implementations) {
 			if (implementation.member.implementsType.getNormalized() == toType)
 				return new InterfaceCastExpression(position, value, implementation.member);
 		}
-		if (extendsOrImplements(toType))
-			return new SupertypeCastExpression(position, value, toType);
+
+		for (TypeMember<CasterMemberRef> caster : casters) {
+			if (caster.member.isImplicit() && caster.member.toType == toType)
+				return caster.member.cast(position, value, implicit);
+		}
+
 
 		return new InvalidExpression(position, toType, CompileExceptionCode.INVALID_CAST, "Could not cast " + this + " to " + toType);
 	}

JavaIntegration/src/main/java/org/openzen/zencode/java/module/converters/JavaNativeTypeConverter.java

@@ -318,7 +318,7 @@ private TypeID loadFunctionalInterface(TypeVariableContext loadContext, Class<?>
 				getMethodDescriptor(functionalInterfaceMethod),
 				JavaModifiers.PUBLIC | JavaModifiers.ABSTRACT,
 				header.getReturnType().isGeneric());
-		return new JavaFunctionalInterfaceTypeID(typeConversionContext.registry, header, functionalInterfaceMethod, method);
+		return typeConversionContext.registry.internalize(JavaFunctionalInterfaceTypeID.class, header, functionHeader -> new JavaFunctionalInterfaceTypeID(typeConversionContext.registry, functionHeader, functionalInterfaceMethod, method));
 	}
 
 	@SuppressWarnings("DuplicatedCode")

JavaShared/src/main/java/org/openzen/zenscript/javashared/types/JavaFunctionalInterfaceTypeID.java

@@ -68,7 +68,6 @@ public Expression castImplicitFrom(CodePosition position, Expression value) {
 	}
 
 	private JavaFunctionalInterfaceTypeID internalizeHeaderChange(GlobalTypeRegistry registry, FunctionHeader header) {
-		JavaFunctionalInterfaceTypeID normalizedTypeId = new JavaFunctionalInterfaceTypeID(registry, header, functionalInterfaceMethod, method);
-		return registry.internalize(JavaFunctionalInterfaceTypeID.class, normalizedTypeId);
+		return registry.internalize(JavaFunctionalInterfaceTypeID.class, header, functionHeader -> new JavaFunctionalInterfaceTypeID(registry, functionHeader, functionalInterfaceMethod, method));
 	}
 }