Adapt patched output to CastXML cvs_revision 1.137

CastXML's output for default arguments for function parameters was
modified in response to CastXML/CastXML#51. The tool now generates fully
qualified names in default arguments, so we need to check the
`cvs_revision` attribute in the XML output to differentiate between the
different output formats.

Change-Id: I18ee4d2319dd879e8b9a2d40bf6bee2d3ec1224e

Cherry-picked from the develop branch

Author: praetorian20

pygccxml/parser/scanner.py

@@ -633,6 +633,7 @@ def __read_version(self, attrs):
             # compatibility.
             logger.debug('CASTXML version - None ( %s )', version_str)
             utils.xml_generator = declarations.xml_generators.CASTXML_None
+        utils.xml_output_version = version
 
     def __update_unnamed_class(self, decl, attrs):
         """

pygccxml/utils/__init__.py

@@ -20,3 +20,4 @@
 
 # Version of xml generator which was used.
 xml_generator = None
+xml_output_version = None

unittests/patcher_tester.py

@@ -60,34 +60,47 @@ def test_numeric_patcher(self):
                     fix_numeric.arguments[0].default_value, val)
         else:
             if "CastXML" in utils.xml_generator:
+                if utils.xml_output_version >= 1.137:
+                    val = "(unsigned long long)-1"
+                else:
+                    val = "(ull)-1"
                 self.assertEqual(
-                    fix_numeric.arguments[0].default_value, "(ull)-1")
+                    fix_numeric.arguments[0].default_value, val)
             else:
                 self.assertEqual(
                     fix_numeric.arguments[0].default_value, "0ffffffff")
 
     def test_unnamed_enum_patcher(self):
         fix_unnamed = self.global_ns.free_fun("fix_unnamed")
+        if ("CastXML" in utils.xml_generator and
+                utils.xml_output_version >= 1.137):
+            val = "fx::unnamed"
+        else:
+            val = "int(::fx::unnamed)"
         self.assertEqual(
-            fix_unnamed.arguments[0].default_value, "int(::fx::unnamed)")
+            fix_unnamed.arguments[0].default_value, val)
 
     def test_function_call_patcher(self):
         fix_function_call = self.global_ns.free_fun("fix_function_call")
         default_val = fix_function_call.arguments[0].default_value
         if "CastXML" in utils.xml_generator:
-            # Most clean output, no need to patch
-            val = "calc(1, 2, 3)"
-            self.assertEqual(default_val, val)
+            if utils.xml_output_version >= 1.137:
+                val = "function_call::calc(1, 2, 3)"
+            else:
+                val = "calc(1, 2, 3)"
         elif "0.9" in utils.xml_generator:
             val = "function_call::calc(1, 2, 3)"
-            self.assertEqual(default_val, val)
         else:
             val = "function_call::calc( 1, 2, 3 )"
-            self.assertEqual(default_val, val)
+        self.assertEqual(default_val, val)
 
     def test_fundamental_patcher(self):
         fcall = self.global_ns.free_fun("fix_fundamental")
-        val = "(unsigned int)(::fundamental::eggs)"
+        if ("CastXML" in utils.xml_generator and
+                utils.xml_output_version >= 1.137):
+            val = "fundamental::spam::eggs"
+        else:
+            val = "(unsigned int)(::fundamental::eggs)"
         self.assertEqual(
             fcall.arguments[0].default_value, val)