Split out eval_op_f_ceil

This splits UNOP_FORTRAN_CEILING into a new function for future use.

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

	* f-lang.c (eval_op_f_ceil): New function.
	(evaluate_subexp_f): Use it.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4ef687f613e8673ea657929ac4ebfde92043d799..4b00777edb8ae90684ae709b6a6bf5413aaa85f2 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+       * f-lang.c (eval_op_f_ceil): New function.
+       (evaluate_subexp_f): Use it.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
        * f-lang.c (eval_op_f_mod): New function.

diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index 57e393614fe0029ad22360e8b5b459e73741b2e2..f3fce2240d5ef07d8fbf1824e624790f74f0683a 100644 (file)
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -1041,6 +1041,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 *
@@ -1072,19 +1091,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:
       {