* src/bison.simple: New `#line' directive.

* src/output.c (output_parser): Support new dynamic muscle input_line.

diff --git a/ChangeLog b/ChangeLog
index 801d76e8ffb7e345dd90e93d1ef5d4851086b89a..8eae12c872216fdacb3abb81cdc94e417d4f74de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-22  Pascal Bart  <pascal.bart@epita.fr>
+
+       * src/bison.simple: New `#line' directive.
+       * src/output.c (output_parser): Support new dynamic muscle input_line.
+
 2001-09-22  Marc Autret  <autret_m@epita.fr>
 
        * src/output.c (output_master_parser): New.

diff --git a/src/bison.simple b/src/bison.simple
index 2e44e86c29da9864be2858e9f3eb72cb182da572..7830a51d92f58c1ffa889acf941373c36ce84f6e 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -990,5 +990,6 @@ yyabortlab:
   return 1;
 }
 
+#line %%input_line "%%filename"
 %%epilogue
 

diff --git a/src/output.c b/src/output.c
index bf1da13b3292635fbb6e15632d4d40e8f16840da..6706af61722b7609106a4ffbf00430311b5c9d4f 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -991,6 +991,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);
+         else if (!strcmp (muscle_key, "input_line"))
+           obstack_fgrow1 (oout, "%d", lineno + 1);
          else if (!strcmp (muscle_key, "action"))
            {
              size_t size = obstack_object_size (&action_obstack);