X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/040984073a54b4c603172be3c3f44b908ea5deb9..eb095650011f68858e877e3590f6901bc79ba668:/src/muscle_tab.c diff --git a/src/muscle_tab.c b/src/muscle_tab.c index 6e7bd9bb..6ceb71f3 100644 --- a/src/muscle_tab.c +++ b/src/muscle_tab.c @@ -1,6 +1,6 @@ /* Muscle table manager for Bison. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -20,6 +20,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include #include "system.h" #include @@ -29,10 +30,13 @@ #include "muscle_tab.h" #include "getargs.h" +/* A key-value pair, along with storage that can be reclaimed when + this pair is no longer needed. */ typedef struct { - const char *key; - char *value; + char const *key; + char const *value; + char *storage; } muscle_entry; /* An obstack used to create some entries. */ @@ -63,6 +67,14 @@ hash_muscle (const void *x, size_t tablesize) | Also set up the MUSCLE_OBSTACK. | `-----------------------------------------------------------------*/ +static void +muscle_entry_free (void *entry) +{ + muscle_entry *mentry = entry; + free (mentry->storage); + free (mentry); +} + void muscle_init (void) { @@ -70,11 +82,11 @@ muscle_init (void) obstack_init (&muscle_obstack); muscle_table = hash_initialize (HT_INITIAL_CAPACITY, NULL, hash_muscle, - hash_compare_muscles, free); + hash_compare_muscles, muscle_entry_free); /* Version and input file. */ MUSCLE_INSERT_STRING ("version", VERSION); - MUSCLE_INSERT_C_STRING ("filename", grammar_file); + MUSCLE_INSERT_C_STRING ("file_name", grammar_file); } @@ -97,7 +109,7 @@ muscle_free (void) `------------------------------------------------------------*/ void -muscle_insert (const char *key, char *value) +muscle_insert (char const *key, char const *value) { muscle_entry probe; muscle_entry *entry; @@ -111,15 +123,16 @@ muscle_insert (const char *key, char *value) entry = xmalloc (sizeof *entry); entry->key = key; hash_insert (muscle_table, entry); + entry->storage = NULL; } entry->value = value; } /*-------------------------------------------------------------------. -| Insert (KEY, VALUE). If KEY already existed, overwrite the | -| previous value. Uses MUSCLE_OBSTACK. De-allocates the previously | -| associated value. VALUE and SEPARATOR are copied. | +| Append VALUE to the current value of KEY. If KEY did not already | +| exist, create it. Use MUSCLE_OBSTACK. De-allocate the previously | +| associated value. Copy VALUE and SEPARATOR. | `-------------------------------------------------------------------*/ void @@ -137,19 +150,19 @@ muscle_grow (const char *key, const char *val, const char *separator) entry = xmalloc (sizeof *entry); entry->key = key; hash_insert (muscle_table, entry); - entry->value = xstrdup (val); + entry->value = entry->storage = xstrdup (val); } else { /* Grow the current value. */ char *new_val; obstack_sgrow (&muscle_obstack, entry->value); - free (entry->value); + free (entry->storage); obstack_sgrow (&muscle_obstack, separator); obstack_sgrow (&muscle_obstack, val); obstack_1grow (&muscle_obstack, 0); new_val = obstack_finish (&muscle_obstack); - entry->value = xstrdup (new_val); + entry->value = entry->storage = xstrdup (new_val); obstack_free (&muscle_obstack, new_val); } } @@ -172,6 +185,7 @@ muscle_code_grow (const char *key, const char *val, location loc) obstack_1grow (&muscle_obstack, 0); extension = obstack_finish (&muscle_obstack); muscle_grow (key, extension, ""); + obstack_free (&muscle_obstack, extension); } @@ -197,7 +211,7 @@ void muscle_pair_list_grow (const char *muscle, | Find the value of muscle KEY. | `-------------------------------*/ -char* +char * muscle_find (const char *key) { muscle_entry probe;