Remove * from decl_string when type is a function pointer #61

This does not change the type of the declaration, just the value of the decl_string attribute.

Author: iMichka

docs/examples/function-pointer/example.py

@@ -29,22 +29,26 @@
 decls = parser.parse([filename], xml_generator_config)
 global_namespace = declarations.get_global_namespace(decls)
 
-function = global_namespace.variables()[0]
+function_ptr = global_namespace.variables()[0]
 
 # Print the name of the function pointer
-print(function.name)
+print(function_ptr.name)
 # > myFuncPointer
 
-# Print the type of the declaration (it's just a pointer)
-print(type(function.decl_type))
+# Print the type of the declaration
+print(function_ptr.decl_type)
+# > void (*)( int,double )
+
+# Print the real type of the declaration (it's just a pointer)
+print(type(function_ptr.decl_type))
 # > <class 'pygccxml.declarations.cpptypes.pointer_t'>
 
 # Check if this is a function pointer
-print(declarations.is_calldef_pointer(function.decl_type))
+print(declarations.is_calldef_pointer(function_ptr.decl_type))
 # > True
 
 # Remove the pointer part, to access the function's type
-f_type = declarations.remove_pointer(function.decl_type)
+f_type = declarations.remove_pointer(function_ptr.decl_type)
 
 # Print the type
 print(type(f_type))

pygccxml/declarations/cpptypes.py

@@ -574,7 +574,12 @@ def __init__(self, base):
         compound_t.__init__(self, base)
 
     def build_decl_string(self, with_defaults=True):
-        return self.base.build_decl_string(with_defaults) + ' *'
+        decl_string = self.base.build_decl_string(with_defaults)
+        if isinstance(self.base, calldef_type_t):
+            # This is a function pointer. Do not add supplementary *
+            return decl_string
+        else:
+            return decl_string + " *"
 
     def _clone_impl(self):
         return pointer_t(self.base.clone())

unittests/test_function_pointer.py

@@ -33,7 +33,7 @@ def test_function_pointer(self):
         self.assertTrue(
             isinstance(variables[0].decl_type, declarations.pointer_t))
         self.assertTrue(
-            str(variables[0].decl_type) == "void (*)( int,double ) *")
+            str(variables[0].decl_type) == "void (*)( int,double )")
         self.assertTrue(
             declarations.is_calldef_pointer(variables[0].decl_type))
         self.assertTrue(