Added support for Collections (java only)

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

@@ -8,11 +8,15 @@
 import org.openzen.zenscript.codemodel.compilation.ResolvingType;
 import org.openzen.zenscript.codemodel.identifiers.ModuleSymbol;
 import org.openzen.zenscript.codemodel.identifiers.TypeSymbol;
+import org.openzen.zenscript.codemodel.member.IDefinitionMember;
+import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.TypeID;
 import org.openzen.zenscript.codemodel.type.member.InterfaceResolvingType;
 import org.openzen.zenscript.codemodel.type.member.MemberSet;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 public class InterfaceDefinition extends HighLevelDefinition {
@@ -39,6 +43,19 @@ public <C, R> R accept(C context, DefinitionVisitorWithContext<C, R> visitor) {
 
 	@Override
 	public ResolvingType resolve(TypeID[] typeArguments) {
-		return InterfaceResolvingType.of(super.resolve(typeArguments), baseInterfaces);
+		if (baseInterfaces.isEmpty()) {
+			return InterfaceResolvingType.of(super.resolve(typeArguments), Collections.emptyList());
+		} else {
+			TypeID type = DefinitionTypeID.create(this, typeArguments);
+
+			MemberSet.Builder members = MemberSet.create(type);
+			GenericMapper mapper = GenericMapper.create(typeParameters, typeArguments);
+			for (IDefinitionMember member : this.members) {
+				member.registerTo(type, members, mapper);
+			}
+
+			TypeID[] baseInterfaces = this.baseInterfaces.toArray(TypeID.NONE);
+			return InterfaceResolvingType.of(super.resolve(typeArguments), Arrays.asList(mapper.map(baseInterfaces)));
+		}
 	}
 }

JavaIntegration/src/main/java/org/openzen/zencode/java/impl/conversion/JdkJavaRuntimeConverter.java

@@ -32,7 +32,7 @@ public Optional<TypeSymbol> resolveJavaType(Class<?> javaType) {
 
 	private void fillJavaClassToZenCodeClassName() {
 		fillMapping(List.class, "stdlib.List");
-		fillMapping(Collection.class, "stdlib.List");
+		fillMapping(Collection.class, "javalib.Collection");
 		fillMapping(Comparable.class, "stdlib.Comparable");
 		fillMapping(Exception.class, "stdlib.Exception");
 		fillMapping(IllegalArgumentException.class, "stdlib.IllegalArgumentException");

JavaIntegration/src/main/java/org/openzen/zencode/java/module/JavaNativeTypeTemplate.java

@@ -29,7 +29,6 @@
 import java.lang.reflect.Modifier;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class JavaNativeTypeTemplate {
 	protected final JavaRuntimeClass class_;

JavaShared/src/main/java/org/openzen/zenscript/javashared/prepare/JavaPrepareDefinitionVisitor.java

@@ -46,6 +46,18 @@ public class JavaPrepareDefinitionVisitor implements DefinitionVisitor<JavaClass
 			nativeClasses.put("collections::Set", cls);
 		}
 
+		{
+			JavaNativeClass cls = new JavaNativeClass(new JavaClass("java.util", "Collection", JavaClass.Kind.INTERFACE));
+			cls.addInstanceMethod("add", "add", "(Ljava/lang/Object;)Z");
+			cls.addInstanceMethod("remove", "remove", "(Ljava/lang/Object;)Z");
+			cls.addInstanceMethod("contains", "contains", "(Ljava/lang/Object;)Z");
+			cls.addMethod("toArray", JavaSpecialMethod.COLLECTION_TO_ARRAY);
+			cls.addInstanceMethod("length", "size", "()I");
+			cls.addInstanceMethod("isEmpty", "isEmpty", "()Z");
+			cls.addInstanceMethod("iterate", "iterator", "()Ljava/util/Iterator;");
+			nativeClasses.put("javalib::Collection", cls);
+		}
+
 		{
 			JavaNativeClass cls = new JavaNativeClass(new JavaClass("java.util", "HashSet", JavaClass.Kind.CLASS));
 			cls.addConstructor("constructor", "()V");

ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/actual_test/java_native/native_template/JavaNativeSpecialTypeTests.java

@@ -5,17 +5,14 @@
 import org.openzen.zenscript.scriptingexample.tests.helpers.ScriptBuilder;
 import org.openzen.zenscript.scriptingexample.tests.helpers.ZenCodeTest;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
+import java.util.*;
 
 
 class JavaNativeSpecialTypeTests extends ZenCodeTest {
 
 	@Override
 	public List<String> getRequiredStdLibModules() {
-		return Collections.singletonList("stdlib");
+		return Arrays.asList("stdlib", "javalib");
 	}
 
 	@Override