* src/bison.simple: Adjust muscle names.

* src/muscle_tab.c (muscle_init): Also rename the muscles.
* src/output.c (prepare): s/_/-/ for the muscles names.
(output_parser): When scanning for a muscle, allow '-' instead of '_'.

diff --git a/ChangeLog b/ChangeLog
index 4480e46628628a071a0403bd42f2970355b3decc..a08c9a918480f30ac5d9f44de8d785f934a9e5e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-28  Marc Autret  <autret_m@epita.fr>
+
+       * src/bison.simple: Adjust muscle names.
+       * src/muscle_tab.c (muscle_init): Also rename the muscles.
+       * src/output.c (prepare): s/_/-/ for the muscles names.
+       (output_parser): When scanning for a muscle, allow '-' instead of '_'.
+
 2001-11-28  Marc Autret  <autret_m@epita.fr>
 
        * src/bison.simple: Fix debug.

diff --git a/src/bison.simple b/src/bison.simple
index 872ee38b6d3c527cdfefa62626c9151075dfe32b..eeaa397701feac7958ee559101ca881e1445e90d 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -44,7 +44,7 @@
 #define yynerrs %%prefix##nerrs
 
 /* Copy the user declarations.  */
-#line %%input_line "%%filename"
+#line %%input-line "%%filename"
 %%prologue
 
 #line %%line "%%skeleton"
@@ -132,7 +132,7 @@ do {                                                                        \
 # define YYDEBUG %%debug
 #endif
 
-#line %%input_line "%%filename"
+#line %%input-line "%%filename"
 #ifndef YYSTYPE
 typedef %%stype yystype;
 # define YYSTYPE yystype
@@ -153,7 +153,7 @@ typedef struct yyltype
 # undef YYERROR_VERBOSE
 #endif
 
-#define YYERROR_VERBOSE %%error_verbose
+#define YYERROR_VERBOSE %%error-verbose
 
 /* Tokens.  */
 %%tokendef
@@ -306,7 +306,7 @@ while (0)
 #endif
 
 /* Definition of YYLSP_NEEDED.  */
-#define YYLSP_NEEDED %%locations_flag
+#define YYLSP_NEEDED %%locations-flag
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
@@ -1006,5 +1006,5 @@ yyabortlab:
   return 1;
 }
 
-#line %%input_line "%%filename"
+#line %%input-line "%%filename"
 %%epilogue

diff --git a/src/muscle_tab.c b/src/muscle_tab.c
index 56a3221327402e8515df98f729518e95de14f633..d487a4a0bface5daf520979b8663aecc8ba55dfb 100644 (file)
--- a/src/muscle_tab.c
+++ b/src/muscle_tab.c
@@ -86,7 +86,7 @@ muscle_init (void)
   muscle_insert ("final", "0");
   muscle_insert ("maxtok", "0");
   muscle_insert ("ntbase", "0");
-  muscle_insert ("error_verbose", "0");
+  muscle_insert ("error-verbose", "0");
   muscle_insert ("prefix", "yy");
   /* Default #line formatting.  */
   muscle_insert ("linef", "#line %d %s\n");

diff --git a/src/output.c b/src/output.c
index dde3eba71e4227d4a47510814334b21256b038f1..0e00c6345badb102c6e60947c0766adbdc803103 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -972,7 +972,7 @@ output_parser (const char *skel_filename, struct obstack *oout)
          const char *muscle_key = 0;
          const char *muscle_value = 0;
 
-         while (isalnum (c = getc (fskel)) || c == '_')
+         while (isalnum (c = getc (fskel)) || c == '-')
            obstack_1grow (&muscle_obstack, c);
          obstack_1grow (&muscle_obstack, 0);
 
@@ -983,7 +983,7 @@ output_parser (const char *skel_filename, struct obstack *oout)
            obstack_sgrow (oout, muscle_value);
          else if (!strcmp (muscle_key, "line"))
            obstack_fgrow1 (oout, "%d", line + 1);
-         else if (!strcmp (muscle_key, "input_line"))
+         else if (!strcmp (muscle_key, "input-line"))
            obstack_fgrow1 (oout, "%d", lineno);
          else
            {
@@ -1052,14 +1052,14 @@ prepare (void)
   MUSCLE_INSERT_INT ("final", final_state);
   MUSCLE_INSERT_INT ("maxtok", max_user_token_number);
   MUSCLE_INSERT_INT ("ntbase", ntokens);
-  MUSCLE_INSERT_INT ("error_verbose", error_verbose_flag);
+  MUSCLE_INSERT_INT ("error-verbose", error_verbose_flag);
 
   MUSCLE_INSERT_INT ("nnts", nvars);
   MUSCLE_INSERT_INT ("nrules", nrules);
   MUSCLE_INSERT_INT ("nstates", nstates);
   MUSCLE_INSERT_INT ("ntokens", ntokens);
 
-  MUSCLE_INSERT_INT ("locations_flag", locations_flag);
+  MUSCLE_INSERT_INT ("locations-flag", locations_flag);
 
   /* We need to save the actions in the muscle %%action.  */
   muscle_insert ("action", obstack_finish (&action_obstack));