FYI [trunk]: rename-muscles.patch

[Marc Autret]

? cvslog
Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.321
diff -u -r1.321 ChangeLog
--- ChangeLog   2001/11/28 19:54:36     1.321
+++ ChangeLog   2001/11/28 20:25:46
@@ -1,5 +1,12 @@
 2001-11-28  Marc Autret  <address@hidden>
 
+       * 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  <address@hidden>
+
        * src/bison.simple: Fix debug.
        [YYERROR_VERBOSE]: Re-integrate as an internal macro.
 
Index: src/bison.simple
===================================================================
RCS file: /cvsroot/bison/bison/src/bison.simple,v
retrieving revision 1.78
diff -u -r1.78 bison.simple
--- src/bison.simple    2001/11/28 19:54:36     1.78
+++ src/bison.simple    2001/11/28 20:25:52
@@ -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 @@
 # define YYDEBUG %%debug
 #endif
 
-#line %%input_line "%%filename"
+#line %%input-line "%%filename"
 #ifndef YYSTYPE
 typedef %%stype yystype;
 # define YYSTYPE yystype
@@ -153,7 +153,7 @@
 # undef YYERROR_VERBOSE
 #endif
 
-#define YYERROR_VERBOSE %%error_verbose
+#define YYERROR_VERBOSE %%error-verbose
 
 /* Tokens.  */
 %%tokendef
@@ -306,7 +306,7 @@
 #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 @@
   return 1;
 }
 
-#line %%input_line "%%filename"
+#line %%input-line "%%filename"
 %%epilogue
Index: src/muscle_tab.c
===================================================================
RCS file: /cvsroot/bison/bison/src/muscle_tab.c,v
retrieving revision 1.6
diff -u -r1.6 muscle_tab.c
--- src/muscle_tab.c    2001/11/27 20:55:16     1.6
+++ src/muscle_tab.c    2001/11/28 20:25:55
@@ -86,7 +86,7 @@
   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");
Index: src/output.c
===================================================================
RCS file: /cvsroot/bison/bison/src/output.c,v
retrieving revision 1.74
diff -u -r1.74 output.c
--- src/output.c        2001/11/27 20:55:16     1.74
+++ src/output.c        2001/11/28 20:26:01
@@ -972,7 +972,7 @@
          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 @@
            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 @@
   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));


-- 
Marc Autret