diff options
author | Tom Tromey <tromey@adacore.com> | 2024-03-14 12:17:30 -0600 |
---|---|---|
committer | Tom Tromey <tromey@adacore.com> | 2024-04-02 11:24:27 -0600 |
commit | 06c3813858a3b4d9cf624fa687ded27b934fa024 (patch) | |
tree | abc7b2f6239317bc51c4cf43a969dd9b7797dafa /gdb | |
parent | 68d7f5b02f2e2d1eba7dca8701d340674f64329d (diff) | |
download | gdb-06c3813858a3b4d9cf624fa687ded27b934fa024.zip gdb-06c3813858a3b4d9cf624fa687ded27b934fa024.tar.gz gdb-06c3813858a3b4d9cf624fa687ded27b934fa024.tar.bz2 |
Move "assignments" global into ada_parse_state
This patch moves the "assignments" global into ada_parse_state.
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ada-exp.y | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index be726ec..207fdcb 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -66,6 +66,9 @@ static struct parser_state *pstate = NULL; using namespace expr; +/* A convenience typedef. */ +typedef std::unique_ptr<ada_assign_operation> ada_assign_up; + /* Data that must be held for the duration of a parse. */ struct ada_parse_state @@ -89,6 +92,10 @@ struct ada_parse_state /* The associations being constructed during this parse. */ std::vector<ada_association_up> associations; + /* The stack of currently active assignment expressions. This is used + to implement '@', the target name symbol. */ + std::vector<ada_assign_up> assignments; + private: /* We don't have a good way to manage non-POD data in Yacc, so store @@ -436,13 +443,6 @@ make_tick_completer (struct stoken tok) (new ada_tick_completer (std::string (tok.ptr, tok.length)))); } -/* A convenience typedef. */ -typedef std::unique_ptr<ada_assign_operation> ada_assign_up; - -/* The stack of currently active assignment expressions. This is used - to implement '@', the target name symbol. */ -static std::vector<ada_assign_up> assignments; - /* Track currently active iterated assignment names. */ static std::unordered_map<std::string, std::vector<ada_index_var_operation *>> iterated_associations; @@ -527,14 +527,14 @@ exp1 : exp { ada_wrap2<comma_operation> (BINOP_COMMA); } | primary ASSIGN { - assignments.emplace_back + ada_parser->assignments.emplace_back (new ada_assign_operation (ada_pop (), nullptr)); } exp /* Extension for convenience */ { ada_assign_up assign - = std::move (assignments.back ()); - assignments.pop_back (); + = std::move (ada_parser->assignments.back ()); + ada_parser->assignments.pop_back (); value *lhs_val = (assign->eval_for_resolution (pstate->expout.get ())); @@ -645,11 +645,11 @@ primary : aggregate primary : '@' { - if (assignments.empty ()) + if (ada_parser->assignments.empty ()) error (_("the target name symbol ('@') may only " "appear in an assignment context")); ada_assign_operation *current - = assignments.back ().get (); + = ada_parser->assignments.back ().get (); pstate->push_new<ada_target_operation> (current); } ; @@ -1256,7 +1256,6 @@ ada_parse (struct parser_state *par_state) lexer_init (yyin); /* (Re-)initialize lexer. */ obstack_free (&temp_parse_space, NULL); obstack_init (&temp_parse_space); - assignments.clear (); iterated_associations.clear (); int result = yyparse (); |