FYI [trunk]: lines-fix.patch

[Marc Autret]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.419
diff -u -r1.419 ChangeLog
--- ChangeLog   15 Dec 2001 18:38:57 -0000      1.419
+++ ChangeLog   16 Dec 2001 01:24:43 -0000
@@ -1,3 +1,15 @@
+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.
+       (output_parser): Adjust, now takes care about the lines of a 
+       output muscles.
+       Fix line numbering.
+       (actions_output): Computes the number of lines taken by actions.
+       (output_master_parser): Insert new skeleton which is the name of
+       the output parser file name.
+
 2001-12-15  Marc Autret  <address@hidden>
 
        * src/bison.simple [YYERROR_VERBOSE]: Restore backward compatibility.
Index: src/bison.simple
===================================================================
RCS file: /cvsroot/bison/bison/src/bison.simple,v
retrieving revision 1.90
diff -u -r1.90 bison.simple
--- src/bison.simple    15 Dec 2001 18:38:57 -0000      1.90
+++ src/bison.simple    16 Dec 2001 01:24:43 -0000
@@ -82,7 +82,8 @@
 /* Copy the user declarations.  */
 %%prologue
 
-#line %%line "%%skeleton"
+/* Line 85 of bison.simple.  */
+#line %%line "%%parser-file-name"
 
 #include <stdio.h>
 
@@ -511,8 +512,6 @@
 
 
 
-#line %%line "%%skeleton"
-
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
    It should actually point to an object.
@@ -897,7 +896,8 @@
     {
 %%actions
     }
-#line %%line "%%skeleton"
+  /* Line 902 of bison.simple.  */
+#line %%line "%%parser-file-name"
 
   yyvsp -= yylen;
   yyssp -= yylen;
Index: src/output.c
===================================================================
RCS file: /cvsroot/bison/bison/src/output.c,v
retrieving revision 1.92
diff -u -r1.92 output.c
--- src/output.c        15 Dec 2001 17:34:37 -0000      1.92
+++ src/output.c        16 Dec 2001 01:24:44 -0000
@@ -125,6 +125,23 @@
 
 int error_verbose = 0;
 
+/* Returns the number of lines of S.  */
+static size_t
+get_lines_number (const char *s)
+{
+  size_t lines = 0;
+  
+  size_t i;
+  for (i = 0; s[i]; ++i)
+    {
+      if (s[i] == '\n')
+       ++lines;
+    }   
+  
+  return lines;
+}
+
+
 /* FIXME. */
 
 static inline void
@@ -519,7 +536,7 @@
 `-----------------------------*/
 
 static void
-actions_output (FILE *out)
+actions_output (FILE *out, size_t *line)
 {
   int rule;
   for (rule = 1; rule < nrules + 1; ++rule)
@@ -538,6 +555,11 @@
        fprintf (out, "{ %s%s }\n    break;\n\n",
                 rule_table[rule].action,
                 yacc_flag ? ";" : "");
+
+       /* We always output 5 '\n' per action.  */
+       *line += 5;
+       /* Get the number of lines written by the user.  */
+       *line += get_lines_number (rule_table[rule].action);
       }
 }
 
@@ -962,11 +984,14 @@
          muscle_key = obstack_finish (&muscle_obstack);
          muscle_value = muscle_find (muscle_key);
          if (!strcmp (muscle_key, "actions"))
-           actions_output (out);
+           actions_output (out, &line);
          else if (!strcmp (muscle_key, "line"))
-           fprintf (out, "%d", line + 1);
+           fprintf (out, "%d", line);
          else if (muscle_value)
-           fputs (muscle_value, out);
+           {
+             fputs (muscle_value, out);
+             line += get_lines_number (muscle_value);
+           }     
          else
            {
              fputs ("%%", out);
@@ -997,6 +1022,7 @@
        skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
     }
   muscle_insert ("skeleton", skeleton);
+  muscle_insert ("parser-file-name", parser_file_name);
 
   output_parser (skeleton, parser);
   xfclose (parser);


-- 
Marc Autret