Merge pull request #41 from praetorian20/typedef_unnamed_struct

Fix for typedef'd unnamed class/struct

Author: iMichka

pygccxml/declarations/__init__.py

@@ -18,6 +18,7 @@
 from .scopedef import scopedef_t
 from .enumeration import enumeration_t
 from .namespace import namespace_t
+from .typedef import typedef_t
 
 from .class_declaration import class_t
 from .class_declaration import CLASS_TYPES

pygccxml/parser/scanner.py

@@ -221,6 +221,8 @@ def startElement(self, name, attrs):
                     self.__read_location(obj, attrs)
                 if isinstance(obj, declarations.class_t):
                     self.__read_bases(obj, attrs)
+                if isinstance(obj, declarations.typedef_t):
+                    self.__update_unnamed_class(obj, attrs)
                 self.__read_artificial(obj, attrs)
                 self.__read_mangled(obj, attrs)
                 self.__read_demangled(obj, attrs)
@@ -628,3 +630,36 @@ def __read_version(self, attrs):
             # compatibility.
             logger.debug('CASTXML version - None ( %s )', version_str)
             utils.xml_generator = declarations.xml_generators.CASTXML_None
+
+    def __update_unnamed_class(self, decl, attrs):
+        """
+        Called for typedef declarations. If CastXML is being used, then type
+        definitions with an unnamed class/struct are split across two nodes in
+        the XML tree. For example,
+
+            typedef struct {} cls;
+
+        produces
+
+            <Struct id="_7" name="" context="_1" .../>
+            <Typedef id="_8" name="cls" type="_7" context="_1" .../>
+
+        So we'll walk the list of read declarations and try to update an
+        unnamed class/struct with matching attributes
+        """
+        if 'CastXML' not in utils.xml_generator:
+            return
+
+        parent = attrs.get(XML_AN_CONTEXT)
+        if not parent:
+            return
+        if parent not in self.__members:
+            return
+        type_ = attrs.get(XML_AN_TYPE)
+        if not type_ or type_ not in self.__declarations:
+            return
+
+        referent = self.__declarations[type_]
+        if referent.name or not isinstance(referent, declarations.class_t):
+            return
+        referent.name = decl.name

unittests/data/classes.hpp

@@ -7,10 +7,16 @@
 #define __classes_hpp__
 
 struct cls{};
+typedef struct {} cls2;
+typedef class {
+   int i;
+} cls3;
 
 namespace ns{
 
     struct nested_cls{};
+    typedef class {} nested_cls2;
+    typedef struct nested_cls3 {} nested_cls3;
 
 }
 

unittests/declaration_matcher_tester.py

@@ -8,6 +8,7 @@
 
 from pygccxml import parser
 from pygccxml import declarations
+from pygccxml import utils
 
 
 class tester_t(parser_test_case.parser_test_case_t):
@@ -31,6 +32,19 @@ def test_global(self):
         gns.class_('cls')
         gns.class_('::cls')
 
+    def test_typedefs(self):
+        gns = self.global_ns
+        gns.class_('cls2')
+        if self.config.xml_generator == "castxml":
+            gns.typedef('cls2')
+        gns.class_('::cls2')
+
+        gns.class_('cls3')
+        if self.config.xml_generator == "castxml":
+            gns.typedef('cls3')
+        cls3 = gns.class_('::cls3')
+        cls3.variable('i')
+
     def test_ns1(self):
         gns = self.global_ns
         ns1 = gns.namespace('ns')
@@ -43,6 +57,14 @@ def test_ns1(self):
         ns1.class_('nested_cls')
         ns1.class_('::ns::nested_cls')
 
+        gns.class_('nested_cls2')
+        self.assertRaises(Exception, lambda: gns.class_('ns::nested_cls2'))
+        gns.class_('::ns::nested_cls2')
+
+        gns.class_('nested_cls3')
+        self.assertRaises(Exception, lambda: gns.class_('ns::nested_cls3'))
+        gns.class_('::ns::nested_cls3')
+
 
 def create_suite():
     suite = unittest.TestSuite()