[PATCH 086/203] Introduce string_operation

Tom Tromey
2021-01-01T21:48:25Z

This adds string_operation, which implements OP_STRING for most
languages (C has its own variant).

gdb/ChangeLog
2021-01-01 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(-)

diff --git a/gdb/eval.c b/gdb/eval.c
index 510a7b720cb..382eca04f15 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1273,7 +1273,7 @@ eval_op_register (struct type *expect_type, struct expression *exp,
return val;
}

-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 989d54d90ad..ff4e82150e6 100644
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -60,6 +60,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
{
@@ -670,6 +674,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 */
--
2.26.2