Merge pull request #138 from dgarnier/fix_anon_unions

anonymous structs and unions fix

Author: trolldbois

ctypeslib/codegen/cursorhandler.py

@@ -985,8 +985,11 @@ def FIELD_DECL(self, cursor):
         # Note: cursor.is_anonymous seems to be unreliable/inconsistent across
         # libclang versions, and we will consider the field as anonymous if
         # cursor.spelling is empty
+        # but at least with clang-17.. anonymous fields have a name "type (anonymous at ..)"
         name = cursor.spelling
         offset = parent.type.get_offset(name)
+        if "(anonymous" in name:
+            name = ""
         if not name and cursor.is_anonymous() and not cursor.is_bitfield():
             # anonymous type, that is not a bitfield field case:
             offset = cursor.get_field_offsetof()

ctypeslib/codegen/handler.py

@@ -1,6 +1,6 @@
 """Abstract Handler with helper methods."""
 
-from clang.cindex import CursorKind, TypeKind
+from clang.cindex import CursorKind, TypeKind, Cursor
 
 from ctypeslib.codegen import typedesc
 from ctypeslib.codegen.util import log_entity
@@ -127,13 +127,21 @@ def _make_unknown_name(self, cursor, field_name):
 
     def get_unique_name(self, cursor, field_name=None):
         """get the spelling or create a unique name for a cursor"""
+        # this gets called for both cursors and types!
+        # so cursor.kind can be a CursorKind or a TypeKind
         if cursor.kind in [CursorKind.UNEXPOSED_DECL]:
             return ''
         # covers most cases
         name = cursor.spelling
         if cursor.kind == CursorKind.CXX_BASE_SPECIFIER:
             name = cursor.type.spelling
         # if it's a record decl or field decl and its type is anonymous
+        # clang > 16 changes anonymous names to have a parenthetical name
+        # so force it to have blank name like it did in earlier clang versions
+        # only cursors, not types have .is_anonymous()
+        if (isinstance(cursor.kind, CursorKind) and
+                cursor.is_anonymous() and '(' in name):
+            name = ''
         if name == '':
             # if cursor.is_anonymous():
             # a unnamed object at the root TU

ctypeslib/codegen/util.py

@@ -114,7 +114,7 @@ def log_entity(func):
     def fn(*args, **kwargs):
         name = args[0].get_unique_name(args[1])
         if name == '':
-            parent = args[1].semantic_parent
+            parent = getattr(args[1], 'semantic_parent', None)
             if parent:
                 name = 'child of %s' % parent.displayname
         log.debug("%s: displayname:'%s'",func.__name__, name)