[v3,087/206] Introduce string_operation

Message ID 20210220201609.838264-88-tom@tromey.com
State New
Headers show
Series
  • Refactor expressions
Related show

Commit Message

Tom Tromey Feb. 20, 2021, 8:14 p.m.
This adds string_operation, which implements OP_STRING for most
languages (C has its own variant).

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

	* expop.h (class string_operation): New.
	* eval.c (eval_op_string): No longer static.
---
 gdb/ChangeLog |  5 +++++
 gdb/eval.c    |  2 +-
 gdb/expop.h   | 24 ++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

-- 
2.26.2

Patch

diff --git a/gdb/eval.c b/gdb/eval.c
index 1e208d07344..d75e74c9891 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1284,7 +1284,7 @@  eval_op_register (struct type *expect_type, struct expression *exp,
 
 /* Helper function that implements the body of OP_STRING.  */
 
-static struct value *
+struct value *
 eval_op_string (struct type *expect_type, struct expression *exp,
 		enum noside noside, int len, const char *string)
 {
diff --git a/gdb/expop.h b/gdb/expop.h
index d143815a259..802be81bda7 100644
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -61,6 +61,10 @@  extern struct value *eval_op_func_static_var (struct type *expect_type,
 extern struct value *eval_op_register (struct type *expect_type,
 				       struct expression *exp,
 				       enum noside noside, const char *name);
+extern struct value *eval_op_string (struct type *expect_type,
+				     struct expression *exp,
+				     enum noside noside, int len,
+				     const char *string);
 
 namespace expr
 {
@@ -681,6 +685,26 @@  class internalvar_operation
     override;
 };
 
+class string_operation
+  : public tuple_holding_operation<std::string>
+{
+public:
+
+  using tuple_holding_operation::tuple_holding_operation;
+
+  value *evaluate (struct type *expect_type,
+		   struct expression *exp,
+		   enum noside noside) override
+  {
+    const std::string &str = std::get<0> (m_storage);
+    return eval_op_string (expect_type, exp, noside,
+			   str.size (), str.c_str ());
+  }
+
+  enum exp_opcode opcode () const override
+  { return OP_STRING; }
+};
+
 } /* namespace expr */
 
 #endif /* EXPOP_H */