diff options
| author | Tom Tromey <tom@tromey.com> | 2019-04-07 15:29:58 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-04-19 14:10:23 -0600 |
| commit | 61f4b350419e91560be94e0671a760b2e4902c65 (patch) | |
| tree | f1cc08b31b813c81d730ccd69974772d82cbcd12 /gdb/f-exp.y | |
| parent | 189b8c2e104017600104457b97315da74a22f549 (diff) | |
| download | binutils-gdb-61f4b350419e91560be94e0671a760b2e4902c65.tar.gz | |
Make copy_name return std::string
This changes copy_name to return a std::string, updating all the
callers. In some cases, an extra copy was removed. This also
required a little bit of constification.
Tested by the buildbot.
gdb/ChangeLog
2019-04-19 Tom Tromey <tom@tromey.com>
* type-stack.h (struct type_stack) <insert>: Constify string.
* type-stack.c (type_stack::insert): Constify string.
* gdbtypes.h (lookup_template_type): Update.
(address_space_name_to_int): Update.
* gdbtypes.c (address_space_name_to_int): Make space_identifier
const.
(lookup_template_type): Make name const.
* c-exp.y: Update rules.
(lex_one_token, classify_name, classify_inner_name)
(c_print_token): Update.
* p-exp.y: Update rules.
(yylex): Update.
* f-exp.y: Update rules.
(yylex): Update.
* d-exp.y: Update rules.
(lex_one_token, classify_name, classify_inner_name): Update.
* parse.c (write_dollar_variable, copy_name): Return std::string.
* parser-defs.h (copy_name): Change return type.
* m2-exp.y: Update rules.
(yylex): Update.
* go-exp.y (lex_one_token): Update.
Update rules.
(classify_unsafe_function, classify_packaged_name)
(classify_name, yylex): Update.
Diffstat (limited to 'gdb/f-exp.y')
| -rw-r--r-- | gdb/f-exp.y | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gdb/f-exp.y b/gdb/f-exp.y index 9ee5316470f..b326d09c44e 100644 --- a/gdb/f-exp.y +++ b/gdb/f-exp.y @@ -490,17 +490,17 @@ variable: name_not_typename else { struct bound_minimal_symbol msymbol; - char *arg = copy_name ($1.stoken); + std::string arg = copy_name ($1.stoken); msymbol = - lookup_bound_minimal_symbol (arg); + lookup_bound_minimal_symbol (arg.c_str ()); if (msymbol.minsym != NULL) write_exp_msymbol (pstate, msymbol); else if (!have_full_symbols () && !have_partial_symbols ()) error (_("No symbol table is loaded. Use the \"file\" command.")); else error (_("No symbol \"%s\" in current context."), - copy_name ($1.stoken)); + arg.c_str ()); } } ; @@ -1264,7 +1264,7 @@ yylex (void) currently as names of types; NAME for other symbols. The caller is not constrained to care about the distinction. */ { - char *tmp = copy_name (yylval.sval); + std::string tmp = copy_name (yylval.sval); struct block_symbol result; struct field_of_this_result is_a_field_of_this; enum domain_enum_tag lookup_domains[] = @@ -1281,7 +1281,7 @@ yylex (void) way we can refer to it unconditionally below. */ memset (&is_a_field_of_this, 0, sizeof (is_a_field_of_this)); - result = lookup_symbol (tmp, pstate->expression_context_block, + result = lookup_symbol (tmp.c_str (), pstate->expression_context_block, lookup_domains[i], pstate->language ()->la_language == language_cplus @@ -1298,7 +1298,7 @@ yylex (void) yylval.tsym.type = language_lookup_primitive_type (pstate->language (), - pstate->gdbarch (), tmp); + pstate->gdbarch (), tmp.c_str ()); if (yylval.tsym.type != NULL) return TYPENAME; |