[v3,044/206] Split out eval_op_f_allocated

Message ID 20210220201609.838264-45-tom@tromey.com
State New
Headers show
Series
  • Refactor expressions
Related show

Commit Message

Tom Tromey Feb. 20, 2021, 8:13 p.m.
This splits out a helper function, eval_op_f_allocated, that will be
used in a later patch.

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

	* f-lang.c (eval_op_f_allocated): New function.
	(evaluate_subexp_f): Use it.
---
 gdb/ChangeLog |  5 +++++
 gdb/f-lang.c  | 24 +++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

-- 
2.26.2

Patch

diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index b5c6499f45e..fea7eab5b46 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -1000,6 +1000,22 @@  eval_op_f_kind (struct type *expect_type, struct expression *exp,
 			     TYPE_LENGTH (TYPE_TARGET_TYPE (type)));
 }
 
+/* A helper function for UNOP_FORTRAN_ALLOCATED.  */
+
+static struct value *
+eval_op_f_allocated (struct type *expect_type, struct expression *exp,
+		     enum noside noside, enum exp_opcode op,
+		     struct value *arg1)
+{
+  struct type *type = check_typedef (value_type (arg1));
+  if (type->code () != TYPE_CODE_ARRAY)
+    error (_("ALLOCATED can only be applied to arrays"));
+  struct type *result_type
+    = builtin_f_type (exp->gdbarch)->builtin_logical;
+  LONGEST result_value = type_not_allocated (type) ? 0 : 1;
+  return value_from_longest (result_type, result_value);
+}
+
 /* Special expression evaluation cases for Fortran.  */
 
 static struct value *
@@ -1043,13 +1059,7 @@  evaluate_subexp_f (struct type *expect_type, struct expression *exp,
 	arg1 = evaluate_subexp (nullptr, exp, pos, noside);
 	if (noside == EVAL_SKIP)
 	  return eval_skip_value (exp);
-	type = check_typedef (value_type (arg1));
-	if (type->code () != TYPE_CODE_ARRAY)
-	  error (_("ALLOCATED can only be applied to arrays"));
-	struct type *result_type
-	  = builtin_f_type (exp->gdbarch)->builtin_logical;
-	LONGEST result_value = type_not_allocated (type) ? 0 : 1;
-	return value_from_longest (result_type, result_value);
+	return eval_op_f_allocated (expect_type, exp, noside, op, arg1);
       }
 
     case BINOP_FORTRAN_MODULO: