/* Parser for linespec for the GNU debugger, GDB.
- Copyright (C) 1986-2017 Free Software Foundation, Inc.
+ Copyright (C) 1986-2018 Free Software Foundation, Inc.
This file is part of GDB.
#include "stack.h"
#include "location.h"
#include "common/function-view.h"
+#include "common/def-vector.h"
+
+/* An enumeration of the various things a user might attempt to
+ complete for a linespec location. */
+
+enum class linespec_complete_what
+{
+ /* Nothing, no possible completion. */
+ NOTHING,
+
+ /* A function/method name. Due to ambiguity between
+
+ (gdb) b source[TAB]
+ source_file.c
+ source_function
+
+ this can also indicate a source filename, iff we haven't seen a
+ separate source filename component, as in "b source.c:function". */
+ FUNCTION,
+
+ /* A label symbol. E.g., break file.c:function:LABEL. */
+ LABEL,
+
+ /* An expression. E.g., "break foo if EXPR", or "break *EXPR". */
+ EXPRESSION,
+
+ /* A linespec keyword ("if"/"thread"/"task").
+ E.g., "break func threa<tab>". */
+ KEYWORD,
+};
typedef struct symbol *symbolp;
DEF_VEC_P (symbolp);
/* The 'canonical' value passed to decode_line_full, or NULL. */
struct linespec_result *canonical;
- /* Canonical strings that mirror the symtabs_and_lines result. */
+ /* Canonical strings that mirror the std::vector<symtab_and_line> result. */
struct linespec_canonical_name *canonical_names;
/* This is a set of address_entry objects which is used to prevent
/* The result of the parse. */
struct linespec result;
#define PARSER_RESULT(PPTR) (&(PPTR)->result)
+
+ /* What the parser believes the current word point should complete
+ to. */
+ linespec_complete_what complete_what;
+
+ /* The completion word point. The parser advances this as it skips
+ tokens. At some point the input string will end or parsing will
+ fail, and then we attempt completion at the captured completion
+ word point, interpreting the string at completion_word as
+ COMPLETE_WHAT. */
+ const char *completion_word;
+
+ /* If the current token was a quoted string, then this is the
+ quoting character (either " or '). */
+ int completion_quote_char;
+
+ /* If the current token was a quoted string, then this points at the
+ end of the quoted string. */
+ const char *completion_quote_end;
+
+ /* If parsing for completion, then this points at the completion
+ tracker. Otherwise, this is NULL. */
+ struct completion_tracker *completion_tracker;
};
typedef struct ls_parser linespec_parser;
/* Prototypes for local functions. */
static void iterate_over_file_blocks
- (struct symtab *symtab, const char *name, domain_enum domain,
+ (struct symtab *symtab, const lookup_name_info &name,
+ domain_enum domain,
gdb::function_view<symbol_found_callback_ftype> callback);
static void initialize_defaults (struct symtab **default_symtab,
CORE_ADDR linespec_expression_to_pc (const char **exp_ptr);
-static struct symtabs_and_lines decode_objc (struct linespec_state *self,
- linespec_p ls,
- const char *arg);
+static std::vector<symtab_and_line> decode_objc (struct linespec_state *self,
+ linespec_p ls,
+ const char *arg);
static VEC (symtab_ptr) *symtabs_from_filename (const char *,
struct program_space *pspace);
static void find_linespec_symbols (struct linespec_state *self,
VEC (symtab_ptr) *file_symtabs,
const char *name,
+ symbol_name_match_type name_match_type,
VEC (symbolp) **symbols,
VEC (bound_minimal_symbol_d) **minsyms);
int funfirstline, struct symbol *sym);
static void add_matching_symbols_to_info (const char *name,
+ symbol_name_match_type name_match_type,
+ enum search_domain search_domain,
struct collect_info *info,
struct program_space *pspace);
static void add_all_symbol_names_from_pspace (struct collect_info *info,
struct program_space *pspace,
- VEC (const_char_ptr) *names);
+ VEC (const_char_ptr) *names,
+ enum search_domain search_domain);
static VEC (symtab_ptr) *
collect_symtabs_from_filename (const char *file,
struct program_space *pspace);
-static void decode_digits_ordinary (struct linespec_state *self,
- linespec_p ls,
- int line,
- struct symtabs_and_lines *sals,
- struct linetable_entry **best_entry);
+static std::vector<symtab_and_line> decode_digits_ordinary
+ (struct linespec_state *self,
+ linespec_p ls,
+ int line,
+ linetable_entry **best_entry);
-static void decode_digits_list_mode (struct linespec_state *self,
- linespec_p ls,
- struct symtabs_and_lines *values,
- struct symtab_and_line val);
+static std::vector<symtab_and_line> decode_digits_list_mode
+ (struct linespec_state *self,
+ linespec_p ls,
+ struct symtab_and_line val);
static void minsym_found (struct linespec_state *self, struct objfile *objfile,
struct minimal_symbol *msymbol,
- struct symtabs_and_lines *result);
+ std::vector<symtab_and_line> *result);
static int compare_symbols (const void *a, const void *b);
if (i != IF_KEYWORD_INDEX)
{
p += len;
- p = skip_spaces_const (p);
+ p = skip_spaces (p);
for (j = 0; linespec_keywords[j] != NULL; ++j)
{
int nextlen = strlen (linespec_keywords[j]);
return p;
}
+/* If the [STRING, STRING_LEN) string ends with what looks like a
+ keyword, return the keyword start offset in STRING. Return -1
+ otherwise. */
+
+static size_t
+string_find_incomplete_keyword_at_end (const char * const *keywords,
+ const char *string, size_t string_len)
+{
+ const char *end = string + string_len;
+ const char *p = end;
+
+ while (p > string && *p != ' ')
+ --p;
+ if (p > string)
+ {
+ p++;
+ size_t len = end - p;
+ for (size_t i = 0; keywords[i] != NULL; ++i)
+ if (strncmp (keywords[i], p, len) == 0)
+ return p - string;
+ }
+
+ return -1;
+}
/* Lex a string from the input in PARSER. */
/* Skip to the ending quote. */
end = skip_quote_char (PARSER_STREAM (parser), quote_char);
- /* Error if the input did not terminate properly. */
- if (end == NULL)
- error (_("unmatched quote"));
+ /* This helps the completer mode decide whether we have a
+ complete string. */
+ parser->completion_quote_char = quote_char;
+ parser->completion_quote_end = end;
- /* Skip over the ending quote and mark the length of the string. */
- PARSER_STREAM (parser) = (char *) ++end;
- LS_TOKEN_STOKEN (token).length = PARSER_STREAM (parser) - 2 - start;
+ /* Error if the input did not terminate properly, unless in
+ completion mode. */
+ if (end == NULL)
+ {
+ if (parser->completion_tracker == NULL)
+ error (_("unmatched quote"));
+
+ /* In completion mode, we'll try to complete the incomplete
+ token. */
+ token.type = LSTOKEN_STRING;
+ while (*PARSER_STREAM (parser) != '\0')
+ PARSER_STREAM (parser)++;
+ LS_TOKEN_STOKEN (token).length = PARSER_STREAM (parser) - 1 - start;
+ }
+ else
+ {
+ /* Skip over the ending quote and mark the length of the string. */
+ PARSER_STREAM (parser) = (char *) ++end;
+ LS_TOKEN_STOKEN (token).length = PARSER_STREAM (parser) - 2 - start;
+ }
}
else
{
{
if (isspace (*PARSER_STREAM (parser)))
{
- p = skip_spaces_const (PARSER_STREAM (parser));
+ p = skip_spaces (PARSER_STREAM (parser));
/* When we get here we know we've found something followed by
a space (we skip over parens and templates below).
So if we find a keyword now, we know it is a keyword and not,
if (PARSER_STREAM (parser)[1] == ':')
++(PARSER_STREAM (parser));
+ /* Do not tokenize ABI tags such as "[abi:cxx11]". */
+ else if (PARSER_STREAM (parser) - start > 4
+ && startswith (PARSER_STREAM (parser) - 4, "[abi"))
+ ++(PARSER_STREAM (parser));
+
/* Do not tokenify if the input length so far is one
(i.e, a single-letter drive name) and the next character
is a directory separator. This allows Windows-style
else if (*PARSER_STREAM (parser) == '<'
|| *PARSER_STREAM (parser) == '(')
{
- const char *p;
+ /* Don't interpret 'operator<' / 'operator<<' as a
+ template parameter list though. */
+ if (*PARSER_STREAM (parser) == '<'
+ && (PARSER_STATE (parser)->language->la_language
+ == language_cplus)
+ && (PARSER_STREAM (parser) - start) >= CP_OPERATOR_LEN)
+ {
+ const char *p = PARSER_STREAM (parser);
- p = find_parameter_list_end (PARSER_STREAM (parser));
- if (p != NULL)
+ while (p > start && isspace (p[-1]))
+ p--;
+ if (p - start >= CP_OPERATOR_LEN)
+ {
+ p -= CP_OPERATOR_LEN;
+ if (strncmp (p, CP_OPERATOR_STR, CP_OPERATOR_LEN) == 0
+ && (p == start
+ || !(isalnum (p[-1]) || p[-1] == '_')))
+ {
+ /* This is an operator name. Keep going. */
+ ++(PARSER_STREAM (parser));
+ if (*PARSER_STREAM (parser) == '<')
+ ++(PARSER_STREAM (parser));
+ continue;
+ }
+ }
+ }
+
+ const char *p = find_parameter_list_end (PARSER_STREAM (parser));
+ PARSER_STREAM (parser) = p;
+
+ /* Don't loop around to the normal \0 case above because
+ we don't want to misinterpret a potential keyword at
+ the end of the token when the string isn't
+ "()<>"-balanced. This handles "b
+ function(thread<tab>" in completion mode. */
+ if (*p == '\0')
{
- PARSER_STREAM (parser) = p;
- continue;
+ LS_TOKEN_STOKEN (token).ptr = start;
+ LS_TOKEN_STOKEN (token).length
+ = PARSER_STREAM (parser) - start;
+ return token;
}
+ else
+ continue;
}
/* Commas are terminators, but not if they are part of an
operator name. */
if (parser->lexer.current.type == LSTOKEN_CONSUMED)
{
/* Skip any whitespace. */
- PARSER_STREAM (parser) = skip_spaces_const (PARSER_STREAM (parser));
+ PARSER_STREAM (parser) = skip_spaces (PARSER_STREAM (parser));
/* Check for a keyword, they end the linespec. */
keyword = linespec_lexer_lex_keyword (PARSER_STREAM (parser));
}
/* Consume the current token and return the next token in PARSER's
- input stream. */
+ input stream. Also advance the completion word for completion
+ mode. */
static linespec_token
linespec_lexer_consume_token (linespec_parser *parser)
{
+ gdb_assert (parser->lexer.current.type != LSTOKEN_EOI);
+
+ bool advance_word = (parser->lexer.current.type != LSTOKEN_STRING
+ || *PARSER_STREAM (parser) != '\0');
+
+ /* If we're moving past a string to some other token, it must be the
+ quote was terminated. */
+ if (parser->completion_quote_char)
+ {
+ gdb_assert (parser->lexer.current.type == LSTOKEN_STRING);
+
+ /* If the string was the last (non-EOI) token, we're past the
+ quote, but remember that for later. */
+ if (*PARSER_STREAM (parser) != '\0')
+ {
+ parser->completion_quote_char = '\0';
+ parser->completion_quote_end = NULL;;
+ }
+ }
+
parser->lexer.current.type = LSTOKEN_CONSUMED;
- return linespec_lexer_lex_one (parser);
+ linespec_lexer_lex_one (parser);
+
+ if (parser->lexer.current.type == LSTOKEN_STRING)
+ {
+ /* Advance the completion word past a potential initial
+ quote-char. */
+ parser->completion_word = LS_TOKEN_STOKEN (parser->lexer.current).ptr;
+ }
+ else if (advance_word)
+ {
+ /* Advance the completion word past any whitespace. */
+ parser->completion_word = PARSER_STREAM (parser);
+ }
+
+ return parser->lexer.current;
}
/* Return the next token without consuming the current token. */
linespec_token next;
const char *saved_stream = PARSER_STREAM (parser);
linespec_token saved_token = parser->lexer.current;
+ int saved_completion_quote_char = parser->completion_quote_char;
+ const char *saved_completion_quote_end = parser->completion_quote_end;
+ const char *saved_completion_word = parser->completion_word;
next = linespec_lexer_consume_token (parser);
PARSER_STREAM (parser) = saved_stream;
parser->lexer.current = saved_token;
+ parser->completion_quote_char = saved_completion_quote_char;
+ parser->completion_quote_end = saved_completion_quote_end;
+ parser->completion_word = saved_completion_word;
return next;
}
/* Helper functions. */
-/* Add SAL to SALS. */
-
-static void
-add_sal_to_sals_basic (struct symtabs_and_lines *sals,
- struct symtab_and_line *sal)
-{
- ++sals->nelts;
- sals->sals = XRESIZEVEC (struct symtab_and_line, sals->sals, sals->nelts);
- sals->sals[sals->nelts - 1] = *sal;
-}
-
/* Add SAL to SALS, and also update SELF->CANONICAL_NAMES to reflect
the new sal, if needed. If not NULL, SYMNAME is the name of the
symbol to use when constructing the new canonical name.
static void
add_sal_to_sals (struct linespec_state *self,
- struct symtabs_and_lines *sals,
+ std::vector<symtab_and_line> *sals,
struct symtab_and_line *sal,
const char *symname, int literal_canonical)
{
- add_sal_to_sals_basic (sals, sal);
+ sals->push_back (*sal);
if (self->canonical)
{
struct linespec_canonical_name *canonical;
self->canonical_names = XRESIZEVEC (struct linespec_canonical_name,
- self->canonical_names, sals->nelts);
- canonical = &self->canonical_names[sals->nelts - 1];
+ self->canonical_names,
+ sals->size ());
+ canonical = &self->canonical_names[sals->size () - 1];
if (!literal_canonical && sal->symtab)
{
symtab_to_fullname (sal->symtab);
static void
iterate_over_all_matching_symtabs
- (struct linespec_state *state, const char *name, const domain_enum domain,
+ (struct linespec_state *state,
+ const lookup_name_info &lookup_name,
+ const domain_enum name_domain,
+ enum search_domain search_domain,
struct program_space *search_pspace, bool include_inline,
gdb::function_view<symbol_found_callback_ftype> callback)
{
struct objfile *objfile;
struct program_space *pspace;
- /* The routine to be used for comparison. */
- symbol_name_cmp_ftype symbol_name_cmp
- = (state->language->la_get_symbol_name_cmp != NULL
- ? state->language->la_get_symbol_name_cmp (name)
- : strcmp_iw);
-
ALL_PSPACES (pspace)
{
if (search_pspace != NULL && search_pspace != pspace)
struct compunit_symtab *cu;
if (objfile->sf)
- objfile->sf->qf->expand_symtabs_matching
- (objfile,
- NULL,
- [&] (const char *symbol_name)
- {
- return symbol_name_cmp (symbol_name, name) == 0;
- },
- NULL,
- ALL_DOMAIN);
+ objfile->sf->qf->expand_symtabs_matching (objfile,
+ NULL,
+ lookup_name,
+ NULL, NULL,
+ search_domain);
ALL_OBJFILE_COMPUNITS (objfile, cu)
{
struct symtab *symtab = COMPUNIT_FILETABS (cu);
- iterate_over_file_blocks (symtab, name, domain, callback);
+ iterate_over_file_blocks (symtab, lookup_name, name_domain, callback);
if (include_inline)
{
{
block = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (symtab), i);
state->language->la_iterate_over_symbols
- (block, name, domain, [&] (symbol *sym)
+ (block, lookup_name, name_domain, [&] (symbol *sym)
{
/* Restrict calls to CALLBACK to symbols
representing inline symbols only. */
static void
iterate_over_file_blocks
- (struct symtab *symtab, const char *name, domain_enum domain,
- gdb::function_view<symbol_found_callback_ftype> callback)
+ (struct symtab *symtab, const lookup_name_info &name,
+ domain_enum domain, gdb::function_view<symbol_found_callback_ftype> callback)
{
struct block *block;
LA_ITERATE_OVER_SYMBOLS (block, name, domain, callback);
}
-/* A helper for find_method. This finds all methods in type T which
- match NAME. It adds matching symbol names to RESULT_NAMES, and
- adds T's direct superclasses to SUPERCLASSES. */
+/* A helper for find_method. This finds all methods in type T of
+ language T_LANG which match NAME. It adds matching symbol names to
+ RESULT_NAMES, and adds T's direct superclasses to SUPERCLASSES. */
static void
-find_methods (struct type *t, const char *name,
+find_methods (struct type *t, enum language t_lang, const char *name,
VEC (const_char_ptr) **result_names,
VEC (typep) **superclasses)
{
if (class_name)
{
int method_counter;
+ lookup_name_info lookup_name (name, symbol_name_match_type::FULL);
+ symbol_name_matcher_ftype *symbol_name_compare
+ = get_symbol_name_matcher (language_def (t_lang), lookup_name);
t = check_typedef (t);
method_name = dem_opname;
}
- if (strcmp_iw (method_name, name) == 0)
+ if (symbol_name_compare (method_name, lookup_name, NULL))
{
int field_counter;
/* Find an instance of the character C in the string S that is outside
of all parenthesis pairs, single-quoted strings, and double-quoted
strings. Also, ignore the char within a template name, like a ','
- within foo<int, int>. */
+ within foo<int, int>, while considering C++ operator</operator<<. */
const char *
find_toplevel_char (const char *s, char c)
depth++;
else if ((*scan == ')' || *scan == '>') && depth > 0)
depth--;
+ else if (*scan == 'o' && !quoted && depth == 0)
+ {
+ /* Handle C++ operator names. */
+ if (strncmp (scan, CP_OPERATOR_STR, CP_OPERATOR_LEN) == 0)
+ {
+ scan += CP_OPERATOR_LEN;
+ if (*scan == c)
+ return scan;
+ while (isspace (*scan))
+ {
+ ++scan;
+ if (*scan == c)
+ return scan;
+ }
+ if (*scan == '\0')
+ break;
+
+ switch (*scan)
+ {
+ /* Skip over one less than the appropriate number of
+ characters: the for loop will skip over the last
+ one. */
+ case '<':
+ if (scan[1] == '<')
+ {
+ scan++;
+ if (*scan == c)
+ return scan;
+ }
+ break;
+ case '>':
+ if (scan[1] == '>')
+ {
+ scan++;
+ if (*scan == c)
+ return scan;
+ }
+ break;
+ }
+ }
+ }
}
return 0;
static void
filter_results (struct linespec_state *self,
- struct symtabs_and_lines *result,
+ std::vector<symtab_and_line> *result,
VEC (const_char_ptr) *filters)
{
int i;
for (i = 0; VEC_iterate (const_char_ptr, filters, i, name); ++i)
{
- struct linespec_sals lsal;
- int j;
-
- memset (&lsal, 0, sizeof (lsal));
+ linespec_sals lsal;
- for (j = 0; j < result->nelts; ++j)
+ for (size_t j = 0; j < result->size (); ++j)
{
const struct linespec_canonical_name *canonical;
char *fullform;
cleanup = make_cleanup (xfree, fullform);
if (strcmp (name, fullform) == 0)
- add_sal_to_sals_basic (&lsal.sals, &result->sals[j]);
+ lsal.sals.push_back ((*result)[j]);
do_cleanups (cleanup);
}
- if (lsal.sals.nelts > 0)
+ if (!lsal.sals.empty ())
{
lsal.canonical = xstrdup (name);
- VEC_safe_push (linespec_sals, self->canonical->sals, &lsal);
+ self->canonical->lsals.push_back (std::move (lsal));
}
}
static void
convert_results_to_lsals (struct linespec_state *self,
- struct symtabs_and_lines *result)
+ std::vector<symtab_and_line> *result)
{
struct linespec_sals lsal;
lsal.canonical = NULL;
- lsal.sals = *result;
- VEC_safe_push (linespec_sals, self->canonical->sals, &lsal);
+ lsal.sals = std::move (*result);
+ self->canonical->lsals.push_back (std::move (lsal));
}
/* A structure that contains two string representations of a struct
static void
decode_line_2 (struct linespec_state *self,
- struct symtabs_and_lines *result,
+ std::vector<symtab_and_line> *result,
const char *select_mode)
{
char *args;
gdb_assert (select_mode != multiple_symbols_all);
gdb_assert (self->canonical != NULL);
- gdb_assert (result->nelts >= 1);
+ gdb_assert (!result->empty ());
old_chain = make_cleanup (VEC_cleanup (const_char_ptr), &filters);
/* Prepare ITEMS array. */
- items_count = result->nelts;
+ items_count = result->size ();
items = XNEWVEC (struct decode_line_2_item, items_count);
make_cleanup (xfree, items);
for (i = 0; i < items_count; ++i)
throw_error (NOT_FOUND_ERROR, _("No source file named %s."), name);
}
+/* Unless at EIO, save the current stream position as completion word
+ point, and consume the next token. */
+
+static linespec_token
+save_stream_and_consume_token (linespec_parser *parser)
+{
+ if (linespec_lexer_peek_token (parser).type != LSTOKEN_EOI)
+ parser->completion_word = PARSER_STREAM (parser);
+ return linespec_lexer_consume_token (parser);
+}
+
/* See description in linespec.h. */
struct line_offset
return line_offset;
}
+/* In completion mode, if the user is still typing the number, there's
+ no possible completion to offer. But if there's already input past
+ the number, setup to expect NEXT. */
+
+static void
+set_completion_after_number (linespec_parser *parser,
+ linespec_complete_what next)
+{
+ if (*PARSER_STREAM (parser) == ' ')
+ {
+ parser->completion_word = skip_spaces (PARSER_STREAM (parser) + 1);
+ parser->complete_what = next;
+ }
+ else
+ {
+ parser->completion_word = PARSER_STREAM (parser);
+ parser->complete_what = linespec_complete_what::NOTHING;
+ }
+}
+
/* Parse the basic_spec in PARSER's input. */
static void
token = linespec_lexer_lex_one (parser);
/* If it is EOI or KEYWORD, issue an error. */
- if (token.type == LSTOKEN_KEYWORD || token.type == LSTOKEN_EOI)
- unexpected_linespec_error (parser);
+ if (token.type == LSTOKEN_KEYWORD)
+ {
+ parser->complete_what = linespec_complete_what::NOTHING;
+ unexpected_linespec_error (parser);
+ }
+ else if (token.type == LSTOKEN_EOI)
+ {
+ unexpected_linespec_error (parser);
+ }
/* If it is a LSTOKEN_NUMBER, we have an offset. */
else if (token.type == LSTOKEN_NUMBER)
{
+ set_completion_after_number (parser, linespec_complete_what::KEYWORD);
+
/* Record the line offset and get the next token. */
name = copy_token_string (token);
cleanup = make_cleanup (xfree, name);
/* If the next token is a comma, stop parsing and return. */
if (token.type == LSTOKEN_COMMA)
- return;
+ {
+ parser->complete_what = linespec_complete_what::NOTHING;
+ return;
+ }
/* If the next token is anything but EOI or KEYWORD, issue
an error. */
/* Next token must be LSTOKEN_STRING. */
if (token.type != LSTOKEN_STRING)
- unexpected_linespec_error (parser);
+ {
+ parser->complete_what = linespec_complete_what::NOTHING;
+ unexpected_linespec_error (parser);
+ }
/* The current token will contain the name of a function, method,
or label. */
- name = copy_token_string (token);
- cleanup = make_cleanup (xfree, name);
+ name = copy_token_string (token);
+ cleanup = make_cleanup (free_current_contents, &name);
+
+ if (parser->completion_tracker != NULL)
+ {
+ /* If the function name ends with a ":", then this may be an
+ incomplete "::" scope operator instead of a label separator.
+ E.g.,
+ "b klass:<tab>"
+ which should expand to:
+ "b klass::method()"
+
+ Do a tentative completion assuming the later. If we find
+ completions, advance the stream past the colon token and make
+ it part of the function name/token. */
+
+ if (!parser->completion_quote_char
+ && strcmp (PARSER_STREAM (parser), ":") == 0)
+ {
+ completion_tracker tmp_tracker;
+ const char *source_filename
+ = PARSER_EXPLICIT (parser)->source_filename;
+ symbol_name_match_type match_type
+ = PARSER_EXPLICIT (parser)->func_name_match_type;
+
+ linespec_complete_function (tmp_tracker,
+ parser->completion_word,
+ match_type,
+ source_filename);
+
+ if (tmp_tracker.have_completions ())
+ {
+ PARSER_STREAM (parser)++;
+ LS_TOKEN_STOKEN (token).length++;
+
+ xfree (name);
+ name = savestring (parser->completion_word,
+ (PARSER_STREAM (parser)
+ - parser->completion_word));
+ }
+ }
+
+ PARSER_EXPLICIT (parser)->function_name = name;
+ discard_cleanups (cleanup);
+ }
+ else
+ {
+ /* XXX Reindent before pushing. */
/* Try looking it up as a function/method. */
find_linespec_symbols (PARSER_STATE (parser),
PARSER_RESULT (parser)->file_symtabs, name,
+ PARSER_EXPLICIT (parser)->func_name_match_type,
&symbols, &minimal_symbols);
if (symbols != NULL || minimal_symbols != NULL)
return;
}
}
+ }
+
+ int previous_qc = parser->completion_quote_char;
/* Get the next token. */
token = linespec_lexer_consume_token (parser);
- if (token.type == LSTOKEN_COLON)
+ if (token.type == LSTOKEN_EOI)
+ {
+ if (previous_qc && !parser->completion_quote_char)
+ parser->complete_what = linespec_complete_what::KEYWORD;
+ }
+ else if (token.type == LSTOKEN_COLON)
{
/* User specified a label or a lineno. */
token = linespec_lexer_consume_token (parser);
{
/* User specified an offset. Record the line offset and
get the next token. */
+ set_completion_after_number (parser, linespec_complete_what::KEYWORD);
+
name = copy_token_string (token);
cleanup = make_cleanup (xfree, name);
PARSER_EXPLICIT (parser)->line_offset
= linespec_parse_line_offset (name);
do_cleanups (cleanup);
- /* Ge the next token. */
+ /* Get the next token. */
token = linespec_lexer_consume_token (parser);
}
+ else if (token.type == LSTOKEN_EOI && parser->completion_tracker != NULL)
+ {
+ parser->complete_what = linespec_complete_what::LABEL;
+ }
else if (token.type == LSTOKEN_STRING)
{
+ parser->complete_what = linespec_complete_what::LABEL;
+
+ /* If we have text after the label separated by whitespace
+ (e.g., "b func():lab i<tab>"), don't consider it part of
+ the label. In completion mode that should complete to
+ "if", in normal mode, the 'i' should be treated as
+ garbage. */
+ if (parser->completion_quote_char == '\0')
+ {
+ const char *ptr = LS_TOKEN_STOKEN (token).ptr;
+ for (size_t i = 0; i < LS_TOKEN_STOKEN (token).length; i++)
+ {
+ if (ptr[i] == ' ')
+ {
+ LS_TOKEN_STOKEN (token).length = i;
+ PARSER_STREAM (parser) = skip_spaces (ptr + i + 1);
+ break;
+ }
+ }
+ }
+
+ if (parser->completion_tracker != NULL)
+ {
+ if (PARSER_STREAM (parser)[-1] == ' ')
+ {
+ parser->completion_word = PARSER_STREAM (parser);
+ parser->complete_what = linespec_complete_what::KEYWORD;
+ }
+ }
+ else
+ {
+ /* XXX Reindent before pushing. */
+
/* Grab a copy of the label's name and look it up. */
name = copy_token_string (token);
cleanup = make_cleanup (xfree, name);
name);
}
+ }
+
/* Check for a line offset. */
- token = linespec_lexer_consume_token (parser);
+ token = save_stream_and_consume_token (parser);
if (token.type == LSTOKEN_COLON)
{
/* Get the next token. */
/* Given a line offset in LS, construct the relevant SALs. */
-static struct symtabs_and_lines
+static std::vector<symtab_and_line>
create_sals_line_offset (struct linespec_state *self,
linespec_p ls)
{
- struct symtabs_and_lines values;
- struct symtab_and_line val;
int use_default = 0;
- init_sal (&val);
- values.sals = NULL;
- values.nelts = 0;
-
/* This is where we need to make sure we have good defaults.
We must guarantee that this section of code is never executed
when we are called with just a function name, since
use_default = 1;
}
+ symtab_and_line val;
val.line = ls->explicit_loc.line_offset.offset;
switch (ls->explicit_loc.line_offset.sign)
{
break; /* No need to adjust val.line. */
}
+ std::vector<symtab_and_line> values;
if (self->list_mode)
- decode_digits_list_mode (self, ls, &values, val);
+ values = decode_digits_list_mode (self, ls, val);
else
{
struct linetable_entry *best_entry = NULL;
- int *filter;
- const struct block **blocks;
- struct cleanup *cleanup;
- struct symtabs_and_lines intermediate_results;
int i, j;
- intermediate_results.sals = NULL;
- intermediate_results.nelts = 0;
-
- decode_digits_ordinary (self, ls, val.line, &intermediate_results,
- &best_entry);
- if (intermediate_results.nelts == 0 && best_entry != NULL)
- decode_digits_ordinary (self, ls, best_entry->line,
- &intermediate_results, &best_entry);
-
- cleanup = make_cleanup (xfree, intermediate_results.sals);
+ std::vector<symtab_and_line> intermediate_results
+ = decode_digits_ordinary (self, ls, val.line, &best_entry);
+ if (intermediate_results.empty () && best_entry != NULL)
+ intermediate_results = decode_digits_ordinary (self, ls,
+ best_entry->line,
+ &best_entry);
/* For optimized code, the compiler can scatter one source line
across disjoint ranges of PC values, even when no duplicate
above, we see if there are other PCs that are in the same
block. If yes, the other PCs are filtered out. */
- filter = XNEWVEC (int, intermediate_results.nelts);
- make_cleanup (xfree, filter);
- blocks = XNEWVEC (const struct block *, intermediate_results.nelts);
- make_cleanup (xfree, blocks);
+ gdb::def_vector<int> filter (intermediate_results.size ());
+ gdb::def_vector<const block *> blocks (intermediate_results.size ());
- for (i = 0; i < intermediate_results.nelts; ++i)
+ for (i = 0; i < intermediate_results.size (); ++i)
{
- set_current_program_space (intermediate_results.sals[i].pspace);
+ set_current_program_space (intermediate_results[i].pspace);
filter[i] = 1;
- blocks[i] = block_for_pc_sect (intermediate_results.sals[i].pc,
- intermediate_results.sals[i].section);
+ blocks[i] = block_for_pc_sect (intermediate_results[i].pc,
+ intermediate_results[i].section);
}
- for (i = 0; i < intermediate_results.nelts; ++i)
+ for (i = 0; i < intermediate_results.size (); ++i)
{
if (blocks[i] != NULL)
- for (j = i + 1; j < intermediate_results.nelts; ++j)
+ for (j = i + 1; j < intermediate_results.size (); ++j)
{
if (blocks[j] == blocks[i])
{
}
}
- for (i = 0; i < intermediate_results.nelts; ++i)
+ for (i = 0; i < intermediate_results.size (); ++i)
if (filter[i])
{
struct symbol *sym = (blocks[i]
: NULL);
if (self->funfirstline)
- skip_prologue_sal (&intermediate_results.sals[i]);
- /* Make sure the line matches the request, not what was
- found. */
- intermediate_results.sals[i].line = val.line;
- add_sal_to_sals (self, &values, &intermediate_results.sals[i],
+ skip_prologue_sal (&intermediate_results[i]);
+ add_sal_to_sals (self, &values, &intermediate_results[i],
sym ? SYMBOL_NATURAL_NAME (sym) : NULL, 0);
}
-
- do_cleanups (cleanup);
}
- if (values.nelts == 0)
+ if (values.empty ())
{
if (ls->explicit_loc.source_filename)
throw_error (NOT_FOUND_ERROR, _("No line %d in file \"%s\"."),
/* Convert the given ADDRESS into SaLs. */
-static struct symtabs_and_lines
+static std::vector<symtab_and_line>
convert_address_location_to_sals (struct linespec_state *self,
CORE_ADDR address)
{
- struct symtab_and_line sal;
- struct symtabs_and_lines sals = {NULL, 0};
-
- sal = find_pc_line (address, 0);
+ symtab_and_line sal = find_pc_line (address, 0);
sal.pc = address;
sal.section = find_pc_overlay (address);
sal.explicit_pc = 1;
+
+ std::vector<symtab_and_line> sals;
add_sal_to_sals (self, &sals, &sal, core_addr_to_string (address), 1);
return sals;
/* Create and return SALs from the linespec LS. */
-static struct symtabs_and_lines
+static std::vector<symtab_and_line>
convert_linespec_to_sals (struct linespec_state *state, linespec_p ls)
{
- struct symtabs_and_lines sals = {NULL, 0};
+ std::vector<symtab_and_line> sals;
if (ls->labels.label_symbols != NULL)
{
canonicalize_linespec (state, ls);
- if (sals.nelts > 0 && state->canonical != NULL)
+ if (!sals.empty () && state->canonical != NULL)
state->canonical->pre_expanded = 1;
return sals;
linespec_p result,
const char *source_filename,
const char *function_name,
+ symbol_name_match_type fname_match_type,
const char *label_name,
struct line_offset line_offset)
{
VEC (symbolp) *symbols, *labels;
VEC (bound_minimal_symbol_d) *minimal_symbols;
+ result->explicit_loc.func_name_match_type = fname_match_type;
+
if (source_filename != NULL)
{
TRY
if (function_name != NULL)
{
find_linespec_symbols (self, result->file_symtabs,
- function_name, &symbols,
- &minimal_symbols);
+ function_name, fname_match_type,
+ &symbols, &minimal_symbols);
if (symbols == NULL && minimal_symbols == NULL)
symbol_not_found_error (function_name,
/* Convert the explicit location EXPLICIT_LOC into SaLs. */
-static struct symtabs_and_lines
+static std::vector<symtab_and_line>
convert_explicit_location_to_sals (struct linespec_state *self,
linespec_p result,
const struct explicit_location *explicit_loc)
convert_explicit_location_to_linespec (self, result,
explicit_loc->source_filename,
explicit_loc->function_name,
+ explicit_loc->func_name_match_type,
explicit_loc->label_name,
explicit_loc->line_offset);
return convert_linespec_to_sals (self, result);
if no file is validly specified. Callers must check that.
Also, the line number returned may be invalid. */
-/* Parse the linespec in ARG. */
+/* Parse the linespec in ARG. MATCH_TYPE indicates how function names
+ should be matched. */
-static struct symtabs_and_lines
-parse_linespec (linespec_parser *parser, const char *arg)
+static std::vector<symtab_and_line>
+parse_linespec (linespec_parser *parser, const char *arg,
+ symbol_name_match_type match_type)
{
linespec_token token;
- struct symtabs_and_lines values;
struct gdb_exception file_exception = exception_none;
struct cleanup *cleanup;
IDEs to work around bugs in the previous parser by quoting
the entire linespec, so we attempt to deal with this nicely. */
parser->is_quote_enclosed = 0;
- if (!is_ada_operator (arg)
+ if (parser->completion_tracker == NULL
+ && !is_ada_operator (arg)
&& strchr (linespec_quote_characters, *arg) != NULL)
{
const char *end;
parser->lexer.saved_arg = arg;
parser->lexer.stream = arg;
+ parser->completion_word = arg;
+ parser->complete_what = linespec_complete_what::FUNCTION;
+ PARSER_EXPLICIT (parser)->func_name_match_type = match_type;
/* Initialize the default symtab and line offset. */
initialize_defaults (&PARSER_STATE (parser)->default_symtab,
&PARSER_STATE (parser)->default_line);
/* Objective-C shortcut. */
- values = decode_objc (PARSER_STATE (parser), PARSER_RESULT (parser), arg);
- if (values.sals != NULL)
- return values;
+ if (parser->completion_tracker == NULL)
+ {
+ std::vector<symtab_and_line> values
+ = decode_objc (PARSER_STATE (parser), PARSER_RESULT (parser), arg);
+ if (!values.empty ())
+ return values;
+ }
+ else
+ {
+ /* "-"/"+" is either an objc selector, or a number. There's
+ nothing to complete the latter to, so just let the caller
+ complete on functions, which finds objc selectors, if there's
+ any. */
+ if ((arg[0] == '-' || arg[0] == '+') && arg[1] == '\0')
+ return {};
+ }
/* Start parsing. */
/* Get the first token. */
- token = linespec_lexer_lex_one (parser);
+ token = linespec_lexer_consume_token (parser);
/* It must be either LSTOKEN_STRING or LSTOKEN_NUMBER. */
if (token.type == LSTOKEN_STRING && *LS_TOKEN_STOKEN (token).ptr == '$')
char *var;
/* A NULL entry means to use GLOBAL_DEFAULT_SYMTAB. */
- VEC_safe_push (symtab_ptr, PARSER_RESULT (parser)->file_symtabs, NULL);
+ if (parser->completion_tracker == NULL)
+ VEC_safe_push (symtab_ptr, PARSER_RESULT (parser)->file_symtabs, NULL);
/* User specified a convenience variable or history value. */
var = copy_token_string (token);
goto convert_to_sals;
}
}
+ else if (token.type == LSTOKEN_EOI && parser->completion_tracker != NULL)
+ {
+ /* Let the default linespec_complete_what::FUNCTION kick in. */
+ unexpected_linespec_error (parser);
+ }
else if (token.type != LSTOKEN_STRING && token.type != LSTOKEN_NUMBER)
- unexpected_linespec_error (parser);
+ {
+ parser->complete_what = linespec_complete_what::NOTHING;
+ unexpected_linespec_error (parser);
+ }
/* Shortcut: If the next token is not LSTOKEN_COLON, we know that
this token cannot represent a filename. */
}
}
/* If the next token is not EOI, KEYWORD, or COMMA, issue an error. */
- else if (token.type != LSTOKEN_EOI && token.type != LSTOKEN_KEYWORD
- && token.type != LSTOKEN_COMMA)
+ else if (parser->completion_tracker == NULL
+ && (token.type != LSTOKEN_EOI && token.type != LSTOKEN_KEYWORD
+ && token.type != LSTOKEN_COMMA))
{
/* TOKEN is the _next_ token, not the one currently in the parser.
Consuming the token will give the correct error message. */
/* Parse the rest of the linespec. */
linespec_parse_basic (parser);
- if (PARSER_RESULT (parser)->function_symbols == NULL
+ if (parser->completion_tracker == NULL
+ && PARSER_RESULT (parser)->function_symbols == NULL
&& PARSER_RESULT (parser)->labels.label_symbols == NULL
&& PARSER_EXPLICIT (parser)->line_offset.sign == LINE_OFFSET_UNKNOWN
&& PARSER_RESULT (parser)->minimal_symbols == NULL)
if necessary. */
token = linespec_lexer_lex_one (parser);
if (token.type != LSTOKEN_EOI && token.type != LSTOKEN_KEYWORD)
- PARSER_STREAM (parser) = LS_TOKEN_STOKEN (token).ptr;
+ unexpected_linespec_error (parser);
+ else if (token.type == LSTOKEN_KEYWORD)
+ {
+ /* Setup the completion word past the keyword. Lexing never
+ advances past a keyword automatically, so skip it
+ manually. */
+ parser->completion_word
+ = skip_spaces (skip_to_space (PARSER_STREAM (parser)));
+ parser->complete_what = linespec_complete_what::EXPRESSION;
+ }
/* Convert the data in PARSER_RESULT to SALs. */
- values = convert_linespec_to_sals (PARSER_STATE (parser),
+ if (parser->completion_tracker == NULL)
+ return convert_linespec_to_sals (PARSER_STATE (parser),
PARSER_RESULT (parser));
- return values;
+ return {};
}
memset (parser, 0, sizeof (linespec_parser));
parser->lexer.current.type = LSTOKEN_CONSUMED;
memset (PARSER_RESULT (parser), 0, sizeof (struct linespec));
+ PARSER_EXPLICIT (parser)->func_name_match_type
+ = symbol_name_match_type::WILD;
PARSER_EXPLICIT (parser)->line_offset.sign = LINE_OFFSET_UNKNOWN;
linespec_state_constructor (PARSER_STATE (parser), flags, language,
search_pspace,
/* See description in linespec.h. */
void
-linespec_lex_to_end (char **stringp)
+linespec_lex_to_end (const char **stringp)
{
linespec_parser parser;
struct cleanup *cleanup;
void
linespec_complete_function (completion_tracker &tracker,
const char *function,
+ symbol_name_match_type func_match_type,
const char *source_filename)
{
complete_symbol_mode mode = complete_symbol_mode::LINESPEC;
if (source_filename != NULL)
{
- collect_file_symbol_completion_matches (tracker, mode,
- function, function,
- source_filename);
+ collect_file_symbol_completion_matches (tracker, mode, func_match_type,
+ function, function, source_filename);
}
else
- collect_symbol_completion_matches (tracker, mode, function, function);
+ {
+ collect_symbol_completion_matches (tracker, mode, func_match_type,
+ function, function);
+
+ }
+}
+
+/* Helper for complete_linespec to simplify it. SOURCE_FILENAME is
+ only meaningful if COMPONENT is FUNCTION. */
+
+static void
+complete_linespec_component (linespec_parser *parser,
+ completion_tracker &tracker,
+ const char *text,
+ linespec_complete_what component,
+ const char *source_filename)
+{
+ if (component == linespec_complete_what::KEYWORD)
+ {
+ complete_on_enum (tracker, linespec_keywords, text, text);
+ }
+ else if (component == linespec_complete_what::EXPRESSION)
+ {
+ const char *word
+ = advance_to_expression_complete_word_point (tracker, text);
+ complete_expression (tracker, text, word);
+ }
+ else if (component == linespec_complete_what::FUNCTION)
+ {
+ completion_list fn_list;
+
+ symbol_name_match_type match_type
+ = PARSER_EXPLICIT (parser)->func_name_match_type;
+ linespec_complete_function (tracker, text, match_type, source_filename);
+ if (source_filename == NULL)
+ {
+ /* Haven't seen a source component, like in "b
+ file.c:function[TAB]". Maybe this wasn't a function, but
+ a filename instead, like "b file.[TAB]". */
+ fn_list = complete_source_filenames (text);
+ }
+
+ /* If we only have a single filename completion, append a ':' for
+ the user, since that's the only thing that can usefully follow
+ the filename. */
+ if (fn_list.size () == 1 && !tracker.have_completions ())
+ {
+ char *fn = fn_list[0].release ();
+
+ /* If we also need to append a quote char, it needs to be
+ appended before the ':'. Append it now, and make ':' the
+ new "quote" char. */
+ if (tracker.quote_char ())
+ {
+ char quote_char_str[2] = { tracker.quote_char () };
+
+ fn = reconcat (fn, fn, quote_char_str, (char *) NULL);
+ tracker.set_quote_char (':');
+ }
+ else
+ fn = reconcat (fn, fn, ":", (char *) NULL);
+ fn_list[0].reset (fn);
+
+ /* Tell readline to skip appending a space. */
+ tracker.set_suppress_append_ws (true);
+ }
+ tracker.add_completions (std::move (fn_list));
+ }
}
/* Helper for linespec_complete_label. Find labels that match
const struct language_defn *language,
const char *source_filename,
const char *function_name,
+ symbol_name_match_type func_name_match_type,
const char *label_name)
{
linespec_parser parser;
PARSER_RESULT (&parser),
source_filename,
function_name,
+ func_name_match_type,
NULL, unknown_offset);
}
CATCH (ex, RETURN_MASK_ERROR)
do_cleanups (cleanup);
}
+/* See description in linespec.h. */
+
+void
+linespec_complete (completion_tracker &tracker, const char *text,
+ symbol_name_match_type match_type)
+{
+ linespec_parser parser;
+ struct cleanup *cleanup;
+ const char *orig = text;
+
+ linespec_parser_new (&parser, 0, current_language, NULL, NULL, 0, NULL);
+ cleanup = make_cleanup (linespec_parser_delete, &parser);
+ parser.lexer.saved_arg = text;
+ PARSER_EXPLICIT (&parser)->func_name_match_type = match_type;
+ PARSER_STREAM (&parser) = text;
+
+ parser.completion_tracker = &tracker;
+ PARSER_STATE (&parser)->is_linespec = 1;
+
+ /* Parse as much as possible. parser.completion_word will hold
+ furthest completion point we managed to parse to. */
+ TRY
+ {
+ parse_linespec (&parser, text, match_type);
+ }
+ CATCH (except, RETURN_MASK_ERROR)
+ {
+ }
+ END_CATCH
+
+ if (parser.completion_quote_char != '\0'
+ && parser.completion_quote_end != NULL
+ && parser.completion_quote_end[1] == '\0')
+ {
+ /* If completing a quoted string with the cursor right at
+ terminating quote char, complete the completion word without
+ interpretation, so that readline advances the cursor one
+ whitespace past the quote, even if there's no match. This
+ makes these cases behave the same:
+
+ before: "b function()"
+ after: "b function() "
+
+ before: "b 'function()'"
+ after: "b 'function()' "
+
+ and trusts the user in this case:
+
+ before: "b 'not_loaded_function_yet()'"
+ after: "b 'not_loaded_function_yet()' "
+ */
+ parser.complete_what = linespec_complete_what::NOTHING;
+ parser.completion_quote_char = '\0';
+
+ gdb::unique_xmalloc_ptr<char> text_copy
+ (xstrdup (parser.completion_word));
+ tracker.add_completion (std::move (text_copy));
+ }
+
+ tracker.set_quote_char (parser.completion_quote_char);
+
+ if (parser.complete_what == linespec_complete_what::LABEL)
+ {
+ parser.complete_what = linespec_complete_what::NOTHING;
+
+ const char *func_name = PARSER_EXPLICIT (&parser)->function_name;
+
+ VEC (symbolp) *function_symbols;
+ VEC (bound_minimal_symbol_d) *minimal_symbols;
+ find_linespec_symbols (PARSER_STATE (&parser),
+ PARSER_RESULT (&parser)->file_symtabs,
+ func_name, match_type,
+ &function_symbols, &minimal_symbols);
+
+ PARSER_RESULT (&parser)->function_symbols = function_symbols;
+ PARSER_RESULT (&parser)->minimal_symbols = minimal_symbols;
+
+ complete_label (tracker, &parser, parser.completion_word);
+ }
+ else if (parser.complete_what == linespec_complete_what::FUNCTION)
+ {
+ /* While parsing/lexing, we didn't know whether the completion
+ word completes to a unique function/source name already or
+ not.
+
+ E.g.:
+ "b function() <tab>"
+ may need to complete either to:
+ "b function() const"
+ or to:
+ "b function() if/thread/task"
+
+ Or, this:
+ "b foo t"
+ may need to complete either to:
+ "b foo template_fun<T>()"
+ with "foo" being the template function's return type, or to:
+ "b foo thread/task"
+
+ Or, this:
+ "b file<TAB>"
+ may need to complete either to a source file name:
+ "b file.c"
+ or this, also a filename, but a unique completion:
+ "b file.c:"
+ or to a function name:
+ "b file_function"
+
+ Address that by completing assuming source or function, and
+ seeing if we find a completion that matches exactly the
+ completion word. If so, then it must be a function (see note
+ below) and we advance the completion word to the end of input
+ and switch to KEYWORD completion mode.
+
+ Note: if we find a unique completion for a source filename,
+ then it won't match the completion word, because the LCD will
+ contain a trailing ':'. And if we're completing at or after
+ the ':', then complete_linespec_component won't try to
+ complete on source filenames. */
+
+ const char *word = parser.completion_word;
+
+ complete_linespec_component (&parser, tracker,
+ parser.completion_word,
+ linespec_complete_what::FUNCTION,
+ PARSER_EXPLICIT (&parser)->source_filename);
+
+ parser.complete_what = linespec_complete_what::NOTHING;
+
+ if (tracker.quote_char ())
+ {
+ /* The function/file name was not close-quoted, so this
+ can't be a keyword. Note: complete_linespec_component
+ may have swapped the original quote char for ':' when we
+ get here, but that still indicates the same. */
+ }
+ else if (!tracker.have_completions ())
+ {
+ size_t key_start;
+ size_t wordlen = strlen (parser.completion_word);
+
+ key_start
+ = string_find_incomplete_keyword_at_end (linespec_keywords,
+ parser.completion_word,
+ wordlen);
+
+ if (key_start != -1
+ || (wordlen > 0
+ && parser.completion_word[wordlen - 1] == ' '))
+ {
+ parser.completion_word += key_start;
+ parser.complete_what = linespec_complete_what::KEYWORD;
+ }
+ }
+ else if (tracker.completes_to_completion_word (word))
+ {
+ /* Skip the function and complete on keywords. */
+ parser.completion_word += strlen (word);
+ parser.complete_what = linespec_complete_what::KEYWORD;
+ tracker.discard_completions ();
+ }
+ }
+
+ tracker.advance_custom_word_point_by (parser.completion_word - orig);
+
+ complete_linespec_component (&parser, tracker,
+ parser.completion_word,
+ parser.complete_what,
+ PARSER_EXPLICIT (&parser)->source_filename);
+
+ /* If we're past the "filename:function:label:offset" linespec, and
+ didn't find any match, then assume the user might want to create
+ a pending breakpoint anyway and offer the keyword
+ completions. */
+ if (!parser.completion_quote_char
+ && (parser.complete_what == linespec_complete_what::FUNCTION
+ || parser.complete_what == linespec_complete_what::LABEL
+ || parser.complete_what == linespec_complete_what::NOTHING)
+ && !tracker.have_completions ())
+ {
+ const char *end
+ = parser.completion_word + strlen (parser.completion_word);
+
+ if (end > orig && end[-1] == ' ')
+ {
+ tracker.advance_custom_word_point_by (end - parser.completion_word);
+
+ complete_linespec_component (&parser, tracker, end,
+ linespec_complete_what::KEYWORD,
+ NULL);
+ }
+ }
+
+ do_cleanups (cleanup);
+}
+
/* A helper function for decode_line_full and decode_line_1 to
- turn LOCATION into symtabs_and_lines. */
+ turn LOCATION into std::vector<symtab_and_line>. */
-static struct symtabs_and_lines
+static std::vector<symtab_and_line>
event_location_to_sals (linespec_parser *parser,
const struct event_location *location)
{
- struct symtabs_and_lines result = {NULL, 0};
+ std::vector<symtab_and_line> result;
switch (event_location_type (location))
{
PARSER_STATE (parser)->is_linespec = 1;
TRY
{
- result = parse_linespec (parser, get_linespec_location (location));
+ const linespec_location *ls = get_linespec_location (location);
+ result = parse_linespec (parser,
+ ls->spec_string, ls->match_type);
}
CATCH (except, RETURN_MASK_ERROR)
{
const char *select_mode,
const char *filter)
{
- struct symtabs_and_lines result;
struct cleanup *cleanups;
VEC (const_char_ptr) *filters = NULL;
linespec_parser parser;
scoped_restore_current_program_space restore_pspace;
- result = event_location_to_sals (&parser, location);
+ std::vector<symtab_and_line> result = event_location_to_sals (&parser,
+ location);
state = PARSER_STATE (&parser);
- gdb_assert (result.nelts == 1 || canonical->pre_expanded);
+ gdb_assert (result.size () == 1 || canonical->pre_expanded);
canonical->pre_expanded = 1;
/* Arrange for allocated canonical names to be freed. */
- if (result.nelts > 0)
+ if (!result.empty ())
{
int i;
make_cleanup (xfree, state->canonical_names);
- for (i = 0; i < result.nelts; ++i)
+ for (i = 0; i < result.size (); ++i)
{
gdb_assert (state->canonical_names[i].suffix != NULL);
make_cleanup (xfree, state->canonical_names[i].suffix);
/* See linespec.h. */
-struct symtabs_and_lines
+std::vector<symtab_and_line>
decode_line_1 (const struct event_location *location, int flags,
struct program_space *search_pspace,
struct symtab *default_symtab,
int default_line)
{
- struct symtabs_and_lines result;
linespec_parser parser;
struct cleanup *cleanups;
scoped_restore_current_program_space restore_pspace;
- result = event_location_to_sals (&parser, location);
+ std::vector<symtab_and_line> result = event_location_to_sals (&parser,
+ location);
do_cleanups (cleanups);
return result;
/* See linespec.h. */
-struct symtabs_and_lines
-decode_line_with_current_source (char *string, int flags)
+std::vector<symtab_and_line>
+decode_line_with_current_source (const char *string, int flags)
{
- struct symtabs_and_lines sals;
- struct symtab_and_line cursal;
-
if (string == 0)
error (_("Empty line specification."));
/* We use whatever is set as the current source line. We do not try
and get a default source symtab+line or it will recursively call us! */
- cursal = get_current_source_symtab_and_line ();
+ symtab_and_line cursal = get_current_source_symtab_and_line ();
event_location_up location = string_to_event_location (&string,
current_language);
- sals = decode_line_1 (location.get (), flags, NULL,
- cursal.symtab, cursal.line);
+ std::vector<symtab_and_line> sals
+ = decode_line_1 (location.get (), flags, NULL, cursal.symtab, cursal.line);
if (*string)
error (_("Junk at end of line specification: %s"), string);
/* See linespec.h. */
-struct symtabs_and_lines
-decode_line_with_last_displayed (char *string, int flags)
+std::vector<symtab_and_line>
+decode_line_with_last_displayed (const char *string, int flags)
{
- struct symtabs_and_lines sals;
-
if (string == 0)
error (_("Empty line specification."));
event_location_up location = string_to_event_location (&string,
current_language);
- if (last_displayed_sal_is_valid ())
- sals = decode_line_1 (location.get (), flags, NULL,
- get_last_displayed_symtab (),
- get_last_displayed_line ());
- else
- sals = decode_line_1 (location.get (), flags, NULL,
- (struct symtab *) NULL, 0);
+ std::vector<symtab_and_line> sals
+ = (last_displayed_sal_is_valid ()
+ ? decode_line_1 (location.get (), flags, NULL,
+ get_last_displayed_symtab (),
+ get_last_displayed_line ())
+ : decode_line_1 (location.get (), flags, NULL,
+ (struct symtab *) NULL, 0));
if (*string)
error (_("Junk at end of line specification: %s"), string);
than one method that could represent the selector, then use some of
the existing C++ code to let the user choose one. */
-static struct symtabs_and_lines
+static std::vector<symtab_and_line>
decode_objc (struct linespec_state *self, linespec_p ls, const char *arg)
{
struct collect_info info;
VEC (const_char_ptr) *symbol_names = NULL;
- struct symtabs_and_lines values;
const char *new_argptr;
struct cleanup *cleanup = make_cleanup (VEC_cleanup (const_char_ptr),
&symbol_names);
make_cleanup (VEC_cleanup (symtab_ptr), &info.file_symtabs);
info.result.symbols = NULL;
info.result.minimal_symbols = NULL;
- values.nelts = 0;
- values.sals = NULL;
new_argptr = find_imps (arg, &symbol_names);
if (VEC_empty (const_char_ptr, symbol_names))
{
do_cleanups (cleanup);
- return values;
+ return {};
}
- add_all_symbol_names_from_pspace (&info, NULL, symbol_names);
+ add_all_symbol_names_from_pspace (&info, NULL, symbol_names,
+ FUNCTIONS_DOMAIN);
+ std::vector<symtab_and_line> values;
if (!VEC_empty (symbolp, info.result.symbols)
|| !VEC_empty (bound_minimal_symbol_d, info.result.minimal_symbols))
{
if (self->canonical)
{
- char *str;
+ std::string holder;
+ const char *str;
self->canonical->pre_expanded = 1;
if (ls->explicit_loc.source_filename)
{
- str = xstrprintf ("%s:%s",
- ls->explicit_loc.source_filename, saved_arg);
+ holder = string_printf ("%s:%s",
+ ls->explicit_loc.source_filename,
+ saved_arg);
+ str = holder.c_str ();
}
else
- str = xstrdup (saved_arg);
+ str = saved_arg;
- make_cleanup (xfree, str);
- self->canonical->location = new_linespec_location (&str);
+ self->canonical->location
+ = new_linespec_location (&str, symbol_name_match_type::FULL);
}
}
struct symtab *elt;
decode_compound_collector collector;
+ lookup_name_info lookup_name (class_name, symbol_name_match_type::FULL);
+
for (ix = 0; VEC_iterate (symtab_ptr, file_symtabs, ix, elt); ++ix)
{
if (elt == NULL)
{
- iterate_over_all_matching_symtabs (state, class_name, STRUCT_DOMAIN,
+ iterate_over_all_matching_symtabs (state, lookup_name,
+ STRUCT_DOMAIN, ALL_DOMAIN,
NULL, false, collector);
- iterate_over_all_matching_symtabs (state, class_name, VAR_DOMAIN,
+ iterate_over_all_matching_symtabs (state, lookup_name,
+ VAR_DOMAIN, ALL_DOMAIN,
NULL, false, collector);
}
else
been filtered out earlier. */
gdb_assert (!SYMTAB_PSPACE (elt)->executing_startup);
set_current_program_space (SYMTAB_PSPACE (elt));
- iterate_over_file_blocks (elt, class_name, STRUCT_DOMAIN, collector);
- iterate_over_file_blocks (elt, class_name, VAR_DOMAIN, collector);
+ iterate_over_file_blocks (elt, lookup_name, STRUCT_DOMAIN, collector);
+ iterate_over_file_blocks (elt, lookup_name, VAR_DOMAIN, collector);
}
}
static void
add_all_symbol_names_from_pspace (struct collect_info *info,
struct program_space *pspace,
- VEC (const_char_ptr) *names)
+ VEC (const_char_ptr) *names,
+ enum search_domain search_domain)
{
int ix;
const char *iter;
for (ix = 0; VEC_iterate (const_char_ptr, names, ix, iter); ++ix)
- add_matching_symbols_to_info (iter, info, pspace);
+ add_matching_symbols_to_info (iter,
+ symbol_name_match_type::FULL,
+ search_domain, info, pspace);
}
static void
find_superclass_methods (VEC (typep) *superclasses,
- const char *name,
+ const char *name, enum language name_lang,
VEC (const_char_ptr) **result_names)
{
int old_len = VEC_length (const_char_ptr, *result_names);
make_cleanup (VEC_cleanup (typep), &new_supers);
for (ix = 0; VEC_iterate (typep, iter_classes, ix, t); ++ix)
- find_methods (t, name, result_names, &new_supers);
+ find_methods (t, name_lang, name, result_names, &new_supers);
if (VEC_length (const_char_ptr, *result_names) != old_len
|| VEC_empty (typep, new_supers))
gdb_assert (!pspace->executing_startup);
set_current_program_space (pspace);
t = check_typedef (SYMBOL_TYPE (sym));
- find_methods (t, method_name, &result_names, &superclass_vec);
+ find_methods (t, SYMBOL_LANGUAGE (sym),
+ method_name, &result_names, &superclass_vec);
/* Handle all items from a single program space at once; and be
sure not to miss the last batch. */
this program space, consider superclasses. */
if (VEC_length (const_char_ptr, result_names) == last_result_len)
find_superclass_methods (superclass_vec, method_name,
- &result_names);
+ SYMBOL_LANGUAGE (sym), &result_names);
/* We have a list of candidate symbol names, so now we
iterate over the symbol tables looking for all
matches in this pspace. */
- add_all_symbol_names_from_pspace (&info, pspace, result_names);
+ add_all_symbol_names_from_pspace (&info, pspace, result_names,
+ FUNCTIONS_DOMAIN);
VEC_truncate (typep, superclass_vec, 0);
last_result_len = VEC_length (const_char_ptr, result_names);
static void
find_function_symbols (struct linespec_state *state,
VEC (symtab_ptr) *file_symtabs, const char *name,
+ symbol_name_match_type name_match_type,
VEC (symbolp) **symbols,
VEC (bound_minimal_symbol_d) **minsyms)
{
find_imps (name, &symbol_names);
if (!VEC_empty (const_char_ptr, symbol_names))
add_all_symbol_names_from_pspace (&info, state->search_pspace,
- symbol_names);
+ symbol_names, FUNCTIONS_DOMAIN);
else
- add_matching_symbols_to_info (name, &info, state->search_pspace);
+ add_matching_symbols_to_info (name, name_match_type, FUNCTIONS_DOMAIN,
+ &info, state->search_pspace);
do_cleanups (cleanup);
static void
find_linespec_symbols (struct linespec_state *state,
VEC (symtab_ptr) *file_symtabs,
- const char *name,
+ const char *lookup_name,
+ symbol_name_match_type name_match_type,
VEC (symbolp) **symbols,
VEC (bound_minimal_symbol_d) **minsyms)
{
- demangle_result_storage demangle_storage;
- std::string ada_lookup_storage;
- const char *lookup_name;
-
- if (state->language->la_language == language_ada)
- {
- /* In Ada, the symbol lookups are performed using the encoded
- name rather than the demangled name. */
- ada_lookup_storage = ada_name_for_lookup (name);
- lookup_name = ada_lookup_storage.c_str ();
- }
- else
- {
- lookup_name = demangle_for_lookup (name,
- state->language->la_language,
- demangle_storage);
- }
-
std::string canon = cp_canonicalize_string_no_typedefs (lookup_name);
if (!canon.empty ())
lookup_name = canon.c_str ();
2) break class::method where method is in class (and not a baseclass) */
find_function_symbols (state, file_symtabs, lookup_name,
+ name_match_type,
symbols, minsyms);
/* If we were unable to locate a symbol of the same name, try dividing
{
int ix;
const struct block *block;
- struct symbol *sym;
struct symbol *fn_sym;
VEC (symbolp) *result = NULL;
/* A helper for create_sals_line_offset that handles the 'list_mode' case. */
-static void
+static std::vector<symtab_and_line>
decode_digits_list_mode (struct linespec_state *self,
linespec_p ls,
- struct symtabs_and_lines *values,
struct symtab_and_line val)
{
int ix;
gdb_assert (self->list_mode);
+ std::vector<symtab_and_line> values;
+
for (ix = 0; VEC_iterate (symtab_ptr, ls->file_symtabs, ix, elt);
++ix)
{
val.pc = 0;
val.explicit_line = 1;
- add_sal_to_sals (self, values, &val, NULL, 0);
+ add_sal_to_sals (self, &values, &val, NULL, 0);
}
+
+ return values;
}
/* A helper for create_sals_line_offset that iterates over the symtabs,
adding lines to the VEC. */
-static void
+static std::vector<symtab_and_line>
decode_digits_ordinary (struct linespec_state *self,
linespec_p ls,
int line,
- struct symtabs_and_lines *sals,
struct linetable_entry **best_entry)
{
int ix;
struct symtab *elt;
+ std::vector<symtab_and_line> sals;
for (ix = 0; VEC_iterate (symtab_ptr, ls->file_symtabs, ix, elt); ++ix)
{
std::vector<CORE_ADDR> pcs;
pcs = find_pcs_for_symtab_line (elt, line, best_entry);
for (CORE_ADDR pc : pcs)
{
- struct symtab_and_line sal;
-
- init_sal (&sal);
+ symtab_and_line sal;
sal.pspace = SYMTAB_PSPACE (elt);
sal.symtab = elt;
sal.line = line;
sal.pc = pc;
- add_sal_to_sals_basic (sals, &sal);
+ sals.push_back (std::move (sal));
}
}
+
+ return sals;
}
\f
static void
minsym_found (struct linespec_state *self, struct objfile *objfile,
struct minimal_symbol *msymbol,
- struct symtabs_and_lines *result)
+ std::vector<symtab_and_line> *result)
{
- struct gdbarch *gdbarch = get_objfile_arch (objfile);
- CORE_ADDR pc;
struct symtab_and_line sal;
- sal = find_pc_sect_line (MSYMBOL_VALUE_ADDRESS (objfile, msymbol),
- (struct obj_section *) 0, 0);
- sal.section = MSYMBOL_OBJ_SECTION (objfile, msymbol);
+ CORE_ADDR func_addr;
+ if (msymbol_is_function (objfile, msymbol, &func_addr))
+ {
+ sal = find_pc_sect_line (func_addr, NULL, 0);
- /* The minimal symbol might point to a function descriptor;
- resolve it to the actual code address instead. */
- pc = gdbarch_convert_from_func_ptr_addr (gdbarch, sal.pc, ¤t_target);
- if (pc != sal.pc)
- sal = find_pc_sect_line (pc, NULL, 0);
-
- if (self->funfirstline)
- {
- if (sal.symtab != NULL
- && (COMPUNIT_LOCATIONS_VALID (SYMTAB_COMPUNIT (sal.symtab))
- || SYMTAB_LANGUAGE (sal.symtab) == language_asm))
- {
- /* If gdbarch_convert_from_func_ptr_addr does not apply then
- sal.SECTION, sal.LINE&co. will stay correct from above.
- If gdbarch_convert_from_func_ptr_addr applies then
- sal.SECTION is cleared from above and sal.LINE&co. will
- stay correct from the last find_pc_sect_line above. */
- sal.pc = MSYMBOL_VALUE_ADDRESS (objfile, msymbol);
- sal.pc = gdbarch_convert_from_func_ptr_addr (gdbarch, sal.pc,
- ¤t_target);
- if (gdbarch_skip_entrypoint_p (gdbarch))
- sal.pc = gdbarch_skip_entrypoint (gdbarch, sal.pc);
+ if (self->funfirstline)
+ {
+ if (sal.symtab != NULL
+ && (COMPUNIT_LOCATIONS_VALID (SYMTAB_COMPUNIT (sal.symtab))
+ || SYMTAB_LANGUAGE (sal.symtab) == language_asm))
+ {
+ struct gdbarch *gdbarch = get_objfile_arch (objfile);
+
+ sal.pc = func_addr;
+ if (gdbarch_skip_entrypoint_p (gdbarch))
+ sal.pc = gdbarch_skip_entrypoint (gdbarch, sal.pc);
+ }
+ else
+ skip_prologue_sal (&sal);
}
- else
- skip_prologue_sal (&sal);
}
+ else
+ {
+ sal.objfile = objfile;
+ sal.pc = MSYMBOL_VALUE_ADDRESS (objfile, msymbol);
+ sal.pspace = current_program_space;
+ }
+
+ sal.section = MSYMBOL_OBJ_SECTION (objfile, msymbol);
if (maybe_add_address (self->addr_set, objfile->pspace, sal.pc))
add_sal_to_sals (self, result, &sal, MSYMBOL_NATURAL_NAME (msymbol), 0);
add_minsym (struct minimal_symbol *minsym, void *d)
{
struct collect_minsyms *info = (struct collect_minsyms *) d;
- bound_minimal_symbol_d mo;
-
- mo.minsym = minsym;
- mo.objfile = info->objfile;
if (info->symtab != NULL)
{
- CORE_ADDR pc;
- struct symtab_and_line sal;
- struct gdbarch *gdbarch = get_objfile_arch (info->objfile);
-
- sal = find_pc_sect_line (MSYMBOL_VALUE_ADDRESS (info->objfile, minsym),
- NULL, 0);
- sal.section = MSYMBOL_OBJ_SECTION (info->objfile, minsym);
- pc
- = gdbarch_convert_from_func_ptr_addr (gdbarch, sal.pc, ¤t_target);
- if (pc != sal.pc)
- sal = find_pc_sect_line (pc, NULL, 0);
+ /* We're looking for a label for which we don't have debug
+ info. */
+ CORE_ADDR func_addr;
+ if (msymbol_is_function (info->objfile, minsym, &func_addr))
+ {
+ symtab_and_line sal = find_pc_sect_line (func_addr, NULL, 0);
- if (info->symtab != sal.symtab)
- return;
+ if (info->symtab != sal.symtab)
+ return;
+ }
}
- /* Exclude data symbols when looking for breakpoint locations. */
- if (!info->list_mode)
- switch (minsym->type)
- {
- case mst_slot_got_plt:
- case mst_data:
- case mst_bss:
- case mst_abs:
- case mst_file_data:
- case mst_file_bss:
- {
- /* Make sure this minsym is not a function descriptor
- before we decide to discard it. */
- struct gdbarch *gdbarch = get_objfile_arch (info->objfile);
- CORE_ADDR addr = gdbarch_convert_from_func_ptr_addr
- (gdbarch, BMSYMBOL_VALUE_ADDRESS (mo),
- ¤t_target);
-
- if (addr == BMSYMBOL_VALUE_ADDRESS (mo))
- return;
- }
- }
+ /* Exclude data symbols when looking for breakpoint locations. */
+ if (!info->list_mode && !msymbol_is_function (info->objfile, minsym))
+ return;
+ bound_minimal_symbol_d mo = {minsym, info->objfile};
VEC_safe_push (bound_minimal_symbol_d, info->msyms, &mo);
}
restrict results to the given SYMTAB. */
static void
-search_minsyms_for_name (struct collect_info *info, const char *name,
+search_minsyms_for_name (struct collect_info *info,
+ const lookup_name_info &name,
struct program_space *search_pspace,
struct symtab *symtab)
{
{
set_current_program_space (SYMTAB_PSPACE (symtab));
local.objfile = SYMTAB_OBJFILE(symtab);
- iterate_over_minimal_symbols (local.objfile, name, add_minsym,
- &local);
+ iterate_over_minimal_symbols (local.objfile, name, add_minsym, &local);
}
}
static void
add_matching_symbols_to_info (const char *name,
+ symbol_name_match_type name_match_type,
+ enum search_domain search_domain,
struct collect_info *info,
struct program_space *pspace)
{
int ix;
struct symtab *elt;
+ lookup_name_info lookup_name (name, name_match_type);
+
for (ix = 0; VEC_iterate (symtab_ptr, info->file_symtabs, ix, elt); ++ix)
{
if (elt == NULL)
{
- iterate_over_all_matching_symtabs (info->state, name, VAR_DOMAIN,
+ iterate_over_all_matching_symtabs (info->state, lookup_name,
+ VAR_DOMAIN, search_domain,
pspace, true, [&] (symbol *sym)
{ return info->add_symbol (sym); });
- search_minsyms_for_name (info, name, pspace, NULL);
+ search_minsyms_for_name (info, lookup_name, pspace, NULL);
}
else if (pspace == NULL || pspace == SYMTAB_PSPACE (elt))
{
been filtered out earlier. */
gdb_assert (!SYMTAB_PSPACE (elt)->executing_startup);
set_current_program_space (SYMTAB_PSPACE (elt));
- iterate_over_file_blocks (elt, name, VAR_DOMAIN, [&] (symbol *sym)
+ iterate_over_file_blocks (elt, lookup_name, VAR_DOMAIN,
+ [&] (symbol *sym)
{ return info->add_symbol (sym); });
/* If no new symbols were found in this iteration and this symtab
this case. */
if (prev_len == VEC_length (symbolp, info->result.symbols)
&& elt->language == language_asm)
- search_minsyms_for_name (info, name, pspace, elt);
+ search_minsyms_for_name (info, lookup_name, pspace, elt);
}
}
}
{
if (SYMBOL_CLASS (sym) == LOC_LABEL && SYMBOL_VALUE_ADDRESS (sym) != 0)
{
- init_sal (result);
+ *result = {};
result->symtab = symbol_symtab (sym);
+ result->symbol = sym;
result->line = SYMBOL_LINE (sym);
result->pc = SYMBOL_VALUE_ADDRESS (sym);
result->pspace = SYMTAB_PSPACE (result->symtab);
else if (SYMBOL_LINE (sym) != 0)
{
/* We know its line number. */
- init_sal (result);
+ *result = {};
result->symtab = symbol_symtab (sym);
+ result->symbol = sym;
result->line = SYMBOL_LINE (sym);
+ result->pc = SYMBOL_VALUE_ADDRESS (sym);
result->pspace = SYMTAB_PSPACE (result->symtab);
return 1;
}
linespec_result::~linespec_result ()
{
- int i;
- struct linespec_sals *lsal;
-
- for (i = 0; VEC_iterate (linespec_sals, sals, i, lsal); ++i)
- {
- xfree (lsal->canonical);
- xfree (lsal->sals.sals);
- }
- VEC_free (linespec_sals, sals);
+ for (linespec_sals &lsal : lsals)
+ xfree (lsal.canonical);
}
/* Return the quote characters permitted by the linespec parser. */