gccxml / pygccxml / 377

pending completion

Build # 377

Build Type

push

travis-ci

Committed by

iMichka

Commit Message

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: Ie22ae5e7e

Cherry-picked from the develop branch

Run Details

42 of 42 new or added lines in 2 files covered. (100.0%)

8101 of 10067 relevant lines covered (80.47%)

3.21 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

77.4

/unittests/patcher_tester.py

# Copyright 2014-2015 Insight Software Consortium.
# Copyright 2004-2008 Roman Yakovenko.
# Distributed under the Boost Software License, Version 1.0.
# See http://www.boost.org/LICENSE_1_0.txt

import os
import unittest
import platform
import autoconfig
import parser_test_case

from pygccxml import utils
from pygccxml import parser


class tester_impl_t(parser_test_case.parser_test_case_t):

    def __init__(self, architecture, *args):
        parser_test_case.parser_test_case_t.__init__(self, *args)
        self.architecture = architecture
        self.global_ns = None

    def test_enum_patcher(self):
        fix_enum = self.global_ns.free_fun("fix_enum")
        default_val = fix_enum.arguments[0].default_value
        self.assertEqual(default_val, "::ns1::ns2::apple")

        if 32 == self.architecture or "CastXML" in utils.xml_generator:
            fix_enum2 = self.global_ns.free_fun("fix_enum2")
            default_val = fix_enum2.arguments[0].default_value
            self.assertEqual(default_val, "::ns1::ns2::apple")

            ns1 = self.global_ns.namespace("ns1")
            ns2 = ns1.namespace("ns2")
            fix_enum2 = ns2.free_fun("fix_enum2")
            default_val = fix_enum2.arguments[0].default_value
            self.assertEqual(default_val, "::ns1::ns2::apple")

            fix_enum3 = self.global_ns.free_fun("fix_enum3")
            default_val = fix_enum3.arguments[0].default_value
            self.assertEqual(default_val, "::ns1::ns2::orange")

        # double_call = declarations.find_declaration(
        # decls, type=declarations.free_function_t, name='double_call' )

    def test_numeric_patcher(self):
        fix_numeric = self.global_ns.free_function("fix_numeric")
        if 32 == self.architecture:
            if "0.9" in utils.xml_generator:
                if platform.machine() == "x86_64":
                    self.assertEqual(
                        fix_numeric.arguments[0].default_value, "-1u")
                else:
                    val = "0xffffffffffffffffu"
                    self.assertEqual(
                        fix_numeric.arguments[0].default_value, val)
            else:
                val = "0xffffffffffffffff"
                self.assertEqual(
                    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, val)
            else:
                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
                utils.xml_output_version >= 1.137):
            val = "fx::unnamed"
        else:
            val = "int(::fx::unnamed)"
        self.assertEqual(
            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:
            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)"
        else:
            val = "function_call::calc( 1, 2, 3 )"
        self.assertEqual(default_val, val)

    def test_fundamental_patcher(self):
        fcall = self.global_ns.free_fun("fix_fundamental")
        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)

    def test_constructor_patcher(self):
        typedef__func = self.global_ns.free_fun("typedef__func")
        default_val = typedef__func.arguments[0].default_value
        if "0.9" in utils.xml_generator:
            val = "typedef_::original_name()"
            self.assertEqual(default_val, val)
        elif "CastXML" in utils.xml_generator:
            # Most clean output, no need to patch
            val = "typedef_::alias()"
            self.assertEqual(default_val, val)
        else:
            val = "::typedef_::alias( )"
            self.assertEqual(default_val, val)
        if 32 == self.architecture:
            clone_tree = self.global_ns.free_fun("clone_tree")
            default_values = []
            if "0.9" in utils.xml_generator:
                default_values = []
            else:
                default_values = [
                    ("vector<std::basic_string<char, std::char_traits<char>," +
                        " std::allocator<char> >,std::allocator" +
                        "<std::basic_string<char, std::char_traits<char>, " +
                        "std::allocator<char> > > >()"),
                    ("vector<std::basic_string<char, std::char_traits<char>," +
                        "std::allocator<char> >,std::allocator" +
                        "<std::basic_string<char, std::char_traits<char>, " +
                        "std::allocator<char> > > >((&allocator" +
                        "<std::basic_string<char, std::char_traits<char>, " +
                        "std::allocator<char> > >()))")]
                self.assertIn(
                    clone_tree.arguments[0].default_value in default_values)


class tester_32_t(tester_impl_t):
    global_ns = None

    def __init__(self, *args):
        tester_impl_t.__init__(self, 32, *args)

    def setUp(self):
        if not tester_32_t.global_ns:
            reader = parser.source_reader_t(self.config)
            tester_32_t.global_ns = reader.read_file(
                "patcher.hpp")[0].top_parent
        self.global_ns = tester_32_t.global_ns


class tester_64_t(tester_impl_t):
    global_ns = None

    def __init__(self, *args):
        tester_impl_t.__init__(self, 64, *args)
        self.original_get_architecture = utils.get_architecture

    def setUp(self):
        self.original_get_architecture = utils.get_architecture
        utils.get_architecture = lambda: 64

        if not tester_64_t.global_ns:
            reader = parser.source_reader_t(self.config)
            if "castxml" not in self.config.xml_generator:
                tester_64_t.global_ns = reader.read_xml_file(
                    os.path.join(
                        autoconfig.data_directory,
                        "patcher_tester_64bit.xml"))[0].top_parent
            else:
                tester_64_t.global_ns = reader.read_file(
                    "patcher.hpp")[0].top_parent
        self.global_ns = tester_64_t.global_ns

    def tearDown(self):
        utils.get_architecture = self.original_get_architecture


def create_suite():
    suite = unittest.TestSuite()
    if "castxml" not in autoconfig.cxx_parsers_cfg.gccxml.xml_generator:
        suite.addTest(unittest.makeSuite(tester_32_t))
    suite.addTest(unittest.makeSuite(tester_64_t))
    return suite


def run_suite():
    unittest.TextTestRunner(verbosity=2).run(create_suite())

if __name__ == "__main__":
    run_suite()

1	# Copyright 2014-2015 Insight Software Consortium.
2	# Copyright 2004-2008 Roman Yakovenko.
3	# Distributed under the Boost Software License, Version 1.0.
4	# See http://www.boost.org/LICENSE_1_0.txt
5
6	import os	4✔
7	import unittest	4✔
8	import platform	4✔
9	import autoconfig	4✔
10	import parser_test_case	4✔
11
12	from pygccxml import utils	4✔
13	from pygccxml import parser	4✔
14
15
16	class tester_impl_t(parser_test_case.parser_test_case_t):	4✔
17
18	def __init__(self, architecture, *args):	4✔
19	parser_test_case.parser_test_case_t.__init__(self, *args)	4✔
20	self.architecture = architecture	4✔
21	self.global_ns = None	4✔
22
23	def test_enum_patcher(self):	4✔
24	fix_enum = self.global_ns.free_fun("fix_enum")	4✔
25	default_val = fix_enum.arguments[0].default_value	4✔
26	self.assertEqual(default_val, "::ns1::ns2::apple")	4✔
27
28	if 32 == self.architecture or "CastXML" in utils.xml_generator:	4✔
29	fix_enum2 = self.global_ns.free_fun("fix_enum2")	4✔
30	default_val = fix_enum2.arguments[0].default_value	4✔
31	self.assertEqual(default_val, "::ns1::ns2::apple")	4✔
32
33	ns1 = self.global_ns.namespace("ns1")	4✔
34	ns2 = ns1.namespace("ns2")	4✔
35	fix_enum2 = ns2.free_fun("fix_enum2")	4✔
36	default_val = fix_enum2.arguments[0].default_value	4✔
37	self.assertEqual(default_val, "::ns1::ns2::apple")	4✔
38
39	fix_enum3 = self.global_ns.free_fun("fix_enum3")	4✔
40	default_val = fix_enum3.arguments[0].default_value	4✔
41	self.assertEqual(default_val, "::ns1::ns2::orange")	4✔
42
43	# double_call = declarations.find_declaration(
44	# decls, type=declarations.free_function_t, name='double_call' )
45
46	def test_numeric_patcher(self):	4✔
47	fix_numeric = self.global_ns.free_function("fix_numeric")	4✔
48	if 32 == self.architecture:	4✔
49	if "0.9" in utils.xml_generator:	4✔
50	if platform.machine() == "x86_64":	4✔
51	self.assertEqual(	4✔
52	fix_numeric.arguments[0].default_value, "-1u")
53	else:
54	val = "0xffffffffffffffffu"	×
55	self.assertEqual(	×
56	fix_numeric.arguments[0].default_value, val)
57	else:
58	val = "0xffffffffffffffff"	×
59	self.assertEqual(	×
60	fix_numeric.arguments[0].default_value, val)
61	else:
62	if "CastXML" in utils.xml_generator:	4✔
63	if utils.xml_output_version >= 1.137:	×
64	val = "(unsigned long long)-1"	×
65	else:
66	val = "(ull)-1"	×
67	self.assertEqual(	×
68	fix_numeric.arguments[0].default_value, val)
69	else:
70	self.assertEqual(	4✔
71	fix_numeric.arguments[0].default_value, "0ffffffff")
72
73	def test_unqualified_integral_patcher(self):	4✔
74	if 32 != self.architecture and "CastXML" not in utils.xml_generator:	4✔
75	# For this check to be removed, patcher_tester_64bit.xml
76	# will need to be updated for GCCXML
77	return	4✔
78
79	ns1 = self.global_ns.namespace("ns1")	4✔
80	st1 = ns1.class_("st1")	4✔
81	fun1 = st1.member_function("fun1")	4✔
82	if "CastXML" in utils.xml_generator:	4✔
83	if utils.xml_output_version >= 1.137:	×
84	val1 = "ns1::DEFAULT_1"	×
85	val2 = "ns1::st1::DEFAULT_2"	×
86	else:
87	val1 = "::ns1::DEFAULT_1"	×
88	val2 = "::ns1::st1::DEFAULT_2"	×
89	self.assertEqual(	×
90	fun1.arguments[0].default_value, val1)
91	self.assertEqual(	×
92	fun1.arguments[1].default_value, val2)
93	else:
94	self.assertEqual(	4✔
95	fun1.arguments[0].default_value,
96	"ns1::DEFAULT_1")
97	self.assertEqual(	4✔
98	fun1.arguments[1].default_value,
99	"ns1::st1::DEFAULT_2")
100
101	fun2 = self.global_ns.free_fun("fun2")	4✔
102	self.assertEqual(	4✔
103	fun2.arguments[0].default_value,
104	"::DEFAULT_1")
105	if "CastXML" in utils.xml_generator:	4✔
106	if utils.xml_output_version >= 1.137:	×
107	val1 = "ns1::DEFAULT_1"	×
108	val2 = "ns1::st1::DEFAULT_2"	×
109	else:
110	# Before XML output version 1.137, the following two
111	# were unpatched and were identical to the text in
112	# matcher.hpp
113	val1 = "ns1::DEFAULT_1"	×
114	val2 = "::ns1::st1::DEFAULT_2"	×
115	self.assertEqual(	×
116	fun2.arguments[1].default_value, val1)
117	self.assertEqual(	×
118	fun2.arguments[2].default_value, val2)
119	else:
120	self.assertEqual(	4✔
121	fun2.arguments[1].default_value,
122	"ns1::DEFAULT_1")
123	self.assertEqual(	4✔
124	fun2.arguments[2].default_value,
125	"ns1::st1::DEFAULT_2")
126
127	def test_unnamed_enum_patcher(self):	4✔
128	fix_unnamed = self.global_ns.free_fun("fix_unnamed")	4✔
129	if ("CastXML" in utils.xml_generator and	4✔
130	utils.xml_output_version >= 1.137):
131	val = "fx::unnamed"	×
132	else:
133	val = "int(::fx::unnamed)"	4✔
134	self.assertEqual(	4✔
135	fix_unnamed.arguments[0].default_value, val)
136
137	def test_function_call_patcher(self):	4✔
138	fix_function_call = self.global_ns.free_fun("fix_function_call")	4✔
139	default_val = fix_function_call.arguments[0].default_value	4✔
140	if "CastXML" in utils.xml_generator:	4✔
141	if utils.xml_output_version >= 1.137:	×
142	val = "function_call::calc(1, 2, 3)"	×
143	else:
144	val = "calc(1, 2, 3)"	×
145	elif "0.9" in utils.xml_generator:	4✔
146	val = "function_call::calc(1, 2, 3)"	4✔
147	else:
148	val = "function_call::calc( 1, 2, 3 )"	4✔
149	self.assertEqual(default_val, val)	4✔
150
151	def test_fundamental_patcher(self):	4✔
152	fcall = self.global_ns.free_fun("fix_fundamental")	4✔
153	if ("CastXML" in utils.xml_generator and	4✔
154	utils.xml_output_version >= 1.137):
155	val = "fundamental::spam::eggs"	×
156	else:
157	val = "(unsigned int)(::fundamental::eggs)"	4✔
158	self.assertEqual(	4✔
159	fcall.arguments[0].default_value, val)
160
161	def test_constructor_patcher(self):	4✔
162	typedef__func = self.global_ns.free_fun("typedef__func")	4✔
163	default_val = typedef__func.arguments[0].default_value	4✔
164	if "0.9" in utils.xml_generator:	4✔
165	val = "typedef_::original_name()"	4✔
166	self.assertEqual(default_val, val)	4✔
167	elif "CastXML" in utils.xml_generator:	4✔
168	# Most clean output, no need to patch
169	val = "typedef_::alias()"	×
170	self.assertEqual(default_val, val)	×
171	else:
172	val = "::typedef_::alias( )"	4✔
173	self.assertEqual(default_val, val)	4✔
174	if 32 == self.architecture:	4✔
175	clone_tree = self.global_ns.free_fun("clone_tree")	4✔
176	default_values = []	4✔
177	if "0.9" in utils.xml_generator:	4✔
178	default_values = []	4✔
179	else:
180	default_values = [	×
181	("vector<std::basic_string<char, std::char_traits<char>," +
182	" std::allocator<char> >,std::allocator" +
183	"<std::basic_string<char, std::char_traits<char>, " +
184	"std::allocator<char> > > >()"),
185	("vector<std::basic_string<char, std::char_traits<char>," +
186	"std::allocator<char> >,std::allocator" +
187	"<std::basic_string<char, std::char_traits<char>, " +
188	"std::allocator<char> > > >((&allocator" +
189	"<std::basic_string<char, std::char_traits<char>, " +
190	"std::allocator<char> > >()))")]
191	self.assertIn(	×
192	clone_tree.arguments[0].default_value in default_values)
193
194
195	class tester_32_t(tester_impl_t):	4✔
196	global_ns = None	4✔
197
198	def __init__(self, *args):	4✔
199	tester_impl_t.__init__(self, 32, *args)	4✔
200
201	def setUp(self):	4✔
202	if not tester_32_t.global_ns:	4✔
203	reader = parser.source_reader_t(self.config)	4✔
204	tester_32_t.global_ns = reader.read_file(	4✔
205	"patcher.hpp")[0].top_parent
206	self.global_ns = tester_32_t.global_ns	4✔
207
208
209	class tester_64_t(tester_impl_t):	4✔
210	global_ns = None	4✔
211
212	def __init__(self, *args):	4✔
213	tester_impl_t.__init__(self, 64, *args)	4✔
214	self.original_get_architecture = utils.get_architecture	4✔
215
216	def setUp(self):	4✔
217	self.original_get_architecture = utils.get_architecture	4✔
218	utils.get_architecture = lambda: 64	4✔
219
220	if not tester_64_t.global_ns:	4✔
221	reader = parser.source_reader_t(self.config)	4✔
222	if "castxml" not in self.config.xml_generator:	4✔
223	tester_64_t.global_ns = reader.read_xml_file(	4✔
224	os.path.join(
225	autoconfig.data_directory,
226	"patcher_tester_64bit.xml"))[0].top_parent
227	else:
228	tester_64_t.global_ns = reader.read_file(	×
229	"patcher.hpp")[0].top_parent
230	self.global_ns = tester_64_t.global_ns	4✔
231
232	def tearDown(self):	4✔
233	utils.get_architecture = self.original_get_architecture	4✔
234
235
236	def create_suite():	4✔
237	suite = unittest.TestSuite()	4✔
238	if "castxml" not in autoconfig.cxx_parsers_cfg.gccxml.xml_generator:	4✔
239	suite.addTest(unittest.makeSuite(tester_32_t))	4✔
240	suite.addTest(unittest.makeSuite(tester_64_t))	4✔
241	return suite	4✔
242
243
244	def run_suite():	4✔
245	unittest.TextTestRunner(verbosity=2).run(create_suite())	×
246
247	if __name__ == "__main__":
248	run_suite()

gccxml / pygccxml / 377

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous