diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ada-exp.y | 17 | ||||
| -rw-r--r-- | gdb/ada-lex.l | 3 |
2 files changed, 12 insertions, 8 deletions
diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index 80c1edc..cb0618c 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -75,8 +75,19 @@ struct ada_parse_state std::string find_completion_bounds (); + const gdb_mpz *push_integer (gdb_mpz &&val) + { + auto &result = m_int_storage.emplace_back (new gdb_mpz (std::move (val))); + return result.get (); + } + private: + /* We don't have a good way to manage non-POD data in Yacc, so store + values here. The storage here is only valid for the duration of + the parse. */ + std::vector<std::unique_ptr<gdb_mpz>> m_int_storage; + /* The original expression string. */ const char *m_original_expr; }; @@ -85,11 +96,6 @@ private: static ada_parse_state *ada_parser; -/* We don't have a good way to manage non-POD data in Yacc, so store - values here. The storage here is only valid for the duration of - the parse. */ -static std::vector<std::unique_ptr<gdb_mpz>> int_storage; - int yyparse (void); static int yylex (void); @@ -1252,7 +1258,6 @@ ada_parse (struct parser_state *par_state) obstack_init (&temp_parse_space); components.clear (); associations.clear (); - int_storage.clear (); assignments.clear (); iterated_associations.clear (); diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l index e1abf9a..109b95c 100644 --- a/gdb/ada-lex.l +++ b/gdb/ada-lex.l @@ -465,8 +465,7 @@ processInt (struct parser_state *par_state, const char *base0, return FLOAT; } - const gdb_mpz *value - = int_storage.emplace_back (new gdb_mpz (std::move (result))).get (); + const gdb_mpz *value = ada_parser->push_integer (std::move (result)); int int_bits = gdbarch_int_bit (par_state->gdbarch ()); int long_bits = gdbarch_long_bit (par_state->gdbarch ()); |