From: tromey Date: Wed, 10 Jun 2009 22:59:01 +0000 (+0000) Subject: * python/libstdcxx/v6/printers.py (lookup_function): Remove extra X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=14413906ab70d1ddca99af38771a14c9420f10ff;p=pf3gnuchains%2Fgcc-fork.git * python/libstdcxx/v6/printers.py (lookup_function): Remove extra ';'. (build_libstdcxx_dictionary): Accept shortened form of basic_string names. (StdStringPrinter.to_string): Remove reference to WideEncoding. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148358 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 642fff10c98..b07378d10c1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2009-06-10 Tom Tromey + * python/libstdcxx/v6/printers.py (lookup_function): Remove extra + ';'. + (build_libstdcxx_dictionary): Accept shortened form of + basic_string names. + (StdStringPrinter.to_string): Remove reference to WideEncoding. + +2009-06-10 Tom Tromey + PR libstdc++/40289: * python/Makefile.in: Rebuild. * python/hook.in: Compute module path relative to objfile. diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 7b22e8a0bdc..4dddd8f60f9 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -452,8 +452,6 @@ class StdStringPrinter: encoding = gdb.parameter('target-charset') elif encoding == 1: encoding = gdb.parameter('target-wide-charset') - elif isinstance(encoding, WideEncoding): - encoding = encoding.value return self.val['_M_dataplus']['_M_p'].string(encoding) def display_hint (self): @@ -559,7 +557,7 @@ def lookup_function (val): "Look-up and return a pretty-printer that can print val." # Get the type. - type = val.type; + type = val.type # If it points to a reference, get the reference. if type.code == gdb.TYPE_CODE_REF: @@ -587,10 +585,10 @@ def build_libstdcxx_dictionary (): # libstdc++ objects requiring pretty-printing. # In order from: # http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/a01847.html - pretty_printers_dict[re.compile('^std::basic_string$')] = lambda val: StdStringPrinter(0, val) - pretty_printers_dict[re.compile('^std::basic_string$')] = lambda val: StdStringPrinter(1, val) - pretty_printers_dict[re.compile('^std::basic_string$')] = lambda val: StdStringPrinter('UTF-16', val) - pretty_printers_dict[re.compile('^std::basic_string$')] = lambda val: StdStringPrinter('UTF-32', val) + pretty_printers_dict[re.compile('^std::basic_string$')] = lambda val: StdStringPrinter(0, val) + pretty_printers_dict[re.compile('^std::basic_string$')] = lambda val: StdStringPrinter(1, val) + pretty_printers_dict[re.compile('^std::basic_string$')] = lambda val: StdStringPrinter('UTF-16', val) + pretty_printers_dict[re.compile('^std::basic_string$')] = lambda val: StdStringPrinter('UTF-32', val) pretty_printers_dict[re.compile('^std::bitset<.*>$')] = StdBitsetPrinter pretty_printers_dict[re.compile('^std::deque<.*>$')] = StdDequePrinter pretty_printers_dict[re.compile('^std::list<.*>$')] = StdListPrinter