Add support for Kotlin unsigned array types.

Author: jpobst

src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs

@@ -232,10 +232,16 @@ static string GetPrimitiveClass (Type type)
 				return "F";
 			if (type == typeof (int))
 				return "I";
+			if (type == typeof (uint))
+				return "I";
 			if (type == typeof (long))
 				return "J";
+			if (type == typeof (ulong))
+				return "J";
 			if (type == typeof (short))
 				return "S";
+			if (type == typeof (ushort))
+				return "S";
 			if (type == typeof (bool))
 				return "Z";
 			return null;

src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs

@@ -302,12 +302,20 @@ static string GetKotlinType (string jvmType, string kotlinClass)
 			// Handle erasure of Kotlin unsigned types
 			if (jvmType == "I" && kotlinClass == "kotlin/UInt;")
 				return "uint";
+			if (jvmType == "[I" && kotlinClass == "kotlin/UIntArray;")
+				return "uint[]";
 			if (jvmType == "S" && kotlinClass == "kotlin/UShort;")
 				return "ushort";
+			if (jvmType == "[S" && kotlinClass == "kotlin/UShortArray;")
+				return "ushort[]";
 			if (jvmType == "J" && kotlinClass == "kotlin/ULong;")
 				return "ulong";
+			if (jvmType == "[J" && kotlinClass == "kotlin/ULongArray;")
+				return "ulong[]";
 			if (jvmType == "B" && kotlinClass == "kotlin/UByte;")
 				return "ubyte";
+			if (jvmType == "[B" && kotlinClass == "kotlin/UByteArray;")
+				return "ubyte[]";
 
 			return null;
 		}

tools/generator/Java.Interop.Tools.Generator.ObjectModel/MethodBase.cs

@@ -87,10 +87,7 @@ public bool IsKotlinNameMangled {
 					if (method.JavaName.IndexOf ("-impl") >= 0)
 						return true;
 
-					var index = method.JavaName.IndexOf ('-');
-
-					// `add-V5j3Lk8` is always a 7 character hashcode
-					return index >= 0 && method.JavaName.Length - index == 8;
+					return method.JavaName.Length >= 8 && method.JavaName [method.JavaName.Length - 8] == '-';
 				}
 
 				return false;

tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/ArraySymbol.cs

@@ -122,10 +122,25 @@ public string[] PreCallback (CodeGenerationOptions opt, string var_name, bool ow
 
 		public string[] PreCall (CodeGenerationOptions opt, string var_name)
 		{
-			return new string[] { String.Format ("IntPtr {0} = JNIEnv.NewArray ({1});", opt.GetSafeIdentifier (TypeNameUtilities.GetNativeName (var_name)), opt.GetSafeIdentifier (var_name)) };
+
+			return new string[] { String.Format ("IntPtr {0} = JNIEnv.NewArray ({2}{1});", opt.GetSafeIdentifier (TypeNameUtilities.GetNativeName (var_name)), opt.GetSafeIdentifier (var_name), GetPreCallCast ()) };
 		}
 
 		public bool NeedsPrep { get { return true; } }
+
+		string GetPreCallCast ()
+		{
+			switch (sym.FullName) {
+				case "uint":
+					return "(int[])(object)";
+				case "ushort":
+					return "(short[])(object)";
+				case "ulong":
+					return "(long[])(object)";
+				default:
+					return string.Empty;
+			}
+		}
 	}
 }
 

tools/generator/Java.Interop.Tools.Generator.Transformation/KotlinFixups.cs

@@ -49,9 +49,12 @@ private static void FixMethodName (Method method)
 				// We want to remove the hyphen and anything afterwards to fix mangled names,
 				// but a previous step converted it to an underscore. Remove the final
 				// underscore and anything after it.
-				var index = method.Name.LastIndexOf ('_');
+				var index = method.Name.IndexOf ("_impl");
 
-				method.Name = method.Name.Substring (0, index);
+				if (index >= 0)
+					method.Name = method.Name.Substring (0, index);
+				else
+					method.Name = method.Name.Substring (0, method.Name.Length - 8);
 			}
 		}
 	}