From 9b773341ece9ce02a693b7cd5a3787dfcd5aae6a Mon Sep 17 00:00:00 2001 From: tobi Date: Wed, 23 Feb 2005 21:34:11 +0000 Subject: * gfortran.h (gfc_expr): Move 'operator', 'op1', 'op2', and 'uop' fields into new struct 'op' inside the 'value' union. * arith.c (eval_intrinsic): Adapt all users. * dependency.c (gfc_check_dependency): Likewise. * dump-parse-tree.c (gfc_show_expr): Likewise. * expr.c (gfc_get_expr): Don't clear removed fields. (free_expr0, gfc_copy_expr, gfc_type_convert_binary, gfc_is_constant_expr, simplify_intrinsic_op, check_init_expr, check_intrinsic_op): Adapt to new field names. * interface.c (gfc_extend_expr): Likewise. Also explicitly nullify 'esym' and 'isym' fields of new function call. * iresolve.c (gfc_resolve_dot_product, gfc_resolve_matmul): Adapt to renamed structure fields. * matchexp.c (build_node, match_level_1, match_expr): Likewise. * module.c (mio_expr): Likewise. * resolve.c (resolve_operator): Likewise. (gfc_find_forall_index): Likewise. Only look through operands if dealing with EXPR_OP * trans-array.c (gfc_walk_op_expr): Adapt to renamed fields. * trans-expr.c (gfc_conv_unary_op, gfc_conv_power_op, gfc_conv_concat_op, gfc_conv_expr_op): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95471 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/gfortran.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gcc/fortran/gfortran.h') diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index f96cff10dde..eb24cba4a8b 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -1044,15 +1044,11 @@ typedef struct gfc_expr int rank; mpz_t *shape; /* Can be NULL if shape is unknown at compile time */ - gfc_intrinsic_op operator; - /* Nonnull for functions and structure constructors */ gfc_symtree *symtree; - gfc_user_op *uop; gfc_ref *ref; - struct gfc_expr *op1, *op2; locus where; union @@ -1068,6 +1064,14 @@ typedef struct gfc_expr } complex; + struct + { + gfc_intrinsic_op operator; + gfc_user_op *uop; + struct gfc_expr *op1, *op2; + } + op; + struct { gfc_actual_arglist *actual; -- cgit v1.2.3