aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@adacore.com>2014-01-30 07:37:08 +0400
committerJoel Brobecker <brobecker@adacore.com>2014-02-26 11:04:12 -0800
commit1b588015839caafc608a6944a78aea170f5fb2f6 (patch)
treec70dbe69d571d253d677f29aa732c69b7a298466 /gdb
parentdbb9c2b1f231262ece36790241fe1fc3902cf03d (diff)
downloadgdb-1b588015839caafc608a6944a78aea170f5fb2f6.zip
gdb-1b588015839caafc608a6944a78aea170f5fb2f6.tar.gz
gdb-1b588015839caafc608a6944a78aea170f5fb2f6.tar.bz2
[Python] Make regexp collection printers work with typedefs as well.
Consider the following type for which we would like to provide a pretty-printer and manage it via RegexpCollectionPrettyPrinter: typedef long time_t; Currently, this does not work because this framework only considers the type's tag name: typename = gdb.types.get_basic_type(val.type).tag if not typename: return None This patch extends it to use the type's name if the basic type does not have a tag name, thus allowing the framework to also work with typedefs like the above. gdb/ChangeLog: * python/lib/gdb/printing.py (RegexpCollectionPrettyPrinter): Use the type's name if its basic type does not have a tag. gdb/testsuite/ChangeLog: * testsuite/gdb.python/py-pp-re-notag.c: New file. * testsuite/gdb.python/py-pp-re-notag.ex: New file. * testsuite/gdb.python/py-pp-re-notag.p: New file.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/python/lib/gdb/printing.py2
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.python/py-pp-re-notag.c33
-rw-r--r--gdb/testsuite/gdb.python/py-pp-re-notag.exp39
-rw-r--r--gdb/testsuite/gdb.python/py-pp-re-notag.py36
6 files changed, 121 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 49d8113..026d0a9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2014-02-27 Joel Brobecker <brobecker@adacore.com>
+ * python/lib/gdb/printing.py (RegexpCollectionPrettyPrinter):
+ Use the type's name if its basic type does not have a tag.
+
+2014-02-27 Joel Brobecker <brobecker@adacore.com>
+
* dwarf2read.c (read_subrange_type): Add comment.
2014-02-27 Joel Brobecker <brobecker@adacore.com>
diff --git a/gdb/python/lib/gdb/printing.py b/gdb/python/lib/gdb/printing.py
index 80227c8..2940b93 100644
--- a/gdb/python/lib/gdb/printing.py
+++ b/gdb/python/lib/gdb/printing.py
@@ -200,6 +200,8 @@ class RegexpCollectionPrettyPrinter(PrettyPrinter):
# Get the type name.
typename = gdb.types.get_basic_type(val.type).tag
if not typename:
+ typename = val.type.name
+ if not typename:
return None
# Iterate over table of type regexps to determine
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b14257f..1a45048 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2014-02-26 Joel Brobecker <brobecker@adacore.com>
+ * testsuite/gdb.python/py-pp-re-notag.c: New file.
+ * testsuite/gdb.python/py-pp-re-notag.ex: New file.
+ * testsuite/gdb.python/py-pp-re-notag.p: New file.
+
+2014-02-26 Joel Brobecker <brobecker@adacore.com>
+
* gdb.dwarf2/arr-subrange.c, gdb.dwarf2/arr-subrange.exp: New files.
2014-02-26 Joel Brobecker <brobecker@adacore.com>
diff --git a/gdb/testsuite/gdb.python/py-pp-re-notag.c b/gdb/testsuite/gdb.python/py-pp-re-notag.c
new file mode 100644
index 0000000..a5fe8c3
--- /dev/null
+++ b/gdb/testsuite/gdb.python/py-pp-re-notag.c
@@ -0,0 +1,33 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2013-2014 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+typedef long time_t;
+
+static void
+tick_tock (time_t *t)
+{
+ *t++;
+}
+
+int
+main (void)
+{
+ time_t current_time = 1384395743;
+
+ tick_tock (&current_time);
+ return 0;
+}
diff --git a/gdb/testsuite/gdb.python/py-pp-re-notag.exp b/gdb/testsuite/gdb.python/py-pp-re-notag.exp
new file mode 100644
index 0000000..8149bde
--- /dev/null
+++ b/gdb/testsuite/gdb.python/py-pp-re-notag.exp
@@ -0,0 +1,39 @@
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+standard_testfile
+
+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
+ return -1
+}
+
+# Skip all tests if Python scripting is not enabled.
+if { [skip_python_tests] } { continue }
+
+if ![runto tick_tock] {
+ return -1
+}
+
+set remote_python_file [gdb_remote_download host \
+ ${srcdir}/${subdir}/${testfile}.py]
+
+gdb_test_no_output "source ${remote_python_file}" \
+ "source ${testfile}.py"
+
+gdb_test "print *t" " = Thu Nov 14 02:22:23 2013 \\(1384395743\\)"
+
+gdb_test "print /r *t" "= 1384395743"
+
+remote_file host delete ${remote_python_file}
diff --git a/gdb/testsuite/gdb.python/py-pp-re-notag.py b/gdb/testsuite/gdb.python/py-pp-re-notag.py
new file mode 100644
index 0000000..0aa0c32
--- /dev/null
+++ b/gdb/testsuite/gdb.python/py-pp-re-notag.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from time import asctime, gmtime
+import gdb # silence pyflakes
+
+
+class TimePrinter:
+ def __init__(self, val):
+ self.val = val
+
+ def to_string(self):
+ secs = int(self.val)
+ return "%s (%d)" % (asctime(gmtime(secs)), secs)
+
+
+def build_pretty_printer():
+ pp = gdb.printing.RegexpCollectionPrettyPrinter("pp-notag")
+ pp.add_printer('time_t', 'time_t', TimePrinter)
+ return pp
+
+
+my_pretty_printer = build_pretty_printer()
+gdb.printing.register_pretty_printer(gdb, my_pretty_printer)