From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 06/12] Move "assignments" global into ada_parse_state
Date: Thu, 21 Mar 2024 13:03:34 -0600 [thread overview]
Message-ID: <20240321-ada-iterated-assign-v1-6-925cdd4f1f4a@adacore.com> (raw)
In-Reply-To: <20240321-ada-iterated-assign-v1-0-925cdd4f1f4a@adacore.com>
This patch moves the "assignments" global into ada_parse_state.
---
gdb/ada-exp.y | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index 25809b6aa24..1c5ffff3290 100644
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -67,6 +67,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
@@ -90,6 +93,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
@@ -437,13 +444,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;
@@ -528,14 +528,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 ()));
@@ -646,11 +646,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);
}
;
@@ -1257,7 +1257,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 ();
--
2.43.0
next prev parent reply other threads:[~2024-03-21 19:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-21 19:03 [PATCH 00/12] Ada iterated assignment, plus parser cleanups Tom Tromey
2024-03-21 19:03 ` [PATCH 01/12] Introduce and use aggregate_assigner type Tom Tromey
2024-03-21 19:03 ` [PATCH 02/12] Implement Ada 2022 iterated assignment Tom Tromey
2024-03-21 19:03 ` [PATCH 03/12] Introduce ada_parse_state Tom Tromey
2024-03-21 19:03 ` [PATCH 04/12] Move "int_storage" global into ada_parse_state Tom Tromey
2024-03-21 19:03 ` [PATCH 05/12] Move "components" and "associations" " Tom Tromey
2024-03-21 19:03 ` Tom Tromey [this message]
2024-03-21 19:03 ` [PATCH 07/12] Move "iterated_associations" " Tom Tromey
2024-03-21 19:03 ` [PATCH 08/12] Move "temp_parse_space" " Tom Tromey
2024-03-21 19:03 ` [PATCH 09/12] Move "paren_depth" " Tom Tromey
2024-03-21 19:03 ` [PATCH 10/12] Move "returned_complete" " Tom Tromey
2024-03-21 19:03 ` [PATCH 11/12] Remove "numbuf" global Tom Tromey
2024-03-21 19:03 ` [PATCH 12/12] Constify ada-lex.l:attributes Tom Tromey
2024-04-02 17:35 ` [PATCH 00/12] Ada iterated assignment, plus parser cleanups Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240321-ada-iterated-assign-v1-6-925cdd4f1f4a@adacore.com \
--to=tromey@adacore.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox