FYI: [MAIN] rename-defs.patch

[marc-alexandre autret]

Hello, 

This patch removes confusing names of `muscles'.
The doc patch will follow...

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.199
diff -u -r1.199 ChangeLog
--- ChangeLog   2001/08/31 11:47:07     1.199
+++ ChangeLog   2001/08/31 15:51:43
@@ -1,3 +1,10 @@
+2001-08-31  Pascal Bart  <address@hidden>, Marc Autret  <address@hidden>
+
+       * 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  <address@hidden>
 
        * src/reader.c (readgram): CleanUp.
Index: src/bison.simple
===================================================================
RCS file: /cvsroot/bison/bison/src/bison.simple,v
retrieving revision 1.59
diff -u -r1.59 bison.simple
--- src/bison.simple    2001/08/29 14:17:00     1.59
+++ src/bison.simple    2001/08/31 15:51:45
@@ -34,7 +34,7 @@
 #include <stdio.h>
 
 /* Copy the user declarations.  */
-%%definitions
+%%prologue
 
 #ifndef __cplusplus
 # ifndef __STDC__
@@ -977,5 +977,5 @@
   return 1;
 }
 
-%%user_code
+%%epilogue
 
Index: src/output.c
===================================================================
RCS file: /cvsroot/bison/bison/src/output.c,v
retrieving revision 1.49
diff -u -r1.49 output.c
--- src/output.c        2001/08/31 11:47:08     1.49
+++ src/output.c        2001/08/31 15:51:47
@@ -1114,7 +1114,7 @@
 #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);
Index: src/reader.c
===================================================================
RCS file: /cvsroot/bison/bison/src/reader.c,v
retrieving revision 1.81
diff -u -r1.81 reader.c
--- src/reader.c        2001/08/31 11:47:08     1.81
+++ src/reader.c        2001/08/31 15:51:50
@@ -1666,21 +1666,21 @@
 }
 
 /* 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));
 }
 
 


-- 
Autret Marc (address@hidden)
Eleve Ingenieur en Informatique.