[PATCH 154/203] Implement Ada equality operators

Tom Tromey
2021-01-01T21:49:19Z

This implements the Ada equal and not-equal operators.

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

* ada-lang.c (ada_equal_binop): No longer static.
* ada-exp.h (class ada_binop_equal_operation): New.
---
gdb/ChangeLog | 5 +++++
gdb/ada-exp.h | 27 +++++++++++++++++++++++++++
gdb/ada-lang.c | 2 +-
3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h
index da52d5cb299..3091323c89e 100644
--- a/gdb/ada-exp.h
+++ b/gdb/ada-exp.h
@@ -46,6 +46,10 @@ extern struct value *ada_mult_binop (struct type *expect_type,
struct expression *exp,
enum noside noside, enum exp_opcode op,
struct value *arg1, struct value *arg2);
+extern struct value *ada_equal_binop (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside, enum exp_opcode op,
+ struct value *arg1, struct value *arg2);

namespace expr
{
@@ -159,6 +163,29 @@ using ada_binop_div_operation = binop_operation<BINOP_DIV, ada_mult_binop>;
using ada_binop_rem_operation = binop_operation<BINOP_REM, ada_mult_binop>;
using ada_binop_mod_operation = binop_operation<BINOP_MOD, ada_mult_binop>;

+/* Implement the equal and not-equal operations for Ada. */
+class ada_binop_equal_operation
+ : public tuple_holding_operation<enum exp_opcode, 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
+ {
+ value *arg1 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
+ value *arg2 = std::get<2> (m_storage)->evaluate (value_type (arg1),
+ exp, noside);
+ return ada_equal_binop (expect_type, exp, noside, std::get<0> (m_storage),
+ arg1, arg2);
+ }
+
+ enum exp_opcode opcode () const override
+ { return std::get<0> (m_storage); }
+};
+
} /* namespace expr */

#endif /* ADA_EXP_H */
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 6b18282ed82..7ec73d4a292 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -10279,7 +10279,7 @@ ada_mult_binop (struct type *expect_type,

/* A helper function for BINOP_EQUAL and BINOP_NOTEQUAL. */

-static value *
+value *
ada_equal_binop (struct type *expect_type,
struct expression *exp,
enum noside noside, enum exp_opcode op,
--
2.26.2