From c284e499898990a4d072f2b4ce7ff95571867ea2 Mon Sep 17 00:00:00 2001 From: Jerry DeLisle Date: Sat, 21 Apr 2007 21:34:04 +0000 Subject: [PATCH] re PR fortran/31495 (Is this continuation line legal?) 2007-04-21 Jerry DeLisle PR fortran/31495 * scanner.c (load_line): Remove check for comment after ampersand and adjust tracking of ampersand. From-SVN: r124022 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/scanner.c | 22 +++++++--------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a02a381ecdd..95afac66548 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2007-04-21 Jerry DeLisle + + PR fortran/31495 + * scanner.c (load_line): Remove check for comment after ampersand and + adjust tracking of ampersand. + 2007-04-21 Andrew Pinski * f95-lang.c (lang_tree_node): Use GENERIC_NEXT diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c index 1f1593b3d15..685039cb170 100644 --- a/gcc/fortran/scanner.c +++ b/gcc/fortran/scanner.c @@ -1050,7 +1050,7 @@ load_line (FILE *input, char **pbuf, int *pbuflen) { /* Check for illegal use of ampersand. See F95 Standard 3.3.1.3. */ if (gfc_current_form == FORM_FREE - && !seen_printable && seen_ampersand) + && !seen_printable && seen_ampersand) { if (pedantic) gfc_error_now ("'&' not allowed by itself in line %d", @@ -1067,25 +1067,17 @@ load_line (FILE *input, char **pbuf, int *pbuflen) if (c == '\0') continue; - /* Check for illegal use of ampersand. See F95 Standard 3.3.1.3. */ if (c == '&') - seen_ampersand = 1; - - if ((c != ' ' && c != '&' && c != '!') || (c == '!' && !seen_ampersand)) - seen_printable = 1; - - if (gfc_current_form == FORM_FREE - && c == '!' && !seen_printable && seen_ampersand) { - if (pedantic) - gfc_error_now ("'&' not allowed by itself with comment in " - "line %d", current_line); + if (seen_ampersand) + seen_ampersand = 0; else - gfc_warning_now ("'&' not allowed by itself with comment in " - "line %d", current_line); - seen_printable = 1; + seen_ampersand = 1; } + if ((c != '&' && c != '!') || (c == '!' && !seen_ampersand)) + seen_printable = 1; + /* Is this a fixed-form comment? */ if (gfc_current_form == FORM_FIXED && i == 0 && (c == '*' || c == 'c' || c == 'd')) -- 2.30.2