diff options
author | Steven G. Kargl <kargl@gcc.gnu.org> | 2007-01-20 22:01:41 +0000 |
---|---|---|
committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2007-01-20 22:01:41 +0000 |
commit | edf1eac29ebf11051dfcba996ac4fb3064e3c95c (patch) | |
tree | a5e1dd4c7002a6118aa4d0e313e2d22c3b3aa8ad /gcc/fortran/matchexp.c | |
parent | 70fadd09be30c98ab6fccf3a97eede5f5c253c1e (diff) | |
download | gcc-edf1eac29ebf11051dfcba996ac4fb3064e3c95c.zip gcc-edf1eac29ebf11051dfcba996ac4fb3064e3c95c.tar.gz gcc-edf1eac29ebf11051dfcba996ac4fb3064e3c95c.tar.bz2 |
openmp.c, [...]: Next installment in the massive whitespace patch.
* openmp.c, matchexp.c, module.c, scanner.c, resolve.c, st.c,
parse.c, primary.c, options.c, misc.c, simplify.c: Next installment
in the massive whitespace patch.
From-SVN: r121012
Diffstat (limited to 'gcc/fortran/matchexp.c')
-rw-r--r-- | gcc/fortran/matchexp.c | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/gcc/fortran/matchexp.c b/gcc/fortran/matchexp.c index b319c24..6e1a5a4 100644 --- a/gcc/fortran/matchexp.c +++ b/gcc/fortran/matchexp.c @@ -1,6 +1,6 @@ /* Expression parser. - Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, - Inc. + Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007 + Free Software Foundation, Inc. Contributed by Andy Vaught This file is part of GCC. @@ -20,7 +20,6 @@ along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - #include "config.h" #include "system.h" #include "gfortran.h" @@ -91,7 +90,7 @@ error: operator already. */ static match -match_defined_operator (gfc_user_op ** result) +match_defined_operator (gfc_user_op **result) { char name[GFC_MAX_SYMBOL_LEN + 1]; match m; @@ -126,6 +125,7 @@ next_operator (gfc_intrinsic_op t) /* Call the INTRINSIC_PARENTHESES function. This is both used explicitly, as below, or by resolve.c to generate temporaries. */ + gfc_expr * gfc_get_parentheses (gfc_expr *e) { @@ -146,7 +146,7 @@ gfc_get_parentheses (gfc_expr *e) /* Match a primary expression. */ static match -match_primary (gfc_expr ** result) +match_primary (gfc_expr **result) { match m; gfc_expr *e; @@ -206,8 +206,8 @@ syntax: /* Build an operator expression node. */ static gfc_expr * -build_node (gfc_intrinsic_op operator, locus * where, - gfc_expr * op1, gfc_expr * op2) +build_node (gfc_intrinsic_op operator, locus *where, + gfc_expr *op1, gfc_expr *op2) { gfc_expr *new; @@ -226,7 +226,7 @@ build_node (gfc_intrinsic_op operator, locus * where, /* Match a level 1 expression. */ static match -match_level_1 (gfc_expr ** result) +match_level_1 (gfc_expr **result) { gfc_user_op *uop; gfc_expr *e, *f; @@ -272,14 +272,12 @@ match_level_1 (gfc_expr ** result) or add-operand */ -static match match_ext_mult_operand (gfc_expr ** result); -static match match_ext_add_operand (gfc_expr ** result); - +static match match_ext_mult_operand (gfc_expr **result); +static match match_ext_add_operand (gfc_expr **result); static int match_add_op (void) { - if (next_operator (INTRINSIC_MINUS)) return -1; if (next_operator (INTRINSIC_PLUS)) @@ -289,7 +287,7 @@ match_add_op (void) static match -match_mult_operand (gfc_expr ** result) +match_mult_operand (gfc_expr **result) { gfc_expr *e, *exp, *r; locus where; @@ -332,7 +330,7 @@ match_mult_operand (gfc_expr ** result) static match -match_ext_mult_operand (gfc_expr ** result) +match_ext_mult_operand (gfc_expr **result) { gfc_expr *all, *e; locus where; @@ -345,8 +343,8 @@ match_ext_mult_operand (gfc_expr ** result) if (i == 0) return match_mult_operand (result); - if (gfc_notify_std (GFC_STD_GNU, "Extension: Unary operator following" - " arithmetic operator (use parentheses) at %C") + if (gfc_notify_std (GFC_STD_GNU, "Extension: Unary operator following " + "arithmetic operator (use parentheses) at %C") == FAILURE) return MATCH_ERROR; @@ -372,7 +370,7 @@ match_ext_mult_operand (gfc_expr ** result) static match -match_add_operand (gfc_expr ** result) +match_add_operand (gfc_expr **result) { gfc_expr *all, *e, *total; locus where, old_loc; @@ -436,7 +434,7 @@ match_add_operand (gfc_expr ** result) static match -match_ext_add_operand (gfc_expr ** result) +match_ext_add_operand (gfc_expr **result) { gfc_expr *all, *e; locus where; @@ -449,8 +447,8 @@ match_ext_add_operand (gfc_expr ** result) if (i == 0) return match_add_operand (result); - if (gfc_notify_std (GFC_STD_GNU, "Extension: Unary operator following" - " arithmetic operator (use parentheses) at %C") + if (gfc_notify_std (GFC_STD_GNU, "Extension: Unary operator following " + "arithmetic operator (use parentheses) at %C") == FAILURE) return MATCH_ERROR; @@ -478,7 +476,7 @@ match_ext_add_operand (gfc_expr ** result) /* Match a level 2 expression. */ static match -match_level_2 (gfc_expr ** result) +match_level_2 (gfc_expr **result) { gfc_expr *all, *e, *total; locus where; @@ -521,7 +519,7 @@ match_level_2 (gfc_expr ** result) all->where = where; -/* Append add-operands to the sum */ + /* Append add-operands to the sum. */ for (;;) { @@ -563,7 +561,7 @@ match_level_2 (gfc_expr ** result) /* Match a level three expression. */ static match -match_level_3 (gfc_expr ** result) +match_level_3 (gfc_expr **result) { gfc_expr *all, *e, *total; locus where; @@ -609,7 +607,7 @@ match_level_3 (gfc_expr ** result) /* Match a level 4 expression. */ static match -match_level_4 (gfc_expr ** result) +match_level_4 (gfc_expr **result) { gfc_expr *left, *right, *r; gfc_intrinsic_op i; @@ -693,7 +691,7 @@ match_level_4 (gfc_expr ** result) static match -match_and_operand (gfc_expr ** result) +match_and_operand (gfc_expr **result) { gfc_expr *e, *r; locus where; @@ -726,7 +724,7 @@ match_and_operand (gfc_expr ** result) static match -match_or_operand (gfc_expr ** result) +match_or_operand (gfc_expr **result) { gfc_expr *all, *e, *total; locus where; @@ -769,7 +767,7 @@ match_or_operand (gfc_expr ** result) static match -match_equiv_operand (gfc_expr ** result) +match_equiv_operand (gfc_expr **result) { gfc_expr *all, *e, *total; locus where; @@ -814,7 +812,7 @@ match_equiv_operand (gfc_expr ** result) /* Match a level 5 expression. */ static match -match_level_5 (gfc_expr ** result) +match_level_5 (gfc_expr **result) { gfc_expr *all, *e, *total; locus where; @@ -873,7 +871,7 @@ match_level_5 (gfc_expr ** result) level 5 expressions separated by binary operators. */ match -gfc_match_expr (gfc_expr ** result) +gfc_match_expr (gfc_expr **result) { gfc_expr *all, *e; gfc_user_op *uop; |