X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ddc8ede1abfd807faf5ddb0ee6c56cead0db84e3..7c0c61812d534683d10234082e6e6adee6eb81a6:/src/scan-code.l diff --git a/src/scan-code.l b/src/scan-code.l index ec01f354..bf46e2da 100644 --- a/src/scan-code.l +++ b/src/scan-code.l @@ -1,6 +1,6 @@ /* Bison Action Scanner -*- C -*- - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -24,28 +24,26 @@ %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 #include "scan-code.h" +#include "symlist.h" /* 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 static char *code_lex (code_props *self, int sc_context) YY_DECL; #define YY_USER_ACTION location_compute (loc, &loc->end, yytext, yyleng); @@ -56,6 +54,9 @@ static void handle_action_at (symbol_list *rule, char *cp, location at_loc); static location the_location; static location *loc = &the_location; +/* A string representing the most recent translation. */ +static char *last_string; + /* True if an untyped $$ or $n was seen. */ static bool untyped_var_seen; %} @@ -81,14 +82,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; %} @@ -154,8 +155,12 @@ splice (\\[ \f\t\v]*\n)* { - "$"("<"{tag}">")?(-?[0-9]+|"$") handle_action_dollar (rule, yytext, *loc); - "@"(-?[0-9]+|"$") handle_action_at (rule, yytext, *loc); + "$"("<"{tag}">")?(-?[0-9]+|"$") { + handle_action_dollar (self->rule, yytext, *loc); + } + "@"(-?[0-9]+|"$") { + handle_action_at (self->rule, yytext, *loc); + } "$" { warn_at (*loc, _("stray `$'")); @@ -193,7 +198,10 @@ splice (\\[ \f\t\v]*\n)* { - "$$" obstack_sgrow (&obstack_for_string, "]b4_dollar_dollar["); + "$$" { + obstack_sgrow (&obstack_for_string, "]b4_dollar_dollar["); + self->is_value_used = true; + } "@$" obstack_sgrow (&obstack_for_string, "]b4_at_dollar["); } @@ -218,8 +226,8 @@ splice (\\[ \f\t\v]*\n)* /* End of processing. */ <*><> { - obstack_1grow (&obstack_for_string, '\0'); - return obstack_finish (&obstack_for_string); + STRING_FINISH; + return last_string; } %% @@ -241,7 +249,7 @@ int max_left_semantic_context = 0; static void handle_action_dollar (symbol_list *rule, char *text, location dollar_loc) { - const char *type_name = NULL; + char const *type_name = NULL; char *cp = text + 1; symbol_list *effective_rule; int effective_rule_length; @@ -284,10 +292,10 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc) _("$$ for the midrule at $%d of `%s'" " has no declared type"), rule->midrule_parent_rhs_index, - effective_rule->sym->tag); + effective_rule->content.sym->tag); else complain_at (dollar_loc, _("$$ of `%s' has no declared type"), - rule->sym->tag); + rule->content.sym->tag); } else untyped_var_seen = true; @@ -315,7 +323,7 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc) { if (union_seen | tag_seen) complain_at (dollar_loc, _("$%d of `%s' has no declared type"), - n, effective_rule->sym->tag); + n, effective_rule->content.sym->tag); else untyped_var_seen = true; type_name = ""; @@ -324,7 +332,8 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc) obstack_fgrow3 (&obstack_for_string, "]b4_rhs_value(%d, %d, [%s])[", effective_rule_length, n, type_name); - symbol_list_n_used_set (effective_rule, n, true); + if (n > 0) + symbol_list_n_get (effective_rule, n)->used = true; } else complain_at (dollar_loc, _("integer out of range: %s"), quote (text)); @@ -341,13 +350,12 @@ 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["); @@ -372,59 +380,111 @@ 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 \a l. The - translation is for \a rule, in the context \a sc_context +/* Translate the dollars and ats in \a self, 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 (code_props *self, int sc_context) { - 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; } - loc->start = loc->end = l.start; - yy_switch_to_buffer (yy_scan_string (a)); - res = code_lex (sc_context, rule); + loc->start = loc->end = self->location.start; + yy_switch_to_buffer (yy_scan_string (self->code)); + res = code_lex (self, sc_context); yy_delete_buffer (YY_CURRENT_BUFFER); return res; } -const char * -translate_rule_action (symbol_list *rule) +/*------------------------------------------------------------------------. +| Implementation of the public interface as documented in "scan-code.h". | +`------------------------------------------------------------------------*/ + +void +code_props_none_init (code_props *self) { - return translate_action (SC_RULE_ACTION, rule, rule->action, - rule->action_location); + *self = code_props_none; } -const char * -translate_symbol_action (const char *a, location l) +code_props const code_props_none = CODE_PROPS_NONE_INIT; + +void +code_props_plain_init (code_props *self, char const *code, location code_loc) { - return translate_action (SC_SYMBOL_ACTION, NULL, a, l); + self->kind = CODE_PROPS_PLAIN; + self->code = code; + self->location = code_loc; + self->is_value_used = false; + self->rule = NULL; } -const char * -translate_code (const char *a, location l) +void +code_props_symbol_action_init (code_props *self, char const *code, + location code_loc) { - return translate_action (INITIAL, NULL, a, l); + self->kind = CODE_PROPS_SYMBOL_ACTION; + self->code = code; + self->location = code_loc; + self->is_value_used = false; + self->rule = NULL; } -/*-----------------------------------------------. -| Free all the memory allocated to the scanner. | -`-----------------------------------------------*/ +void +code_props_rule_action_init (code_props *self, char const *code, + location code_loc, symbol_list *rule) +{ + self->kind = CODE_PROPS_RULE_ACTION; + self->code = code; + self->location = code_loc; + self->is_value_used = false; + self->rule = rule; +} + +void +code_props_translate_code (code_props *self) +{ + switch (self->kind) + { + case CODE_PROPS_NONE: + break; + case CODE_PROPS_PLAIN: + self->code = translate_action (self, INITIAL); + break; + case CODE_PROPS_SYMBOL_ACTION: + self->code = translate_action (self, SC_SYMBOL_ACTION); + break; + case CODE_PROPS_RULE_ACTION: + self->code = translate_action (self, SC_RULE_ACTION); + break; + } +} + +void +code_scanner_last_string_free (void) +{ + STRING_FREE; +} void code_scanner_free (void) { obstack_free (&obstack_for_string, 0); /* Reclaim Flex's buffers. */ - yy_delete_buffer (YY_CURRENT_BUFFER); + yylex_destroy (); +} + +char const * +translate_rule_action (symbol_list *rule) +{ + code_props cp; + code_props_rule_action_init (&cp, rule->action, rule->action_location, rule); + code_props_translate_code (&cp); + return cp.code; }