* src/reader.c (copy_definition): Re-use CPP-outed code which

replace precedent remove.
* src/bison.simple: Remove #line before %%prologue because
%%input-line is wrong at this time.

diff --git a/ChangeLog b/ChangeLog
index 258243e56ba11f5903d74d969f126f7d7420dada..2e2cbb0d484ee6ab6736d598ac0444393f7e2626 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-10  Marc Autret  <autret_m@epita.fr>
+
+       * src/reader.c (copy_definition): Re-use CPP-outed code which 
+       replace precedent remove.
+       * src/bison.simple: Remove #line before %%prologue because
+       %%input-line is wrong at this time.
+
 2001-12-10  Marc Autret  <autret_m@epita.fr>
 
        * src/reader.c (symbols_output): Clean up.

diff --git a/TODO b/TODO
index 596bd1eec3efc0a16af58397f83b153389514d30..a46c66f13bca15a412d24f4b205b8d6a86f7a7e7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,10 +1,12 @@
 -*- outline -*-
 
 * src/reader.c
-Check and cleanup for CPP-out code.    []
+Check and cleanup for CPP-out code.    [ok]
 
 * src/output.c
-Check and cleanup for CPP-out code.    []
+Check and cleanup for CPP-out code.    [ok]
+** %%input-line is not correct at this time.
+Rely with bison.simple.
 
 * Broken options ?.
 ** %no-lines           []

diff --git a/src/bison.simple b/src/bison.simple
index a55a66bd24a6b9a59f045c28d0ef5f3616f8825e..6228f2be8b821a84287bb975cf390773717d49e4 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -76,7 +76,6 @@ typedef struct yyltype
 #endif
 
 /* Copy the user declarations.  */
-#line %%input-line "%%filename"
 %%prologue
 
 #line %%line "%%skeleton"

diff --git a/src/output.c b/src/output.c
index 485d587369a918e419fc037ffca2c001ebef6c1d..3833ec9e746f5bc258d65ca57ca52a61b83b45ef 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -959,6 +959,8 @@ output_parser (const char *skel_filename, struct obstack *oout)
            obstack_sgrow (oout, muscle_value);
          else if (!strcmp (muscle_key, "line"))
            obstack_fgrow1 (oout, "%d", line + 1);
+         /* How can lineno be correct after having finished reading
+            input file ? --Marc.  */
          else if (!strcmp (muscle_key, "input-line"))
            obstack_fgrow1 (oout, "%d", lineno);
          else

diff --git a/src/reader.c b/src/reader.c
index 3974f06934ffbdcdc772ab6e88a444add3f3a741..099ce3090fff2e3133113c75965f3c6c41b93c4c 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -437,14 +437,12 @@ copy_definition (void)
   /* -1 while reading a character if prev char was %. */
   int after_percent;
 
-#if 0
   if (!no_lines_flag)
     {
       obstack_fgrow2 (&attrs_obstack, muscle_find ("linef"),
                      lineno, quotearg_style (c_quoting_style,
                                              muscle_find("filename")));
     }
-#endif
 
   after_percent = 0;