[Main] Repair any options.

[Pascal Bart]

Re-hello,

        this patch repairs any options, I don't apply it, because I amn't
sure that the better way, so I'm waiting for your comments about it.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.222
diff -u -r1.222 ChangeLog
--- ChangeLog   2001/09/25 11:36:25     1.222
+++ ChangeLog   2001/09/25 13:02:11
@@ -1,5 +1,14 @@
 2001-09-25  Pascal Bart  <address@hidden>

+       * src/muscle_tab.c (muscle_init): Set pure muscle according user
+       specification.
+       (gram.h): Include it.
+       (muscle_init): Set debug muscle, if option sets.
+       (muscle_init): Likewise for verbose muscle.
+       * src/bison.simple: Prevent against redefinition of YYPPURE.
+
+2001-09-25  Pascal Bart  <address@hidden>
+
        * src/output.c (output_master_parser): Don't finish action_obstack.
        (output_parser): Don't care about the muscle action, here.
        (prepare): Copy the action_obstack in the action muscle.
Index: src/bison.simple
===================================================================
RCS file: /cvsroot/bison/bison/src/bison.simple,v
retrieving revision 1.68
diff -u -r1.68 bison.simple
--- src/bison.simple    2001/09/25 11:36:25     1.68
+++ src/bison.simple    2001/09/25 13:02:11
@@ -105,7 +105,9 @@
 #endif

 #define YYBISON        1       /* Identify Bison output.  */
-#define YYPURE %%pure  /* Identify pure parsers.  */
+#ifndef YYPURE
+# define YYPURE        %%pure  /* Identify pure parsers.  */
+#endif

 #ifndef YYDEBUG
 # define YYDEBUG %%debug
Index: src/muscle_tab.c
===================================================================
RCS file: /cvsroot/bison/bison/src/muscle_tab.c,v
retrieving revision 1.3
diff -u -r1.3 muscle_tab.c
--- src/muscle_tab.c    2001/09/21 16:25:19     1.3
+++ src/muscle_tab.c    2001/09/25 13:02:11
@@ -26,6 +26,7 @@
 #include "files.h"
 #include "muscle_tab.h"
 #include "getargs.h"
+#include "gram.h"

 struct hash_table muscle_table;

@@ -83,13 +84,13 @@
   /* Various macros.  */
   muscle_insert ("flag", "0");
   muscle_insert ("last", "0");
-  muscle_insert ("pure", "0");
+  muscle_insert ("pure", (pure_parser ? "1" : "0"));
   muscle_insert ("nsym", "0");
-  muscle_insert ("debug", "0");
+  muscle_insert ("debug", (debug_flag ? "1" : "0"));
   muscle_insert ("final", "0");
   muscle_insert ("maxtok", "0");
   muscle_insert ("ntbase", "0");
-  muscle_insert ("verbose", "0");
+  muscle_insert ("verbose", (verbose_flag ? "1" : "0"));
   muscle_insert ("prefix", "yy");
   /* Default #line formatting.  */
   muscle_insert ("linef", "#line %d %s\n");

Pascal Bart (address@hidden)