[runtime] Fix skipping nested struct types when processing method type encodings. Fixes #22837. (#22859)

Fix skipping consecutive nested structs (such as `"{CGPoint=dd}{CGSize=dd}"` inside `"{CGRect={CGPoint=dd}{CGSize=dd}}"`) by keep looping once the first nested struct is found.

Fixes #22837.

Author: rolfbjarne

runtime/trampolines.m

@@ -428,6 +428,7 @@
 // Example:
 //    {bc}d => d
 //    {a{b}cd}e => e
+//    {CGRect={CGPoint=dd}{CGSize=dd}}e =>
 static const char *
 skip_nested_brace (const char *type)
 {
@@ -436,7 +437,8 @@
 	while (*++type) {
 		switch (*type) {
 		case '{':
-			return skip_nested_brace (type);
+			type = skip_nested_brace (type);
+			break;
 		case '}':
 			return type++;
 		default:
@@ -455,11 +457,14 @@
 //     {CGRect=dddd} => dddd
 //     ^q => ^
 //	   @? => @ (this is a block)
+//    ^{CGRect={CGPoint=dd}{CGSize=dd}} => ^
 //
 // type: the input type name
 // struct_name: where to write the collapsed struct name. Returns an empty string if the array isn't big enough.
 // max_char: the maximum number of characters to write to struct_name
 // return value: false if something went wrong (an exception thrown, or struct_name wasn't big enough).
+//
+// There's a unit test for this method in monotouch-test (in NativeRuntimeTest.cs)
 bool
 xamarin_collapse_struct_name (const char *type, char struct_name[], int max_char, GCHandle *exception_gchandle)
 {

tests/bindings-test/ApiDefinition.cs

@@ -316,6 +316,9 @@ interface ObjCProtocolTest {
 
 		[Export ("methodEncodings:obj2:obj3:obj4:obj5:obj6:obj7:")]
 		void GetMethodEncodings (ref NSObject obj1, ref NSObject obj2, ref NSObject obj3, ref NSObject obj4, ref NSObject obj5, ref NSObject obj6, ref NSObject obj7);
+
+		[Export ("setPtrPropertyCGRect:p2:p3:p4:p5:p6:")]
+		void SetPtrPropertyCGRect (nint p1, nint p2, nint p3, nint p4, ref global::CoreGraphics.CGRect p5, nint p6);
 	}
 
 	[Protocol]

tests/monotouch-test/ObjCRuntime/Messaging.cs

@@ -244,6 +244,9 @@ public struct objc_super {
 
 		[DllImport (LIBOBJC_DYLIB, EntryPoint = "objc_msgSend")]
 		public extern static void void_objc_msgSend_out_byte_out_sbyte_out_short_out_ushort_out_int_out_uint_out_long_out_ulong (IntPtr receiver, IntPtr selector, out EnumB b, out EnumSB sb, out EnumS s, out EnumUS us, out EnumI i, out EnumUI ui, out EnumL l, out EnumUL ul);
+
+		[DllImport (LIBOBJC_DYLIB, EntryPoint = "objc_msgSend")]
+		public extern static void void_objc_msgSend_IntPtr_IntPtr_IntPtr_IntPtr_CGRect_IntPtr (IntPtr receiver, IntPtr selector, IntPtr p1, IntPtr p2, IntPtr p3, IntPtr p4, ref CGRect p5, IntPtr p6);
 	}
 
 	public enum EnumB : byte { a, b = 10 };

tests/monotouch-test/ObjCRuntime/NativeRuntimeTest.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+
+using Foundation;
+using ObjCRuntime;
+
+using NUnit.Framework;
+
+namespace MonoTouchFixtures.ObjCRuntime {
+
+	[TestFixture]
+	[Preserve (AllMembers = true)]
+	public class NativeRuntimeTest {
+		// bool xamarin_collapse_struct_name (const char *type, char struct_name[], int max_char, GCHandle *exception_gchandle)
+		[DllImport ("__Internal")]
+		unsafe static extern byte xamarin_collapse_struct_name (string type, StringBuilder struct_name, int max_char, ref IntPtr exception_gchandle);
+
+		[Test]
+		public void XamarinCollapseStructName ()
+		{
+			AssertCollapsed ("{MKCoordinateRegion={CLLocationCoordinate2D=dd}{MKCoordinateSpan=dd}}", "dddd", "1");
+			AssertCollapsed ("{CGRect=dddd}", "dddd", "2");
+			AssertCollapsed ("^q", "^", "3");
+			AssertCollapsed ("@?", "@", "4");
+			AssertCollapsed ("^{CGRect={CGPoint=dd}{CGSize=dd}}", "^", "5");
+		}
+
+		void AssertCollapsed (string input, string expected, string message)
+		{
+			var sb = new StringBuilder (255);
+			var exception_gchandle = IntPtr.Zero;
+			var rv = xamarin_collapse_struct_name (input, sb, sb.Length - 1, ref exception_gchandle);
+			Assert.That (rv, Is.Not.EqualTo (0), $"rv/{message}");
+			Assert.That (exception_gchandle, Is.EqualTo (IntPtr.Zero), $"exc/{message}");
+			Assert.That (sb.ToString (), Is.EqualTo (expected), $"actual/{message}");
+		}
+	}
+}

tests/monotouch-test/ObjCRuntime/RegistrarTest.cs

@@ -4982,6 +4982,21 @@ public void MethodEncodings ()
 			}
 		}
 
+		[Test]
+		public void MethodEncodings2 ()
+		{
+			using (var met = new MethodEncodingsTests ()) {
+				nint obj1 = 1;
+				nint obj2 = 2;
+				nint obj3 = 3;
+				nint obj4 = 4;
+				CGRect obj5 = new CGRect (1, 2, 3, 4);
+				nint obj6 = 6;
+				Messaging.void_objc_msgSend_IntPtr_IntPtr_IntPtr_IntPtr_CGRect_IntPtr (met.Handle, Selector.GetHandle ("setPtrPropertyCGRect:p2:p3:p4:p5:p6:"), obj1, obj2, obj3, obj4, ref obj5, obj6);
+				Assert.AreEqual (new CGRect (5, 6, 7, 8), obj5, "rv");
+			}
+		}
+
 		class MethodEncodingsTests : NSObject, IObjCProtocolTest {
 			[Export ("methodEncodings:obj2:obj3:obj4:obj5:obj6:obj7:")]
 			public void GetMethodEncodings (ref NSObject obj1, ref NSObject obj2, ref NSObject obj3, ref NSObject obj4, ref NSObject obj5, ref NSObject obj6, ref NSObject obj7)
@@ -5001,6 +5016,19 @@ public void GetMethodEncodings (ref NSObject obj1, ref NSObject obj2, ref NSObje
 				obj6 = new NSObject ();
 				obj7 = new NSObject ();
 			}
+
+			[Export ("setPtrPropertyCGRect:p2:p3:p4:p5:p6:")]
+			void SetPtrPropertyCGRect (nint p1, nint p2, nint p3, nint p4, ref global::CoreGraphics.CGRect p5, nint p6)
+			{
+				Assert.AreEqual ((nint) 1, p1, "1");
+				Assert.AreEqual ((nint) 2, p2, "2");
+				Assert.AreEqual ((nint) 3, p3, "3");
+				Assert.AreEqual ((nint) 4, p4, "4");
+				Assert.AreEqual (new CGRect (1, 2, 3, 4), p5, "5a");
+				Assert.AreEqual ((nint) 6, p6, "6");
+
+				p5 = new CGRect (5, 6, 7, 8);
+			}
 		}
 
 		class RefOutParametersSubclass : BI1064.RefOutParameters {

tests/test-libraries/libtest.h

@@ -197,6 +197,8 @@ typedef unsigned int (^RegistrarTestBlock) (unsigned int magic);
 		obj6: (byref NSObject **) obj6P
 		obj7: (oneway NSObject **) obj7P
 		;
+
+	-(void) setPtrPropertyCGRect: (void *) p1 p2:(void *)p2 p3:(void *)p3 p4:(void *)p4 p5:(CGRect*)p5 p6:(void *)p6;
 @end
 
 // We need this class so that the ObjCProtocolTest protocol