Improve parsing of function reference

cpp/ast.py

@@ -1061,11 +1061,10 @@ def _get_method(self, return_type_and_name, modifiers, templated_types,
         # Handle pointer to functions that are really data but look
         # like method declarations.
         if token.name == '(':
-            if parameters[0].name == '*':
+            if parameters[0].name in '*&':
                 # name contains the return type.
+                return_type.append(name)
                 name = parameters.pop()
-                # parameters contains the name of the data.
-                modifiers = [p.name for p in parameters]
                 # Already at the ( to open the parameter list.
                 function_parameters = list(self._get_matching_char('(', ')'))
                 del function_parameters[-1]  # Remove trailing ')'.
@@ -1075,8 +1074,9 @@ def _get_method(self, return_type_and_name, modifiers, templated_types,
                 assert_parse(token.token_type == tokenize.SYNTAX, token)
                 assert_parse(token.name == ';', token)
 
+                types = [t.name for t in return_type]
                 return self._create_variable(indices, name.name, indices.name,
-                                             modifiers, '')
+                                             [], types)
             # At this point, we got something like:
             #  return_type (type::*name_)(params);
             # This is a data member called name_ that is a function pointer.

test_ast.py

@@ -644,6 +644,12 @@ def test_variable_initialization_with_complex_expression(self):
                                              initial_value='fct()+42'),
                          nodes[0])
 
+    def test_variable_function_reference(self):
+        nodes = list(MakeBuilder('int* (&fn)();').generate())
+        self.assertEqual(1, len(nodes), repr(nodes))
+        self.assertEqual(VariableDeclaration('fn', Type('int', pointer=True)),
+                         nodes[0])
+
     def test_variable_anonymous_class(self):
         nodes = list(MakeBuilder('class {public:} a;').generate())
         self.assertEqual(1, len(nodes), repr(nodes))