[generator] Add support for unsigned types.

jpobst · jpobst · commit a1528b4336d5 · 2019-12-16T09:23:48.000-06:00
diff --git a/src/Java.Interop/Java.Interop/JniArgumentValue.cs b/src/Java.Interop/Java.Interop/JniArgumentValue.cs
@@ -34,6 +34,8 @@ public JniArgumentValue (sbyte value)
 			b = value;
 		}
 
+		public JniArgumentValue (byte value) : this ((sbyte)value) { }
+
 		public JniArgumentValue (char value)
 		{
 			this = new JniArgumentValue ();
@@ -46,18 +48,24 @@ public JniArgumentValue (short value)
 			s = value;
 		}
 
+		public JniArgumentValue (ushort value) : this ((short)value) { }
+
 		public JniArgumentValue (int value)
 		{
 			this = new JniArgumentValue ();
 			i = value;
 		}
 
+		public JniArgumentValue (uint value) : this ((int)value) { }
+
 		public JniArgumentValue (long value)
 		{
 			this = new JniArgumentValue ();
 			j = value;
 		}
 
+		public JniArgumentValue (ulong value) : this ((long) value) { }
+
 		public JniArgumentValue (float value)
 		{
 			this = new JniArgumentValue ();
diff --git a/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs b/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs
@@ -1212,7 +1212,7 @@ public void WriteMethodInvokerBody (Method method, string indent)
 				writer.WriteLine ("{0}{1}", indent, prep);
 			WriteParameterListCallArgs (method.Parameters, indent, invoker: true);
 			string env_method = "Call" + method.RetVal.CallMethodPrefix + "Method";
-			string call = "JNIEnv." + env_method + " (" +
+			string call = method.RetVal.ReturnCast + "JNIEnv." + env_method + " (" +
 			    Context.ContextType.GetObjectHandleProperty ("this") + ", " + method.EscapedIdName + method.Parameters.GetCallArgs (opt, invoker: true) + ")";
 			if (method.IsVoid)
 				writer.WriteLine ("{0}{1};", indent, call);
diff --git a/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/JavaInteropCodeGenerator.cs b/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/JavaInteropCodeGenerator.cs
@@ -19,6 +19,10 @@ static string GetInvokeType (string type)
 			case "Short":           return "Int16";
 			case "Long":            return "Int64";
 			case "Float":           return "Single";
+			case "UInt":            return "Int32";
+			case "UShort":          return "Int16";
+			case "ULong":           return "Int64";
+			case "UByte":           return "SByte";
 			default:                return type;
 			}
 		}
@@ -171,7 +175,7 @@ internal override void WriteMethodBody (Method method, string indent, GenBase ty
 
 			if (!method.IsVoid) {
 				var r   = invokeType == "Object" ? "__rm.Handle" : "__rm";
-				writer.WriteLine ("{0}return {1};", indent, method.RetVal.FromNative (opt, r, true));
+				writer.WriteLine ("{0}return {2}{1};", indent, method.RetVal.FromNative (opt, r, true), method.RetVal.ReturnCast);
 			}
 
 			indent = oldindent;
@@ -196,19 +200,21 @@ internal override void WriteFieldGetBody (Field field, string indent, GenBase ty
 			var invoke      = "Get{0}Value";
 			invoke          = string.Format (invoke, invokeType);
 
-			writer.WriteLine ("{0}var __v = _members.{1}.{2} (__id{3});",
+			writer.WriteLine ("{0}var __v = {4}_members.{1}.{2} (__id{3});",
 					indent,
 					indirect,
 					invoke,
-					field.IsStatic ? "" : ", this");
+					field.IsStatic ? "" : ", this",
+					field.Symbol.ReturnCast);
 
 			if (field.Symbol.IsArray) {
 				writer.WriteLine ("{0}return global::Android.Runtime.JavaArray<{1}>.FromJniHandle (__v.Handle, JniHandleOwnership.TransferLocalRef);", indent, opt.GetOutputName (field.Symbol.ElementType));
 			}
 			else if (field.Symbol.NativeType != field.Symbol.FullName) {
-				writer.WriteLine ("{0}return {1};",
+				writer.WriteLine ("{0}return {2}{1};",
 						indent,
-						field.Symbol.FromNative (opt, invokeType != "Object" ? "__v" : "__v.Handle", true));
+						field.Symbol.FromNative (opt, invokeType != "Object" ? "__v" : "__v.Handle", true),
+						field.Symbol.ReturnCast);
 			} else {
 				writer.WriteLine ("{0}return __v;", indent);
 			}
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Field.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Field.cs
@@ -23,7 +23,7 @@ public class Field : ApiVersionsSupport.IApiAvailability
 		public string Value { get; set; }
 		public string Visibility { get; set; }
 
-		internal string GetMethodPrefix => (Symbol is SimpleSymbol || Symbol.IsEnum) ? StringRocks.MemberToPascalCase (Symbol.JavaName) : "Object";
+		internal string GetMethodPrefix => TypeNameUtilities.GetCallPrefix (Symbol);
 
 		internal string ID => JavaName + "_jfieldId";
 
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/GenBase.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/GenBase.cs
@@ -33,6 +33,8 @@ protected GenBase (GenBaseSupport support)
 		public string DefaultValue { get; set; }
 		public bool HasVirtualMethods { get; set; }
 
+		public string ReturnCast => string.Empty;
+
 		// This means Ctors/Methods/Properties/Fields has not been populated yet.
 		// If this type is retrieved from the SymbolTable, it will call PopulateAction
 		// to fill in members before returning it to the user.
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Method.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Method.cs
@@ -108,7 +108,7 @@ internal string CalculateEventName (Func<string, bool> checkNameDuplicate)
 
 		public string EscapedCallbackName => IdentifierValidator.CreateValidIdentifier ($"cb_{JavaName}{IDSignature}", true);
 
-		public string EscapedIdName => "id_" + JavaName.Replace ("<", "_x60_").Replace (">", "_x62_") + IDSignature;
+		public string EscapedIdName => IdentifierValidator.CreateValidIdentifier ($"id_{JavaName}{IDSignature}", true);
 
 		internal void FillReturnType ()
 		{
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/ReturnValue.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/ReturnValue.cs
@@ -22,14 +22,7 @@ public ReturnValue (Method owner, string java_type, string managed_type, bool is
 			this.is_enumified = isEnumified;
 		}
 
-		public string CallMethodPrefix {
-			get {
-				if (sym is SimpleSymbol || sym.IsEnum)
-					return StringRocks.MemberToPascalCase (sym.JavaName);
-				else
-					return "Object";
-			}
-		}
+		public string CallMethodPrefix => TypeNameUtilities.GetCallPrefix (sym);
 
 		public string DefaultValue {
 			get { return sym.DefaultValue; }
@@ -89,6 +82,8 @@ public string RawJavaType {
 			get { return raw_type; }
 		}
 
+		public string ReturnCast => sym?.ReturnCast ?? string.Empty;
+
 		public string FromNative (CodeGenerationOptions opt, string var_name, bool owned)
 		{
 			if (!string.IsNullOrEmpty (managed_type) && (sym is ClassGen || sym is InterfaceGen)) {
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/ArraySymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/ArraySymbol.cs
@@ -64,6 +64,8 @@ public bool IsArray {
 			get { return true; }
 		}
 
+		public string ReturnCast => string.Empty;
+
 		public string GetObjectHandleProperty (string variable)
 		{
 			return sym.GetObjectHandleProperty (variable);
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/CharSequenceSymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/CharSequenceSymbol.cs
@@ -41,6 +41,8 @@ public string ElementType {
 			get { return null; }
 		}
 
+		public string ReturnCast => string.Empty;
+
 		public string GetObjectHandleProperty (string variable)
 		{
 			return $"((global::Java.Lang.Object) {variable}).Handle";
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/CollectionSymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/CollectionSymbol.cs
@@ -56,6 +56,8 @@ public bool MayHaveManagedGenericArguments {
 			get { return true; }
 		}
 
+		public string ReturnCast => string.Empty;
+
 		public string GetObjectHandleProperty (string variable)
 		{
 			return $"((global::Java.Lang.Object) {variable}).Handle";
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/EnumSymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/EnumSymbol.cs
@@ -46,6 +46,8 @@ public string ElementType {
 			get { return null; }
 		}
 
+		public string ReturnCast => string.Empty;
+
 		public string GetObjectHandleProperty (string variable)
 		{
 			return null;
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/FormatSymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/FormatSymbol.cs
@@ -13,8 +13,9 @@ public class FormatSymbol : ISymbol {
 		string native_type;
 		string to_fmt;
 		string type;
+		string return_cast;
 
-		public FormatSymbol (string default_value, string java_type, string jni_type, string native_type, string type, string from_fmt, string to_fmt)
+		public FormatSymbol (string default_value, string java_type, string jni_type, string native_type, string type, string from_fmt, string to_fmt, string returnCast)
 		{
 			this.default_value = default_value;
 			this.java_type = java_type;
@@ -23,6 +24,7 @@ public FormatSymbol (string default_value, string java_type, string jni_type, st
 			this.type = type;
 			this.from_fmt = from_fmt;
 			this.to_fmt = to_fmt;
+			this.return_cast = returnCast ?? string.Empty;
 		}
 		
 		public string DefaultValue {
@@ -61,6 +63,8 @@ public string ElementType {
 			get { return null; }
 		}
 
+		public string ReturnCast => return_cast;
+
 		public string GetObjectHandleProperty (string variable)
 		{
 			return null;
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/GeneratedEnumSymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/GeneratedEnumSymbol.cs
@@ -77,6 +77,8 @@ public string ElementType {
 			get { return enum_type; }
 		}
 
+		public string ReturnCast => string.Empty;
+
 		public string GetObjectHandleProperty (string variable)
 		{
 			return null;
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/GenericSymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/GenericSymbol.cs
@@ -63,6 +63,8 @@ public ISymbol [] TypeParams {
 			get { return type_params; }
 		}
 
+		public string ReturnCast => string.Empty;
+
 		public string GetObjectHandleProperty (string variable)
 		{
 			return gen.GetObjectHandleProperty (variable);
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/GenericTypeParameter.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/GenericTypeParameter.cs
@@ -63,6 +63,8 @@ public string ElementType {
 			get { return null; }
 		}
 
+		public string ReturnCast => string.Empty;
+
 		public string GetObjectHandleProperty (string variable)
 		{
 			return null;
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/ISymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/ISymbol.cs
@@ -13,6 +13,7 @@ public interface ISymbol  {
 		bool   IsEnum { get; }
 		bool   IsArray { get; }
 		string ElementType { get; }
+		string ReturnCast { get; }
 
 		string GetObjectHandleProperty (string variable);
 
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/SimpleSymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/SimpleSymbol.cs
@@ -4,8 +4,8 @@ namespace MonoDroid.Generation {
 
 	public class SimpleSymbol : FormatSymbol {
 
-		public SimpleSymbol (string default_value, string java_type, string type, string jni_type, string native_type = null, string from_fmt="{0}", string to_fmt="{0}")
-			: base (default_value, java_type, jni_type, native_type ?? type, type, from_fmt, to_fmt)
+		public SimpleSymbol (string default_value, string java_type, string type, string jni_type, string native_type = null, string from_fmt="{0}", string to_fmt="{0}", string returnCast = null)
+			: base (default_value, java_type, jni_type, native_type ?? type, type, from_fmt, to_fmt, returnCast)
 		{
 		}
 
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/StreamSymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/StreamSymbol.cs
@@ -54,6 +54,8 @@ public string ElementType {
 			get { return null; }
 		}
 
+		public string ReturnCast => string.Empty;
+
 		public string GetObjectHandleProperty (string variable)
 		{
 			return $"((global::Java.Lang.Object) {variable}).Handle";
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/StringSymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/StringSymbol.cs
@@ -44,6 +44,8 @@ public string ElementType {
 			get { return null; }
 		}
 
+		public string ReturnCast => string.Empty;
+
 		public string GetObjectHandleProperty (string variable)
 		{
 			return $"((global::Java.Lang.Object) {variable}).Handle";
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/SymbolTable.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/SymbolTable.cs
@@ -33,6 +33,10 @@ public class SymbolTable {
 			"int",
 			"long",
 			"short",
+			"ubyte",
+			"uint",
+			"ulong",
+			"ushort",
 			"void",
 		};
 
@@ -55,6 +59,10 @@ public SymbolTable ()
 			AddType (new SimpleSymbol ("0", "int", "int", "I"));
 			AddType (new SimpleSymbol ("0L", "long", "long", "J"));
 			AddType (new SimpleSymbol ("0", "short", "short", "S"));
+			AddType (new SimpleSymbol ("0", "uint", "uint", "I", returnCast: "(uint)"));
+			AddType (new SimpleSymbol ("0", "ushort", "ushort", "S", returnCast: "(ushort)"));
+			AddType (new SimpleSymbol ("0", "ulong", "ulong", "J", returnCast: "(ulong)"));
+			AddType (new SimpleSymbol ("0", "ubyte", "byte", "B", returnCast: "(byte)"));
 			AddType ("Android.Graphics.Color", new ColorSymbol ());
 			char_seq = new CharSequenceSymbol ();
 			instream_sym = new StreamSymbol ("InputStream");
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/XmlPullParserSymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/XmlPullParserSymbol.cs
@@ -41,6 +41,8 @@ public string ElementType {
 			get { return null; }
 		}
 
+		public string ReturnCast => string.Empty;
+
 		public string GetObjectHandleProperty (string variable)
 		{
 			return $"((global::Java.Lang.Object) {variable}).Handle";
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/XmlResourceParserSymbol.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/XmlResourceParserSymbol.cs
@@ -41,6 +41,8 @@ public string ElementType {
 			get { return null; }
 		}
 
+		public string ReturnCast => string.Empty;
+
 		public string GetObjectHandleProperty (string variable)
 		{
 			return $"((global::Java.Lang.Object) {variable}).Handle";
diff --git a/tools/generator/Java.Interop.Tools.Generator.Transformation/KotlinFixups.cs b/tools/generator/Java.Interop.Tools.Generator.Transformation/KotlinFixups.cs
@@ -12,6 +12,8 @@ public static void Fixup (List<GenBase> gens)
 		{
 			foreach (var c in gens.OfType<ClassGen> ())
 				FixupClass (c);
+			foreach (var i in gens.OfType<InterfaceGen> ())
+				FixupInterface (i);
 		}
 
 		private static void FixupClass (ClassGen c)
@@ -20,9 +22,8 @@ private static void FixupClass (ClassGen c)
 			// inaccessible from Java, like `add-impl` and `add-V5j3Lk8`.
 			// We need to generate C# compatible names as well as prevent overriding 
 			// them as we cannot generate JCW for them.
-			var invalid_methods = c.Methods.Where (m => m.IsKotlinNameMangled).ToList ();
 
-			foreach (var method in invalid_methods) {
+			foreach (var method in c.Methods.Where (m => m.IsKotlinNameMangled)) {
 
 				// If the method is virtual, mark it as !virtual as it can't be overridden in Java
 				if (!method.IsFinal)
@@ -31,15 +32,26 @@ private static void FixupClass (ClassGen c)
 				if (method.IsVirtual)
 					method.IsVirtual = false;
 
-				// Only run this if it's the default name (ie: not a user's "managedName")
-				if (method.Name == StringRocks.MemberToPascalCase (method.JavaName).Replace ('-', '_')) {
-					// 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 ('_');
+				FixMethodName (method);
+			}
+		}
+
+		private static void FixupInterface (InterfaceGen gen)
+		{
+			foreach (var method in gen.Methods.Where (m => m.IsKotlinNameMangled))
+				FixMethodName (method);
+		}
+
+		private static void FixMethodName (Method method)
+		{
+			// Only run this if it's the default name (ie: not a user's "managedName")
+			if (method.Name == StringRocks.MemberToPascalCase (method.JavaName).Replace ('-', '_')) {
+				// 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 ('_');
 
-					method.Name = method.Name.Substring (0, index);
-				}
+				method.Name = method.Name.Substring (0, index);
 			}
 		}
 	}
diff --git a/tools/generator/Utilities/TypeNameUtilities.cs b/tools/generator/Utilities/TypeNameUtilities.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using MonoDroid.Utils;
 
 namespace MonoDroid.Generation
 {
@@ -101,5 +102,27 @@ public static string StudlyCase (string name)
 			}
 			return builder.ToString ();
 		}
+
+		public static string GetCallPrefix (ISymbol symbol)
+		{
+			if (symbol is SimpleSymbol || symbol.IsEnum) {
+				var ret = StringRocks.MemberToPascalCase (symbol.JavaName);
+
+				// We do not have unsigned versions of GetIntValue, etc.
+				// We use the signed versions and cast the result
+				if (ret == "Uint")
+					return "Int";
+				if (ret == "Ushort")
+					return "Short";
+				if (ret == "Ulong")
+					return "Long";
+				if (ret == "Ubyte")
+					return "Byte";
+
+				return ret;
+
+			} else
+				return "Object";
+		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ public JniArgumentValue (sbyte value)`
`34`	`34`	`b = value;`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ public JniArgumentValue (byte value) : this ((sbyte)value) { }`
	`38`	`+`
`37`	`39`	`public JniArgumentValue (char value)`
`38`	`40`	`{`
`39`	`41`	`this = new JniArgumentValue ();`
`@@ -46,18 +48,24 @@ public JniArgumentValue (short value)`
`46`	`48`	`s = value;`
`47`	`49`	`}`
`48`	`50`
	`51`	`+ public JniArgumentValue (ushort value) : this ((short)value) { }`
	`52`	`+`
`49`	`53`	`public JniArgumentValue (int value)`
`50`	`54`	`{`
`51`	`55`	`this = new JniArgumentValue ();`
`52`	`56`	`i = value;`
`53`	`57`	`}`
`54`	`58`
	`59`	`+ public JniArgumentValue (uint value) : this ((int)value) { }`
	`60`	`+`
`55`	`61`	`public JniArgumentValue (long value)`
`56`	`62`	`{`
`57`	`63`	`this = new JniArgumentValue ();`
`58`	`64`	`j = value;`
`59`	`65`	`}`
`60`	`66`
	`67`	`+ public JniArgumentValue (ulong value) : this ((long) value) { }`
	`68`	`+`
`61`	`69`	`public JniArgumentValue (float value)`
`62`	`70`	`{`
`63`	`71`	`this = new JniArgumentValue ();`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ internal string CalculateEventName (Func<string, bool> checkNameDuplicate)`
`108`	`108`
`109`	`109`	`public string EscapedCallbackName => IdentifierValidator.CreateValidIdentifier ($"cb_{JavaName}{IDSignature}", true);`
`110`	`110`
`111`		`- public string EscapedIdName => "id_" + JavaName.Replace ("<", "_x60_").Replace (">", "_x62_") + IDSignature;`
	`111`	`+ public string EscapedIdName => IdentifierValidator.CreateValidIdentifier ($"id_{JavaName}{IDSignature}", true);`
`112`	`112`
`113`	`113`	`internal void FillReturnType ()`
`114`	`114`	`{`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@ public bool IsArray {`
`64`	`64`	`get { return true; }`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ public string ReturnCast => string.Empty;`
	`68`	`+`
`67`	`69`	`public string GetObjectHandleProperty (string variable)`
`68`	`70`	`{`
`69`	`71`	`return sym.GetObjectHandleProperty (variable);`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ public string ElementType {`
`41`	`41`	`get { return null; }`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ public string ReturnCast => string.Empty;`
	`45`	`+`
`44`	`46`	`public string GetObjectHandleProperty (string variable)`
`45`	`47`	`{`
`46`	`48`	`return $"((global::Java.Lang.Object) {variable}).Handle";`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ public bool MayHaveManagedGenericArguments {`
`56`	`56`	`get { return true; }`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ public string ReturnCast => string.Empty;`
	`60`	`+`
`59`	`61`	`public string GetObjectHandleProperty (string variable)`
`60`	`62`	`{`
`61`	`63`	`return $"((global::Java.Lang.Object) {variable}).Handle";`