[Ada] Fix completion for multiple function matches
authorPierre-Marie de Rodat <derodat@adacore.com>
Mon, 31 Aug 2015 14:04:07 +0000 (16:04 +0200)
committerPierre-Marie de Rodat <derodat@adacore.com>
Tue, 1 Sep 2015 12:54:19 +0000 (14:54 +0200)
commitdc5c874652de144c5ab05d11e85013b568678039
tree909e35303e8559e990182956fdeb5e888900d209
parent04ebc307f9601168c165fb63aa39a676e45454b7
[Ada] Fix completion for multiple function matches

Before this change, trying to complete an expression ending with an
ambiguous function name (i.e. for which there are multiple matches)
would display a menu with a prompt for the user to pick one. For
instance:

    (gdb) p func<tab>Multiple matches for func
    [0] cancel
    [1] pack2.func at pack2.adb:5
    [2] pack.func at pack.adb:5
    >

This is not user friendly and actually triggered a segmentation fault
after the user did pick one. It is not clear whether the segmentation
fault needs a separate fix, but this is the only known case which
exhibits it at the moment, and this case must be fixed itself.

The problem lies in ada-lang.c (ada_resolve_function): when we got
multiple matches, we should not display the menu if we are in completion
mode. This patch adjusts the corresponding condition accordingly.

gdb/ChangeLog:

* ada-lang.c (ada_resolve_function): Do not ask the user what
match to use when in completion mode.

gdb/testsuite/ChangeLog:

* gdb.ada/complete.exp: Add "pck.ambiguous_func" to the relevant
expected outputs.  Add two testcases for completing ambiguous
functions.
* gdb.ada/complete/aux_pck.adb: New file.
* gdb.ada/complete/aux_pck.ads: New file.
* gdb.ada/complete/foo.adb: Pull Aux_Pck and call the two
Ambiguous_Func functions.
* gdb.ada/complete/pck.ads: Add an Ambiguous_Func function.
* gdb.ada/complete/pck.adb: Likewise.

Tested on x86_64-linux, no regression.
gdb/ChangeLog
gdb/ada-lang.c
gdb/testsuite/ChangeLog
gdb/testsuite/gdb.ada/complete.exp
gdb/testsuite/gdb.ada/complete/aux_pck.adb [new file with mode: 0644]
gdb/testsuite/gdb.ada/complete/aux_pck.ads [new file with mode: 0644]
gdb/testsuite/gdb.ada/complete/foo.adb
gdb/testsuite/gdb.ada/complete/pck.adb
gdb/testsuite/gdb.ada/complete/pck.ads