FYI [trunk]: lines-fix-fix.patch

[Marc Autret]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.420
diff -u -r1.420 ChangeLog
--- ChangeLog   16 Dec 2001 01:26:25 -0000      1.420
+++ ChangeLog   16 Dec 2001 01:42:21 -0000
@@ -1,5 +1,10 @@
 2001-12-16  Marc Autret  <address@hidden>
 
+       * src/output.c (actions_output): Fix. When we use %no-lines,
+       there is one less line per action.
+
+2001-12-16  Marc Autret  <address@hidden>
+
        * src/bison.simple: Remove a useless #line directive.
        s/#line %%line %%skeleton/#line %%line "%%parser-file-name"/'.
        * src/output.c (get_lines_number): New.
Index: src/output.c
===================================================================
RCS file: /cvsroot/bison/bison/src/output.c,v
retrieving revision 1.93
diff -u -r1.93 output.c
--- src/output.c        16 Dec 2001 01:26:25 -0000      1.93
+++ src/output.c        16 Dec 2001 01:42:22 -0000
@@ -556,8 +556,11 @@
                 rule_table[rule].action,
                 yacc_flag ? ";" : "");
 
-       /* We always output 5 '\n' per action.  */
-       *line += 5;
+       /* We always output 4 '\n' per action.  */
+       *line += 4;
+       /* Plus one if !no_lines_flag.  */
+       if (!no_lines_flag)
+         ++*line;
        /* Get the number of lines written by the user.  */
        *line += get_lines_number (rule_table[rule].action);
       }


-- 
Marc Autret