diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 2008-07-19 16:22:12 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 2008-07-19 16:22:12 +0000 |
| commit | a1ee985fa319b7a55e52ddd62f266e42ef9ae067 (patch) | |
| tree | eed351bb3b2763a12eff13217ad87938370c269c /gcc/fortran/expr.c | |
| parent | 9aa433c2945d1f8d62961452bcd4e07f509815a8 (diff) | |
| download | gcc-a1ee985fa319b7a55e52ddd62f266e42ef9ae067.zip gcc-a1ee985fa319b7a55e52ddd62f266e42ef9ae067.tar.gz gcc-a1ee985fa319b7a55e52ddd62f266e42ef9ae067.tar.bz2 | |
gfortran.h (operator): Remove macro.
* gfortran.h (operator): Remove macro.
(gfc_namespace, gfc_expr): Avoid C++ keywords.
* arith.c (eval_intrinsic, eval_intrinsic_f2, eval_intrinsic_f3):
Likewise.
* decl.c (access_attr_decl): Likewise.
* dependency.c (gfc_dep_compare_expr): Likewise.
* dump-parse-tree.c (show_expr, show_uop, show_namespace):
Likewise.
* expr.c (gfc_copy_expr, gfc_type_convert_binary,
simplify_intrinsic_op, check_intrinsic_op): Likewise.
* interface.c (fold_unary, gfc_match_generic_spec,
gfc_match_interface, gfc_match_end_interface,
check_operator_interface, check_uop_interfaces,
gfc_check_interfaces, gfc_extend_expr, gfc_extend_assign,
gfc_add_interface, gfc_current_interface_head,
gfc_set_current_interface_head): Likewise.
* iresolve.c (gfc_resolve_dot_product, gfc_resolve_matmul):
Likewise.
* matchexp.c (gfc_get_parentheses, build_node): Likewise.
* module.c (gfc_use_rename, gfc_match_use, find_use_name_n,
number_use_names, mio_expr, load_operator_interfaces, read_module,
write_operator, write_module): Likewise.
* openmp.c (resolve_omp_atomic): Likewise.
* resolve.c (resolve_operator, gfc_resolve_character_operator,
gfc_resolve_uops): Likewise.
* symbol.c (free_uop_tree, gfc_free_namespace): Likewise.
* trans-expr.c (gfc_conv_expr_op): Likewise.
* trans-openmp.c (gfc_trans_omp_atomic): Likewise.
From-SVN: r137981
Diffstat (limited to 'gcc/fortran/expr.c')
| -rw-r--r-- | gcc/fortran/expr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index d379500..c0c4fdd 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -480,7 +480,7 @@ gfc_copy_expr (gfc_expr *p) break; case EXPR_OP: - switch (q->value.op.operator) + switch (q->value.op.op) { case INTRINSIC_NOT: case INTRINSIC_PARENTHESES: @@ -659,7 +659,7 @@ gfc_type_convert_binary (gfc_expr *e) e->ts = op1->ts; /* Special case for ** operator. */ - if (e->value.op.operator == INTRINSIC_POWER) + if (e->value.op.op == INTRINSIC_POWER) goto done; gfc_convert_type (e->value.op.op2, &e->ts, 2); @@ -830,12 +830,12 @@ simplify_intrinsic_op (gfc_expr *p, int type) gfc_intrinsic_op op; gfc_expr *op1, *op2, *result; - if (p->value.op.operator == INTRINSIC_USER) + if (p->value.op.op == INTRINSIC_USER) return SUCCESS; op1 = p->value.op.op1; op2 = p->value.op.op2; - op = p->value.op.operator; + op = p->value.op.op; if (gfc_simplify_expr (op1, type) == FAILURE) return FAILURE; @@ -1840,7 +1840,7 @@ check_intrinsic_op (gfc_expr *e, try (*check_function) (gfc_expr *)) if ((*check_function) (op1) == FAILURE) return FAILURE; - switch (e->value.op.operator) + switch (e->value.op.op) { case INTRINSIC_UPLUS: case INTRINSIC_UMINUS: @@ -1883,7 +1883,7 @@ check_intrinsic_op (gfc_expr *e, try (*check_function) (gfc_expr *)) if (!numeric_type (et0 (op1)) || !numeric_type (et0 (op2))) goto not_numeric; - if (e->value.op.operator == INTRINSIC_POWER + if (e->value.op.op == INTRINSIC_POWER && check_function == check_init_expr && et0 (op2) != BT_INTEGER) { if (gfc_notify_std (GFC_STD_F2003,"Fortran 2003: Noninteger " |