Committed to trunk.
commit dacf2aec1b84828e92a06431d725a6e80413b21d Author: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Fri Jul 18 15:56:00 2014 +0000
PR libstdc++/61835 * python/libstdcxx/v6/printers.py (TemplateTypePrinter): Use raw string. (SingleObjContainerPrinter): Check if type printers are in use. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212822 138bc75d-0d04-0410-961f-82ee72b054a4 diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index af41f1f..625396b 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -845,6 +845,9 @@ class SingleObjContainerPrinter(object): def _recognize(self, type): """Return TYPE as a string after applying type printers""" + global _use_type_printing + if not _use_type_printing: + return str(type) return gdb.types.apply_type_recognizers(gdb.types.get_type_recognizers(), type) or str(type) @@ -1043,7 +1046,7 @@ class Printer(object): libstdcxx_printer = None class TemplateTypePrinter(object): - """A type printer for class templates. + r"""A type printer for class templates. Recognizes type names that match a regular expression. Replaces them with a formatted string which can use replacement field