git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

printers.py (lookup_function): Remove extra ';'. 

* 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.

From-SVN: r148358
This commit is contained in:
Tom Tromey 2009-06-10 22:59:01 +00:00 committed by Tom Tromey
parent 35204bbe76
commit 3af622115b
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2009-06-10 Tom Tromey <tromey@redhat.com>
* 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 <tromey@redhat.com> 2009-06-10 Tom Tromey <tromey@redhat.com>
PR libstdc++/40289: PR libstdc++/40289:

12
libstdc++-v3/python/libstdcxx/v6/printers.py
View File

@ -452,8 +452,6 @@ class StdStringPrinter:
encoding = gdb.parameter('target-charset') encoding = gdb.parameter('target-charset')
elif encoding == 1: elif encoding == 1:
encoding = gdb.parameter('target-wide-charset') encoding = gdb.parameter('target-wide-charset')
elif isinstance(encoding, WideEncoding):
encoding = encoding.value
return self.val['_M_dataplus']['_M_p'].string(encoding) return self.val['_M_dataplus']['_M_p'].string(encoding)
def display_hint (self): def display_hint (self):
@ -559,7 +557,7 @@ def lookup_function (val):
"Look-up and return a pretty-printer that can print val." "Look-up and return a pretty-printer that can print val."
# Get the type. # Get the type.
type = val.type; type = val.type
# If it points to a reference, get the reference. # If it points to a reference, get the reference.
if type.code == gdb.TYPE_CODE_REF: if type.code == gdb.TYPE_CODE_REF:
@ -587,10 +585,10 @@ def build_libstdcxx_dictionary ():
# libstdc++ objects requiring pretty-printing. # libstdc++ objects requiring pretty-printing.
# In order from: # In order from:
# http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/a01847.html # http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/a01847.html
pretty_printers_dict[re.compile('^std::basic_string<char,.*>$')] = lambda val: StdStringPrinter(0, val) pretty_printers_dict[re.compile('^std::basic_string<char(,.*)?>$')] = lambda val: StdStringPrinter(0, val)
pretty_printers_dict[re.compile('^std::basic_string<wchar_t,.*>$')] = lambda val: StdStringPrinter(1, val) pretty_printers_dict[re.compile('^std::basic_string<wchar_t(,.*)?>$')] = lambda val: StdStringPrinter(1, val)
pretty_printers_dict[re.compile('^std::basic_string<char16_t,.*>$')] = lambda val: StdStringPrinter('UTF-16', val) pretty_printers_dict[re.compile('^std::basic_string<char16_t(,.*)?>$')] = lambda val: StdStringPrinter('UTF-16', val)
pretty_printers_dict[re.compile('^std::basic_string<char32_t,.*>$')] = lambda val: StdStringPrinter('UTF-32', val) pretty_printers_dict[re.compile('^std::basic_string<char32_t(,.*)?>$')] = lambda val: StdStringPrinter('UTF-32', val)
pretty_printers_dict[re.compile('^std::bitset<.*>$')] = StdBitsetPrinter pretty_printers_dict[re.compile('^std::bitset<.*>$')] = StdBitsetPrinter
pretty_printers_dict[re.compile('^std::deque<.*>$')] = StdDequePrinter pretty_printers_dict[re.compile('^std::deque<.*>$')] = StdDequePrinter
pretty_printers_dict[re.compile('^std::list<.*>$')] = StdListPrinter pretty_printers_dict[re.compile('^std::list<.*>$')] = StdListPrinter