X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ffa4ba3aeff61dee4bc4f64ee3abedafe142af31..960349830600dc408ebd1ddc9710aa3ed955ed66:/src/scan-code.l diff --git a/src/scan-code.l b/src/scan-code.l index 471b2a45..0a338b4e 100644 --- a/src/scan-code.l +++ b/src/scan-code.l @@ -24,20 +24,17 @@ %option prefix="code_" outfile="lex.yy.c" %{ -#include -#include "system.h" - /* Work around a bug in flex 2.5.31. See Debian bug 333231 . */ #undef code_wrap #define code_wrap() 1 #define FLEX_PREFIX(Id) code_ ## Id -#include "complain.h" #include "flex-scanner.h" + +#include "complain.h" #include "reader.h" #include "getargs.h" -#include #include #include @@ -45,7 +42,7 @@ /* The current calling start condition: SC_RULE_ACTION or SC_SYMBOL_ACTION. */ -# define YY_DECL const char *code_lex (int sc_context, symbol_list *rule) +# define YY_DECL char *code_lex (int sc_context, symbol_list *rule) YY_DECL; #define YY_USER_ACTION location_compute (loc, &loc->end, yytext, yyleng); @@ -55,6 +52,9 @@ static void handle_action_dollar (symbol_list *rule, char *cp, static void handle_action_at (symbol_list *rule, char *cp, location at_loc); static location the_location; static location *loc = &the_location; + +/* True if an untyped $$ or $n was seen. */ +static bool untyped_var_seen; %} /* C and C++ comments in code. */ %x SC_COMMENT SC_LINE_COMMENT @@ -78,14 +78,14 @@ splice (\\[ \f\t\v]*\n)* %{ /* Nesting level of the current code in braces. */ - int braces_level IF_LINT (= 0); + int braces_level = 0; /* This scanner is special: it is invoked only once, henceforth is expected to return only once. This initialization is therefore done once per action to translate. */ - assert (sc_context == SC_SYMBOL_ACTION - || sc_context == SC_RULE_ACTION - || sc_context == INITIAL); + aver (sc_context == SC_SYMBOL_ACTION + || sc_context == SC_RULE_ACTION + || sc_context == INITIAL); BEGIN sc_context; %} @@ -262,48 +262,62 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc) ++cp; *cp = '\0'; ++cp; + if (untyped_var_seen) + complain_at (dollar_loc, _("explicit type given in untyped grammar")); + tag_seen = true; } if (*cp == '$') { if (!type_name) type_name = symbol_list_n_type_name_get (rule, dollar_loc, 0); - if (!type_name && typed) - { - if (rule->midrule_parent_rule) - complain_at (dollar_loc, - _("$$ for the midrule at $%d of `%s' has no declared" - " type"), - rule->midrule_parent_rhs_index, - effective_rule->sym->tag); - else - complain_at (dollar_loc, _("$$ of `%s' has no declared type"), - rule->sym->tag); - } + if (!type_name) - type_name = ""; + { + if (union_seen | tag_seen) + { + if (rule->midrule_parent_rule) + complain_at (dollar_loc, + _("$$ for the midrule at $%d of `%s'" + " has no declared type"), + rule->midrule_parent_rhs_index, + effective_rule->content.sym->tag); + else + complain_at (dollar_loc, _("$$ of `%s' has no declared type"), + rule->content.sym->tag); + } + else + untyped_var_seen = true; + type_name = ""; + } + obstack_fgrow1 (&obstack_for_string, "]b4_lhs_value([%s])[", type_name); rule->used = true; } else { - long int num; - set_errno (0); - num = strtol (cp, 0, 10); - if (INT_MIN <= num && num <= effective_rule_length && ! get_errno ()) + long int num = strtol (cp, NULL, 10); + + if (1 - INT_MAX + effective_rule_length <= num + && num <= effective_rule_length) { int n = num; - if (1-n > max_left_semantic_context) - max_left_semantic_context = 1-n; - if (!type_name && n > 0) + if (max_left_semantic_context < 1 - n) + max_left_semantic_context = 1 - n; + if (!type_name && 0 < n) type_name = symbol_list_n_type_name_get (effective_rule, dollar_loc, n); - if (!type_name && typed) - complain_at (dollar_loc, _("$%d of `%s' has no declared type"), - n, effective_rule->sym->tag); if (!type_name) - type_name = ""; + { + if (union_seen | tag_seen) + complain_at (dollar_loc, _("$%d of `%s' has no declared type"), + n, effective_rule->content.sym->tag); + else + untyped_var_seen = true; + type_name = ""; + } + obstack_fgrow3 (&obstack_for_string, "]b4_rhs_value(%d, %d, [%s])[", effective_rule_length, n, type_name); @@ -324,23 +338,21 @@ static void handle_action_at (symbol_list *rule, char *text, location at_loc) { char *cp = text + 1; - locations_flag = true; - int effective_rule_length; + int effective_rule_length = + (rule->midrule_parent_rule + ? rule->midrule_parent_rhs_index - 1 + : symbol_list_length (rule->next)); - if (rule->midrule_parent_rule) - effective_rule_length = rule->midrule_parent_rhs_index - 1; - else - effective_rule_length = symbol_list_length (rule->next); + locations_flag = true; if (*cp == '$') obstack_sgrow (&obstack_for_string, "]b4_lhs_location["); else { - long int num; - set_errno (0); - num = strtol (cp, 0, 10); + long int num = strtol (cp, NULL, 10); - if (INT_MIN <= num && num <= effective_rule_length && ! get_errno ()) + if (1 - INT_MAX + effective_rule_length <= num + && num <= effective_rule_length) { int n = num; obstack_fgrow2 (&obstack_for_string, "]b4_rhs_location(%d, %d)[", @@ -356,20 +368,18 @@ handle_action_at (symbol_list *rule, char *text, location at_loc) | Initialize the scanner. | `-------------------------*/ -/* Translate the dollars and ats in \a a, whose location is l. - Depending on the \a sc_context (SC_RULE_ACTION, SC_SYMBOL_ACTION, - INITIAL), the processing is different. */ +/* Translate the dollars and ats in \a a, whose location is \a l. The + translation is for \a rule, in the context \a sc_context + (SC_RULE_ACTION, SC_SYMBOL_ACTION, INITIAL). */ -static const char * -translate_action (int sc_context, symbol_list *rule, const char *a, location l) +static char const * +translate_action (int sc_context, symbol_list *rule, char const *a, location l) { - const char *res; + char *res; static bool initialized = false; if (!initialized) { obstack_init (&obstack_for_string); - /* The initial buffer, never used. */ - yy_delete_buffer (YY_CURRENT_BUFFER); yy_flex_debug = 0; initialized = true; } @@ -382,21 +392,21 @@ translate_action (int sc_context, symbol_list *rule, const char *a, location l) return res; } -const char * +char const * translate_rule_action (symbol_list *rule) { return translate_action (SC_RULE_ACTION, rule, rule->action, rule->action_location); } -const char * -translate_symbol_action (const char *a, location l) +char const * +translate_symbol_action (char const *a, location l) { return translate_action (SC_SYMBOL_ACTION, NULL, a, l); } -const char * -translate_code (const char *a, location l) +char const * +translate_code (char const *a, location l) { return translate_action (INITIAL, NULL, a, l); } @@ -410,5 +420,5 @@ code_scanner_free (void) { obstack_free (&obstack_for_string, 0); /* Reclaim Flex's buffers. */ - yy_delete_buffer (YY_CURRENT_BUFFER); + yylex_destroy (); }