[Parser] Improve parsing of types with structural generics

Author: leptos-null

ClassDump.xcodeproj/project.pbxproj

@@ -455,7 +455,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -521,7 +521,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;

ClassDump/Services/CDTypeParser.m

@@ -538,24 +538,60 @@ + (CDRecordType *)recordTypeForEncodingStart:(const char *const)start end:(const
     CDRecordType *record = [CDRecordType new];
     record.isUnion = isUnion;
 
-    size_t nameOffset = 1;
-    while (start[nameOffset] != '=' && start[nameOffset] != '}') {
-        nameOffset++;
+    const char *chr = start;
+    
+    unsigned openTokens = 1;
+    while (1) {
+        const char token = *++chr;
+        
+        if (isStruct) {
+            switch (token) {
+                case '{':
+                    openTokens++;
+                    break;
+                case '}':
+                    openTokens--;
+                    break;
+                default:
+                    break;
+            }
+        }
+        
+        if (isUnion) {
+            switch (token) {
+                case '(':
+                    openTokens++;
+                    break;
+                case ')':
+                    openTokens--;
+                    break;
+                default:
+                    break;
+            }
+        }
+        
+        if (openTokens == 0) {
+            break; // we've reached the end - we're done
+        }
+        if (openTokens == 1 && token == '=') {
+            break; // we hit the name indicator for the current "scope"
+        }
     }
-    nameOffset++;
+    // we've already read this token, move over
+    chr++;
 
     // anonymous indicator
-    if (nameOffset != 3 && start[1] != '?') {
-        record.name = [[NSString alloc] initWithBytes:(start + 1) length:(nameOffset - 2) encoding:NSUTF8StringEncoding];
+    if (chr != (start + 3) && start[1] != '?') {
+        record.name = [[NSString alloc] initWithBytes:(start + 1) length:((chr - start) - 2) encoding:NSUTF8StringEncoding];
     }
     // no content, usually caused by multiple levels of indirection
-    if (nameOffset == (end - start)) {
+    if (chr == end) {
         return record;
     }
 
     NSMutableArray<CDVariableModel *> *fields = [NSMutableArray array];
 
-    for (const char *chr = start + nameOffset; chr < endToken;) {
+    while (chr < endToken) {
         CDVariableModel *variableModel = [CDVariableModel new];
 
         if (*chr == '"') {

ClassDumpTests/CDParseCppTests.mm

@@ -35,6 +35,17 @@ @implementation CDParseCppTests
     };
 }
 
+
+struct MatrixDimensions {
+    unsigned width, height;
+};
+
+template<MatrixDimensions Dimensions>
+class MatrixFixedPoint {
+    short storage[Dimensions.height][Dimensions.width];
+};
+
+
 - (void)testClass {
     CDParseType *type = [CDTypeParser typeForEncoding:@encode(SuperUser)];
     XCTAssert([[type stringForVariableName:@"var"] isEqualToString:@"struct SuperUser { "
@@ -59,4 +70,11 @@ - (void)testNamespace {
                "} var"]);
 }
 
+- (void)testStructuralGenerics {
+    CDParseType *type = [CDTypeParser typeForEncoding:@encode(MatrixFixedPoint<MatrixDimensions { 32, 8 }>)];
+    XCTAssert([[type stringForVariableName:@"var"] isEqualToString:@"struct MatrixFixedPoint<MatrixDimensions{32, 8}> { "
+               "short x0[8][32]; "
+               "} var"]);
+}
+
 @end

Package.swift

@@ -28,5 +28,6 @@ let package = Package(
             dependencies: ["ClassDumpRuntime"],
             path: "ClassDumpTests"
         ),
-    ]
+    ],
+    cxxLanguageStandard: .cxx20
 )