[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI [trunk]: lines-fix2.patch
From: |
Marc Autret |
Subject: |
FYI [trunk]: lines-fix2.patch |
Date: |
17 Dec 2001 15:18:44 -0500 |
User-agent: |
Gnus/5.0807 (Gnus v5.8.7) Emacs/20.7 |
Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.421
diff -u -r1.421 ChangeLog
--- ChangeLog 16 Dec 2001 01:45:19 -0000 1.421
+++ ChangeLog 17 Dec 2001 20:10:31 -0000
@@ -1,3 +1,9 @@
+2001-12-17 Marc Autret <address@hidden>
+
+ * src/bison.simple: Don't hard code the skeleton line and filename.
+ * src/output.c (output_parser): Rename 'line' as 'output_line'.
+ New line counter 'skeleton_line'.
+
2001-12-16 Marc Autret <address@hidden>
* src/output.c (actions_output): Fix. When we use %no-lines,
Index: src/bison.simple
===================================================================
RCS file: /cvsroot/bison/bison/src/bison.simple,v
retrieving revision 1.91
diff -u -r1.91 bison.simple
--- src/bison.simple 16 Dec 2001 01:26:25 -0000 1.91
+++ src/bison.simple 17 Dec 2001 20:10:31 -0000
@@ -82,7 +82,7 @@
/* Copy the user declarations. */
%%prologue
-/* Line 85 of bison.simple. */
+/* Line %%skeleton-line of %%skeleton. */
#line %%line "%%parser-file-name"
#include <stdio.h>
@@ -896,7 +896,8 @@
{
%%actions
}
- /* Line 902 of bison.simple. */
+
+/* Line %%skeleton-line of %%skeleton. */
#line %%line "%%parser-file-name"
yyvsp -= yylen;
Index: src/output.c
===================================================================
RCS file: /cvsroot/bison/bison/src/output.c,v
retrieving revision 1.94
diff -u -r1.94 output.c
--- src/output.c 16 Dec 2001 01:45:19 -0000 1.94
+++ src/output.c 17 Dec 2001 20:10:33 -0000
@@ -957,19 +957,24 @@
{
int c;
FILE *fskel;
- size_t line;
+ size_t output_line;
+ size_t skeleton_line;
fskel = xfopen (skel_filename, "r");
/* New output code. */
- line = 1;
+ output_line = 1;
+ skeleton_line = 1;
c = getc (fskel);
while (c != EOF)
{
if (c != '%')
{
if (c == '\n')
- ++line;
+ {
+ ++output_line;
+ ++skeleton_line;
+ }
putc (c, out);
c = getc (fskel);
}
@@ -987,13 +992,15 @@
muscle_key = obstack_finish (&muscle_obstack);
muscle_value = muscle_find (muscle_key);
if (!strcmp (muscle_key, "actions"))
- actions_output (out, &line);
+ actions_output (out, &output_line);
else if (!strcmp (muscle_key, "line"))
- fprintf (out, "%d", line);
+ fprintf (out, "%d", output_line);
+ else if (!strcmp (muscle_key, "skeleton-line"))
+ fprintf (out, "%d", skeleton_line);
else if (muscle_value)
{
fputs (muscle_value, out);
- line += get_lines_number (muscle_value);
+ output_line += get_lines_number (muscle_value);
}
else
{
--
Marc Autret
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI [trunk]: lines-fix2.patch,
Marc Autret <=