Merge remote-tracking branch 'kindlich/development' into development

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaExpressionVisitor.java

@@ -23,7 +23,10 @@ import org.openzen.zenscript.javashared.*;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Modifier;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.StringJoiner;
 
 public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativeTranslator<Void> {
 	private static final JavaMethod BOOLEAN_PARSE = JavaMethod.getNativeStatic(JavaClass.BOOLEAN, "parseBoolean", "(Ljava/lang/String;)Z");
@@ -374,12 +377,12 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativ
 		BuiltinID builtin = expression.member.getBuiltin();
 		if (builtin == null) {
 			expression.target.accept(this);
-			
+
 			JavaMethod methodInfo = context.getJavaMethod(expression.member);
 			for (int i = 0; i < expression.arguments.typeArguments.length; i++) {
 				if (methodInfo.typeParameterArguments[i]) {
 					StoredType arguments = expression.arguments.typeArguments[i];
-					
+
 				}
 			}
 			for (Expression argument : expression.arguments.arguments) {
@@ -3988,6 +3991,8 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativ
 			getJavaWriter().invokeInterface(methodInfo);
 		} else if (methodInfo.kind == JavaMethod.Kind.COMPILED) {
 			Objects.requireNonNull(methodInfo.translation).translate(expression, this);
+		} else if (methodInfo.cls.kind == JavaClass.Kind.INTERFACE) {
+			getJavaWriter().invokeInterface(methodInfo);
 		} else {
 			getJavaWriter().invokeVirtual(methodInfo);
 		}

JavaIntegration/src/main/java/org/openzen/zencode/java/JavaNativeModule.java

@@ -62,7 +62,6 @@ import org.openzen.zenscript.javashared.JavaMethod;
 import stdlib.Strings;
 
 /**
- *
  * @author Stan Hebben
  */
 public class JavaNativeModule {
@@ -84,8 +83,7 @@ public class JavaNativeModule {
 			String name,
 			String basePackage,
 			GlobalTypeRegistry registry,
-			JavaNativeModule[] dependencies)
-	{
+			JavaNativeModule[] dependencies) {
 		this.pkg = pkg;
 		this.basePackage = basePackage;
 		module = new Module(name);
@@ -214,7 +212,8 @@ public class JavaNativeModule {
 	}
 	
 	private ZSPackage getPackage(String className) {
-		if (!className.contains("."))
+		//TODO make a lang package?
+		if (!className.contains(".") || className.startsWith("java.lang"))
 			return pkg;
 		
 		if (className.startsWith("."))
@@ -296,10 +295,8 @@ public class JavaNativeModule {
 				continue;
 			if (!isPublic(field.getModifiers()))
 				continue;
-
-			String fieldName = field.getName();
-			if (annotation != null && !annotation.value().isEmpty())
-				fieldName = annotation.value();
+			
+			final String fieldName = annotation.value().isEmpty() ? field.getName() : annotation.value();
 			
 			StoredType fieldType = loadStoredType(field.getAnnotatedType());
 			FieldMember member = new FieldMember(CodePosition.NATIVE, definition, Modifiers.PUBLIC, fieldName, thisType, fieldType, registry, 0, 0, null);
@@ -309,7 +306,7 @@ public class JavaNativeModule {
 		
 		boolean hasConstructor = false;
 		for (java.lang.reflect.Constructor constructor : cls.getConstructors()) {
-			ZenCodeType.Constructor constructorAnnotation = (ZenCodeType.Constructor)constructor.getAnnotation(ZenCodeType.Constructor.class);
+			ZenCodeType.Constructor constructorAnnotation = (ZenCodeType.Constructor) constructor.getAnnotation(ZenCodeType.Constructor.class);
 			if (constructorAnnotation != null) {
 				ConstructorMember member = asConstructor(definition, constructor);
 				definition.addMember(member);
@@ -487,8 +484,7 @@ public class JavaNativeModule {
 			AnnotatedType javaReturnType,
 			AnnotatedType[] parameterTypes,
 			TypeVariable<Method>[] javaTypeParameters,
-			AnnotatedType[] exceptionTypes)
-	{
+			AnnotatedType[] exceptionTypes) {
 		StoredType returnType = javaReturnType == null ? BasicTypeID.VOID.stored : loadStoredType(javaReturnType);
 		
 		FunctionParameter[] parameters = new FunctionParameter[parameterTypes.length];
@@ -532,7 +528,7 @@ public class JavaNativeModule {
 	
 	private TypeID loadType(Type type, boolean nullable, boolean unsigned) {
 		if (type instanceof Class) {
-			Class<?> classType = (Class<?>)type;
+			Class<?> classType = (Class<?>) type;
 			if (unsigned) {
 				if (unsignedByClass.containsKey(classType))
 					return unsignedByClass.get(classType);
@@ -548,8 +544,8 @@ public class JavaNativeModule {
 			HighLevelDefinition definition = addClass(classType);
 			return registry.getForDefinition(definition);
 		} else if (type instanceof ParameterizedType) {
-			ParameterizedType parameterizedType = (ParameterizedType)type;
-			Class<?> rawType = (Class)parameterizedType.getRawType();
+			ParameterizedType parameterizedType = (ParameterizedType) type;
+			Class<?> rawType = (Class) parameterizedType.getRawType();
 			
 			HighLevelDefinition definition = addClass(rawType);
 			Type[] parameters = parameterizedType.getActualTypeArguments();