Introduce ada_atr_val_operation

This adds class ada_atr_val_operation, which implements OP_ATR_VAL.

gdb/ChangeLog
2021-03-08  Tom Tromey  <tom@tromey.com>

	* ada-lang.c (ada_val_atr): No longer static.
	(ada_atr_val_operation::evaluate): New method.
	* ada-exp.h (class ada_atr_val_operation): New.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index adb5140d369fc8c21248341547583bfaf0fa94f5..c49a9db1aa20e789bc771fa3a6cd37c3e8167e48 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+       * ada-lang.c (ada_val_atr): No longer static.
+       (ada_atr_val_operation::evaluate): New method.
+       * ada-exp.h (class ada_atr_val_operation): New.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
        * ada-lang.c (ada_pos_atr): No longer static.

diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h
index 07744c1c8eaae39f3e0bff97b662bfa957939bec..c86b05489478a37f53badd2b00bfbd44485054d1 100644 (file)
--- a/gdb/ada-exp.h
+++ b/gdb/ada-exp.h
@@ -69,6 +69,9 @@ extern struct value *ada_pos_atr (struct type *expect_type,
                                  struct expression *exp,
                                  enum noside noside, enum exp_opcode op,
                                  struct value *arg);
+extern struct value *ada_val_atr (enum noside noside, struct type *type,
+                                 struct value *arg);
+
 
 namespace expr
 {
@@ -334,6 +337,22 @@ protected:
   using operation::do_generate_ax;
 };
 
+/* Implement the Ada 'val attribute.  */
+class ada_atr_val_operation
+  : public tuple_holding_operation<struct type *, operation_up>
+{
+public:
+
+  using tuple_holding_operation::tuple_holding_operation;
+
+  value *evaluate (struct type *expect_type,
+                  struct expression *exp,
+                  enum noside noside) override;
+
+  enum exp_opcode opcode () const override
+  { return OP_ATR_VAL; }
+};
+
 } /* namespace expr */
 
 #endif /* ADA_EXP_H */

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 52766ae916c5d500d172c301c3eb06147d083118..c689c7fec8b67fafaa32eb18aa92eac47285d270 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -8892,7 +8892,7 @@ val_atr (struct type *type, LONGEST val)
   return value_from_longest (type, val);
 }
 
-static struct value *
+struct value *
 ada_val_atr (enum noside noside, struct type *type, struct value *arg)
 {
   if (noside == EVAL_AVOID_SIDE_EFFECTS)
@@ -10694,6 +10694,15 @@ ada_var_value_operation::evaluate (struct type *expect_type,
   return ada_to_fixed_value (arg1);
 }
 
+value *
+ada_atr_val_operation::evaluate (struct type *expect_type,
+                                struct expression *exp,
+                                enum noside noside)
+{
+  value *arg = std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
+  return ada_val_atr (noside, std::get<0> (m_storage), arg);
+}
+
 }
 
 /* Implement the evaluate_exp routine in the exp_descriptor structure