diff options
| author | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-19 16:22:12 +0000 |
|---|---|---|
| committer | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-19 16:22:12 +0000 |
| commit | dcb1b019e865f2ed8c7161b54dcf438477ab6e6b (patch) | |
| tree | eed351bb3b2763a12eff13217ad87938370c269c /gcc/fortran/matchexp.c | |
| parent | 41694d7cb8dc338c3a33248b1429ae94648aa3ab (diff) | |
| download | gcc-dcb1b019e865f2ed8c7161b54dcf438477ab6e6b.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137981 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/matchexp.c')
| -rw-r--r-- | gcc/fortran/matchexp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/fortran/matchexp.c b/gcc/fortran/matchexp.c index a9e90c99454..433f4d21784 100644 --- a/gcc/fortran/matchexp.c +++ b/gcc/fortran/matchexp.c @@ -142,7 +142,7 @@ gfc_get_parentheses (gfc_expr *e) e2->ts = e->ts; e2->rank = e->rank; e2->where = e->where; - e2->value.op.operator = INTRINSIC_PARENTHESES; + e2->value.op.op = INTRINSIC_PARENTHESES; e2->value.op.op1 = e; e2->value.op.op2 = NULL; return e2; @@ -208,14 +208,14 @@ syntax: /* Build an operator expression node. */ static gfc_expr * -build_node (gfc_intrinsic_op operator, locus *where, +build_node (gfc_intrinsic_op op, locus *where, gfc_expr *op1, gfc_expr *op2) { gfc_expr *new; new = gfc_get_expr (); new->expr_type = EXPR_OP; - new->value.op.operator = operator; + new->value.op.op = op; new->where = *where; new->value.op.op1 = op1; |