From fc715eb288a8f364616c7adc16afd8ba74849d62 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 8 Mar 2021 07:27:57 -0700 Subject: [PATCH] Introduce ada_ternop_range_operation This adds class ada_ternop_range_operation, which implements TERNOP_IN_RANGE. gdb/ChangeLog 2021-03-08 Tom Tromey * ada-lang.c (ada_ternop_range_operation::evaluate): New method. * ada-exp.h (class ada_ternop_range_operation): New. --- gdb/ChangeLog | 5 +++++ gdb/ada-exp.h | 16 ++++++++++++++++ gdb/ada-lang.c | 11 +++++++++++ 3 files changed, 32 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 337813d31db..83482307934 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-03-08 Tom Tromey + + * ada-lang.c (ada_ternop_range_operation::evaluate): New method. + * ada-exp.h (class ada_ternop_range_operation): New. + 2021-03-08 Tom Tromey * ada-lang.c (ada_qual_operation::evaluate): New method. diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h index 9a8c8dffd5c..17a04ea15c6 100644 --- a/gdb/ada-exp.h +++ b/gdb/ada-exp.h @@ -71,6 +71,22 @@ public: { return UNOP_QUAL; } }; +/* Ternary in-range operator. */ +class ada_ternop_range_operation + : public tuple_holding_operation +{ +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 TERNOP_IN_RANGE; } +}; + } /* namespace expr */ #endif /* ADA_EXP_H */ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 409ffb98dcd..dd884668dc4 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10436,6 +10436,17 @@ ada_qual_operation::evaluate (struct type *expect_type, return std::get<0> (m_storage)->evaluate (type, exp, noside); } +value * +ada_ternop_range_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + value *arg0 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + value *arg1 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + value *arg2 = std::get<2> (m_storage)->evaluate (nullptr, exp, noside); + return eval_ternop_in_range (expect_type, exp, noside, arg0, arg1, arg2); +} + } /* Implement the evaluate_exp routine in the exp_descriptor structure -- 2.30.2