X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/66d30cd4eb907af83dffa8ed7db84485a28663dc..f94705b204a258adb244997a5bcc2b6e4cc0472b:/src/muscle_tab.c diff --git a/src/muscle_tab.c b/src/muscle_tab.c index 552cf96b..2d71085e 100644 --- a/src/muscle_tab.c +++ b/src/muscle_tab.c @@ -1,5 +1,7 @@ -/* Muscle table manager for Bison, - Copyright (C) 2001, 2002 Free Software Foundation, Inc. +/* Muscle table manager for Bison. + + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software + Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -15,15 +17,24 @@ You should have received a copy of the GNU General Public License along with Bison; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ +#include #include "system.h" -#include "hash.h" + +#include +#include + #include "files.h" #include "muscle_tab.h" #include "getargs.h" +typedef struct +{ + const char *key; + char *value; +} muscle_entry; /* An obstack used to create some entries. */ struct obstack muscle_obstack; @@ -31,20 +42,20 @@ struct obstack muscle_obstack; /* Initial capacity of muscles hash table. */ #define HT_INITIAL_CAPACITY 257 -struct hash_table *muscle_table = NULL; +static struct hash_table *muscle_table = NULL; static bool 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; + muscle_entry const *m1 = x; + muscle_entry const *m2 = y; + return strcmp (m1->key, m2->key) == 0; } -static unsigned int -hash_muscle (const void *x, unsigned int tablesize) +static size_t +hash_muscle (const void *x, size_t tablesize) { - const muscle_entry_t *m = x; + muscle_entry const *m = x; return hash_string (m->key, tablesize); } @@ -64,13 +75,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. */ - - /* Default #line formatting. */ - MUSCLE_INSERT_STRING ("linef", "#line %d %s\n"); + MUSCLE_INSERT_C_STRING ("file_name", grammar_file); } @@ -95,8 +100,8 @@ muscle_free (void) void muscle_insert (const char *key, char *value) { - muscle_entry_t probe; - muscle_entry_t *entry = NULL; + muscle_entry probe; + muscle_entry *entry; probe.key = key; entry = hash_lookup (muscle_table, &probe); @@ -104,7 +109,7 @@ muscle_insert (const char *key, char *value) if (!entry) { /* First insertion in the hash. */ - entry = XMALLOC (muscle_entry_t, 1); + entry = xmalloc (sizeof *entry); entry->key = key; hash_insert (muscle_table, entry); } @@ -113,16 +118,16 @@ muscle_insert (const char *key, char *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 muscle_grow (const char *key, const char *val, const char *separator) { - muscle_entry_t probe; - muscle_entry_t *entry = NULL; + muscle_entry probe; + muscle_entry *entry = NULL; probe.key = key; entry = hash_lookup (muscle_table, &probe); @@ -130,7 +135,7 @@ muscle_grow (const char *key, const char *val, const char *separator) if (!entry) { /* First insertion in the hash. */ - entry = XMALLOC (muscle_entry_t, 1); + entry = xmalloc (sizeof *entry); entry->key = key; hash_insert (muscle_table, entry); entry->value = xstrdup (val); @@ -139,7 +144,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); @@ -147,12 +151,31 @@ 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); } } +/*------------------------------------------------------------------. +| Append VALUE to the current value of KEY, using muscle_grow. But | +| in addition, issue a synchronization line for the location LOC. | +`------------------------------------------------------------------*/ + +void +muscle_code_grow (const char *key, const char *val, location loc) +{ + char *extension = NULL; + obstack_fgrow1 (&muscle_obstack, "]b4_syncline(%d, [[", loc.start.line); + MUSCLE_OBSTACK_SGROW (&muscle_obstack, + quotearg_style (c_quoting_style, loc.start.file)); + obstack_sgrow (&muscle_obstack, "]])[\n"); + obstack_sgrow (&muscle_obstack, val); + obstack_1grow (&muscle_obstack, 0); + extension = obstack_finish (&muscle_obstack); + muscle_grow (key, extension, ""); +} + + /*-------------------------------------------------------------------. | MUSCLE is an M4 list of pairs. Create or extend it with the pair | | (A1, A2). Note that because the muscle values are output *double* | @@ -175,11 +198,11 @@ void muscle_pair_list_grow (const char *muscle, | Find the value of muscle KEY. | `-------------------------------*/ -char* +char * muscle_find (const char *key) { - muscle_entry_t probe; - muscle_entry_t *result = NULL; + muscle_entry probe; + muscle_entry *result = NULL; probe.key = key; result = hash_lookup (muscle_table, &probe); @@ -191,12 +214,18 @@ muscle_find (const char *key) | Output the definition of ENTRY as a m4_define. | `------------------------------------------------*/ -static int -muscle_m4_output (muscle_entry_t *entry, FILE *out) +static inline bool +muscle_m4_output (muscle_entry *entry, FILE *out) { fprintf (out, "m4_define([b4_%s],\n", entry->key); fprintf (out, "[[%s]])\n\n\n", entry->value); - return 1; + return true; +} + +static bool +muscle_m4_output_processor (void *entry, void *out) +{ + return muscle_m4_output (entry, out); } @@ -208,7 +237,5 @@ muscle_m4_output (muscle_entry_t *entry, FILE *out) void muscles_m4_output (FILE *out) { - hash_do_for_each (muscle_table, - (Hash_processor) muscle_m4_output, - out); + hash_do_for_each (muscle_table, muscle_m4_output_processor, out); }