This commit was manufactured by cvs2svn to create branchcagney_offbyone-20030303-branchpoint

'cagney_offbyone-20030303-branch'.

Sprout from interps-20030202-branch 2003-02-02 23:00:07 UTC nobody 'This commit was manufactured by cvs2svn to create branch'
Cherrypick from master 2003-03-03 20:50:20 UTC Andrew Cagney <cagney@redhat.com> '2003-03-03  Andrew Cagney  <cagney@redhat.com>':
    ChangeLog
    Makefile.def
    Makefile.in
    Makefile.tpl
    bfd/ChangeLog
    bfd/Makefile.am
    bfd/Makefile.in
    bfd/archures.c
    bfd/bfd-in.h
    bfd/bfd-in2.h
    bfd/bfd.c
    bfd/coff-h8300.c
    bfd/coff-ppc.c
    bfd/coffcode.h
    bfd/config.bfd
    bfd/cpu-arm.c
    bfd/doc/ChangeLog
    bfd/doc/bfd.texinfo
    bfd/doc/fdl.texi
    bfd/ecoff.c
    bfd/elf-bfd.h
    bfd/elf-eh-frame.c
    bfd/elf.c
    bfd/elf32-arm.h
    bfd/elf32-cris.c
    bfd/elf32-hppa.c
    bfd/elf32-i386.c
    bfd/elf32-m68k.c
    bfd/elf32-mips.c
    bfd/elf32-ppc.c
    bfd/elf32-ppc.h
    bfd/elf32-s390.c
    bfd/elf32-sh.c
    bfd/elf32-sparc.c
    bfd/elf32-vax.c
    bfd/elf64-alpha.c
    bfd/elf64-hppa.c
    bfd/elf64-mips.c
    bfd/elf64-mmix.c
    bfd/elf64-ppc.c
    bfd/elf64-ppc.h
    bfd/elf64-s390.c
    bfd/elf64-sparc.c
    bfd/elf64-x86-64.c
    bfd/elfcore.h
    bfd/elflink.c
    bfd/elflink.h
    bfd/elfn32-mips.c
    bfd/elfxx-ia64.c
    bfd/elfxx-mips.c
    bfd/format.c
    bfd/ieee.c
    bfd/libbfd.h
    bfd/libcoff.h
    bfd/mmo.c
    bfd/oasys.c
    bfd/po/da.po
    bfd/reloc.c
    bfd/section.c
    bfd/syms.c
    bfd/targets.c
    bfd/version.h
    config.guess
    config.sub
    configure
    configure.in
    gdb/ChangeLog
    gdb/MAINTAINERS
    gdb/Makefile.in
    gdb/NEWS
    gdb/PROBLEMS
    gdb/TODO
    gdb/acinclude.m4
    gdb/aclocal.m4
    gdb/ada-exp.y
    gdb/ada-lang.c
    gdb/ada-lang.h
    gdb/ada-typeprint.c
    gdb/alpha-tdep.c
    gdb/arch-utils.c
    gdb/arm-linux-tdep.c
    gdb/arm-tdep.c
    gdb/avr-tdep.c
    gdb/ax-gdb.c
    gdb/block.c
    gdb/block.h
    gdb/blockframe.c
    gdb/breakpoint.c
    gdb/breakpoint.h
    gdb/buildsym.c
    gdb/buildsym.h
    gdb/c-exp.y
    gdb/c-valprint.c
    gdb/cli-out.c
    gdb/cli-out.h
    gdb/cli/cli-cmds.c
    gdb/cli/cli-decode.c
    gdb/cli/cli-dump.c
    gdb/cli/cli-interp.c
    gdb/cli/cli-script.c
    gdb/cli/cli-setshow.c
    gdb/coff-pe-read.c
    gdb/coff-pe-read.h
    gdb/coffread.c
    gdb/config.in
    gdb/config/djgpp/fnchange.lst
    gdb/config/h8500/h8500.mt
    gdb/config/h8500/tm-h8500.h
    gdb/config/i386/nm-i386.h
    gdb/config/i386/nm-i386sco5.h
    gdb/config/i386/nm-i386sol2.h
    gdb/config/i386/tm-ptx.h
    gdb/config/ia64/tm-ia64.h
    gdb/config/m32r/m32r.mt
    gdb/config/m32r/tm-m32r.h
    gdb/config/mn10200/mn10200.mt
    gdb/config/mn10200/tm-mn10200.h
    gdb/config/pa/tm-hppa.h
    gdb/config/pa/tm-hppa64.h
    gdb/config/s390/nm-linux.h
    gdb/config/sparc/nm-sun4sol2.h
    gdb/config/sparc/tm-sp64.h
    gdb/config/sparc/tm-sparc.h
    gdb/config/z8k/tm-z8k.h
    gdb/config/z8k/z8k.mt
    gdb/configure
    gdb/configure.host
    gdb/configure.in
    gdb/configure.tgt
    gdb/cp-valprint.c
    gdb/cris-tdep.c
    gdb/d10v-tdep.c
    gdb/dbxread.c
    gdb/defs.h
    gdb/disasm.c
    gdb/doc/ChangeLog
    gdb/doc/Makefile.in
    gdb/doc/gdb.texinfo
    gdb/doc/gdbint.texinfo
    gdb/doublest.c
    gdb/dwarf2cfi.c
    gdb/dwarf2expr.c
    gdb/dwarf2expr.h
    gdb/dwarf2loc.c
    gdb/dwarf2loc.h
    gdb/dwarf2read.c
    gdb/dwarfread.c
    gdb/elfread.c
    gdb/event-top.c
    gdb/event-top.h
    gdb/expprint.c
    gdb/f-exp.y
    gdb/f-lang.c
    gdb/f-valprint.c
    gdb/findvar.c
    gdb/frame.c
    gdb/frame.h
    gdb/frv-tdep.c
    gdb/gdb.c
    gdb/gdb_mbuild.sh
    gdb/gdb_thread_db.h
    gdb/gdbarch.c
    gdb/gdbarch.h
    gdb/gdbarch.sh
    gdb/gdbtypes.c
    gdb/gdbtypes.h
    gdb/gnu-v2-abi.c
    gdb/h8300-tdep.c
    gdb/h8500-tdep.c
    gdb/hppa-tdep.c
    gdb/hpread.c
    gdb/hpux-thread.c
    gdb/i386-interix-tdep.c
    gdb/i386-linux-tdep.c
    gdb/i386-tdep.c
    gdb/i386bsd-tdep.c
    gdb/ia64-linux-nat.c
    gdb/ia64-tdep.c
    gdb/infcmd.c
    gdb/inflow.c
    gdb/inflow.h
    gdb/infptrace.c
    gdb/infrun.c
    gdb/inftarg.c
    gdb/infttrace.c
    gdb/interps.c
    gdb/interps.h
    gdb/jv-exp.y
    gdb/jv-lang.c
    gdb/jv-typeprint.c
    gdb/jv-valprint.c
    gdb/linespec.c
    gdb/linux-proc.c
    gdb/lynx-nat.c
    gdb/m2-exp.y
    gdb/m32r-rom.c
    gdb/m32r-stub.c
    gdb/m32r-tdep.c
    gdb/m68hc11-tdep.c
    gdb/m68k-tdep.c
    gdb/main.c
    gdb/main.h
    gdb/maint.c
    gdb/mcore-tdep.c
    gdb/mdebugread.c
    gdb/mi/ChangeLog
    gdb/mi/gdbmi.texinfo
    gdb/mi/mi-cmd-env.c
    gdb/mi/mi-cmd-stack.c
    gdb/mi/mi-cmds.c
    gdb/mi/mi-cmds.h
    gdb/mi/mi-console.c
    gdb/mi/mi-console.h
    gdb/mi/mi-interp.c
    gdb/mi/mi-main.c
    gdb/mi/mi-main.h
    gdb/minsyms.c
    gdb/mips-tdep.c
    gdb/mipsread.c
    gdb/mn10200-tdep.c
    gdb/mn10300-tdep.c
    gdb/monitor.c
    gdb/nlmread.c
    gdb/ns32k-tdep.c
    gdb/objc-exp.y
    gdb/objc-lang.c
    gdb/objc-lang.h
    gdb/objfiles.c
    gdb/objfiles.h
    gdb/observer.c
    gdb/observer.h
    gdb/osabi.c
    gdb/p-exp.y
    gdb/p-valprint.c
    gdb/parse.c
    gdb/parser-defs.h
    gdb/ppc-linux-nat.c
    gdb/ppc-linux-tdep.c
    gdb/printcmd.c
    gdb/proc-api.c
    gdb/procfs.c
    gdb/rdi-share/ardi.c
    gdb/regcache.c
    gdb/regcache.h
    gdb/remote-e7000.c
    gdb/remote-sim.c
    gdb/remote.c
    gdb/rs6000-tdep.c
    gdb/s390-tdep.c
    gdb/sh-tdep.c
    gdb/sol-thread.c
    gdb/solib-sunos.c
    gdb/solib.c
    gdb/solist.h
    gdb/somread.c
    gdb/somsolib.c
    gdb/sparc-nat.c
    gdb/sparc-tdep.c
    gdb/stabsread.c
    gdb/stack.c
    gdb/symfile.c
    gdb/symfile.h
    gdb/symm-nat.c
    gdb/symmisc.c
    gdb/symtab.c
    gdb/symtab.h
    gdb/target.c
    gdb/target.h
    gdb/testsuite/ChangeLog
    gdb/testsuite/Makefile.in
    gdb/testsuite/configure.in
    gdb/testsuite/gdb.base/advance.c
    gdb/testsuite/gdb.base/advance.exp
    gdb/testsuite/gdb.base/dump.exp
    gdb/testsuite/gdb.base/exprs.exp
    gdb/testsuite/gdb.base/funcargs.exp
    gdb/testsuite/gdb.base/list.exp
    gdb/testsuite/gdb.base/maint.exp
    gdb/testsuite/gdb.base/ptype.exp
    gdb/testsuite/gdb.base/restore.c
    gdb/testsuite/gdb.base/until.exp
    gdb/testsuite/gdb.base/watchpoint.exp
    gdb/testsuite/gdb.c++/anon-union.exp
    gdb/testsuite/gdb.c++/classes.exp
    gdb/testsuite/gdb.c++/cplusfuncs.exp
    gdb/testsuite/gdb.c++/inherit.exp
    gdb/testsuite/gdb.c++/local.cc
    gdb/testsuite/gdb.c++/local.exp
    gdb/testsuite/gdb.c++/overload.cc
    gdb/testsuite/gdb.c++/overload.exp
    gdb/testsuite/gdb.c++/ovldbreak.exp
    gdb/testsuite/gdb.c++/pr-1023.cc
    gdb/testsuite/gdb.c++/pr-1023.exp
    gdb/testsuite/gdb.c++/templates.exp
    gdb/testsuite/gdb.c++/virtfunc.exp
    gdb/testsuite/gdb.disasm/Makefile.in
    gdb/testsuite/gdb.disasm/mn10200.exp
    gdb/testsuite/gdb.mi/ChangeLog
    gdb/testsuite/gdb.mi/mi-cli.exp
    gdb/testsuite/gdb.mi/mi-syn-frame.c
    gdb/testsuite/gdb.mi/mi-syn-frame.exp
    gdb/testsuite/gdb.trace/Makefile.in
    gdb/testsuite/lib/gdb.exp
    gdb/thread.c
    gdb/top.c
    gdb/tracepoint.c
    gdb/tui/ChangeLog
    gdb/tui/tui-hooks.c
    gdb/tui/tui-interp.c
    gdb/tui/tui.c
    gdb/tui/tuiData.h
    gdb/tui/tuiIO.c
    gdb/typeprint.c
    gdb/ui-out.c
    gdb/ui-out.h
    gdb/utils.c
    gdb/v850-tdep.c
    gdb/valops.c
    gdb/value.h
    gdb/values.c
    gdb/vax-tdep.c
    gdb/version.in
    gdb/win32-nat.c
    gdb/wrapper.h
    gdb/x86-64-linux-nat.c
    gdb/x86-64-tdep.c
    gdb/xcoffread.c
    gdb/xstormy16-tdep.c
    gdb/z8k-tdep.c
    include/ChangeLog
    include/elf/ChangeLog
    include/elf/arm.h
    include/elf/ia64.h
    include/elf/ppc.h
    include/elf/ppc64.h
    include/gdb/ChangeLog
    include/gdb/remote-sim.h
    include/libiberty.h
    include/opcode/ChangeLog
    include/opcode/h8300.h
    libiberty/ChangeLog
    libiberty/Makefile.in
    libiberty/acconfig.h
    libiberty/aclocal.m4
    libiberty/config.in
    libiberty/configure
    libiberty/configure.in
    libiberty/cplus-dem.c
    libiberty/functions.texi
    libiberty/libiberty.texi
    libiberty/lrealpath.c
    libiberty/make-relative-prefix.c
    libiberty/physmem.c
    libtool.m4
    ltcf-cxx.sh
    ltcf-gcj.sh
    ltconfig
    opcodes/ChangeLog
    opcodes/fr30-desc.c
    opcodes/hppa-dis.c
    opcodes/i386-dis.c
    opcodes/mips-dis.c
    readline/ChangeLog.gdb
    readline/Makefile.in
    readline/aclocal.m4
    readline/config.h.in
    readline/configure
    readline/rlmbutil.h
    readline/shlib/Makefile.in
    sim/ChangeLog
    sim/arm/ChangeLog
    sim/arm/armos.c
    sim/arm/wrapper.c
    sim/common/ChangeLog
    sim/common/Make-common.in
    sim/common/nrun.c
    sim/common/sim-base.h
    sim/common/sim-engine.c
    sim/common/sim-engine.h
    sim/common/sim-hload.c
    sim/common/sim-module.c
    sim/common/sim-utils.h
    sim/d10v/ChangeLog
    sim/d10v/interp.c
    sim/erc32/ChangeLog
    sim/erc32/interf.c
    sim/h8300/ChangeLog
    sim/h8300/compile.c
    sim/h8500/ChangeLog
    sim/h8500/compile.c
    sim/i960/ChangeLog
    sim/i960/sim-if.c
    sim/m32r/ChangeLog
    sim/m32r/sim-if.c
    sim/m68hc11/ChangeLog
    sim/m68hc11/Makefile.in
    sim/m68hc11/interp.c
    sim/mcore/ChangeLog
    sim/mcore/interp.c
    sim/mips/ChangeLog
    sim/mips/interp.c
    sim/mn10200/ChangeLog
    sim/mn10200/interp.c
    sim/mn10300/ChangeLog
    sim/mn10300/am33.igen
    sim/mn10300/dv-mn103tim.c
    sim/mn10300/interp.c
    sim/ppc/ChangeLog
    sim/ppc/sim_calls.c
    sim/sh/ChangeLog
    sim/sh/gencode.c
    sim/sh/interp.c
    sim/v850/ChangeLog
    sim/v850/interp.c
    sim/z8k/ChangeLog
    sim/z8k/iface.c
Delete:
    gdb/config/i386/gdbserve.mt
    gdb/config/i386/i386sco5.mt
    gdb/config/i386/i386v4.mt
    gdb/config/i386/i386v42mp.mt
    gdb/config/m68k/nm-apollo68b.h
    gdb/config/m68k/nm-hp300bsd.h
    gdb/config/m68k/tm-apollo68b.h
    gdb/config/m68k/tm-es1800.h
    gdb/config/m68k/tm-hp300bsd.h
    gdb/config/m68k/tm-mac.h
    gdb/config/m68k/xm-apollo68b.h
    gdb/config/pa/hpux1020.mt
    gdb/config/pa/hpux11.mt
    gdb/config/pa/hpux11w.mt
    gdb/config/powerpc/gdbserve.mt
    gdb/config/powerpc/ppcle-eabi.mt
    gdb/config/powerpc/ppcle-sim.mt
    gdb/config/powerpc/tm-ppc-sim.h
    gdb/config/sparc/sp64sim.mt
    gdb/config/sparc/tm-sp64sim.h
    sim/common/sim-break.c
    sim/common/sim-break.h

1 files changed, 151 insertions, 92 deletions

diff --git a/gdb/linespec.c b/gdb/linespec.c
index 37633ccf5ec..2738b1e1dec 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -32,6 +32,7 @@
 #include "completer.h"
 #include "cp-abi.h"
 #include "parser-defs.h"
+#include "block.h"
 
 /* We share this one with symtab.c, but it is not exported widely. */
 
@@ -54,6 +55,18 @@ static struct symtabs_and_lines decode_compound (char **argptr,
 						 char *saved_arg,
 						 char *p);
 
+static struct symbol *lookup_prefix_sym (char **argptr, char *p);
+
+static struct symtabs_and_lines find_method (int funfirstline,
+					     char ***canonical,
+					     char *saved_arg,
+					     char *copy,
+					     struct type *t,
+					     struct symbol *sym_class);
+
+static int collect_methods (char *copy, struct type *t,
+			    struct symbol **sym_arr);
+
 static NORETURN void cplusplus_error (const char *name,
 				      const char *fmt, ...)
      ATTR_NORETURN ATTR_FORMAT (printf, 2, 3);
@@ -427,7 +440,7 @@ decode_line_2 (struct symbol *sym_arr[], int nelts, int funfirstline,
 	  values.sals[i] = find_function_start_sal (sym_arr[i], funfirstline);
 	  printf_unfiltered ("[%d] %s at %s:%d\n",
 			     (i + 2),
-			     SYMBOL_SOURCE_NAME (sym_arr[i]),
+			     SYMBOL_PRINT_NAME (sym_arr[i]),
 			     values.sals[i].symtab->filename,
 			     values.sals[i].line);
 	}
@@ -436,7 +449,8 @@ decode_line_2 (struct symbol *sym_arr[], int nelts, int funfirstline,
       i++;
     }
 
-  if ((prompt = getenv ("PS2")) == NULL)
+  prompt = getenv ("PS2");
+  if (prompt == NULL)
     {
       prompt = "> ";
     }
@@ -468,7 +482,7 @@ decode_line_2 (struct symbol *sym_arr[], int nelts, int funfirstline,
 		{
 		  if (canonical_arr[i] == NULL)
 		    {
-		      symname = SYMBOL_NAME (sym_arr[i]);
+		      symname = DEPRECATED_SYMBOL_NAME (sym_arr[i]);
 		      canonical_arr[i] = savestring (symname, strlen (symname));
 		    }
 		}
@@ -491,7 +505,7 @@ decode_line_2 (struct symbol *sym_arr[], int nelts, int funfirstline,
 	    {
 	      if (canonical_arr)
 		{
-		  symname = SYMBOL_NAME (sym_arr[num]);
+		  symname = DEPRECATED_SYMBOL_NAME (sym_arr[num]);
 		  make_cleanup (xfree, symname);
 		  canonical_arr[i] = savestring (symname, strlen (symname));
 		}
@@ -930,7 +944,7 @@ decode_compound (char **argptr, int funfirstline, char ***canonical,
 		 char *saved_arg, char *p)
 {
   struct symtabs_and_lines values;
-  char *p1, *p2;
+  char *p2;
 #if 0
   char *q, *q1;
 #endif
@@ -941,7 +955,6 @@ decode_compound (char **argptr, int funfirstline, char ***canonical,
   struct symtab *sym_symtab;
   char *copy;
   struct symbol *sym_class;
-  int i1;
   struct symbol **sym_arr;
   struct type *t;
 
@@ -975,22 +988,7 @@ decode_compound (char **argptr, int funfirstline, char ***canonical,
   p2 = p;		/* Save for restart.  */
   while (1)
     {
-      /* Extract the class name.  */
-      p1 = p;
-      while (p != *argptr && p[-1] == ' ')
-	--p;
-      copy = (char *) alloca (p - *argptr + 1);
-      memcpy (copy, *argptr, p - *argptr);
-      copy[p - *argptr] = 0;
-
-      /* Discard the class name from the arg.  */
-      p = p1 + (p1[0] == ':' ? 2 : 1);
-      while (*p == ' ' || *p == '\t')
-	p++;
-      *argptr = p;
-
-      sym_class = lookup_symbol (copy, 0, STRUCT_NAMESPACE, 0,
-				 (struct symtab **) NULL);
+      sym_class = lookup_prefix_sym (argptr, p);
 
       if (sym_class &&
 	  (t = check_typedef (SYMBOL_TYPE (sym_class)),
@@ -1048,76 +1046,8 @@ decode_compound (char **argptr, int funfirstline, char ***canonical,
 	    p++;
 	  *argptr = p;
 
-	  sym = 0;
-	  i1 = 0;	/*  Counter for the symbol array.  */
-	  sym_arr = (struct symbol **) alloca (total_number_of_methods (t)
-					       * sizeof (struct symbol *));
-
-	  if (destructor_name_p (copy, t))
-	    {
-	      /* Destructors are a special case.  */
-	      int m_index, f_index;
-
-	      if (get_destructor_fn_field (t, &m_index, &f_index))
-		{
-		  struct fn_field *f = TYPE_FN_FIELDLIST1 (t, m_index);
-
-		  sym_arr[i1] =
-		    lookup_symbol (TYPE_FN_FIELD_PHYSNAME (f, f_index),
-				   NULL, VAR_NAMESPACE, (int *) NULL,
-				   (struct symtab **) NULL);
-		  if (sym_arr[i1])
-		    i1++;
-		}
-	    }
-	  else
-	    i1 = find_methods (t, copy, sym_arr);
-	  if (i1 == 1)
-	    {
-	      /* There is exactly one field with that name.  */
-	      sym = sym_arr[0];
-
-	      if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
-		{
-		  values.sals = (struct symtab_and_line *)
-		    xmalloc (sizeof (struct symtab_and_line));
-		  values.nelts = 1;
-		  values.sals[0] = find_function_start_sal (sym,
-							    funfirstline);
-		}
-	      else
-		{
-		  values.nelts = 0;
-		}
-	      return values;
-	    }
-	  if (i1 > 0)
-	    {
-	      /* There is more than one field with that name
-		 (overloaded).  Ask the user which one to use.  */
-	      return decode_line_2 (sym_arr, i1, funfirstline, canonical);
-	    }
-	  else
-	    {
-	      char *tmp;
-
-	      if (is_operator_name (copy))
-		{
-		  tmp = (char *) alloca (strlen (copy + 3) + 9);
-		  strcpy (tmp, "operator ");
-		  strcat (tmp, copy + 3);
-		}
-	      else
-		tmp = copy;
-	      if (tmp[0] == '~')
-		cplusplus_error (saved_arg,
-				 "the class `%s' does not have destructor defined\n",
-				 SYMBOL_SOURCE_NAME (sym_class));
-	      else
-		cplusplus_error (saved_arg,
-				 "the class %s does not have any method named %s\n",
-				 SYMBOL_SOURCE_NAME (sym_class), tmp);
-	    }
+	  return find_method (funfirstline, canonical, saved_arg,
+			      copy, t, sym_class);
 	}
 
       /* Move pointer up to next possible class/namespace token.  */
@@ -1168,6 +1098,135 @@ decode_compound (char **argptr, int funfirstline, char ***canonical,
 		   copy);
 }
 
+/* Next come some helper functions for decode_compound.  */
+
+/* Return the symbol corresponding to the substring of *ARGPTR ending
+   at P, allowing whitespace.  Also, advance *ARGPTR past the symbol
+   name in question, the compound object separator ("::" or "."), and
+   whitespace.  */
+
+static struct symbol *
+lookup_prefix_sym (char **argptr, char *p)
+{
+  char *p1;
+  char *copy;
+
+  /* Extract the class name.  */
+  p1 = p;
+  while (p != *argptr && p[-1] == ' ')
+    --p;
+  copy = (char *) alloca (p - *argptr + 1);
+  memcpy (copy, *argptr, p - *argptr);
+  copy[p - *argptr] = 0;
+
+  /* Discard the class name from the arg.  */
+  p = p1 + (p1[0] == ':' ? 2 : 1);
+  while (*p == ' ' || *p == '\t')
+    p++;
+  *argptr = p;
+
+  return lookup_symbol (copy, 0, STRUCT_NAMESPACE, 0,
+			(struct symtab **) NULL);
+}
+
+/* This finds the method COPY in the class whose type is T and whose
+   symbol is SYM_CLASS.  */
+
+static struct symtabs_and_lines
+find_method (int funfirstline, char ***canonical, char *saved_arg,
+	     char *copy, struct type *t, struct symbol *sym_class)
+{
+  struct symtabs_and_lines values;
+  struct symbol *sym = 0;
+  int i1;	/*  Counter for the symbol array.  */
+  struct symbol **sym_arr =  alloca (total_number_of_methods (t)
+				     * sizeof (struct symbol *));
+
+  /* Find all methods with a matching name, and put them in
+     sym_arr.  */
+
+  i1 = collect_methods (copy, t, sym_arr);
+
+  if (i1 == 1)
+    {
+      /* There is exactly one field with that name.  */
+      sym = sym_arr[0];
+
+      if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
+	{
+	  values.sals = (struct symtab_and_line *)
+	    xmalloc (sizeof (struct symtab_and_line));
+	  values.nelts = 1;
+	  values.sals[0] = find_function_start_sal (sym,
+						    funfirstline);
+	}
+      else
+	{
+	  values.nelts = 0;
+	}
+      return values;
+    }
+  if (i1 > 0)
+    {
+      /* There is more than one field with that name
+	 (overloaded).  Ask the user which one to use.  */
+      return decode_line_2 (sym_arr, i1, funfirstline, canonical);
+    }
+  else
+    {
+      char *tmp;
+
+      if (is_operator_name (copy))
+	{
+	  tmp = (char *) alloca (strlen (copy + 3) + 9);
+	  strcpy (tmp, "operator ");
+	  strcat (tmp, copy + 3);
+	}
+      else
+	tmp = copy;
+      if (tmp[0] == '~')
+	cplusplus_error (saved_arg,
+			 "the class `%s' does not have destructor defined\n",
+			 SYMBOL_PRINT_NAME (sym_class));
+      else
+	cplusplus_error (saved_arg,
+			 "the class %s does not have any method named %s\n",
+			 SYMBOL_PRINT_NAME (sym_class), tmp);
+    }
+}
+
+/* Find all methods named COPY in the class whose type is T, and put
+   them in SYM_ARR.  Return the number of methods found.  */
+
+static int
+collect_methods (char *copy, struct type *t,
+		 struct symbol **sym_arr)
+{
+  int i1 = 0;	/*  Counter for the symbol array.  */
+
+  if (destructor_name_p (copy, t))
+    {
+      /* Destructors are a special case.  */
+      int m_index, f_index;
+
+      if (get_destructor_fn_field (t, &m_index, &f_index))
+	{
+	  struct fn_field *f = TYPE_FN_FIELDLIST1 (t, m_index);
+
+	  sym_arr[i1] =
+	    lookup_symbol (TYPE_FN_FIELD_PHYSNAME (f, f_index),
+			   NULL, VAR_NAMESPACE, (int *) NULL,
+			   (struct symtab **) NULL);
+	  if (sym_arr[i1])
+	    i1++;
+	}
+    }
+  else
+    i1 = find_methods (t, copy, sym_arr);
+
+  return i1;
+}
+
 
 
 /* Return the symtab associated to the filename given by the substring