[PATCH 042/203] Split out eval_op_f_cmplx

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

This splits BINOP_FORTRAN_CMPLX into a new function for future use.

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

* f-lang.c (eval_op_f_cmplx): New function.
(evaluate_subexp_f): Use it.
---
gdb/ChangeLog | 5 +++++
gdb/f-lang.c | 18 ++++++++++++++----
2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index b127f6edf05..949812cc15a 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -848,6 +848,19 @@ eval_op_f_modulo (struct type *expect_type, struct expression *exp,
error (_("MODULO of type %s not supported"), TYPE_SAFE_NAME (type));
}

+/* A helper function for BINOP_FORTRAN_CMPLX. */
+
+static struct value *
+eval_op_f_cmplx (struct type *expect_type, struct expression *exp,
+ enum noside noside,
+ struct value *arg1, struct value *arg2)
+{
+ if (noside == EVAL_SKIP)
+ return eval_skip_value (exp);
+ struct type *type = builtin_f_type(exp->gdbarch)->builtin_complex_s16;
+ return value_literal_complex (arg1, arg2, type);
+}
+
/* Special expression evaluation cases for Fortran. */

static struct value *
@@ -894,10 +907,7 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp,
case BINOP_FORTRAN_CMPLX:
arg1 = evaluate_subexp (nullptr, exp, pos, noside);
arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
- if (noside == EVAL_SKIP)
- return eval_skip_value (exp);
- type = builtin_f_type(exp->gdbarch)->builtin_complex_s16;
- return value_literal_complex (arg1, arg2, type);
+ return eval_op_f_cmplx (expect_type, exp, noside, arg1, arg2);

case UNOP_FORTRAN_KIND:
arg1 = evaluate_subexp (NULL, exp, pos, EVAL_AVOID_SIDE_EFFECTS);
--
2.26.2