Introduce rust_subscript_operation

This adds class rust_subscript_operation, which implements
BINOP_SUBSCRIPT for Rust.

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

	* rust-lang.c (rust_subscript): No longer static.
	* rust-exp.h (class rust_subscript_operation): New.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 397a6067bfcd09808092d07e9cecfe6258099597..a9b47648e2f12fbcac33d22fe8fe7b0046893f1c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+       * rust-lang.c (rust_subscript): No longer static.
+       * rust-exp.h (class rust_subscript_operation): New.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
        * rust-lang.c (eval_op_rust_ind): No longer static.  Add "opcode"

diff --git a/gdb/rust-exp.h b/gdb/rust-exp.h
index d16f921ca0047151618b072073f4d4e914fc0dd4..7571009ea39552d29fffc24341e33401434136a3 100644 (file)
--- a/gdb/rust-exp.h
+++ b/gdb/rust-exp.h
@@ -38,6 +38,10 @@ extern struct value *eval_op_rust_ind (struct type *expect_type,
                                       enum noside noside,
                                       enum exp_opcode opcode,
                                       struct value *value);
+extern struct value *rust_subscript (struct type *expect_type,
+                                    struct expression *exp,
+                                    enum noside noside, bool for_addr,
+                                    struct value *lhs, struct value *rhs);
 
 namespace expr
 {
@@ -67,6 +71,59 @@ public:
   }
 };
 
+/* Subscript operator for Rust.  */
+class rust_subscript_operation
+  : public tuple_holding_operation<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<0> (m_storage)->evaluate (nullptr, exp, noside);
+    value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
+    return rust_subscript (expect_type, exp, noside, false, arg1, arg2);
+  }
+
+  value *slice (struct type *expect_type,
+               struct expression *exp,
+               enum noside noside)
+  {
+    value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
+    value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
+    return rust_subscript (expect_type, exp, noside, true, arg1, arg2);
+  }
+
+  enum exp_opcode opcode () const override
+  { return BINOP_SUBSCRIPT; }
+};
+
+class rust_unop_addr_operation
+  : public tuple_holding_operation<operation_up>
+{
+public:
+
+  using tuple_holding_operation::tuple_holding_operation;
+
+  value *evaluate (struct type *expect_type,
+                  struct expression *exp,
+                  enum noside noside) override
+  {
+    operation *oper = std::get<0> (m_storage).get ();
+    rust_subscript_operation *sub_op
+      = dynamic_cast<rust_subscript_operation *> (oper);
+    if (sub_op != nullptr)
+      return sub_op->slice (expect_type, exp, noside);
+    return oper->evaluate_for_address (exp, noside);
+  }
+
+  enum exp_opcode opcode () const override
+  { return UNOP_ADDR; }
+};
+
 } /* namespace expr */
 
 #endif /* RUST_EXP_H */

diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
index f1f4cd334010eb6cf16f876ee915560f46e93a3c..81b670240f699cf86999586bb7862e6379c5adc4 100644 (file)
--- a/gdb/rust-lang.c
+++ b/gdb/rust-lang.c
@@ -1168,7 +1168,7 @@ rust_compute_range (struct type *type, struct value *range,
 
 /* A helper for rust_evaluate_subexp that handles BINOP_SUBSCRIPT.  */
 
-static struct value *
+struct value *
 rust_subscript (struct type *expect_type, struct expression *exp,
                enum noside noside, bool for_addr,
                struct value *lhs, struct value *rhs)