7b08b9eb12
* ada-lang.c (struct add_partial_datum): Update the comment for expand_partial_symbol_name. (ada_add_partial_symbol_completions): Rename to ... (ada_expand_partial_symbol_name): ... here, change return type, update function comment, call symbol_completion_match instead of symbol_completion_add. (ada_make_symbol_completion_list): Use now expand_partial_symbol_names and ada_expand_partial_symbol_name. * dwarf2read.c (dw2_expand_symtabs_matching): Support NULL FILE_MATCHER. (dw2_map_symbol_names): Remove. (dwarf2_gdb_index_functions): Unlist dw2_map_symbol_names. * psymtab.c (map_symbol_names_psymtab): Remove. (expand_symtabs_matching_via_partial): Support NULL FILE_MATCHER. Support KIND == ALL_DOMAIN. Exchange the NAME_MATCHER and KIND check order. (psym_functions): Unlist map_symbol_names_psymtab. (map_partial_symbol_names): Rename to ... (expand_partial_symbol_names): ... here, change the FUN type, call expand_symtabs_matching with ALL_DOMAIN and NULL FILE_MATCHER now. * psymtab.h (map_partial_symbol_names): Rename to ... (expand_partial_symbol_names): ... here, change the FUN type. * symfile.h (struct quick_symbol_functions): Update the description of expand_symtabs_matching. Remove map_symbol_names. * symtab.c (search_symbols): Add ALL_DOMAIN to the function comment. (struct add_name_data): Update the comment for expand_partial_symbol_name. (add_partial_symbol_name): Rename to ... (expand_partial_symbol_name): ... here. Replace completion_list_add_name call by strncmp. (default_make_symbol_completion_list_break_on): Use now expand_partial_symbol_names and expand_partial_symbol_name. * symtab.h (enum search_domain): New element ALL_DOMAIN. gdb/testsuite/ * gdb.cp/cpcompletion.exp (complete class methods) (complete class methods beginning with F): Move them above runto. New comment about the runto delimiter.
104 lines
2.9 KiB
Text
104 lines
2.9 KiB
Text
# Copyright 2009, 2010, 2011 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.
|
|
|
|
# A helper procedure to test location completions restricted by
|
|
# class.
|
|
proc test_class_complete {class expr name matches} {
|
|
global gdb_prompt
|
|
|
|
set matches [lsort $matches]
|
|
set cmd "complete break ${class}::$expr"
|
|
set seen {}
|
|
gdb_test_multiple $cmd $name {
|
|
"break ${class}::main" { fail "$name (saw global symbol)" }
|
|
$cmd { exp_continue }
|
|
-re "break ${class}::\[A-Za-z0-9_~\]+" {
|
|
set str $expect_out(0,string)
|
|
scan $str "break ${class}::%\[^(\]" method
|
|
lappend seen $method
|
|
exp_continue
|
|
}
|
|
-re "$gdb_prompt $" {
|
|
set failed ""
|
|
foreach got [lsort $seen] have $matches {
|
|
if {![string equal $got $have]} {
|
|
set failed $have
|
|
break
|
|
}
|
|
}
|
|
if {[string length $failed] != 0} {
|
|
fail "$name ($failed not found)"
|
|
} else {
|
|
pass $name
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if $tracelevel then {
|
|
strace $tracelevel
|
|
}
|
|
|
|
if { [skip_cplus_tests] } { continue }
|
|
|
|
set testfile pr9594
|
|
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
|
|
|
|
gdb_start
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
gdb_load ${binfile}
|
|
|
|
# Test that completion is restricted by class name (all methods)
|
|
test_class_complete Foo "" "complete class methods" \
|
|
[list Foo Foofoo get_foo set_foo ~Foo]
|
|
|
|
test_class_complete Foo F "complete class methods beginning with F" \
|
|
[list Foo Foofoo]
|
|
|
|
# The tests below depend on the current code scope.
|
|
|
|
set bp_location [gdb_get_line_number "Set breakpoint here" ${testfile}.cc]
|
|
|
|
if {![runto "${testfile}.cc:$bp_location"]} {
|
|
perror "test suppressed"
|
|
return
|
|
}
|
|
|
|
# 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"
|