[PATCH 039/203] Split out eval_op_f_ceil

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

This splits UNOP_FORTRAN_CEILING into a new function for future use.

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

* f-lang.c (eval_op_f_ceil): New function.
(evaluate_subexp_f): Use it.
---
gdb/ChangeLog | 5 +++++
gdb/f-lang.c | 34 +++++++++++++++++++++-------------
2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index 5dcbb8194fa..ca676044ee3 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -769,6 +769,25 @@ eval_op_f_mod (struct type *expect_type, struct expression *exp,
error (_("MOD of type %s not supported"), TYPE_SAFE_NAME (type));
}

+/* A helper function for UNOP_FORTRAN_CEILING. */
+
+static struct value *
+eval_op_f_ceil (struct type *expect_type, struct expression *exp,
+ enum noside noside,
+ struct value *arg1)
+{
+ if (noside == EVAL_SKIP)
+ return eval_skip_value (exp);
+ struct type *type = value_type (arg1);
+ if (type->code () != TYPE_CODE_FLT)
+ error (_("argument to CEILING must be of type float"));
+ double val
+ = target_float_to_host_double (value_contents (arg1),
+ value_type (arg1));
+ val = ceil (val);
+ return value_from_host_double (type, val);
+}
+
/* Special expression evaluation cases for Fortran. */

static struct value *
@@ -800,19 +819,8 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp,
return eval_op_f_mod (expect_type, exp, noside, arg1, arg2);

case UNOP_FORTRAN_CEILING:
- {
- arg1 = evaluate_subexp (nullptr, exp, pos, noside);
- if (noside == EVAL_SKIP)
- return eval_skip_value (exp);
- type = value_type (arg1);
- if (type->code () != TYPE_CODE_FLT)
- error (_("argument to CEILING must be of type float"));
- double val
- = target_float_to_host_double (value_contents (arg1),
- value_type (arg1));
- val = ceil (val);
- return value_from_host_double (type, val);
- }
+ arg1 = evaluate_subexp (nullptr, exp, pos, noside);
+ return eval_op_f_ceil (expect_type, exp, noside, arg1);

case UNOP_FORTRAN_FLOOR:
{
--
2.26.2