* src/reader.c (read_additionnal_code): Rename %%user_code to

%%epilogue.
* src/output.c (output): Rename %%declarations to %%prologue.
* src/bison.simple: Echo modifications.

diff --git a/ChangeLog b/ChangeLog
index f2c7fad75252643caa158aa057559f6e5bde9f79..08dd0e0d6215f4696673fcbbe18da07e01465081 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-31  Pascal Bart  <pascal.bart@epita.fr>, Marc Autret  <autret_m@epita.fr>
+
+       * src/reader.c (read_additionnal_code): Rename %%user_code to 
+       %%epilogue.
+       * src/output.c (output): Rename %%declarations to %%prologue.
+       * src/bison.simple: Echo modifications.
+       
 2001-08-31  Marc Autret  <autret_m@epita.fr>
 
        * src/reader.c (readgram): CleanUp.

diff --git a/TODO b/TODO
index 8eddcdc5370e913b6ff217bf63f72247fce4e47a..7f58a43d27eaf9f9d811d63bf0926b44698ceae6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,7 +6,7 @@
 * src/output.c
 ** Output sub-skeleton files.
 ** Cleanup dirty CPP-out code.
-** s/definitions/prologue/  s/user_code/epilogue/
+** s/definitions/prologue/  s/user_code/epilogue/ [ok].
 ** s/macro/muscle/
 
 * src/getargs.c src/lex.c
@@ -17,4 +17,7 @@
 ** s/macro/muscle/
 
 * src/print_graph.c
-** Find the best graph parameters.
\ No newline at end of file
+** Find the best graph parameters.
+
+* doc/bison.texinfo
+** Echo modifications of prologue and epilogue.
\ No newline at end of file

diff --git a/src/bison.simple b/src/bison.simple
index d6268630ba8229024eaf588b08ca44d1031be4c4..74040d49eef99354770f6b945b718a55c343967c 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -34,7 +34,7 @@
 #include <stdio.h>
 
 /* Copy the user declarations.  */
-%%definitions
+%%prologue
 
 #ifndef __cplusplus
 # ifndef __STDC__
@@ -977,5 +977,5 @@ yyabortlab:
   return 1;
 }
 
-%%user_code
+%%epilogue
 

diff --git a/src/output.c b/src/output.c
index b4d443760afe6ac29cd50c5341fc8f6f3552bb19..944ebb5483c0a4da2ffe60855544110edc6cff8f 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1114,7 +1114,7 @@ output (void)
 #endif
   prepare ();
   /* Copy definitions in directive.  */
-  macro_insert ("definitions", obstack_finish (&attrs_obstack));
+  macro_insert ("prologue", obstack_finish (&attrs_obstack));
   output_parser ();
 
   obstack_free (&macro_obstack, 0);

diff --git a/src/reader.c b/src/reader.c
index 31af907d5415012f21eda6fa8c246a898e110e80..22eedc80f0a40f3e9c542f6a2efb475d40cae3a2 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1666,21 +1666,21 @@ readgram (void)
 }
 
 /* At the end of the grammar file, some C source code must
-   be stored. It is going to be associated to the user_code
+   be stored. It is going to be associated to the epilogue
    directive.  */
 static void
 read_additionnal_code (void)
 {
   char c;
-  struct obstack uc_obstack;
+  struct obstack el_obstack;
   
-  obstack_init (&uc_obstack);
+  obstack_init (&el_obstack);
 
   while ((c = getc (finput)) != EOF)
-    obstack_1grow (&uc_obstack, c);
+    obstack_1grow (&el_obstack, c);
   
-  obstack_1grow (&uc_obstack, 0);
-  macro_insert ("user_code", obstack_finish (&uc_obstack));
+  obstack_1grow (&el_obstack, 0);
+  macro_insert ("epilogue", obstack_finish (&el_obstack));
 }
 
 \f