From 11081198f1cca4499b966bb023db9f1c6be38843 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Wed, 27 Jul 2011 17:41:21 +0000 Subject: [PATCH] gdb/ * typeprint.c (_initialize_typeprint): Extend the help of "whatis" and "ptype" by their typedefs difference. gdb/testsuite/ * gdb.base/help.exp (help whatis): Update the expected string. --- gdb/ChangeLog | 5 +++++ gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/help.exp | 2 +- gdb/typeprint.c | 6 ++++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b302e1cd259..71f21af10aa 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2011-07-27 Jan Kratochvil + + * typeprint.c (_initialize_typeprint): Extend the help of "whatis" and + "ptype" by their typedefs difference. + 2011-07-27 Jan Kratochvil * dwarf2expr.c (ctx_no_read_reg): New function. diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 16ab82efb33..cfcc0ff01e0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-07-27 Jan Kratochvil + + * gdb.base/help.exp (help whatis): Update the expected string. + 2011-07-27 Jan Kratochvil * gdb.dwarf2/dw2-simple-locdesc.S: New file. diff --git a/gdb/testsuite/gdb.base/help.exp b/gdb/testsuite/gdb.base/help.exp index 0219c7604e0..3d59edf4ef9 100644 --- a/gdb/testsuite/gdb.base/help.exp +++ b/gdb/testsuite/gdb.base/help.exp @@ -685,7 +685,7 @@ test_class_help "user-defined" { # test help watch gdb_test "help watch" "Set a watchpoint for an expression\.\[\r\n\]+Usage: watch .-l.-location. EXPRESSION\[\r\n\]+A watchpoint stops execution of your program whenever the value of\[\r\n\]+an expression changes\.\[\r\n\]+If -l or -location is given, this evaluates EXPRESSION and watches\[\r\n\]+the memory to which it refers\." "help watch" # test help whatis -gdb_test "help whatis" "Print data type of expression EXP\." "help whatis" +gdb_test "help whatis" "Print data type of expression EXP\.\r\nOnly one level .*" "help whatis" # test help where gdb_test "help where" "Print backtrace of all stack frames, or innermost COUNT frames\.\[\r\n\]+With a negative argument, print outermost -COUNT frames\.\[\r\n\]+Use of the 'full' qualifier also prints the values of the local variables\." "help where" # test help x diff --git a/gdb/typeprint.c b/gdb/typeprint.c index 03e633241c3..cf4158da9c0 100644 --- a/gdb/typeprint.c +++ b/gdb/typeprint.c @@ -316,8 +316,10 @@ _initialize_typeprint (void) Print definition of type TYPE.\n\ Argument may be a type name defined by typedef, or \"struct STRUCT-TAG\"\n\ or \"class CLASS-NAME\" or \"union UNION-TAG\" or \"enum ENUM-TAG\".\n\ -The selected stack frame's lexical context is used to look up the name.")); +The selected stack frame's lexical context is used to look up the name.\n\ +Contrary to \"whatis\", \"ptype\" always unrolls any typedefs.")); add_com ("whatis", class_vars, whatis_command, - _("Print data type of expression EXP.")); + _("Print data type of expression EXP.\n\ +Only one level of typedefs is unrolled. See also \"ptype\".")); } -- 2.30.2