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

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

@@ -81,4 +81,24 @@ public class Modifiers {
 	public static boolean hasAccess(int modifiers) {
 		return (modifiers & (PRIVATE | PUBLIC | PROTECTED | INTERNAL)) > 0;
 	}
+    
+    public static String describe(int modifiers) {
+        StringBuilder builder = new StringBuilder();
+        if (isPublic(modifiers)) {
+            builder.append("public");
+        } else if (isPrivate(modifiers)) {
+            builder.append("private");
+        } else if (isProtected(modifiers)) {
+            builder.append("protected");
+        }
+        if (isAbstract(modifiers)) {
+            builder.append(" abstract");
+        } else if (isFinal(modifiers)) {
+            builder.append(" final");
+        } else if (isStatic(modifiers)) {
+            builder.append(" static");
+        }
+        return builder.toString();
+    }
+    
 }

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

@@ -5,26 +5,23 @@
  */
 package org.openzen.zenscript.codemodel.type.member;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.CompileException;
 import org.openzen.zencode.shared.CompileExceptionCode;
+import org.openzen.zenscript.codemodel.CompareType;
+import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
+import org.openzen.zenscript.codemodel.expression.ConstExpression;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.GetFieldExpression;
 import org.openzen.zenscript.codemodel.expression.GetStaticFieldExpression;
+import org.openzen.zenscript.codemodel.expression.InvalidExpression;
+import org.openzen.zenscript.codemodel.expression.PostCallExpression;
 import org.openzen.zenscript.codemodel.expression.SetFieldExpression;
 import org.openzen.zenscript.codemodel.expression.SetStaticFieldExpression;
 import org.openzen.zenscript.codemodel.expression.SetterExpression;
 import org.openzen.zenscript.codemodel.expression.StaticSetterExpression;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
-import org.openzen.zenscript.codemodel.CompareType;
-import org.openzen.zenscript.codemodel.FunctionHeader;
-import org.openzen.zenscript.codemodel.expression.ConstExpression;
-import org.openzen.zenscript.codemodel.expression.InvalidExpression;
-import org.openzen.zenscript.codemodel.expression.PostCallExpression;
 import org.openzen.zenscript.codemodel.member.FunctionalMember;
 import org.openzen.zenscript.codemodel.member.ref.ConstMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.FieldMemberRef;
@@ -35,6 +32,10 @@ import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  *
  * @author Hoofdgebruiker
@@ -335,15 +336,28 @@ public class TypeMemberGroup {
 	
 	public FunctionalMemberRef selectMethod(CodePosition position, TypeScope scope, CallArguments arguments, boolean allowNonStatic, boolean allowStatic) throws CompileException {
 		// try to match with exact types
+        List<TypeMember<FunctionalMemberRef>> possibleMethods = new ArrayList<>();
 		for (TypeMember<FunctionalMemberRef> method : methods) {
 			if (!(method.member.isStatic() ? allowStatic : allowNonStatic))
 				continue;
 			
 			FunctionHeader header = method.member.getHeader().instanceForCall(position, scope.getTypeRegistry(), arguments);
 			if (header.matchesExactly(position, arguments, scope))
-				return method.member;
+			    possibleMethods.add(method);
 		}
-		
+        if (!possibleMethods.isEmpty()) {
+            TypeMember<FunctionalMemberRef> selectedMethod = null;
+            for (TypeMember<FunctionalMemberRef> method : possibleMethods) {
+                if (selectedMethod == null) {
+                    selectedMethod = method;
+                    continue;
+                }
+                
+                selectedMethod = selectedMethod.resolve(method);
+            }
+            if (selectedMethod != null)
+                return selectedMethod.member;
+        }
 		// try to match with approximate types
 		FunctionalMemberRef selected = null;
 		for (TypeMember<FunctionalMemberRef> method : methods) {

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

@@ -5,15 +5,11 @@
  */
 package org.openzen.zenscript.codemodel.type.member;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.CompileException;
 import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.CompareType;
+import org.openzen.zenscript.codemodel.GenericName;
 import org.openzen.zenscript.codemodel.OperatorType;
 import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.CheckNullExpression;
@@ -42,14 +38,19 @@ import org.openzen.zenscript.codemodel.partial.PartialMemberGroupExpression;
 import org.openzen.zenscript.codemodel.partial.PartialStaticMemberGroupExpression;
 import org.openzen.zenscript.codemodel.partial.PartialTypeExpression;
 import org.openzen.zenscript.codemodel.partial.PartialVariantOptionExpression;
+import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
-import org.openzen.zenscript.codemodel.GenericName;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
-import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  *
  * @author Hoofdgebruiker
@@ -559,7 +560,7 @@ public final class TypeMembers {
 			if (implementation.member.implementsType.type.getNormalized() == toType.type)
 				return castEquivalent(position, new InterfaceCastExpression(position, value, implementation.member), toType);
 		}
-		if (extendsType(toType.type))
+		if (extendsOrImplements(toType.type))
 			return new SupertypeCastExpression(position, value, toType);
 		
 		return new InvalidExpression(position, toType, CompileExceptionCode.INVALID_CAST, "Could not cast " + toString() + " to " + toType);

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

@@ -562,7 +562,7 @@ public class JavaNativeModule {
 		final String actualName = split[split.length-1];
 
 		for (HighLevelDefinition value : this.definitionByClass.values()) {
-			if(value.name.equals(actualName) && value.pkg.equals(zsPackage))
+			if(actualName.equals(value.name) && value.pkg.equals(zsPackage))
 				return registry.getForMyDefinition(value);
 		}