X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c98b5143b071e351bdb820565681890046a6b45a..d72642d6915dbecd28609d307ef4676d1d5ab448:/src/muscle-tab.c diff --git a/src/muscle-tab.c b/src/muscle-tab.c index d666824b..b38598b0 100644 --- a/src/muscle-tab.c +++ b/src/muscle-tab.c @@ -1,6 +1,6 @@ /* Muscle table manager for Bison. - Copyright (C) 2001-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -37,7 +37,7 @@ muscle_kind_new (char const *k) return muscle_keyword; else if (STREQ (k, "string")) return muscle_string; - aver (0); + abort (); } char const * @@ -49,7 +49,7 @@ muscle_kind_string (muscle_kind k) case muscle_keyword: return "keyword"; case muscle_string: return "string"; } - aver (0); + abort (); } @@ -299,8 +299,9 @@ muscle_location_grow (char const *key, location loc) #define COMMON_DECODE(Value) \ case '$': \ - aver (*++(Value) == ']'); \ - aver (*++(Value) == '['); \ + ++(Value); aver (*(Value) == '['); \ + ++(Value); aver (*(Value) == ']'); \ + ++(Value); aver (*(Value) == '['); \ obstack_sgrow (&muscle_obstack, "$"); \ break; \ case '@': \ @@ -344,13 +345,12 @@ string_decode (char const *key) /* Reverse of muscle_location_grow. */ static location -location_decode (char const *key) +location_decode (char const *value) { location loc; - char const *value = muscle_find_const (key); aver (value); aver (*value == '['); - aver (*++value == '['); + ++value; aver (*value == '['); while (*++value) switch (*value) { @@ -361,16 +361,16 @@ location_decode (char const *key) case ']': { char *boundary_str; - aver (*++value == ']'); + ++value; aver (*value == ']'); boundary_str = obstack_finish0 (&muscle_obstack); switch (*++value) { case ',': boundary_set_from_string (&loc.start, boundary_str); obstack_free (&muscle_obstack, boundary_str); - aver (*++value == ' '); - aver (*++value == '['); - aver (*++value == '['); + ++value; aver (*value == ' '); + ++value; aver (*value == '['); + ++value; aver (*value == '['); break; case '\0': boundary_set_from_string (&loc.end, boundary_str); @@ -542,60 +542,103 @@ muscle_percent_define_ensure (char const *variable, location loc, /* Don't complain is VARIABLE is already defined, but be sure to set its value to VAL. */ - if (!muscle_find_const (name)) - muscle_percent_define_insert (variable, loc, muscle_keyword, val, - MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); - if (muscle_percent_define_flag_if (variable) != value) + if (!muscle_find_const (name) + || muscle_percent_define_flag_if (variable) != value) muscle_percent_define_insert (variable, loc, muscle_keyword, val, MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } +/* Mark %define VARIABLE as used. */ +static void +muscle_percent_define_use (char const *variable) +{ + muscle_insert (muscle_name (variable, "bison_variables"), ""); +} + +/* The value of %define variable VARIABLE (corresponding to FIELD, if + defined). Do not register as used, but diagnose unset variables. */ + +static +char const * +muscle_percent_define_get_raw (char const *variable, char const *field) +{ + uniqstr name = muscle_name (variable, field); + char const *res = muscle_find_const (name); + if (!res) + complain (NULL, fatal, _("%s: undefined %%define variable %s"), + "muscle_percent_define_get_raw", quote (variable)); + return res; +} + char * muscle_percent_define_get (char const *variable) { uniqstr name = muscle_name (variable, NULL); - uniqstr usage_name = muscle_name (variable, "bison_variables"); char *value = string_decode (name); if (!value) value = xstrdup (""); - - muscle_insert (usage_name, ""); + muscle_percent_define_use (variable); return value; } +/* The kind of VARIABLE. An error if undefined. */ +static muscle_kind +muscle_percent_define_get_kind (char const *variable) +{ + return muscle_kind_new (muscle_percent_define_get_raw (variable, "kind")); +} + +/* Check the kind of VARIABLE. An error if undefined. */ +static void +muscle_percent_define_check_kind (char const *variable, muscle_kind kind) +{ + if (muscle_percent_define_get_kind (variable) != kind) + { + location loc = muscle_percent_define_get_loc (variable); + switch (kind) + { + case muscle_code: + complain (&loc, Wdeprecated, + "%%define variable '%s' requires '{...}' values", + variable); + break; + case muscle_keyword: + complain (&loc, Wdeprecated, + "%%define variable '%s' requires keyword values", + variable); + break; + case muscle_string: + complain (&loc, Wdeprecated, + "%%define variable '%s' requires '\"...\"' values", + variable); + break; + } + } +} + + location muscle_percent_define_get_loc (char const *variable) { - uniqstr loc_name = muscle_name (variable, "loc"); - if (!muscle_find_const (loc_name)) - complain (NULL, fatal, _("%s: undefined %%define variable %s"), - "muscle_percent_define_get_loc", quote (variable)); - return location_decode (loc_name); + return location_decode (muscle_percent_define_get_raw (variable, "loc")); } char const * muscle_percent_define_get_syncline (char const *variable) { - uniqstr syncline_name = muscle_name (variable, "syncline"); - char const *syncline = muscle_find_const (syncline_name); - if (!syncline) - complain (NULL, fatal, _("%s: undefined %%define variable %s"), - "muscle_percent_define_get_syncline", quote (variable)); - return syncline; + return muscle_percent_define_get_raw (variable, "syncline"); } bool muscle_percent_define_ifdef (char const *variable) { - char const *value = muscle_find_const (muscle_name (variable, NULL)); - if (value) + if (muscle_find_const (muscle_name (variable, NULL))) { - uniqstr usage_name = muscle_name (variable, "bison_variables"); - muscle_insert (usage_name, ""); + muscle_percent_define_use (variable); return true; } - - return false; + else + return false; } bool @@ -607,6 +650,7 @@ muscle_percent_define_flag_if (char const *variable) if (muscle_percent_define_ifdef (variable)) { char *value = muscle_percent_define_get (variable); + muscle_percent_define_check_kind (variable, muscle_keyword); if (value[0] == '\0' || STREQ (value, "true")) result = true; else if (STREQ (value, "false")) @@ -632,18 +676,20 @@ void muscle_percent_define_default (char const *variable, char const *value) { uniqstr name = muscle_name (variable, NULL); - uniqstr loc_name = muscle_name (variable, "loc"); - uniqstr syncline_name = muscle_name (variable, "syncline"); if (!muscle_find_const (name)) { - location loc; MUSCLE_INSERT_STRING (name, value); - 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, ""); + MUSCLE_INSERT_STRING (muscle_name (variable, "kind"), "keyword"); + { + uniqstr loc_name = muscle_name (variable, "loc"); + location loc; + 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 (muscle_name (variable, "syncline"), ""); } } @@ -655,6 +701,7 @@ muscle_percent_define_check_values (char const * const *values) char const * const *variablep = values; uniqstr name = muscle_name (*variablep, NULL); char *value = string_decode (name); + muscle_percent_define_check_kind (*variablep, muscle_keyword); if (value) { for (++values; *values; ++values)