From 1594e0bb3d35b05aa53519f08021fb15bf26f1dc Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 8 Mar 2021 07:27:57 -0700 Subject: [PATCH] Introduce ternop_slice_operation This adds class ternop_slice_operation, which implements TERNOP_SLICE. gdb/ChangeLog 2021-03-08 Tom Tromey * expop.h (class ternop_slice_operation): New. * eval.c (eval_op_ternop): No longer static. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 2 +- gdb/expop.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ddf93421490..c3fc9c8ad3d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-03-08 Tom Tromey + + * expop.h (class ternop_slice_operation): New. + * eval.c (eval_op_ternop): No longer static. + 2021-03-08 Tom Tromey * expop.h (class string_operation): New. diff --git a/gdb/eval.c b/gdb/eval.c index e68a93d15c7..c667925b1bf 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1327,7 +1327,7 @@ eval_op_concat (struct type *expect_type, struct expression *exp, /* A helper function for TERNOP_SLICE. */ -static struct value * +struct value * eval_op_ternop (struct type *expect_type, struct expression *exp, enum noside noside, struct value *array, struct value *low, struct value *upper) diff --git a/gdb/expop.h b/gdb/expop.h index 802be81bda7..436a011e4d4 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -65,6 +65,11 @@ extern struct value *eval_op_string (struct type *expect_type, struct expression *exp, enum noside noside, int len, const char *string); +extern struct value *eval_op_ternop (struct type *expect_type, + struct expression *exp, + enum noside noside, + struct value *array, struct value *low, + struct value *upper); namespace expr { @@ -705,6 +710,30 @@ public: { return OP_STRING; } }; +class ternop_slice_operation + : public maybe_constant_operation +{ +public: + + using maybe_constant_operation::maybe_constant_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + struct value *array + = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + struct value *low + = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + struct value *upper + = std::get<2> (m_storage)->evaluate (nullptr, exp, noside); + return eval_op_ternop (expect_type, exp, noside, array, low, upper); + } + + enum exp_opcode opcode () const override + { return TERNOP_SLICE; } +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.30.2