Introduce ternop_slice_operation

This adds class ternop_slice_operation, which implements TERNOP_SLICE.

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

	* expop.h (class ternop_slice_operation): New.
	* eval.c (eval_op_ternop): No longer static.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ddf93421490228f854c7c7c1336061f1a89a49ea..c3fc9c8ad3d59d4b70b9df641ed536ec4d6445f3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+       * expop.h (class ternop_slice_operation): New.
+       * eval.c (eval_op_ternop): No longer static.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
        * expop.h (class string_operation): New.

diff --git a/gdb/eval.c b/gdb/eval.c
index e68a93d15c77f2cd3aed492ca5872c0d78b1df6d..c667925b1bface4f3ab34cad160ccdc0e4ecc171 100644 (file)
--- 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 802be81bda7bcaf48e4c42e387373504c6105193..436a011e4d447d0dba34f97c33ea89c808844f64 100644 (file)
--- 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<operation_up, operation_up, operation_up>
+{
+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 */