diff options
author | Pedro Alves <palves@redhat.com> | 2017-07-17 12:05:03 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2017-07-17 12:05:03 +0100 |
commit | 6e1dbf8cda1c66256179d0b15c96bc97ea5cf7b3 (patch) | |
tree | 1ce35dd58e6d3a3e884467426d24b62a0b532870 /gdb/completer.h | |
parent | 78b13106edcd14d87b4cc0b7f8dce8db8c2be489 (diff) | |
download | binutils-6e1dbf8cda1c66256179d0b15c96bc97ea5cf7b3.zip binutils-6e1dbf8cda1c66256179d0b15c96bc97ea5cf7b3.tar.gz binutils-6e1dbf8cda1c66256179d0b15c96bc97ea5cf7b3.tar.bz2 |
Clean up "completer_handle_brkchars" callback handling
This patch cleans up "completer_handle_brkchars" callback handling:
- Renames the function typedef to better match its intent:
completer_ftype_void -> completer_handle_brkchars_ftype
- Factors out common code in complete_line_internal handling the
"handle_brkchars" callback to a separate function.
- Centralizes all the "completer method" to "handle_brkchars method"
mapping in a single function.
gdb/ChangeLog:
2017-07-17 Pedro Alves <palves@redhat.com>
* cli/cli-decode.c (set_cmd_completer_handle_brkchars): Adjust to
renames.
* cli/cli-decode.h (struct cmd_list_element) <completer>: Move
comments to completer_ftype's declaration.
<completer_handle_brkchars>: Change type to
completer_handle_brkchars_ftype.
* command.h (completer_ftype): Add describing comment and give
names to parameters.
(completer_ftype_void): Rename to ...
(completer_handle_brkchars_ftype) ... this. Add describing comment.
(set_cmd_completer_handle_brkchars): Adjust.
* completer.c (filename_completer_handle_brkchars): New function.
(complete_line_internal_normal_command): New function, factored
out from ...
(complete_line_internal): ... here.
(command_completer_handle_brkchars)
(default_completer_handle_brkchars)
(completer_handle_brkchars_func_for_completer): New functions.
* completer.h (set_gdb_completion_word_break_characters): Delete
declaration.
(completer_handle_brkchars_func_for_completer): New declaration.
* python/py-cmd.c (cmdpy_completer_handle_brkchars): Adjust to use
completer_handle_brkchars_func_for_completer.
Diffstat (limited to 'gdb/completer.h')
-rw-r--r-- | gdb/completer.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gdb/completer.h b/gdb/completer.h index 0a40eaa..463a53d 100644 --- a/gdb/completer.h +++ b/gdb/completer.h @@ -112,12 +112,14 @@ extern char *gdb_completion_word_break_characters (void); not "const char *". */ extern void set_rl_completer_word_break_characters (const char *break_chars); -/* Set the word break characters array to the corresponding set of - chars, based on FN. This function is useful for cases when the - completer doesn't know the type of the completion until some +/* Get the matching completer_handle_brkchars_ftype function for FN. + FN is one of the core completer functions above (filename, + location, symbol, etc.). This function is useful for cases when + the completer doesn't know the type of the completion until some calculation is done (e.g., for Python functions). */ -extern void set_gdb_completion_word_break_characters (completer_ftype *fn); +extern completer_handle_brkchars_ftype * + completer_handle_brkchars_func_for_completer (completer_ftype *fn); /* Exported to linespec.c */ |