c-lex.c (src_line): Remove unneeded static variable.

	* c-lex.c (src_line):   Remove unneeded static variable.
	(cb_line_change):  Set input_line directly, instead of src_line.
	(get_non_padding_token):  We no longer need to compensate for the
	"horrible things" the C++ front-end does with the current line number,

From-SVN: r72010

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 367a269..3bad417 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-01  Per Bothner  <pbothner@apple.com>
+
+       * c-lex.c (src_line):   Remove unneeded static variable.
+       (cb_line_change):  Set input_line directly, instead of src_line.
+       (get_non_padding_token):  We no longer need to compensate for the
+       "horrible things" the C++ front-end does with the current line number,
+
 2003-10-01  Zack Weinberg  <zack@codesourcery.com>
 
        * target.h (init_libfuncs): New hook.

diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index 2109eff..f3cdd3c 100644 (file)
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -45,9 +45,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 /* The current line map.  */
 static const struct line_map *map;
 
-/* The line used to refresh the lineno global variable after each token.  */
-static unsigned int src_lineno;
-
 /* We may keep statistics about how long which files took to compile.  */
 static int header_time, body_time;
 static splay_tree file_info_tree;
@@ -202,7 +199,7 @@ cb_line_change (cpp_reader *pfile ATTRIBUTE_UNUSED, const cpp_token *token,
   if (token->type == CPP_EOF || parsing_args)
     return;
 
-  src_lineno = SOURCE_LINE (map, token->line);
+  input_line = SOURCE_LINE (map, token->line);
 }
 
 static void
@@ -317,11 +314,6 @@ get_nonpadding_token (void)
   while (tok->type == CPP_PADDING);
   timevar_pop (TV_CPP);
 
-  /* The C++ front end does horrible things with the current line
-     number.  To ensure an accurate line number, we must reset it
-     every time we advance a token.  */
-  input_line = src_lineno;
-
   return tok;
 }