From 86397ed17c9629fdaf8e1757aad3fd3f49683aeb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Wed, 1 Nov 2017 17:52:05 +0000 Subject: [PATCH] printers.py (StdExpAnyPrinter.__init__): Strip typename versioned namespace before the substitution. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2017-11-01 François Dumont * python/libstdcxx/v6/printers.py (StdExpAnyPrinter.__init__): Strip typename versioned namespace before the substitution. (StdExpOptionalPrinter.__init__): Likewise. (StdVariantPrinter.__init__): Likewise. (Printer.add_version): Inject versioned namespace after std or __gnu_cxx. (build_libstdcxx_dictionary): Adapt add_version usages, always pass namespace first and symbol second. From-SVN: r254320 --- libstdc++-v3/ChangeLog | 11 ++++++++ libstdc++-v3/python/libstdcxx/v6/printers.py | 29 ++++++++++---------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9805e4ba664..3ca18b2f401 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2017-11-01 François Dumont + + * python/libstdcxx/v6/printers.py (StdExpAnyPrinter.__init__): Strip + typename versioned namespace before the substitution. + (StdExpOptionalPrinter.__init__): Likewise. + (StdVariantPrinter.__init__): Likewise. + (Printer.add_version): Inject versioned namespace after std or + __gnu_cxx. + (build_libstdcxx_dictionary): Adapt add_version usages, always pass + namespace first and symbol second. + 2017-11-01 Jonathan Wakely PR libstdc++/82777 diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 9d2119632ba..a0f5ede682c 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -973,8 +973,8 @@ class StdExpAnyPrinter(SingleObjContainerPrinter): "Print a std::any or std::experimental::any" def __init__ (self, typename, val): - self.typename = re.sub('^std::experimental::fundamentals_v\d::', 'std::experimental::', typename, 1) - self.typename = strip_versioned_namespace(self.typename) + self.typename = strip_versioned_namespace(typename) + self.typename = re.sub('^std::experimental::fundamentals_v\d::', 'std::experimental::', self.typename, 1) self.val = val self.contained_type = None contained_value = None @@ -1021,8 +1021,8 @@ class StdExpOptionalPrinter(SingleObjContainerPrinter): def __init__ (self, typename, val): valtype = self._recognize (val.type.template_argument(0)) - self.typename = re.sub('^std::(experimental::|)(fundamentals_v\d::|)(.*)', r'std::\1\3<%s>' % valtype, typename, 1) - self.typename = strip_versioned_namespace(self.typename) + self.typename = strip_versioned_namespace(typename) + self.typename = re.sub('^std::(experimental::|)(fundamentals_v\d::|)(.*)', r'std::\1\3<%s>' % valtype, self.typename, 1) if not self.typename.startswith('std::experimental'): val = val['_M_payload'] self.val = val @@ -1043,8 +1043,8 @@ class StdVariantPrinter(SingleObjContainerPrinter): def __init__(self, typename, val): alternatives = self._template_args(val) - self.typename = "%s<%s>" % (typename, ', '.join([self._recognize(alt) for alt in alternatives])) - self.typename = strip_versioned_namespace(self.typename) + self.typename = strip_versioned_namespace(typename) + self.typename = "%s<%s>" % (self.typename, ', '.join([self._recognize(alt) for alt in alternatives])) self.index = val['_M_index'] if self.index >= len(alternatives): self.contained_type = None @@ -1227,7 +1227,8 @@ class Printer(object): def add_version(self, base, name, function): self.add(base + name, function) if _versioned_namespace: - self.add(base + _versioned_namespace + name, function) + vbase = re.sub('^(std|__gnu_cxx)::', r'\g<0>%s' % _versioned_namespace, base) + self.add(vbase + name, function) # Add a name using _GLIBCXX_BEGIN_NAMESPACE_CONTAINER. def add_container(self, base, name, function): @@ -1507,7 +1508,7 @@ def build_libstdcxx_dictionary (): # In order from: # http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/a01847.html libstdcxx_printer.add_version('std::', 'basic_string', StdStringPrinter) - libstdcxx_printer.add_version('std::', '__cxx11::basic_string', StdStringPrinter) + libstdcxx_printer.add_version('std::__cxx11::', 'basic_string', StdStringPrinter) libstdcxx_printer.add_container('std::', 'bitset', StdBitsetPrinter) libstdcxx_printer.add_container('std::', 'deque', StdDequePrinter) libstdcxx_printer.add_container('std::', 'list', StdListPrinter) @@ -1555,15 +1556,15 @@ def build_libstdcxx_dictionary (): libstdcxx_printer.add_container('std::', 'forward_list', StdForwardListPrinter) - libstdcxx_printer.add_version('std::', 'tr1::shared_ptr', SharedPointerPrinter) - libstdcxx_printer.add_version('std::', 'tr1::weak_ptr', SharedPointerPrinter) - libstdcxx_printer.add_version('std::', 'tr1::unordered_map', + libstdcxx_printer.add_version('std::tr1::', 'shared_ptr', SharedPointerPrinter) + libstdcxx_printer.add_version('std::tr1::', 'weak_ptr', SharedPointerPrinter) + libstdcxx_printer.add_version('std::tr1::', 'unordered_map', Tr1UnorderedMapPrinter) - libstdcxx_printer.add_version('std::', 'tr1::unordered_set', + libstdcxx_printer.add_version('std::tr1::', 'unordered_set', Tr1UnorderedSetPrinter) - libstdcxx_printer.add_version('std::', 'tr1::unordered_multimap', + libstdcxx_printer.add_version('std::tr1::', 'unordered_multimap', Tr1UnorderedMapPrinter) - libstdcxx_printer.add_version('std::', 'tr1::unordered_multiset', + libstdcxx_printer.add_version('std::tr1::', 'unordered_multiset', Tr1UnorderedSetPrinter) # These are the C++11 printer registrations for -D_GLIBCXX_DEBUG cases. -- 2.30.2