aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorTobias Schlüter <tobias.schlueter@physik.uni-muenchen.de>2004-12-15 19:55:57 +0100
committerTobias Schlüter <tobi@gcc.gnu.org>2004-12-15 19:55:57 +0100
commit172b87995cadacf87ba6ce1517b8a49acc3db0ae (patch)
tree25d335815082aad2eeacd0769e1dfa8b999b1d25 /gcc/fortran
parent7cbeffe2fb5a19ce1ae22e1a1e5654eb951ce901 (diff)
downloadgcc-172b87995cadacf87ba6ce1517b8a49acc3db0ae.zip
gcc-172b87995cadacf87ba6ce1517b8a49acc3db0ae.tar.gz
gcc-172b87995cadacf87ba6ce1517b8a49acc3db0ae.tar.bz2
re PR fortran/18993 (incorrect parsing in fixed-form)
fortran/ PR fortran/18993 * match.c (gfc_match_if): Don't explicitly skip optional whitespace. (gfc_match_nullify): Make sure that ')' is in front of the end of statement. testsuite/ PR fortran/18993 * gfotran.dg/nullify_1.f: New test. From-SVN: r92209
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog7
-rw-r--r--gcc/fortran/match.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b701dc9..e3b2255 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-15 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
+
+ PR fortran/18993
+ * match.c (gfc_match_if): Don't explicitly skip optional whitespace.
+ (gfc_match_nullify): Make sure that ')' is in front of the end of
+ statement.
+
2004-12-14 Richard Henderson <rth@redhat.com>
* gfortran.h (gfc_expr.function.name): Make const.
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index cf0c255..825120f 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -974,7 +974,7 @@ gfc_match_if (gfc_statement * if_type)
return MATCH_YES;
}
- if (gfc_match (" then %t") == MATCH_YES)
+ if (gfc_match (" then%t") == MATCH_YES)
{
new_st.op = EXEC_IF;
new_st.expr = expr;
@@ -1822,7 +1822,7 @@ gfc_match_nullify (void)
tail->expr = p;
tail->expr2 = e;
- if (gfc_match_char (')') == MATCH_YES)
+ if (gfc_match (" )%t") == MATCH_YES)
break;
if (gfc_match_char (',') != MATCH_YES)
goto syntax;