* src/muscle_tab.c (muscle_init): Remove initialization of

skeleton muscle.
* src/output.c (output_master_parser): Do it here.

diff --git a/ChangeLog b/ChangeLog
index 7af123e841447a9012802653a801d930e11262b3..56fe9703d0a73855407f9208e676309c7630ee50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-22  Marc Autret  <autret_m@epita.fr>
+
+       * src/muscle_tab.c (muscle_init): Remove initialization of
+       skeleton muscle.
+       * src/output.c (output_master_parser): Do it here.
+
 2001-11-20  Akim Demaille  <akim@epita.fr>
 
        * po/sv.po: New.

diff --git a/src/muscle_tab.c b/src/muscle_tab.c
index eeda61123aa2675083ae8b5dcc3c71ebfe702142..7dffbbd53decafcc5f28edd0737afee122f8f057 100644 (file)
--- a/src/muscle_tab.c
+++ b/src/muscle_tab.c
@@ -56,9 +56,6 @@ muscle_init (void)
   muscle_insert ("version", VERSION);
   muscle_insert ("filename", infile);
 
-  /* Skeleton use.  */
-  muscle_insert ("skeleton", skeleton);
-
   /* Types.  */
   muscle_insert ("stype", "int");
   muscle_insert ("ltype", "yyltype");

diff --git a/src/output.c b/src/output.c
index 4317215473ca2a45f92cdacfdecce8ae32af94e8..a24441cb3e5ea753e3145ab8541db59bc08203be 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -985,7 +985,6 @@ output_parser (const char *skel_filename, struct obstack *oout)
            obstack_fgrow1 (oout, "%d", line + 1);
          else if (!strcmp (muscle_key, "input_line"))
            obstack_fgrow1 (oout, "%d", lineno);
-         /* FIXME: Insert the code to recognize %%sub-skeleton for exemple.  */
          else
            {
              obstack_sgrow (oout, "%%");
@@ -1014,6 +1013,7 @@ output_master_parser (void)
       else
        skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
     }
+  muscle_insert ("skeleton", skeleton);    
   output_parser (skeleton, &table_obstack);
 }