* typeprint.c (_initialize_typeprint): Set completer

	for "whatis" and "ptype".
testsuite
	* gdb.base/completion.exp: Add tests for ptype and whatis
	completion.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b4e6afb..eda155b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-07  Tom Tromey  <tromey@redhat.com>
+
+       * typeprint.c (_initialize_typeprint): Set completer
+       for "whatis" and "ptype".
+
 2012-12-07  Joel Brobecker  <brobecker@adacore.com>
 
        * copyright.py (NOT_FSF_LIST): Remove duplicate entry

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2cc6d25..0bdd094 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-07  Tom Tromey  <tromey@redhat.com>
+
+       * gdb.base/completion.exp: Add tests for ptype and whatis
+       completion.
+
 2012-12-07  Joel Brobecker  <brobecker@adacore.com>
 
        * gdb.base/stale-infcall.exp: Fix copyright line.

diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index 80f7032..c8edc98 100644 (file)
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -555,6 +555,14 @@ gdb_test "complete p &values\[0\]->z" \
     "p &values.0.->z_field" \
     "completion of field in anonymous union"
 
+gdb_test "complete ptype &values\[0\]->z" \
+    "ptype &values.0.->z_field" \
+    "ptype completion of field in anonymous union"
+
+gdb_test "complete whatis &values\[0\]->z" \
+    "whatis &values.0.->z_field" \
+    "whatis completion of field in anonymous union"
+
 # The following tests used to simply try to complete `${objdir}/file',
 # and so on.  The problem is that ${objdir} can be very long; the
 # completed filename may be more than eighty characters wide.  When

diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index cf3ba38..53cc9eb 100644 (file)
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -39,6 +39,7 @@
 #include <ctype.h>
 #include "cli/cli-utils.h"
 #include "python/python.h"
+#include "completer.h"
 
 extern void _initialize_typeprint (void);
 
@@ -680,7 +681,9 @@ show_print_type_typedefs (struct ui_file *file, int from_tty,
 void
 _initialize_typeprint (void)
 {
-  add_com ("ptype", class_vars, ptype_command, _("\
+  struct cmd_list_element *c;
+
+  c = add_com ("ptype", class_vars, ptype_command, _("\
 Print definition of type TYPE.\n\
 Usage: ptype[/FLAGS] TYPE-NAME | EXPRESSION\n\
 Argument may be a type name defined by typedef, or \"struct STRUCT-TAG\"\n\
@@ -694,10 +697,12 @@ Available FLAGS are:\n\
   /M    print methods defined in a class\n\
   /t    do not print typedefs defined in a class\n\
   /T    print typedefs defined in a class"));
+  set_cmd_completer (c, expression_completer);
 
-  add_com ("whatis", class_vars, whatis_command,
-          _("Print data type of expression EXP.\n\
+  c = add_com ("whatis", class_vars, whatis_command,
+              _("Print data type of expression EXP.\n\
 Only one level of typedefs is unrolled.  See also \"ptype\"."));
+  set_cmd_completer (c, expression_completer);
 
   add_prefix_cmd ("type", no_class, show_print_type,
                  _("Generic command for showing type-printing settings."),