[PATCH 025/203] Split out eval_op_plus

Tom Tromey
2021-01-01T21:47:47Z

This splits UNOP_PLUS into a new function for future use.

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

* eval.c (eval_op_plus): New function.
(evaluate_subexp_standard): Use it.
---
gdb/ChangeLog | 5 +++++
gdb/eval.c | 28 +++++++++++++++++++---------
2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/gdb/eval.c b/gdb/eval.c
index fdbca1a8e05..7d9c60a3d94 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1736,6 +1736,24 @@ eval_op_repeat (struct type *expect_type, struct expression *exp,
return value_repeat (arg1, longest_to_int (value_as_long (arg2)));
}

+/* A helper function for UNOP_PLUS. */
+
+static struct value *
+eval_op_plus (struct type *expect_type, struct expression *exp,
+ enum noside noside, enum exp_opcode op,
+ struct value *arg1)
+{
+ if (noside == EVAL_SKIP)
+ return eval_skip_value (exp);
+ if (unop_user_defined_p (op, arg1))
+ return value_x_unop (arg1, op, noside);
+ else
+ {
+ unop_promote (exp->language_defn, exp->gdbarch, &arg1);
+ return value_pos (arg1);
+ }
+}
+
struct value *
evaluate_subexp_standard (struct type *expect_type,
struct expression *exp, int *pos,
@@ -2585,15 +2603,7 @@ evaluate_subexp_standard (struct type *expect_type,

case UNOP_PLUS:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
- if (noside == EVAL_SKIP)
- return eval_skip_value (exp);
- if (unop_user_defined_p (op, arg1))
- return value_x_unop (arg1, op, noside);
- else
- {
- unop_promote (exp->language_defn, exp->gdbarch, &arg1);
- return value_pos (arg1);
- }
+ return eval_op_plus (expect_type, exp, noside, op, arg1);

case UNOP_NEG:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
--
2.26.2