From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 07/12] Move "iterated_associations" into ada_parse_state
Date: Thu, 21 Mar 2024 13:03:35 -0600 [thread overview]
Message-ID: <20240321-ada-iterated-assign-v1-7-925cdd4f1f4a@adacore.com> (raw)
In-Reply-To: <20240321-ada-iterated-assign-v1-0-925cdd4f1f4a@adacore.com>
This patch moves the "iterated_associations" 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 1c5ffff3290..615b74d14d8 100644
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -97,6 +97,10 @@ struct ada_parse_state
to implement '@', the target name symbol. */
std::vector<ada_assign_up> assignments;
+ /* Track currently active iterated assignment names. */
+ std::unordered_map<std::string, std::vector<ada_index_var_operation *>>
+ iterated_associations;
+
private:
/* We don't have a good way to manage non-POD data in Yacc, so store
@@ -444,10 +448,6 @@ make_tick_completer (struct stoken tok)
(new ada_tick_completer (std::string (tok.ptr, tok.length))));
}
-/* Track currently active iterated assignment names. */
-static std::unordered_map<std::string, std::vector<ada_index_var_operation *>>
- iterated_associations;
-
%}
%union
@@ -1128,12 +1128,12 @@ component_group :
{
std::string name = copy_name ($2);
- auto iter = iterated_associations.find (name);
- if (iter != iterated_associations.end ())
+ auto iter = ada_parser->iterated_associations.find (name);
+ if (iter != ada_parser->iterated_associations.end ())
error (_("Nested use of index parameter '%s'"),
name.c_str ());
- iterated_associations[name] = {};
+ ada_parser->iterated_associations[name] = {};
}
component_associations
{
@@ -1142,12 +1142,12 @@ component_group :
ada_choices_component *choices = choice_component ();
choices->set_associations (pop_associations ($5));
- auto iter = iterated_associations.find (name);
- gdb_assert (iter != iterated_associations.end ());
+ auto iter = ada_parser->iterated_associations.find (name);
+ gdb_assert (iter != ada_parser->iterated_associations.end ());
for (ada_index_var_operation *var : iter->second)
var->set_choices (choices);
- iterated_associations.erase (name);
+ ada_parser->iterated_associations.erase (name);
choices->set_name (std::move (name));
}
@@ -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);
- iterated_associations.clear ();
int result = yyparse ();
if (!result)
@@ -1707,8 +1706,8 @@ write_var_or_type (struct parser_state *par_state,
if (block == nullptr)
{
- auto iter = iterated_associations.find (name_storage);
- if (iter != iterated_associations.end ())
+ auto iter = ada_parser->iterated_associations.find (name_storage);
+ if (iter != ada_parser->iterated_associations.end ())
{
auto op = std::make_unique<ada_index_var_operation> ();
iter->second.push_back (op.get ());
--
2.43.0
next prev parent reply other threads:[~2024-03-21 19:05 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 ` [PATCH 06/12] Move "assignments" global " Tom Tromey
2024-03-21 19:03 ` Tom Tromey [this message]
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-7-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