Split out eval_op_plus
This splits UNOP_PLUS into a new function for future use. gdb/ChangeLog 2021-03-08 Tom Tromey <tom@tromey.com> * eval.c (eval_op_plus): New function. (evaluate_subexp_standard): Use it.
This commit is contained in:
parent
eed70b1c37
commit
39f288bea9
@ -1,3 +1,8 @@
|
||||
2021-03-08 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* eval.c (eval_op_plus): New function.
|
||||
(evaluate_subexp_standard): Use it.
|
||||
|
||||
2021-03-08 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* eval.c (eval_op_repeat): New function.
|
||||
|
28
gdb/eval.c
28
gdb/eval.c
@ -1751,6 +1751,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,
|
||||
@ -2600,15 +2618,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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user