X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d9d363b1728c1ee338ee686ca2a0e1b1175da6f3..78bcec17c82fe777c90f86717773de35bb5018e7:/src/muscle_tab.c diff --git a/src/muscle_tab.c b/src/muscle_tab.c index 085b838d..b86c09bd 100644 --- a/src/muscle_tab.c +++ b/src/muscle_tab.c @@ -38,7 +38,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 @@ -69,18 +69,8 @@ muscle_init (void) /* 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"); } @@ -149,7 +139,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 +146,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 +161,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); } /*-------------------------------.