forked from Imagelibrary/binutils-gdb
276d9db22d
Currently gdb.parameter doesn't raise an exception if an
ambiguous name is used, it instead returns the value of the
last partly matching parameter:
```
(gdb) show print sym
Ambiguous show print command "sym": symbol, symbol-filename, symbol-loading.
(gdb) show print symbol-loading
Printing of symbol loading messages is "full".
(gdb) py print(gdb.parameter("print sym"))
full
```
It's because lookup_cmd_composition_1 tries to detect
ambigous names by checking the return value of find_cmd
for CMD_LIST_AMBIGUOUS, which never happens, since only
lookup_cmd_1 returns CMD_LIST_AMBIGUOUS.
Instead the nfound argument contains the number of found
matches.
By using it instead, and by setting *CMD to the special value
CMD_LIST_AMBIGUOUS in this case, gdbpy_parameter can now show
the appropriate error message:
```
(gdb) py print(gdb.parameter("print sym"))
Traceback (most recent call last):
File "<string>", line 1, in <module>
RuntimeError: Parameter `print sym' is ambiguous.
Error while executing Python code.
(gdb) py print(gdb.parameter("print symbol"))
True
(gdb) py print(gdb.parameter("print symbol-"))
Traceback (most recent call last):
File "<string>", line 1, in <module>
RuntimeError: Parameter `print symbol-' is ambiguous.
Error while executing Python code.
(gdb) py print(gdb.parameter("print symbol-load"))
full
```
Since the document command also uses lookup_cmd_composition, it needed
to check for CMD_LIST_AMBIGUOUS as well, so it now also shows an
"Ambiguous command" error message in this case.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=14639
Approved-By: Tom Tromey <tom@tromey.com>
45 lines
1.9 KiB
Plaintext
45 lines
1.9 KiB
Plaintext
# Copyright 1998-2024 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/>.
|
|
|
|
standard_testfile break.c break1.c
|
|
|
|
if {[prepare_for_testing "failed to prepare" ${testfile} \
|
|
[list $srcfile $srcfile2] {debug nowarnings}]} {
|
|
return -1
|
|
}
|
|
|
|
# test document command used within user command.
|
|
gdb_test_multiple "define do-document" "" {
|
|
-re "Type commands for definition of \"do-document\".\r\nEnd with a line saying just \"end\".\r\n>$" {
|
|
gdb_test "document do-document\nusage: do-document\nend\nend" "" "define do-document"
|
|
}
|
|
}
|
|
gdb_test_no_output "do-document" "invoke do-document"
|
|
gdb_test "help do-document" "usage: do-document" "invoke help do-document"
|
|
|
|
# Test that document of a non-existing command prints an error. There
|
|
# was a regression at one point causing this to crash.
|
|
gdb_test "document nosuchcommand" "Undefined command: \"nosuchcommand\"\\."
|
|
|
|
# Test that document of an ambiguous command prints an error.
|
|
foreach_with_prefix cmd {1 2} {
|
|
gdb_test_multiple "define ambiguous_command_$cmd" "" {
|
|
-re "Type commands for definition of \"ambiguous_command_$cmd\".\r\nEnd with a line saying just \"end\".\r\n>$" {
|
|
gdb_test "end" "" "define ambiguous_command_$cmd"
|
|
}
|
|
}
|
|
}
|
|
gdb_test "document ambiguous_command" "Ambiguous command: \"ambiguous_command\"."
|