[SCM] archer-tromey-ambiguous-linespec: only invoke lookup_symbol for Ada; fix ovsrch.exp

[SCM] archer-tromey-ambiguous-linespec: only invoke lookup_symbol for Ada; fix ovsrch.exp

[tromey]

The branch, archer-tromey-ambiguous-linespec has been updated
       via  6aac6a6515490e86f0792d324be8da7e500eebb9 (commit)
      from  fcd5c8727a24dab9733eb0fb18eb46666d1a3f6b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 6aac6a6515490e86f0792d324be8da7e500eebb9
Author: Tom Tromey <tromey@redhat.com>
Date:   Wed Nov 9 10:48:43 2011 -0700

    only invoke lookup_symbol for Ada; fix ovsrch.exp

-----------------------------------------------------------------------

Summary of changes:
 gdb/linespec.c                  |    5 +++--
 gdb/testsuite/gdb.cp/ovsrch.exp |   20 ++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

First 500 lines of diff:
diff --git a/gdb/linespec.c b/gdb/linespec.c
index 76dcc19..2c11198 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -2244,7 +2244,8 @@ find_function_symbols (char **argptr, char *p, int is_quote_enclosed,
      language to look up a symbol.  This may augment the search.  If a
      symbol is found this way, repeat the iteration, but using the
      discovered name.  */
-  if (VEC_empty (symbolp, result))
+  if (VEC_empty (symbolp, result)
+      && current_language->la_language == language_ada)
     {
       struct symbol *function_symbol;
 
@@ -2796,7 +2797,7 @@ decode_variable (struct linespec_state *self, char *copy)
      language to look up a symbol.  This may augment the search.  If a
      symbol is found this way, repeat the iteration, but using the
      discovered name.  */
-  if (info.result.nelts == 0)
+  if (info.result.nelts == 0 && current_language->la_language == language_ada)
     {
       struct symbol *sym;
 
diff --git a/gdb/testsuite/gdb.cp/ovsrch.exp b/gdb/testsuite/gdb.cp/ovsrch.exp
index b509a25..3c3fd29 100644
--- a/gdb/testsuite/gdb.cp/ovsrch.exp
+++ b/gdb/testsuite/gdb.cp/ovsrch.exp
@@ -73,28 +73,28 @@ if {![runto_main]} {
 }
 
 # Break in A::stop_here and run tests.
-if {[gdb_breakpoint "stop_here"]} {
-    pass "break stop_here"
+if {[gdb_breakpoint "A::stop_here"]} {
+    pass "break A::stop_here"
 }
 
-if {[gdb_breakpoint "'stop_here'"]} {
-    pass "break 'stop_here'"
+if {[gdb_breakpoint "'A::stop_here'"]} {
+    pass "break 'A::stop_here'"
 }
 
 gdb_continue_to_breakpoint "stop_here"
-test_class outer
+test_class A::outer
 
 # Break in A::B::stop_here_too and run tests.
-if {[gdb_breakpoint "B::stop_here_too"]} {
-    pass "break B::stop_here_too"
+if {[gdb_breakpoint "A::B::stop_here_too"]} {
+    pass "break A::B::stop_here_too"
 }
 
-if {[gdb_breakpoint "'B::stop_here_too'"]} {
-    pass "break 'B::stop_here_too'"
+if {[gdb_breakpoint "'A::B::stop_here_too'"]} {
+    pass "break 'A::B::stop_here_too'"
 }
 
 gdb_continue_to_breakpoint "stop_here_too"
-test_class inner
+test_class A::B::inner
 
 gdb_exit
 return 0


hooks/post-receive
--
Repository for Project Archer.