Do not include <assert.h>.

[bison.git] / src / muscle_tab.c

diff --git a/src/muscle_tab.c b/src/muscle_tab.c
index 085b838dfea01864bcda6f0a88505f32ff9dcdcf..979604f1d07a91c4be34aa60612056cdddcddc5e 100644 (file)
--- a/src/muscle_tab.c
+++ b/src/muscle_tab.c
@@ -20,6 +20,7 @@
 
 #include "system.h"
 #include "hash.h"
+#include "quotearg.h"
 #include "files.h"
 #include "muscle_tab.h"
 #include "getargs.h"
@@ -38,7 +39,7 @@ hash_compare_muscles (void const *x, void const *y)
 {
   const muscle_entry_t *m1 = x;
   const muscle_entry_t *m2 = y;
-  return strcmp (m1->key, m2->key) ? FALSE : TRUE;
+  return strcmp (m1->key, m2->key) == 0;
 }
 
 static unsigned int
@@ -64,23 +65,7 @@ muscle_init (void)
 
   /* Version and input file.  */
   MUSCLE_INSERT_STRING ("version", VERSION);
-  MUSCLE_INSERT_STRING ("filename", infile);
-
-  /* FIXME: there should probably be no default here, only in the
-     skeletons.  */
-
-  /* Types.  */
-  MUSCLE_INSERT_STRING ("ltype", "yyltype");
-
-  /* Default #line formatting.  */
-  MUSCLE_INSERT_STRING ("linef", "#line %d %s\n");
-
-  /* Stack parameters.  */
-  MUSCLE_INSERT_STRING ("maxdepth", "10000");
-  MUSCLE_INSERT_STRING ("initdepth", "200");
-
-  /* C++ macros.  */
-  MUSCLE_INSERT_STRING ("name", "Parser");
+  MUSCLE_INSERT_C_STRING ("filename", grammar_file);
 }
 
 
@@ -149,7 +134,6 @@ muscle_grow (const char *key, const char *val, const char *separator)
     {
       /* Grow the current value. */
       char *new_val;
-      fprintf (stderr, "<= %s + %s\n", entry->value, val);
       obstack_sgrow (&muscle_obstack, entry->value);
       free (entry->value);
       obstack_sgrow (&muscle_obstack, separator);
@@ -157,7 +141,6 @@ muscle_grow (const char *key, const char *val, const char *separator)
       obstack_1grow (&muscle_obstack, 0);
       new_val = obstack_finish (&muscle_obstack);
       entry->value = xstrdup (new_val);
-      fprintf (stderr, "=> %s\n", new_val);
       obstack_free (&muscle_obstack, new_val);
     }
 }
@@ -173,12 +156,12 @@ muscle_grow (const char *key, const char *val, const char *separator)
 void muscle_pair_list_grow (const char *muscle,
                            const char *a1, const char *a2)
 {
-  char *val;
+  char *pair;
   obstack_fgrow2 (&muscle_obstack, "[[[%s]], [[%s]]]", a1, a2);
   obstack_1grow (&muscle_obstack, 0);
-  val = obstack_finish (&muscle_obstack);
-  muscle_grow (muscle, val, ",\n");
-  obstack_free (&muscle_obstack, val);
+  pair = obstack_finish (&muscle_obstack);
+  muscle_grow (muscle, pair, ",\n");
+  obstack_free (&muscle_obstack, pair);
 }
 
 /*-------------------------------.