scanner.c (gfc_next_char_literal): Reset truncation flag for lines ending in a…

scanner.c (gfc_next_char_literal): Reset truncation flag for lines ending in a comment for both fixed and free form.

2005-04-17  Richard Guenther  <rguenth@gcc.gnu.org>

	* scanner.c (gfc_next_char_literal): Reset truncation flag
	for lines ending in a comment for both fixed and free form.
	(load_line): Do not set truncated flag if only truncating
	the EOL marker.

	* gfortran.dg/wtruncate.f: New testcase.
	* gfortran.dg/wtruncate.f90: New testcase.

From-SVN: r98269

gcc/fortran/ChangeLog

+2005-04-17  Richard Guenther  <rguenth@gcc.gnu.org>
+
+	* scanner.c (gfc_next_char_literal): Reset truncation flag
+	for lines ending in a comment for both fixed and free form.
+	(load_line): Do not set truncated flag if only truncating
+	the EOL marker.
+
 2005-04-15  Richard Guenther  <rguenth@gcc.gnu.org>
 
 	PR fortran/14569

gcc/fortran/scanner.c

@@ -458,6 +458,9 @@ restart:
 	    }
 	  while (c != '\n');
 
+	  /* Avoid truncation warnings for comment ending lines.  */
+	  gfc_current_locus.lb->truncated = 0;
+
 	  goto done;
 	}
 
@@ -525,6 +528,9 @@ restart:
 	      c = next_char ();
 	    }
 	  while (c != '\n');
+
+	  /* Avoid truncation warnings for comment ending lines.  */
+	  gfc_current_locus.lb->truncated = 0;
 	}
 
       if (c != '\n')
@@ -758,13 +764,13 @@ load_line (FILE * input, char **pbuf)
       else if (i >= buflen)
 	{			
 	  /* Truncate the rest of the line.  */
-	  trunc_flag = 1;
-
 	  for (;;)
 	    {
 	      c = fgetc (input);
 	      if (c == '\n' || c == EOF)
 		break;
+
+	      trunc_flag = 1;
 	    }
 
 	  ungetc ('\n', input);

gcc/testsuite/ChangeLog

+2005-04-17  Richard Guenther  <rguenth@gcc.gnu.org>
+
+	* gfortran.dg/wtruncate.f: New testcase.
+	* gfortran.dg/wtruncate.f90: New testcase.
+
 2005-04-16  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/21025

gcc/testsuite/gfortran.dg/wtruncate.f

+! { dg-do compile }
+! { dg-options "-Wall" }
+
+! This long comment line should not trigger a line-truncation warning with -Wall
+
+      PROGRAM foo
+      WRITE (*,*) "Test"           ! Neither this comment which exceeds the 72 character limit, too
+      WRITE (*,*) "This exactly 72 character long soruce line not, too."
+      END
+

gcc/testsuite/gfortran.dg/wtruncate.f90

+! { dg-do compile }
+! { dg-options "-Wall" }
+
+! This long comment line should not trigger a line-truncation warning with -Wall even for free-form 132 character line limit (blah blah)
+
+      PROGRAM foo
+      WRITE (*,*) "Test"           ! Neither this comment which exceeds the 132 character limit with some random words, too (blah blah)
+      WRITE (*,*) "This exactly 132 character long soruce line not, too.  How can people fill 132 characters without sensless stuff"
+      END
+