X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/922bdd7ffa913135a33ea9e54e5034cfc15e0436..4b7a4c1b1c8c18e9ad2517c117442b9b7d7e671a:/src/muscle_tab.c?ds=sidebyside diff --git a/src/muscle_tab.c b/src/muscle_tab.c index 01f80dc4..c25b519d 100644 --- a/src/muscle_tab.c +++ b/src/muscle_tab.c @@ -1,7 +1,7 @@ /* Muscle table manager for Bison. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software - Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free + Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -85,7 +85,6 @@ muscle_init (void) /* Version and input file. */ MUSCLE_INSERT_STRING ("version", VERSION); - MUSCLE_INSERT_C_STRING ("file_name", grammar_file); } @@ -121,7 +120,8 @@ muscle_insert (char const *key, char const *value) /* First insertion in the hash. */ entry = xmalloc (sizeof *entry); entry->key = key; - hash_insert (muscle_table, entry); + if (!hash_insert (muscle_table, entry)) + xalloc_die (); } else free (entry->storage); @@ -150,7 +150,8 @@ muscle_grow (const char *key, const char *val, const char *separator) /* First insertion in the hash. */ entry = xmalloc (sizeof *entry); entry->key = key; - hash_insert (muscle_table, entry); + if (!hash_insert (muscle_table, entry)) + xalloc_die (); entry->value = entry->storage = xstrdup (val); } else @@ -168,27 +169,38 @@ muscle_grow (const char *key, const char *val, const char *separator) } } - /*------------------------------------------------------------------. -| Append VALUE to the current value of KEY, using muscle_grow. But | -| in addition, issue a synchronization line for the location LOC. | +| Using muscle_grow, append a synchronization line for the location | +| LOC to the current value of KEY. | `------------------------------------------------------------------*/ -void -muscle_code_grow (const char *key, const char *val, location loc) +static void +muscle_syncline_grow (char const *key, 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_sgrow (&muscle_obstack, "]])["); obstack_1grow (&muscle_obstack, 0); extension = obstack_finish (&muscle_obstack); muscle_grow (key, extension, ""); obstack_free (&muscle_obstack, extension); } +/*------------------------------------------------------------------. +| Append VALUE to the current value of KEY, using muscle_grow. But | +| in addition, issue a synchronization line for the location LOC | +| using muscle_syncline_grow. | +`------------------------------------------------------------------*/ + +void +muscle_code_grow (const char *key, const char *val, location loc) +{ + muscle_syncline_grow (key, loc); + muscle_grow (key, val, "\n"); +} + void muscle_pair_list_grow (const char *muscle, const char *a1, const char *a2) @@ -391,26 +403,57 @@ do { \ void muscle_percent_define_insert (char const *variable, location variable_loc, - char const *value) + char const *value, + muscle_percent_define_how how) { + char *variable_tr = NULL; char const *name; char const *loc_name; + char const *syncline_name; + char const *how_name; + + /* Permit certain names with underscores for backward compatibility. */ + if (0 == strcmp (variable, "api.push_pull") + || 0 == strcmp (variable, "lr.keep_unreachable_states")) + { + variable_tr = strdup (variable); + tr (variable_tr, '_', '-'); + variable = variable_tr; + } MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")"); MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")"); + MUSCLE_USER_NAME_CONVERT (syncline_name, + "percent_define_syncline(", variable, ")"); + MUSCLE_USER_NAME_CONVERT (how_name, "percent_define_how(", variable, ")"); - if (muscle_find_const (name)) + /* Command-line options are processed before the grammar file. */ + if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE + && muscle_find_const (name)) { - warn_at (variable_loc, _("%s `%s' redefined"), - "%define variable", variable); - warn_at (muscle_location_decode (loc_name), _("previous definition")); + muscle_percent_define_how how_old = + atoi (muscle_find_const (how_name)); + if (how_old == MUSCLE_PERCENT_DEFINE_F) + { + free (variable_tr); + return; + } + complain_at (variable_loc, _("%s `%s' redefined"), + "%define variable", variable); + complain_at (muscle_percent_define_get_loc (variable), + _("previous definition")); } - MUSCLE_INSERT_STRING (name, value); + MUSCLE_INSERT_STRING (name, value); muscle_insert (loc_name, ""); muscle_location_grow (loc_name, variable_loc); + muscle_insert (syncline_name, ""); + muscle_syncline_grow (syncline_name, variable_loc); muscle_user_name_list_grow ("percent_define_user_variables", variable, variable_loc); + MUSCLE_INSERT_INT (how_name, how); + + free (variable_tr); } char * @@ -431,6 +474,31 @@ muscle_percent_define_get (char const *variable) return value; } +location +muscle_percent_define_get_loc (char const *variable) +{ + char const *loc_name; + MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")"); + if (!muscle_find_const (loc_name)) + fatal(_("undefined %%define variable `%s' passed to muscle_percent_define_get_loc"), + variable); + return muscle_location_decode (loc_name); +} + +char const * +muscle_percent_define_get_syncline (char const *variable) +{ + char const *syncline_name; + char const *syncline; + MUSCLE_USER_NAME_CONVERT (syncline_name, + "percent_define_syncline(", variable, ")"); + syncline = muscle_find_const (syncline_name); + if (!syncline) + fatal(_("undefined %%define variable `%s' passed to muscle_percent_define_get_syncline"), + variable); + return syncline; +} + bool muscle_percent_define_ifdef (char const *variable) { @@ -455,16 +523,9 @@ muscle_percent_define_ifdef (char const *variable) bool muscle_percent_define_flag_if (char const *variable) { - char const *name; - char const *loc_name; - char const *usage_name; char const *invalid_boolean_name; bool result = false; - MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")"); - MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")"); - MUSCLE_USER_NAME_CONVERT (usage_name, "percent_define_bison_variables(", - variable, ")"); MUSCLE_USER_NAME_CONVERT (invalid_boolean_name, "percent_define_invalid_boolean(", variable, ")"); @@ -478,7 +539,7 @@ muscle_percent_define_flag_if (char const *variable) else if (!muscle_find_const (invalid_boolean_name)) { muscle_insert (invalid_boolean_name, ""); - complain_at(muscle_location_decode (loc_name), + complain_at(muscle_percent_define_get_loc (variable), _("invalid value for %%define Boolean variable `%s'"), variable); } @@ -496,17 +557,21 @@ muscle_percent_define_default (char const *variable, char const *value) { char const *name; char const *loc_name; + char const *syncline_name; MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")"); MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")"); + MUSCLE_USER_NAME_CONVERT (syncline_name, + "percent_define_syncline(", variable, ")"); if (!muscle_find_const (name)) { location loc; MUSCLE_INSERT_STRING (name, value); - loc.start.file = loc.end.file = "[Bison:muscle_percent_define_default]"; - loc.start.line = loc.start.column = 0; - loc.end.line = loc.end.column = 0; + loc.start.file = loc.end.file = ""; + loc.start.line = loc.end.line = -1; + loc.start.column = loc.end.column = -1; muscle_insert (loc_name, ""); muscle_location_grow (loc_name, loc); + muscle_insert (syncline_name, ""); } } @@ -515,37 +580,40 @@ muscle_percent_define_check_values (char const * const *values) { for (; *values; ++values) { - char const *variable = *values; + char const * const *variablep = values; char const *name; - char const *loc_name; char *value; - MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")"); - MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")"); + MUSCLE_USER_NAME_CONVERT (name, "percent_define(", *variablep, ")"); value = muscle_string_decode (name); if (value) { - bool valid = false; for (++values; *values; ++values) { if (0 == strcmp (value, *values)) - { - valid = true; - while (*values) - ++values; - break; - } + break; + } + if (!*values) + { + location loc = muscle_percent_define_get_loc (*variablep); + complain_at(loc, + _("invalid value for %%define variable `%s': `%s'"), + *variablep, value); + for (values = variablep + 1; *values; ++values) + complain_at (loc, _("accepted value: `%s'"), *values); + } + else + { + while (*values) + ++values; } - if (!valid) - complain_at(muscle_location_decode (loc_name), - _("invalid value for %%define variable `%s': `%s'"), - variable, value); free (value); } else - fatal(_("undefined %%define variable `%s' passed to muscle_percent_define_check_values"), - variable); + fatal(_("undefined %%define variable `%s' passed to" + " muscle_percent_define_check_values"), + *variablep); } }