* src/scan-skel.l: Correct off-by-one error in handling of __oline__.

diff --git a/ChangeLog b/ChangeLog
index 53c8ccf9e1d2f0a23b8bb782cc5b645c9f6ce215..c45fa3a513344c10f29ad7d903a432288a69c3bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2002-05-12  Paul Hilfinger  <Hilfinger@CS.Berkeley.EDU>
 
 2002-05-12  Paul Hilfinger  <Hilfinger@CS.Berkeley.EDU>
 

+       * src/scan-skel.l: Correct off-by-one error in handling of __oline__.

        * data/bison.simple (b4_sint_type, b4_uint_type): Correct to reflect
        32-bit arithmetic.
        * data/bison.c++ (b4_sint_type, b4_uint_type): Ditto.
        * data/bison.simple (b4_sint_type, b4_uint_type): Correct to reflect
        32-bit arithmetic.
        * data/bison.c++ (b4_sint_type, b4_uint_type): Ditto.

diff --git a/src/scan-skel.l b/src/scan-skel.l
index e7eeaa568ee24a142ef237df84dee97889075748..be336079bb91df718c6dd386eb9ed0d609db4b65 100644 (file)
--- a/src/scan-skel.l
+++ b/src/scan-skel.l
@@ -41,7 +41,7 @@ static char *yyoutname = NULL;
 "@<:@" fputc ('[', yyout);
 "@:>@" fputc (']', yyout);
 
 "@<:@" fputc ('[', yyout);
 "@:>@" fputc (']', yyout);
 

-"__oline__"      fprintf (yyout, "%d", yylineno);
+"__oline__"      fprintf (yyout, "%d", yylineno+1);

 "__ofile__"      fprintf (yyout, "%s", yyoutname);
 [^@_\n]+         ECHO;
 \n+              yylineno += yyleng; ECHO;
 "__ofile__"      fprintf (yyout, "%s", yyoutname);
 [^@_\n]+         ECHO;
 \n+              yylineno += yyleng; ECHO;