gccxml / pygccxml / 453

pending completion

Build # 453

Build Type

Pull #54

travis-ci

Committed by

praetorian20

Commit Message

<a href="https://github.com/gccxml/pygccxml/commit/a5602a222">Fix patching of enums in default arguments for C++03

Given the following code

    namespace ns
    {
        enum color {red, green, blue};
        void test( color arg=blue );
    }

CastXML produces a fully qualified name for the default argument -
`::ns::color::blue`.

While this default argument string is valid for C++11 and later, and
indeed required if `color` were a scoped enumeration, the default
argument is invalid for C++03 code.

Prior to C++11, enumerator names were added to the enclosing scope, so
they could not be qualified using the enum-name. Hence, for C++03, the
default argument needs to be patched to say `::ns::blue`.

Change-Id: I</a><a class="double-link" href="https://github.com/gccxml/pygccxml/commit/72c5d4fc5">72c5d4fc5</a>

Pull Request Pull Request #54: Fix patching of enums in default arguments for C++03

Run Details

76 of 76 new or added lines in 5 files covered. (100.0%)

8176 of 10191 relevant lines covered (80.23%)

4.81 hits per line

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

94.74

/unittests/test_copy_constructor.py

# Copyright 2014-2016 Insight Software Consortium.
# 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
from pygccxml import utils


class tester_t(parser_test_case.parser_test_case_t):

    def __init__(self, *args):
        parser_test_case.parser_test_case_t.__init__(self, *args)
        self.header = "test_copy_constructor.hpp"

    def setUp(self):
        decls = parser.parse([self.header], self.config)
        self.global_ns = declarations.get_global_namespace(decls)

    def test(self):
        """
        Check the is_copy_constructor method.

        This fails when using CastXML, see issue #27.

        """

        tclass = self.global_ns.class_("test")
        ctors = []
        for decl in tclass.declarations:
            if isinstance(decl, declarations.calldef.constructor_t):
                ctors.append(decl)

        # test::test(test const & t0) [copy constructor]
        self.assertTrue(ctors[0].is_copy_constructor)
        # test::test(float const & t0) [constructor]
        self.assertFalse(ctors[1].is_copy_constructor)
        # test::test(myvar t0) [constructor]
        self.assertFalse(ctors[2].is_copy_constructor)

        t2class = self.global_ns.class_("test2")
        ctors = []
        for decl in t2class.declarations:
            if isinstance(decl, declarations.calldef.constructor_t):
                ctors.append(decl)

        # GCCXML and CastXML return the constructors in a different order.
        # I hope this index inversion will cover the two cases. If different
        # compilers give other orders, we will need to find a nicer solution.
        if "CastXML" in utils.xml_generator:
            positions = [0, 1]
        elif "GCC" in utils.xml_generator:
            positions = [1, 0]

        # test2::test2() [constructor]
        self.assertFalse(ctors[positions[0]].is_copy_constructor)
        # test2::test2(test2 const & arg0) [copy constructor]
        self.assertTrue(ctors[positions[1]].is_copy_constructor)


def create_suite():
    suite = unittest.TestSuite()
    suite.addTest(unittest.makeSuite(tester_t))
    return suite


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

if __name__ == "__main__":
    run_suite()

1	# Copyright 2014-2016 Insight Software Consortium.
2	# Distributed under the Boost Software License, Version 1.0.
3	# See http://www.boost.org/LICENSE_1_0.txt
4
5	import unittest	6✔
6	import parser_test_case	6✔
7
8	from pygccxml import parser	6✔
9	from pygccxml import declarations	6✔
10	from pygccxml import utils	6✔
11
12
13	class tester_t(parser_test_case.parser_test_case_t):	6✔
14
15	def __init__(self, *args):	6✔
16	parser_test_case.parser_test_case_t.__init__(self, *args)	6✔
17	self.header = "test_copy_constructor.hpp"	6✔
18
19	def setUp(self):	6✔
20	decls = parser.parse([self.header], self.config)	6✔
21	self.global_ns = declarations.get_global_namespace(decls)	6✔
22
23	def test(self):	6✔
24	"""
25	Check the is_copy_constructor method.
26
27	This fails when using CastXML, see issue #27.
28
29	"""
30
31	tclass = self.global_ns.class_("test")	6✔
32	ctors = []	6✔
33	for decl in tclass.declarations:	6✔
34	if isinstance(decl, declarations.calldef.constructor_t):	6✔
35	ctors.append(decl)	6✔
36
37	# test::test(test const & t0) [copy constructor]
38	self.assertTrue(ctors[0].is_copy_constructor)	6✔
39	# test::test(float const & t0) [constructor]
40	self.assertFalse(ctors[1].is_copy_constructor)	6✔
41	# test::test(myvar t0) [constructor]
42	self.assertFalse(ctors[2].is_copy_constructor)	6✔
43
44	t2class = self.global_ns.class_("test2")	6✔
45	ctors = []	6✔
46	for decl in t2class.declarations:	6✔
47	if isinstance(decl, declarations.calldef.constructor_t):	6✔
48	ctors.append(decl)	6✔
49
50	# GCCXML and CastXML return the constructors in a different order.
51	# I hope this index inversion will cover the two cases. If different
52	# compilers give other orders, we will need to find a nicer solution.
53	if "CastXML" in utils.xml_generator:	6✔
54	positions = [0, 1]	×
55	elif "GCC" in utils.xml_generator:	6✔
56	positions = [1, 0]	6✔
57
58	# test2::test2() [constructor]
59	self.assertFalse(ctors[positions[0]].is_copy_constructor)	6✔
60	# test2::test2(test2 const & arg0) [copy constructor]
61	self.assertTrue(ctors[positions[1]].is_copy_constructor)	6✔
62
63
64	def create_suite():	6✔
65	suite = unittest.TestSuite()	6✔
66	suite.addTest(unittest.makeSuite(tester_t))	6✔
67	return suite	6✔
68
69
70	def run_suite():	6✔
71	unittest.TextTestRunner(verbosity=2).run(create_suite())	×
72
73	if __name__ == "__main__":
74	run_suite()

gccxml / pygccxml / 453

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