Fix attribute handling for pointer declarators

Author: retif

pycparserext/ext_c_parser.py

@@ -429,24 +429,30 @@ def p_xxx_declarator_2(self, p):
             decl = p[3]
 
         if asm_label or attr_decl.exprs:
-            if isinstance(decl, (c_ast.ArrayDecl, c_ast.FuncDecl)):
-                decl_ext = to_decl_ext(decl.type)
-
-            elif isinstance(decl, c_ast.TypeDecl):
-                decl_ext = to_decl_ext(decl)
-
-            else:
-                raise NotImplementedError(
-                    "cannot attach asm or attributes to nodes of type '%s'"
-                    % type(p[1]))
+            innermost_decl = decl
+            while not isinstance(innermost_decl, c_ast.TypeDecl):
+                try:
+                    innermost_decl = innermost_decl.type
+                except AttributeError:
+                    raise NotImplementedError(
+                            "cannot attach asm or attributes to "
+                            "nodes of type '%s'"
+                            % type(innermost_decl))
+
+            decl_ext = to_decl_ext(innermost_decl)
 
             if asm_label:
                 decl_ext.asm = asm_label
-
             if attr_decl.exprs:
                 decl_ext.attributes = attr_decl
 
-            p[1] = decl_ext
+            if innermost_decl is decl:
+                decl = decl_ext
+            else:
+                parent = decl
+                while parent.type is not innermost_decl:
+                    parent = parent.type
+                parent.type = decl_ext
 
         p[0] = self._type_modify_decl(decl, p[1])
 
@@ -557,6 +563,14 @@ def p_gnu_unary_expression(self, p):
             p[2] if len(p) == 3 else p[3],
             self._token_coord(p, 1))
 
+    def p_gnu_unary_expression(self, p):
+        """ unary_expression : __ALIGNOF__ LPAREN type_name RPAREN
+        """
+        p[0] = c_ast.UnaryOp(
+            p[1],
+            p[2] if len(p) == 3 else p[3],
+            self._token_coord(p, 1))
+
     def p_statement(self, p):
         """ statement   : labeled_statement
                         | expression_statement

test/test_pycparserext.py

@@ -649,6 +649,12 @@ def test_typedef():
     assert gen == "int"
 
 
+def test_pointer_to_function_with_attribute():
+    # https://github.com/inducer/pycparserext/issues/66
+    src = "void (*f)(void) __attribute__((unused));"
+    assert _round_trip_matches(src)
+
+
 if __name__ == "__main__":
     import sys
     if len(sys.argv) > 1: