From 17bbca74807b33cbebdea7761536468e147cf197 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Fri, 23 Jun 2006 21:05:04 +0000 Subject: [PATCH] re PR fortran/27981 (Strange error message for illegal integer constant) 2006-06-23 Steven G. Kargl PR fortran/27981 * match.c (gfc_match_if): Handle errors in assignment in simple if. 2006-06-23 Steven G. Kargl PR fortran/27981 * gfortran.dg/simpleif_2.f90: New test. From-SVN: r114950 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/match.c | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/simpleif_2.f90 | 7 +++++++ 4 files changed, 23 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/simpleif_2.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a02bebdede7..3b3584c2f08 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2006-06-23 Steven G. Kargl + + PR fortran/27981 + * match.c (gfc_match_if): Handle errors in assignment in simple if. + 2006-06-22 Asher Langton PR fortran/24748 diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index 448d927ce86..0ad5e13ce15 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -1061,6 +1061,12 @@ gfc_match_if (gfc_statement * if_type) gfc_undo_symbols (); gfc_current_locus = old_loc; + /* m can be MATCH_NO or MATCH_ERROR, here. For MATCH_NO, continue to + call the various matchers. For MATCH_ERROR, a mangled assignment + was found. */ + if (m == MATCH_ERROR) + return MATCH_ERROR; + gfc_match (" if ( %e ) ", &expr); /* Guaranteed to match */ m = gfc_match_pointer_assignment (); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d6deeb930fa..3cb91517102 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-06-23 Steven G. Kargl + + PR fortran/27981 + * gfortran.dg/simpleif_2.f90: New test. + 2006-06-23 Lee Millward * g++.dg/template/error22.C: Fix typo. diff --git a/gcc/testsuite/gfortran.dg/simpleif_2.f90 b/gcc/testsuite/gfortran.dg/simpleif_2.f90 new file mode 100644 index 00000000000..0d8e6dda966 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/simpleif_2.f90 @@ -0,0 +1,7 @@ +! { dg-do compile } +! PR 27981 +program a + real x + real, pointer :: y + if (.true.) x = 12345678901 ! { dg-error "Integer too big" } +end program a -- 2.30.2