Fix unqualified integral const in default arguments for CastXML

CastXML, prior to XML output versin 1.137, didn't modify integral
constant names used in default arguments for functions, it simply used
the same text present in the source file. This causes compilation
failures in bindings generated by pyplusplus in case of code such as the
following:

	struct st
	{
		static int const DEFAULT = 0;
		void fun(int arg=DEFAULT);
	};

In this case, CastXML produced `DEFAULT` as the default value while
GCCXML qualifies the name and sets the default value to `st::DEFAULT`.

Consequently, pyplusplus refers to the default value as `DEFAULT`, which
fails compilation because the name needs to be fully qualified as
`st::DEFAULT`. This fix produces the desired qualified output from
pygccxml with both GCCXML and CastXML.

As of XML output version 1.137, CastXML now produces fully qualified
names for default arguments.

Change-Id: Ie22ae5e7e058743efcd986a44797005be8e9c891

Cherry-picked from the develop branch

Author: praetorian20

pygccxml/parser/patcher.py

@@ -3,6 +3,7 @@
 # Distributed under the Boost Software License, Version 1.0.
 # See http://www.boost.org/LICENSE_1_0.txt
 
+import re
 from pygccxml import utils
 from pygccxml import declarations
 
@@ -106,6 +107,27 @@ def __fix_invalid_integral(self, func, arg):
                                        arg.default_value))
             else:
                 parent = parent.parent
+
+        # check if we have an unqualified integral constant
+        # only do patching in cases where we have a bare variable name
+        c_var = re.compile("[a-z_][a-z0-9_]*", re.IGNORECASE)
+        m = c_var.match(arg.default_value)
+        if m:
+            parent = func.parent
+            while parent:
+                try:
+                    found = parent.variable(arg.default_value,
+                                            recursive=False)
+                except declarations.matcher.declaration_not_found_t:
+                    # ignore exceptions if a match is not found
+                    found = None
+                if found:
+                    if declarations.is_fundamental(arg.type):
+                        return "%s" % self.__join_names(
+                                        found.parent.decl_string,
+                                        arg.default_value)
+                parent = parent.parent
+
         return arg.default_value
 
     def __find_enum(self, scope, default_value):

unittests/data/patcher.hpp

@@ -62,6 +62,20 @@ namespace osg{
 
 }
 
+namespace ns1{
+
+static int const DEFAULT_1 = 0;
+struct st1{
+    static long const DEFAULT_2 = 10;
+    void fun1( int arg1=DEFAULT_1, long=DEFAULT_2 );
+};
+
+}
+
+static int const DEFAULT_1 = 20;
+int fun2( int arg1=DEFAULT_1, int arg2=ns1::DEFAULT_1, long arg3=::ns1::st1::DEFAULT_2 );
+
+
 /*struct default_arg_t{};*/
 /*default_arg_t create_default_argument();*/
 /*void double_call( default_arg_t x=create_default_argument() );*/

unittests/patcher_tester.py

@@ -70,6 +70,60 @@ def test_numeric_patcher(self):
                 self.assertEqual(
                     fix_numeric.arguments[0].default_value, "0ffffffff")
 
+    def test_unqualified_integral_patcher(self):
+        if 32 != self.architecture and "CastXML" not in utils.xml_generator:
+            # For this check to be removed, patcher_tester_64bit.xml
+            # will need to be updated for GCCXML
+            return
+
+        ns1 = self.global_ns.namespace("ns1")
+        st1 = ns1.class_("st1")
+        fun1 = st1.member_function("fun1")
+        if "CastXML" in utils.xml_generator:
+            if utils.xml_output_version >= 1.137:
+                val1 = "ns1::DEFAULT_1"
+                val2 = "ns1::st1::DEFAULT_2"
+            else:
+                val1 = "::ns1::DEFAULT_1"
+                val2 = "::ns1::st1::DEFAULT_2"
+            self.assertEqual(
+                fun1.arguments[0].default_value, val1)
+            self.assertEqual(
+                fun1.arguments[1].default_value, val2)
+        else:
+            self.assertEqual(
+                fun1.arguments[0].default_value,
+                "ns1::DEFAULT_1")
+            self.assertEqual(
+                fun1.arguments[1].default_value,
+                "ns1::st1::DEFAULT_2")
+
+        fun2 = self.global_ns.free_fun("fun2")
+        self.assertEqual(
+            fun2.arguments[0].default_value,
+            "::DEFAULT_1")
+        if "CastXML" in utils.xml_generator:
+            if utils.xml_output_version >= 1.137:
+                val1 = "ns1::DEFAULT_1"
+                val2 = "ns1::st1::DEFAULT_2"
+            else:
+                # Before XML output version 1.137, the following two
+                # were unpatched and were identical to the text in
+                # matcher.hpp
+                val1 = "ns1::DEFAULT_1"
+                val2 = "::ns1::st1::DEFAULT_2"
+            self.assertEqual(
+                fun2.arguments[1].default_value, val1)
+            self.assertEqual(
+                fun2.arguments[2].default_value, val2)
+        else:
+            self.assertEqual(
+                fun2.arguments[1].default_value,
+                "ns1::DEFAULT_1")
+            self.assertEqual(
+                fun2.arguments[2].default_value,
+                "ns1::st1::DEFAULT_2")
+
     def test_unnamed_enum_patcher(self):
         fix_unnamed = self.global_ns.free_fun("fix_unnamed")
         if ("CastXML" in utils.xml_generator and