muscles_output.

	* src/output.c (muscles_output): New, extracted from...
	(output_skeleton): here.
	Adjust.

diff --git a/ChangeLog b/ChangeLog
index 6e00950dddd2ed3f23e02c1d5fbbc7e3db867af7..f4c31a4456296e5ddfcf47d6aeddd245b4320704 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-10  Akim Demaille  <demaille@gostai.com>
+
+       muscles_output.
+       * src/output.c (muscles_output): New, extracted from...
+       (output_skeleton): here.
+       Adjust.
+

 2008-11-21  Akim Demaille  <demaille@gostai.com>
 
        Display the changes in cross-options.texi.
 2008-11-21  Akim Demaille  <demaille@gostai.com>
 
        Display the changes in cross-options.texi.

diff --git a/src/output.c b/src/output.c
index 585b90e06dd4724ff86b1f5e43b5b21ffde1f192..7eb3518522a832b579202599a85f7312c39a62b6 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -462,6 +462,23 @@ prepare_actions (void)
                                    0, 1, conflict_list_cnt);
 }
 
                                    0, 1, conflict_list_cnt);
 }
 

+/*--------------------------------------------.
+| Output the definitions of all the muscles.  |
+`--------------------------------------------*/
+
+static void
+muscles_output (FILE *out)
+{
+  fputs ("m4_init()\n", out);
+
+  user_actions_output (out);
+  merger_output (out);
+  token_definitions_output (out);
+  symbol_code_props_output (out, "destructors", &symbol_destructor_get);
+  symbol_code_props_output (out, "printers", &symbol_printer_get);
+
+  muscles_m4_output (out);
+}

 \f
 /*---------------------------.
 | Call the skeleton parser.  |
 \f
 /*---------------------------.
 | Call the skeleton parser.  |


@@ -563,17 +580,7 @@ output_skeleton (void)
   if (! out)
     error (EXIT_FAILURE, get_errno (),
           "fdopen");
   if (! out)
     error (EXIT_FAILURE, get_errno (),
           "fdopen");

-
-  /* Output the definitions of all the muscles.  */
-  fputs ("m4_init()\n", out);
-
-  user_actions_output (out);
-  merger_output (out);
-  token_definitions_output (out);
-  symbol_code_props_output (out, "destructors", &symbol_destructor_get);
-  symbol_code_props_output (out, "printers", &symbol_printer_get);
-
-  muscles_m4_output (out);
+  muscles_output (out);

   xfclose (out);
 
   /* Read and process m4's output.  */
   xfclose (out);
 
   /* Read and process m4's output.  */