[PATCH 093/203] Introduce structop_operation

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

This adds class structop_base_operation and structop_operation, which
implement STRUCTOP_STRUCT. The base class exists to unify the
completion code between STRUCTOP_STRUCT and STRUCTOP_PTR.

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

* expop.h (class structop_base_operation)
(class structop_operation): New.
* eval.c (eval_op_structop_struct): No longer static.
---
gdb/ChangeLog | 6 +++++
gdb/eval.c | 2 +-
gdb/expop.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/gdb/eval.c b/gdb/eval.c
index 217e37b8530..2da1cf5fdbc 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1327,7 +1327,7 @@ eval_op_ternop (struct type *expect_type, struct expression *exp,

/* A helper function for STRUCTOP_STRUCT. */

-static struct value *
+struct value *
eval_op_structop_struct (struct type *expect_type, struct expression *exp,
enum noside noside,
struct value *arg1, const char *string)
diff --git a/gdb/expop.h b/gdb/expop.h
index 88ceb6033ac..c629614f5f1 100644
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -69,6 +69,11 @@ extern struct value *eval_op_ternop (struct type *expect_type,
enum noside noside,
struct value *array, struct value *low,
struct value *upper);
+extern struct value *eval_op_structop_struct (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside,
+ struct value *arg1,
+ const char *string);

namespace expr
{
@@ -775,6 +780,63 @@ class complex_operation
{ return OP_COMPLEX; }
};

+class structop_base_operation
+ : public tuple_holding_operation<operation_up, std::string>
+{
+public:
+
+ /* Used for completion. Return the field name. */
+ const std::string &get_string () const
+ {
+ return std::get<1> (m_storage);
+ }
+
+ /* Used for completion. Evaluate the LHS for type. */
+ value *evaluate_lhs (struct expression *exp)
+ {
+ return std::get<0> (m_storage)->evaluate (nullptr, exp,
+ EVAL_AVOID_SIDE_EFFECTS);
+ }
+
+protected:
+
+ using tuple_holding_operation::tuple_holding_operation;
+};
+
+class structop_operation
+ : public structop_base_operation
+{
+public:
+
+ using structop_base_operation::structop_base_operation;
+
+ value *evaluate (struct type *expect_type,
+ struct expression *exp,
+ enum noside noside) override
+ {
+ value *val =std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
+ return eval_op_structop_struct (expect_type, exp, noside, val,
+ std::get<1> (m_storage).c_str ());
+ }
+
+ enum exp_opcode opcode () const override
+ { return STRUCTOP_STRUCT; }
+
+protected:
+
+ void do_generate_ax (struct expression *exp,
+ struct agent_expr *ax,
+ struct axs_value *value,
+ struct type *cast_type)
+ override
+ {
+ gen_expr_structop (exp, STRUCTOP_STRUCT,
+ std::get<0> (this->m_storage).get (),
+ std::get<1> (this->m_storage).c_str (),
+ ax, value);
+ }
+};
+
} /* namespace expr */

#endif /* EXPOP_H */
--
2.26.2