gdb

	PR gdb/2489:
	* completer.c (count_struct_fields): Count method names.
	(add_struct_fields): Add matching method names.
gdb/testsuite
	* gdb.cp/Makefile.in (EXECUTABLES): Add pr2489.
	* gdb.cp/pr2489.cc: New file.
	* gdb.cp/cpcompletion.exp: New file.

6 files changed, 164 insertions, 5 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2740f36..79e532b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-02  Tom Tromey  <tromey@redhat.com>
+
+	PR gdb/2489:
+	* completer.c (count_struct_fields): Count method names.
+	(add_struct_fields): Add matching method names.
+
 2009-02-02  Doug Evans  <dje@google.com>
 
 	* configure.ac (gdbkt): Check both no_tcl/no_tk first, before
diff --git a/gdb/completer.c b/gdb/completer.c
index b1b0cf3..5d7225f 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -339,7 +339,7 @@ location_completer (char *text, char *word)
 }
 
 /* Helper for expression_completer which recursively counts the number
-   of named fields in a structure or union type.  */
+   of named fields and methods in a structure or union type.  */
 static int
 count_struct_fields (struct type *type)
 {
@@ -353,17 +353,25 @@ count_struct_fields (struct type *type)
       else if (TYPE_FIELD_NAME (type, i))
 	++result;
     }
+
+  for (i = TYPE_NFN_FIELDS (type) - 1; i >= 0; --i)
+    {
+      if (TYPE_FN_FIELDLIST_NAME (type, i))
+	++result;
+    }
+
   return result;
 }
 
-/* Helper for expression_completer which recursively adds field names
-   from TYPE, a struct or union type, to the array OUTPUT.  This
-   function assumes that OUTPUT is correctly-sized.  */
+/* Helper for expression_completer which recursively adds field and
+   method names from TYPE, a struct or union type, to the array
+   OUTPUT.  This function assumes that OUTPUT is correctly-sized.  */
 static void
 add_struct_fields (struct type *type, int *nextp, char **output,
 		   char *fieldname, int namelen)
 {
   int i;
+  char *type_name = NULL;
 
   CHECK_TYPEDEF (type);
   for (i = 0; i < TYPE_NFIELDS (type); ++i)
@@ -378,6 +386,22 @@ add_struct_fields (struct type *type, int *nextp, char **output,
 	  ++*nextp;
 	}
     }
+
+  for (i = TYPE_NFN_FIELDS (type) - 1; i >= 0; --i)
+    {
+      char *name = TYPE_FN_FIELDLIST_NAME (type, i);
+      if (name && ! strncmp (name, fieldname, namelen))
+	{
+	  if (!type_name)
+	    type_name = type_name_no_tag (type);
+	  /* Omit constructors from the completion list.  */
+	  if (strcmp (type_name, name))
+	    {
+	      output[*nextp] = xstrdup (name);
+	      ++*nextp;
+	    }
+	}
+    }
 }
 
 /* Complete on expressions.  Often this means completing on symbol
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 55f2d0e..aca5b5e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2009-02-02  Tom Tromey  <tromey@redhat.com>
 
+	* gdb.cp/Makefile.in (EXECUTABLES): Add pr2489.
+	* gdb.cp/pr2489.cc: New file.
+	* gdb.cp/cpcompletion.exp: New file.
+
+2009-02-02  Tom Tromey  <tromey@redhat.com>
+
 	PR exp/9059:
 	* gdb.cp/call-c.exp: Add regression test.
 	* gdb.cp/call-c.cc (FooHandle): New typedef.
diff --git a/gdb/testsuite/gdb.cp/Makefile.in b/gdb/testsuite/gdb.cp/Makefile.in
index f4a989c..9239d70 100644
--- a/gdb/testsuite/gdb.cp/Makefile.in
+++ b/gdb/testsuite/gdb.cp/Makefile.in
@@ -4,7 +4,7 @@ srcdir = @srcdir@
 EXECUTABLES = ambiguous annota2 anon-union cplusfuncs cttiadd \
 	derivation inherit local member-ptr method misc \
         overload ovldbreak ref-typ ref-typ2 templates userdef virtfunc namespace \
-	ref-types ref-params method2
+	ref-types ref-params method2 pr2489
 
 all info install-info dvi install uninstall installcheck check:
 	@echo "Nothing to be done for $@..."
diff --git a/gdb/testsuite/gdb.cp/cpcompletion.exp b/gdb/testsuite/gdb.cp/cpcompletion.exp
new file mode 100644
index 0000000..2f715ad
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/cpcompletion.exp
@@ -0,0 +1,72 @@
+# Copyright 2009 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/>.
+
+# This file is part of the gdb testsuite.
+
+if $tracelevel then {
+	strace $tracelevel
+}
+
+if { [skip_cplus_tests] } { continue }
+
+set testfile pr2489
+set binfile ${objdir}/${subdir}/${testfile}
+
+if {[gdb_compile "${srcdir}/${subdir}/${testfile}.cc" "${testfile}.o" object {c++ debug}] != ""} {
+    untested cpcompletion.exp
+    return -1
+}
+
+if {[gdb_compile "${testfile}.o" ${binfile} executable {c++ debug}] != "" } {
+     untested cpcompletion.exp
+     return -1
+}
+
+gdb_exit
+
+# Don't let a .inputrc file or an existing setting of INPUTRC mess up
+# the test results.  Even if /dev/null doesn't exist on the particular
+# platform, the readline library will use the default setting just by
+# failing to open the file.  OTOH, opening /dev/null successfully will
+# also result in the default settings being used since nothing will be
+# read from this file.
+global env
+if [info exists env(INPUTRC)] {
+    set old_inputrc $env(INPUTRC)
+}
+set env(INPUTRC) "/dev/null"
+
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+set bp_location [gdb_get_line_number "Set breakpoint here" ${testfile}.cc]
+
+if {![runto $bp_location]} {
+    perror "test suppressed"
+}
+
+# This also tests inheritance -- completion should only see a single
+# "get_foo".
+gdb_test "complete p foo1.g" "p foo1\\.get_foo"
+
+# Test inheritance without overriding.
+gdb_test "complete p foo1.base" "p foo1\\.base_function_only"
+
+# Test non-completion of constructor names.
+gdb_test "complete p foo1.Fo" "p foo1\\.Foofoo"
+
+# Test completion with an anonymous struct.
+gdb_test "complete p a.g" "p a\\.get"
diff --git a/gdb/testsuite/gdb.cp/pr2489.cc b/gdb/testsuite/gdb.cp/pr2489.cc
new file mode 100644
index 0000000..bb7e1d6
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/pr2489.cc
@@ -0,0 +1,51 @@
+
+class Base
+{
+public:
+  virtual int get_foo () { return 1; }
+  int base_function_only () { return 2; }
+};
+
+class Foo : public Base
+{
+
+private:
+  int foo_value;
+
+public:
+  Foo () { foo_value = 0;}
+  Foo (int i) { foo_value = i;}
+  ~Foo () { }
+  void set_foo (int value);
+  int get_foo ();
+
+  // Something similar to a constructor name.
+  void Foofoo ();
+
+  bool operator== (const Foo &other) { return foo_value == other.foo_value; }
+};
+ 
+void Foo::set_foo (int value)
+{
+  foo_value = value;
+}
+
+int Foo::get_foo ()
+{
+  return foo_value;
+}
+
+void Foo::Foofoo ()
+{
+}
+
+int main ()
+{
+  // Anonymous struct with method.
+  struct {
+    int get() { return 5; }
+  } a;
+  Foo foo1;
+  foo1.set_foo (42);		// Set breakpoint here.
+  return 0;
+}