From 00f2db6f7d52b718d5436e76184c92006713f531 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 8 Mar 2021 07:27:57 -0700 Subject: [PATCH] Split out eval_op_f_cmplx This splits BINOP_FORTRAN_CMPLX into a new function for future use. gdb/ChangeLog 2021-03-08 Tom Tromey * 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/ChangeLog b/gdb/ChangeLog index 5bf13a718c..5b23e7caba 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-03-08 Tom Tromey + + * f-lang.c (eval_op_f_cmplx): New function. + (evaluate_subexp_f): Use it. + 2021-03-08 Tom Tromey * f-lang.c (eval_op_f_modulo): New function. diff --git a/gdb/f-lang.c b/gdb/f-lang.c index 5239f7aa50..554626e537 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -1120,6 +1120,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 * @@ -1247,10 +1260,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.34.1