re PR fortran/31495 (Is this continuation line legal?)

2007-04-21  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/31495
	* scanner.c (load_line):  Remove check for comment after ampersand and
	adjust tracking of ampersand.

From-SVN: r124022

gcc/fortran/ChangeLog

+2007-04-21  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/31495
+	* scanner.c (load_line):  Remove check for comment after ampersand and
+	adjust tracking of ampersand.
+
 2007-04-21  Andrew Pinski  <andrew_pinski@playstation.sony.com>
 
 	* f95-lang.c (lang_tree_node): Use GENERIC_NEXT

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'))