muscles_output.

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

diff --git a/ChangeLog b/ChangeLog
index ef5d3b9e8ab8aabf145bf29a3039f74983e801ce..f9db6f4bf63b8480bb59d727276fd24c7a42554a 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-10  Akim Demaille  <demaille@gostai.com>
 
        Formatting changes.

diff --git a/src/output.c b/src/output.c
index d59429b03977966286a58276cdee590a002cb24e..6e6da2e6b3c540866f68059e1070563ed9731cdf 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -485,6 +485,26 @@ prepare_actions (void)
   muscle_insert_unsigned_int_table ("conflicting_rules", conflict_list,
                                    0, 1, conflict_list_cnt);
 }
+
+
+/*--------------------------------------------.
+| Output the definitions of all the muscles.  |
+`--------------------------------------------*/
+
+static void
+muscles_output (FILE *out)
+{
+  fputs ("m4_init()\n", out);
+
+  type_names_output (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.  |
@@ -586,18 +606,7 @@ output_skeleton (void)
   if (! out)
     error (EXIT_FAILURE, get_errno (),
           "fdopen");
-
-  /* Output the definitions of all the muscles.  */
-  fputs ("m4_init()\n", out);
-
-  type_names_output (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.  */