[PATCH 161/203] Implement Ada min and max operations

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

This implement the Ada min and max operations using an existing
template class.

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

* ada-lang.c (ada_binop_minmax): No longer static.
* ada-exp.h (ada_binop_min_operation, ada_binop_max_operation):
New typedefs.
---
gdb/ChangeLog | 6 ++++++
gdb/ada-exp.h | 8 ++++++++
gdb/ada-lang.c | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h
index 0fe6ecf7e93..f3808935f99 100644
--- a/gdb/ada-exp.h
+++ b/gdb/ada-exp.h
@@ -60,6 +60,11 @@ extern struct value *ada_binop_in_bounds (struct expression *exp,
struct value *arg1,
struct value *arg2,
int n);
+extern struct value *ada_binop_minmax (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside, enum exp_opcode op,
+ struct value *arg1,
+ struct value *arg2);

namespace expr
{
@@ -173,6 +178,9 @@ 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>;

+using ada_binop_min_operation = binop_operation<OP_ATR_MIN, ada_binop_minmax>;
+using ada_binop_max_operation = binop_operation<OP_ATR_MAX, ada_binop_minmax>;
+
/* 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>
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 3560eee307a..b3278183177 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -10539,7 +10539,7 @@ ada_unop_atr (struct expression *exp, enum noside noside, enum exp_opcode op,

/* A helper function for OP_ATR_MIN and OP_ATR_MAX. */

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