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.
This commit is contained in:
Tom Tromey
2021-03-08 07:27:57 -07:00
parent 7631cf6cc8
commit 9e99f48f27
3 changed files with 35 additions and 1 deletions

View File

@@ -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.

View File

@@ -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 */

View File

@@ -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