diff mbox series

[07/12] Move "iterated_associations" into ada_parse_state

Message ID 20240321-ada-iterated-assign-v1-7-925cdd4f1f4a@adacore.com
State New
Headers
Series Ada iterated assignment, plus parser cleanups |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Testing passed

Commit Message

Tom Tromey March 21, 2024, 7:03 p.m. UTC 
  This patch moves the "iterated_associations" global into
ada_parse_state.
---
 gdb/ada-exp.y | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)
diff mbox series

Patch

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 ());