fix: handle typeless objc struct field edge case

blacktop · Jun 22, 2024 · e65521a · e65521a
1 parent 7eb5830
commit e65521a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/types/objc/type_encoding.go b/types/objc/type_encoding.go
@@ -455,8 +455,13 @@ func decodeStructOrUnion(typ, kind string) string {
 		// necessary to disambiguate {"x0"@"x1"c}.
 		if fieldName != "" && rest != "" && strings.HasSuffix(field, `"`) && !strings.HasPrefix(rest, `"`) {
 			penultQuoteIdx := strings.LastIndex(strings.TrimRight(field, `"`), `"`)
-			rest = field[penultQuoteIdx:] + rest
-			field = field[:penultQuoteIdx]
+			if penultQuoteIdx == -1 {
+				rest = field + rest
+				field = "id"
+			} else {
+				rest = field[penultQuoteIdx:] + rest
+				field = field[:penultQuoteIdx]
+			}
 		}
 
 		if fieldName == "" {

diff --git a/types/objc/type_encoding_test.go b/types/objc/type_encoding_test.go
@@ -88,6 +88,13 @@ func Test_decodeType(t *testing.T) {
 			},
 			want: "struct __cfobservers_t { id slot; struct __cfobservers_t *next; }",
 		},
+		{
+			name: "Test struct 5",
+			args: args{
+				encType: "{_UISmallVector<unsigned short, 16UL>=\"_vector\"\"_size\"Q}",
+			},
+			want: "struct _UISmallVector<unsigned short, 16UL> { id _vector; unsigned long long _size; }",
+		},
 		{
 			name: "Test union 0",
 			args: args{