diff options
| author | tobi <tobi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-29 17:01:35 +0000 |
|---|---|---|
| committer | tobi <tobi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-29 17:01:35 +0000 |
| commit | 8e77051c24dbe0ae95b364a934b837f9e2cf3218 (patch) | |
| tree | b83774bb232127fd4ea92cf995002971484653b5 /gcc/fortran | |
| parent | f50f6fc325b75d425b6f190f4c74d0a31190085f (diff) | |
| download | gcc-8e77051c24dbe0ae95b364a934b837f9e2cf3218.tar.gz | |
fortran/
PR fortran/15963
* expr.c (check_intrinsic_op): Allow comparison of characters.
Make logic easier.
testsuite/
PR fortran/15963
* gfortran.fortran-torture/execute/initialization_1.f90: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83859 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 17 |
2 files changed, 19 insertions, 4 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index c93c9a49a53..9193234effc 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2004-06-22 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + + PR fortran/15963 + * expr.c (check_intrinsic_op): Allow comparison of characters. + Make logic easier. + 2004-06-26 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> Andrew Vaught <andyv@firstinter.net> diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 6abc9244c51..e9ed27040ee 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -1167,6 +1167,17 @@ check_intrinsic_op (gfc_expr * e, try (*check_function) (gfc_expr *)) case INTRINSIC_GE: case INTRINSIC_LT: case INTRINSIC_LE: + if ((*check_function) (e->op2) == FAILURE) + return FAILURE; + + if (!(et0 (e->op1) == BT_CHARACTER && et0 (e->op2) == BT_CHARACTER) + && !(numeric_type (et0 (e->op1)) && numeric_type (et0 (e->op2)))) + { + gfc_error ("Numeric or CHARACTER operands are required in " + "expression at %L", &e->where); + return FAILURE; + } + break; case INTRINSIC_PLUS: case INTRINSIC_MINUS: @@ -1179,10 +1190,8 @@ check_intrinsic_op (gfc_expr * e, try (*check_function) (gfc_expr *)) if (!numeric_type (et0 (e->op1)) || !numeric_type (et0 (e->op2))) goto not_numeric; - if (e->operator != INTRINSIC_POWER) - break; - - if (check_function == check_init_expr && et0 (e->op2) != BT_INTEGER) + if (e->operator == INTRINSIC_POWER + && check_function == check_init_expr && et0 (e->op2) != BT_INTEGER) { gfc_error ("Exponent at %L must be INTEGER for an initialization " "expression", &e->op2->where); |