Introduce rust_range_operation

This adds class rust_range_operation, which implements OP_RANGE.

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

	* rust-lang.c (rust_range): No longer static.
	* rust-exp.h (class rust_range_operation): New.
This commit is contained in:
Tom Tromey
2021-03-08 07:27:57 -07:00
parent 6ce1ad679a
commit 9db6b6ddbd
3 changed files with 36 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2021-03-08 Tom Tromey <tom@tromey.com>
* rust-lang.c (rust_range): No longer static.
* rust-exp.h (class rust_range_operation): New.
2021-03-08 Tom Tromey <tom@tromey.com>
* rust-lang.c (rust_subscript): No longer static.

View File

@ -42,6 +42,10 @@ extern struct value *rust_subscript (struct type *expect_type,
struct expression *exp,
enum noside noside, bool for_addr,
struct value *lhs, struct value *rhs);
extern struct value *rust_range (struct type *expect_type,
struct expression *exp,
enum noside noside, enum range_flag kind,
struct value *low, struct value *high);
namespace expr
{
@ -124,6 +128,32 @@ public:
{ return UNOP_ADDR; }
};
/* The Rust range operators. */
class rust_range_operation
: public tuple_holding_operation<enum range_flag, operation_up, operation_up>
{
public:
using tuple_holding_operation::tuple_holding_operation;
value *evaluate (struct type *expect_type,
struct expression *exp,
enum noside noside) override
{
auto kind = std::get<0> (m_storage);
value *low = nullptr;
if (std::get<1> (m_storage) != nullptr)
low = std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
value *high = nullptr;
if (std::get<2> (m_storage) != nullptr)
high = std::get<2> (m_storage)->evaluate (nullptr, exp, noside);
return rust_range (expect_type, exp, noside, kind, low, high);
}
enum exp_opcode opcode () const override
{ return OP_RANGE; }
};
} /* namespace expr */
#endif /* RUST_EXP_H */

View File

@ -1041,7 +1041,7 @@ rust_evaluate_funcall (struct expression *exp, int *pos, enum noside noside)
/* A helper for rust_evaluate_subexp that handles OP_RANGE. */
static struct value *
struct value *
rust_range (struct type *expect_type, struct expression *exp,
enum noside noside, enum range_flag kind,
struct value *low, struct value *high)