Introduce ada_ternop_slice

This adds class ada_ternop_slice, which implements TERNOP_SLICE for
Ada.

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

	* ada-lang.c (ada_ternop_slice): No longer static.
	* ada-exp.h (class ada_ternop_slice_operation): New.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 62c71b7c53476fc84ea520ac8dd4779cff3fee01..57d083c350ab89c209624fb65b089bae240ae273 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+       * ada-lang.c (ada_ternop_slice): No longer static.
+       * ada-exp.h (class ada_ternop_slice_operation): New.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
        * ada-exp.h (ada_bitwise_operation): New template class.

diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h
index d8f18b9c61f76a496c30bcd3ab2c97609d8ffdf7..96e3c407b6fa9f321397b7928f64d8c68995d79a 100644 (file)
--- a/gdb/ada-exp.h
+++ b/gdb/ada-exp.h
@@ -50,6 +50,11 @@ 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);
+extern struct value *ada_ternop_slice (struct expression *exp,
+                                      enum noside noside,
+                                      struct value *array,
+                                      struct value *low_bound_val,
+                                      struct value *high_bound_val);
 
 namespace expr
 {
@@ -213,6 +218,28 @@ using ada_bitwise_and_operation = ada_bitwise_operation<BINOP_BITWISE_AND>;
 using ada_bitwise_ior_operation = ada_bitwise_operation<BINOP_BITWISE_IOR>;
 using ada_bitwise_xor_operation = ada_bitwise_operation<BINOP_BITWISE_XOR>;
 
+/* Ada array- or string-slice operation.  */
+class ada_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
+  {
+    value *array = std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
+    value *low = std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
+    value *high = std::get<2> (m_storage)->evaluate (nullptr, exp, noside);
+    return ada_ternop_slice (exp, noside, array, low, high);
+  }
+
+  enum exp_opcode opcode () const override
+  { return TERNOP_SLICE; }
+};
+
 } /* namespace expr */
 
 #endif /* ADA_EXP_H */

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 7ae3343a63078421c8f5fc2eddead7e438642610..3f14922e18c2730c4e612a3f5f954de160928678 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -10156,7 +10156,7 @@ ada_equal_binop (struct type *expect_type,
 
 /* A helper function for TERNOP_SLICE.  */
 
-static value *
+value *
 ada_ternop_slice (struct expression *exp,
                  enum noside noside,
                  struct value *array, struct value *low_bound_val,