Introduce ada_binop_in_bounds

This adds class ada_binop_in_bounds, which implements BINOP_IN_BOUNDS.

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

	* ada-lang.c (ada_binop_in_bounds): No longer static.
	* ada-exp.h (class ada_binop_in_bounds_operation): New.
This commit is contained in:
Tom Tromey 2021-03-08 07:27:57 -07:00
parent 1b1ebfab47
commit 82c3886e24
3 changed files with 33 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2021-03-08 Tom Tromey <tom@tromey.com>
* ada-lang.c (ada_binop_in_bounds): No longer static.
* ada-exp.h (class ada_binop_in_bounds_operation): New.
2021-03-08 Tom Tromey <tom@tromey.com> 2021-03-08 Tom Tromey <tom@tromey.com>
* ada-lang.c (ada_ternop_slice): No longer static. * ada-lang.c (ada_ternop_slice): No longer static.

View file

@ -55,6 +55,11 @@ extern struct value *ada_ternop_slice (struct expression *exp,
struct value *array, struct value *array,
struct value *low_bound_val, struct value *low_bound_val,
struct value *high_bound_val); struct value *high_bound_val);
extern struct value *ada_binop_in_bounds (struct expression *exp,
enum noside noside,
struct value *arg1,
struct value *arg2,
int n);
namespace expr namespace expr
{ {
@ -240,6 +245,28 @@ public:
{ return TERNOP_SLICE; } { return TERNOP_SLICE; }
}; };
/* Implement BINOP_IN_BOUNDS for Ada. */
class ada_binop_in_bounds_operation
: public maybe_constant_operation<operation_up, operation_up, int>
{
public:
using maybe_constant_operation::maybe_constant_operation;
value *evaluate (struct type *expect_type,
struct expression *exp,
enum noside noside) override
{
value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
return ada_binop_in_bounds (exp, noside, arg1, arg2,
std::get<2> (m_storage));
}
enum exp_opcode opcode () const override
{ return BINOP_IN_BOUNDS; }
};
} /* namespace expr */ } /* namespace expr */
#endif /* ADA_EXP_H */ #endif /* ADA_EXP_H */

View file

@ -10237,7 +10237,7 @@ ada_ternop_slice (struct expression *exp,
/* A helper function for BINOP_IN_BOUNDS. */ /* A helper function for BINOP_IN_BOUNDS. */
static value * value *
ada_binop_in_bounds (struct expression *exp, enum noside noside, ada_binop_in_bounds (struct expression *exp, enum noside noside,
struct value *arg1, struct value *arg2, int n) struct value *arg1, struct value *arg2, int n)
{ {