Fix bug in remove_pointer function when used on a function pointer (#61)

Author: iMichka

CHANGELOG.md

@@ -17,6 +17,9 @@ Version 1.8.0 (not yet released)
   specifically when containing parentheses:
   myClass<std::vector<char>(const std::string &, const std::string &)> obj;
 
+* When using the ```remove_pointer``` function on a function pointer, the
+  ```remove_pointer``` function now correctly returns a ```calldef_type_t```.
+
 * ```declarations.is_string```, ```declarations.is_std_wstring```,
   ```declarations.is_std_ostream``` and ```declarations.is_std_wostream``` now
   correctly work when a the type is also a reference.

pygccxml/declarations/type_traits.py

@@ -249,8 +249,6 @@ def remove_pointer(type_):
         return (
             cpptypes.volatile_t(cpptypes.const_t(nake_type.base.base.base))
         )
-    elif isinstance(nake_type.base, cpptypes.calldef_type_t):
-        return type_
     else:
         return nake_type.base
 

unittests/data/test_function_pointer.hpp

@@ -0,0 +1,12 @@
+// Copyright 2014-2016 Insight Software Consortium.
+// Copyright 2004-2009 Roman Yakovenko.
+// Distributed under the Boost Software License, Version 1.0.
+// See http://www.boost.org/LICENSE_1_0.txt
+
+// func1 is a function pointer
+// In this case, func1 is the declaration of a function which has two arguments
+// (on the right) and returns nothing (void on the left)
+void (*func1)(int, double);
+
+// Another pointer, but not a function pointer
+int const volatile* myPointer;

unittests/test_all.py

@@ -73,6 +73,7 @@
 import test_argument_without_name
 import test_smart_pointer
 import test_pattern_parser
+import test_function_pointer
 
 testers = [
     # , demangled_tester # failing right now
@@ -138,7 +139,8 @@
     test_map_gcc5,
     test_argument_without_name,
     test_smart_pointer,
-    test_pattern_parser
+    test_pattern_parser,
+    test_function_pointer
 ]
 
 if 'posix' in os.name:

unittests/test_function_pointer.py

@@ -0,0 +1,76 @@
+# Copyright 2014-2016 Insight Software Consortium.
+# Copyright 2004-2009 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+
+import unittest
+import parser_test_case
+
+from pygccxml import parser
+from pygccxml import declarations
+
+
+class Test(parser_test_case.parser_test_case_t):
+
+    def __init__(self, *args):
+        parser_test_case.parser_test_case_t.__init__(self, *args)
+        self.header = "test_function_pointer.hpp"
+
+    def test_function_pointer(self):
+        """
+        Test working with pointers and function pointers.
+
+        """
+
+        decls = parser.parse([self.header], self.config)
+        global_ns = declarations.get_global_namespace(decls)
+
+        # Test on a function pointer
+        criteria = declarations.variable_matcher(name="func1")
+        variables = declarations.matcher.find(criteria, global_ns)
+
+        self.assertTrue(variables[0].name == "func1")
+        self.assertTrue(
+            isinstance(variables[0].decl_type, declarations.pointer_t))
+        self.assertTrue(
+            str(variables[0].decl_type) == "void (*)( int,double ) *")
+        self.assertTrue(
+            declarations.is_calldef_pointer(variables[0].decl_type))
+        self.assertTrue(
+            isinstance(declarations.remove_pointer(variables[0].decl_type),
+                       declarations.free_function_type_t))
+
+        # Get the function (free_function_type_t) and test the return and
+        # argument types
+        function = variables[0].decl_type.base
+        self.assertTrue(isinstance(function.return_type, declarations.void_t))
+        self.assertTrue(
+            isinstance(function.arguments_types[0], declarations.int_t))
+        self.assertTrue(
+            isinstance(function.arguments_types[1], declarations.double_t))
+
+        # Test on a normal pointer
+        criteria = declarations.variable_matcher(name="myPointer")
+        variables = declarations.matcher.find(criteria, global_ns)
+
+        self.assertTrue(variables[0].name == "myPointer")
+        self.assertTrue(
+            isinstance(variables[0].decl_type, declarations.pointer_t))
+        self.assertFalse(
+            declarations.is_calldef_pointer(variables[0].decl_type))
+        self.assertTrue(
+            isinstance(declarations.remove_pointer(variables[0].decl_type),
+                       declarations.volatile_t))
+
+
+def create_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(Test))
+    return suite
+
+
+def run_suite():
+    unittest.TextTestRunner(verbosity=2).run(create_suite())
+
+if __name__ == "__main__":
+    run_suite()