Ignore a missing newline at EOF for single line comments. (#83674, Sven

Fri Jun 11 22:56:46 2004 Matthias Clasen <maclas@gmx.de> * glib/gscanner.c (g_scanner_get_token_ll): Ignore a missing newline at EOF for single line comments. (#83674, Sven Neumann)
dieterv · Jun 12, 2004 · f65f760 · f65f760
1 parent 9bee417
commit f65f760
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 11 22:56:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gscanner.c (g_scanner_get_token_ll): Ignore a 
+	missing newline at EOF for single line comments.  
+	(#83674, Sven Neumann)
+
 Thu Jun 10 23:38:02 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* tests/printf-test.c (TEST): Actually set any_failed on 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Jun 11 22:56:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gscanner.c (g_scanner_get_token_ll): Ignore a 
+	missing newline at EOF for single line comments.  
+	(#83674, Sven Neumann)
+
 Thu Jun 10 23:38:02 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* tests/printf-test.c (TEST): Actually set any_failed on 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Fri Jun 11 22:56:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gscanner.c (g_scanner_get_token_ll): Ignore a 
+	missing newline at EOF for single line comments.  
+	(#83674, Sven Neumann)
+
 Thu Jun 10 23:38:02 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* tests/printf-test.c (TEST): Actually set any_failed on 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Jun 11 22:56:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gscanner.c (g_scanner_get_token_ll): Ignore a 
+	missing newline at EOF for single line comments.  
+	(#83674, Sven Neumann)
+
 Thu Jun 10 23:38:02 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* tests/printf-test.c (TEST): Actually set any_failed on 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Jun 11 22:56:46 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gscanner.c (g_scanner_get_token_ll): Ignore a 
+	missing newline at EOF for single line comments.  
+	(#83674, Sven Neumann)
+
 Thu Jun 10 23:38:02 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* tests/printf-test.c (TEST): Actually set any_failed on 

diff --git a/glib/gscanner.c b/glib/gscanner.c
@@ -1634,6 +1634,10 @@ g_scanner_get_token_ll	(GScanner	*scanner,
 		  gstring = g_string_append_c (gstring, ch);
 		  ch = g_scanner_get_char (scanner, line_p, position_p);
 		}
+	      /* ignore a missing newline at EOF for single line comments */
+	      if (in_comment_single &&
+		  config->cpair_comment_single[1] == '\n')
+		in_comment_single = FALSE;
 	    }
 	  else if (config->scan_identifier && ch &&
 		   strchr (config->cset_identifier_first, ch))