diff options
Diffstat (limited to 'gcc/f')
| -rw-r--r-- | gcc/f/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/f/expr.c | 18 |
2 files changed, 7 insertions, 18 deletions
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 1891718..0bc2791 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,10 @@ +2003-11-24 Toon Moene <toon@moene.indiv.nluug.nl> + + PR fortran/12633 + * expr.c (ffeexpr_reduced_ugly2log_): Revert + change allowing logical .and. logical to be + integer in expressions when -fugly-logint. + 2003-11-21 Kelley Cook <kcook@gcc.gnu.org> * .cvsignore: Delete. diff --git a/gcc/f/expr.c b/gcc/f/expr.c index 6aeddaf..f7ee46b 100644 --- a/gcc/f/expr.c +++ b/gcc/f/expr.c @@ -10593,24 +10593,6 @@ ffeexpr_reduced_ugly2log_ (ffebld reduced, ffeexprExpr_ l, ffeexprExpr_ op, /* else Leave it alone. */ } - if (lbt == FFEINFO_basictypeLOGICAL) - { - ffebld_set_left (reduced, ffeexpr_convert (ffebld_left (reduced), - l->token, op->token, FFEINFO_basictypeINTEGER, - FFEINFO_kindtypeINTEGERDEFAULT, 0, - FFETARGET_charactersizeNONE, - FFEEXPR_contextLET)); - } - - if (rbt == FFEINFO_basictypeLOGICAL) - { - ffebld_set_right (reduced, ffeexpr_convert (ffebld_right (reduced), - r->token, op->token, FFEINFO_basictypeINTEGER, - FFEINFO_kindtypeINTEGERDEFAULT, 0, - FFETARGET_charactersizeNONE, - FFEEXPR_contextLET)); - } - return reduced; } |