/* Line completion stuff for GDB, the GNU debugger.
- Copyright (C) 2000-2020 Free Software Foundation, Inc.
+ Copyright (C) 2000-2022 Free Software Foundation, Inc.
This file is part of GDB.
return htab_hash_string (m_name.get ());
}
- /* A static function that can be passed to the htab hash system to be
- used as a callback that deletes an item from the hash. */
- static void deleter (void *arg)
- {
- completion_hash_entry *entry = (completion_hash_entry *) arg;
- delete entry;
- }
-
private:
/* The symbol name stored in this hash entry. */
(gdb_completer_file_name_break_characters);
}
-/* Possible values for the found_quote flags word used by the completion
- functions. It says what kind of (shell-like) quoting we found anywhere
- in the line. */
-#define RL_QF_SINGLE_QUOTE 0x01
-#define RL_QF_DOUBLE_QUOTE 0x02
-#define RL_QF_BACKSLASH 0x04
-#define RL_QF_OTHER_QUOTE 0x08
-
/* Find the bounds of the current word for completion purposes, and
return a pointer to the end of the word. This mimics (and is a
modified version of) readline's _rl_find_completion_word internal
int *qc, int *dp,
const char *line_buffer)
{
- int scan, end, found_quote, delimiter, pass_next, isbrk;
+ int scan, end, delimiter, pass_next, isbrk;
char quote_char;
const char *brkchars;
int point = strlen (line_buffer);
}
end = point;
- found_quote = delimiter = 0;
+ delimiter = 0;
quote_char = '\0';
brkchars = info->word_break_characters;
/* We have a list of characters which can be used in pairs to
quote substrings for the completer. Try to find the start of
an unclosed quoted substring. */
- /* FOUND_QUOTE is set so we know what kind of quotes we
- found. */
for (scan = pass_next = 0;
scan < end;
scan++)
if (quote_char != '\'' && line_buffer[scan] == '\\')
{
pass_next = 1;
- found_quote |= RL_QF_BACKSLASH;
continue;
}
/* Found start of a quoted substring. */
quote_char = line_buffer[scan];
point = scan + 1;
- /* Shell-like quoting conventions. */
- if (quote_char == '\'')
- found_quote |= RL_QF_SINGLE_QUOTE;
- else if (quote_char == '"')
- found_quote |= RL_QF_DOUBLE_QUOTE;
- else
- found_quote |= RL_QF_OTHER_QUOTE;
}
}
}
int keyword = skip_keyword (tracker, explicit_options, &text);
if (keyword == -1)
- complete_on_enum (tracker, explicit_options, text, text);
+ {
+ complete_on_enum (tracker, explicit_options, text, text);
+ /* There are keywords that start with "-". Include them, too. */
+ complete_on_enum (tracker, linespec_keywords, text, text);
+ }
else
{
/* Completing on value. */
if (i < TYPE_N_BASECLASSES (type))
add_struct_fields (TYPE_BASECLASS (type, i),
output, fieldname, namelen);
- else if (TYPE_FIELD_NAME (type, i))
+ else if (type->field (i).name ())
{
- if (TYPE_FIELD_NAME (type, i)[0] != '\0')
+ if (type->field (i).name ()[0] != '\0')
{
- if (! strncmp (TYPE_FIELD_NAME (type, i),
+ if (! strncmp (type->field (i).name (),
fieldname, namelen))
- output.emplace_back (xstrdup (TYPE_FIELD_NAME (type, i)));
+ output.emplace_back (xstrdup (type->field (i).name ()));
}
else if (type->field (i).type ()->code () == TYPE_CODE_UNION)
{
for (;;)
{
type = check_typedef (type);
- if (type->code () != TYPE_CODE_PTR && !TYPE_IS_REFERENCE (type))
+ if (!type->is_pointer_or_reference ())
break;
type = TYPE_TARGET_TYPE (type);
}
result_list = 0;
}
else
- {
- c = lookup_cmd_1 (&p, cmdlist, &result_list, NULL, ignore_help_classes);
- }
+ c = lookup_cmd_1 (&p, cmdlist, &result_list, NULL, ignore_help_classes,
+ true);
/* Move p up to the next interesting thing. */
while (*p == ' ' || *p == '\t')
if (result_list)
{
if (reason != handle_brkchars)
- complete_on_cmdlist (*result_list->prefixlist, tracker, p,
+ complete_on_cmdlist (*result_list->subcommands, tracker, p,
word, ignore_help_classes);
}
else
{
/* The command is followed by whitespace; we need to
complete on whatever comes after command. */
- if (c->prefixlist)
+ if (c->is_prefix ())
{
/* It is a prefix command; what comes after it is
a subcommand (e.g. "info "). */
if (reason != handle_brkchars)
- complete_on_cmdlist (*c->prefixlist, tracker, p, word,
+ complete_on_cmdlist (*c->subcommands, tracker, p, word,
ignore_help_classes);
/* Ensure that readline does the right thing
{
/* There is non-whitespace beyond the command. */
- if (c->prefixlist && !c->allow_unknown)
+ if (c->is_prefix () && !c->allow_unknown)
{
/* It is an unrecognized subcommand of a prefix command,
e.g. "info adsfkdj". */
m_entries_hash.reset (nullptr);
/* A callback used by the hash table to compare new entries with existing
- entries. We can't use the standard streq_hash function here as the
+ entries. We can't use the standard htab_eq_string function here as the
key to our hash is just a single string, while the values we store in
the hash are a struct containing multiple strings. */
static auto entry_eq_func
return entry->hash_name ();
};
- m_entries_hash.reset (htab_create_alloc (INITIAL_COMPLETION_HTAB_SIZE,
- entry_hash_func, entry_eq_func,
- completion_hash_entry::deleter,
- xcalloc, xfree));
+ m_entries_hash.reset
+ (htab_create_alloc (INITIAL_COMPLETION_HTAB_SIZE,
+ entry_hash_func, entry_eq_func,
+ htab_delete_entry<completion_hash_entry>,
+ xcalloc, xfree));
}
/* See completer.h. */
projects / binutils-gdb.git / blobdiff