Make JavaRuntimeTypeConverter Object aware

Author: jaredlll08

CodeModel/src/main/java/org/openzen/zenscript/codemodel/GenericName.java

@@ -5,7 +5,9 @@
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 public class GenericName {
@@ -52,6 +54,21 @@ public boolean hasNoArguments() {
 		return arguments.length == 0;
 	}
 
+	@Override
+	public final boolean equals(Object o) {
+		if (!(o instanceof GenericName)) return false;
+
+		GenericName that = (GenericName) o;
+		return Objects.equals(name, that.name) && Arrays.equals(arguments, that.arguments);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = Objects.hashCode(name);
+		result = 31 * result + Arrays.hashCode(arguments);
+		return result;
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder result = new StringBuilder(name);

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

@@ -0,0 +1,36 @@
+package org.openzen.zencode.java.impl.conversion;
+
+import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.GenericName;
+import org.openzen.zenscript.codemodel.annotations.AnnotationDefinition;
+import org.openzen.zenscript.codemodel.compilation.CompileContext;
+import org.openzen.zenscript.codemodel.definition.ZSPackage;
+import org.openzen.zenscript.codemodel.globals.IGlobal;
+import org.openzen.zenscript.codemodel.identifiers.ExpansionSymbol;
+import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
+import org.openzen.zenscript.codemodel.type.TypeID;
+import org.openzen.zenscript.javashared.types.ObjectTypeSymbol;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public class JavaCompileContext extends CompileContext {
+
+	private static final GenericName OBJECT_NAME = new GenericName("Object");
+	public JavaCompileContext(ZSPackage rootPackage, ZSPackage modulePackage, List<ExpansionSymbol> expansions, Map<String, IGlobal> globals, List<AnnotationDefinition> annotations) {
+		super(rootPackage, modulePackage, expansions, globals, annotations);
+	}
+
+	@Override
+	public Optional<TypeID> resolve(CodePosition position, List<GenericName> name) {
+
+		if(name.size() == 1) {
+			GenericName genericName = name.get(0);
+			if(genericName.equals(OBJECT_NAME)) {
+				return Optional.of(DefinitionTypeID.create(ObjectTypeSymbol.INSTANCE));
+			}
+		}
+		return super.resolve(position, name);
+	}
+}

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

@@ -89,7 +89,7 @@ public TypeID parseType(ZenCodeType.Expansion expansion) {
 			boolean relative = tokens.optional(ZSTokenType.T_DOT) != null;
 			IParsedType parsed = IParsedType.parse(tokens);
 
-			CompileContext context = new CompileContext(relative ? packageInfo.getPkg() : packageInfo.getRoot(), packageInfo.getPkg(), Collections.emptyList(), Collections.emptyMap(), Collections.emptyList());
+			JavaCompileContext context = new JavaCompileContext(relative ? packageInfo.getPkg() : packageInfo.getRoot(), packageInfo.getPkg(), Collections.emptyList(), Collections.emptyMap(), Collections.emptyList());
 
 			final ZSTokenParser typeBoundsTokens = ZSTokenParser.create(new LiteralSourceFile("internal", expansion.typeParameters()), null);
 			TypeParameter[] typeParameters = Optional.ofNullable(ParsedTypeParameter.parseAll(typeBoundsTokens))