X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/bf3e44fe46440ebe473798f9d887908b120bb646..ccdc1577ef7fb32a5e30cb655337e7cd42b98987:/src/scan-code.l diff --git a/src/scan-code.l b/src/scan-code.l index 9a08af7a..24ef5d92 100644 --- a/src/scan-code.l +++ b/src/scan-code.l @@ -1,6 +1,6 @@ /* Bison Action Scanner -*- C -*- - Copyright (C) 2006-2011 Free Software Foundation, Inc. + Copyright (C) 2006-2012 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -47,9 +47,12 @@ YY_DECL; #define YY_USER_ACTION location_compute (loc, &loc->end, yytext, yyleng); -static void handle_action_dollar (symbol_list *, char *, unsigned, location); -static void handle_action_at (symbol_list const *, char const *, unsigned, - location); +static void handle_action_dollar (symbol_list *rule, char *cp, + location dollar_loc); +static void handle_action_at (symbol_list *rule, char *cp, location at_loc); + +/* A string to be pushed to obstack after dollar/at has been handled. */ +static char *ref_tail_fields; static location the_location; static location *loc = &the_location; @@ -73,22 +76,18 @@ static bool untyped_var_seen; /* POSIX says that a tag must be both an id and a C union member, but historically almost any character is allowed in a tag. We disallow NUL and newline, as this simplifies our implementation. */ -tag [^\0\n>]+ +tag [^\0\n>]+ /* Zero or more instances of backslash-newline. Following GCC, allow white space between the backslash and the newline. */ -splice (\\[ \f\t\v]*\n)* - -/* A Bison identifier. Keep this synchronized with scan-gram.l "id". */ -letter [-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_] -id {letter}({letter}|[0-9])* - -/* An identifier that can appear unbracketed in a reference. - This happens to be the same as a C-language identifier. */ -c_letter [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_] -c_id {c_letter}({c_letter}|[0-9])* +splice (\\[ \f\t\v]*\n)* -ref -?[0-9]+|{c_id}|"["{id}"]"|"$" +/* C style identifier. Must start with letter. Will be used for + named symbol references. Shall be kept synchronized with + scan-gram.l "letter" and "id". */ +letter [.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_] +id {letter}({letter}|[-0-9])* +ref -?[0-9]+|{id}|"["{id}"]"|"$" %% @@ -97,10 +96,10 @@ ref -?[0-9]+|{c_id}|"["{id}"]"|"$" int braces_level = 0; /* Whether a semicolon is probably needed. - The heuristic is that a semicolon is not needed after `{', `}', `;', + The heuristic is that a semicolon is not needed after '{', '}', ';', or a C preprocessor directive, and that whitespaces and comments do not affect this flag. - Note that `{' does not need a semicolon because of `{}'. + Note that '{' does not need a semicolon because of '{}'. A semicolon may be needed before a cpp direcive, but don't bother. */ bool need_semicolon = false; @@ -113,13 +112,13 @@ ref -?[0-9]+|{c_id}|"["{id}"]"|"$" is expected to return only once. This initialization is therefore done once per action to translate. */ aver (sc_context == SC_SYMBOL_ACTION - || sc_context == SC_RULE_ACTION - || sc_context == INITIAL); + || sc_context == SC_RULE_ACTION + || sc_context == INITIAL); BEGIN sc_context; %} /*------------------------------------------------------------. - | Scanning a C comment. The initial `/ *' is already eaten. | + | Scanning a C comment. The initial '/ *' is already eaten. | `------------------------------------------------------------*/ @@ -129,13 +128,13 @@ ref -?[0-9]+|{c_id}|"["{id}"]"|"$" /*--------------------------------------------------------------. - | Scanning a line comment. The initial `//' is already eaten. | + | Scanning a line comment. The initial '//' is already eaten. | `--------------------------------------------------------------*/ { - "\n" STRING_GROW; BEGIN sc_context; - {splice} STRING_GROW; + "\n" STRING_GROW; BEGIN sc_context; + {splice} STRING_GROW; } @@ -145,17 +144,17 @@ ref -?[0-9]+|{c_id}|"["{id}"]"|"$" { - {splice}|\\{splice}. STRING_GROW; + {splice}|\\{splice}. STRING_GROW; } { - "'" STRING_GROW; BEGIN sc_context; + "'" STRING_GROW; BEGIN sc_context; } { - "\"" STRING_GROW; BEGIN sc_context; + "\"" STRING_GROW; BEGIN sc_context; } @@ -183,20 +182,28 @@ ref -?[0-9]+|{c_id}|"["{id}"]"|"$" { "$"("<"{tag}">")?{ref} { - handle_action_dollar (self->rule, yytext, yyleng, *loc); + ref_tail_fields = 0; + handle_action_dollar (self->rule, yytext, *loc); + if (ref_tail_fields) { + obstack_sgrow (&obstack_for_string, ref_tail_fields); + } need_semicolon = true; } "@"{ref} { - handle_action_at (self->rule, yytext, yyleng, *loc); + ref_tail_fields = 0; + handle_action_at (self->rule, yytext, *loc); + if (ref_tail_fields) { + obstack_sgrow (&obstack_for_string, ref_tail_fields); + } need_semicolon = true; } "$" { - warn_at (*loc, _("stray `$'")); + complain_at (*loc, Wother, _("stray '$'")); obstack_sgrow (&obstack_for_string, "$]["); need_semicolon = true; } "@" { - warn_at (*loc, _("stray `@'")); + complain_at (*loc, Wother, _("stray '@'")); obstack_sgrow (&obstack_for_string, "@@"); need_semicolon = true; } @@ -214,16 +221,18 @@ ref -?[0-9]+|{c_id}|"["{id}"]"|"$" "}" { bool outer_brace = --braces_level == 0; - /* As an undocumented Bison extension, append `;' before the last + /* As an undocumented Bison extension, append ';' before the last brace in braced code, so that the user code can omit trailing - `;'. But do not append `;' if emulating Yacc, since Yacc does + ';'. But do not append ';' if emulating Yacc, since Yacc does not append one. */ if (outer_brace && !yacc_flag && language_prio == default_prio && skeleton_prio == default_prio && need_semicolon && ! in_cpp) { - warn_at (*loc, _("a `;' might be needed at the end of action code")); - warn_at (*loc, _("future versions of Bison will not add the `;'")); - obstack_1grow (&obstack_for_string, ';'); + complain_at (*loc, Wother, + _("a ';' might be needed at the end of action code")); + complain_at (*loc, Wother, + _("future versions of Bison will not add the ';'")); + obstack_1grow (&obstack_for_string, ';'); } STRING_GROW; @@ -232,8 +241,8 @@ ref -?[0-9]+|{c_id}|"["{id}"]"|"$" /* Preprocessing directives should only be recognized at the beginning of lines, allowing whitespace including comments, but in C/C++, - `#' can only be the start of preprocessor directives or within - `#define' directives anyway, so don't bother with begin of line. */ + '#' can only be the start of preprocessor directives or within + '#define' directives anyway, so don't bother with begin of line. */ "#" STRING_GROW; in_cpp = true; {splice} STRING_GROW; @@ -244,8 +253,8 @@ ref -?[0-9]+|{c_id}|"["{id}"]"|"$" 2.4.2. */ YYFAIL { STRING_GROW; need_semicolon = true; - warn_at (*loc, _("use of YYFAIL, which is deprecated and will be" - " removed")); + complain_at (*loc, Wother, + _("use of YYFAIL, which is deprecated and will be removed")); } /* The sole purpose of this is to make sure identifiers that merely @@ -274,20 +283,20 @@ ref -?[0-9]+|{c_id}|"["{id}"]"|"$" <*> { - \$ obstack_sgrow (&obstack_for_string, "$]["); - \@ obstack_sgrow (&obstack_for_string, "@@"); - \[ obstack_sgrow (&obstack_for_string, "@{"); - \] obstack_sgrow (&obstack_for_string, "@}"); + \$ obstack_sgrow (&obstack_for_string, "$]["); + \@ obstack_sgrow (&obstack_for_string, "@@"); + \[ obstack_sgrow (&obstack_for_string, "@{"); + \] obstack_sgrow (&obstack_for_string, "@}"); } /*-----------------------------------------------------. | By default, grow the string obstack with the input. | `-----------------------------------------------------*/ -<*>.|\n STRING_GROW; +<*>.|\n STRING_GROW; /* End of processing. */ -<*><> { +<*><> { STRING_FINISH; return last_string; } @@ -331,9 +340,13 @@ typedef struct by an explicit symbol reference. */ #define VARIANT_HIDDEN (1 << 0) +/* Set when the variant refers to a symbol containing + dots or dashes. Will require explicit bracketing. */ +#define VARIANT_BAD_BRACKETING (1 << 1) + /* Set when the variant refers to a symbol which is not visible from current midrule. */ -#define VARIANT_NOT_VISIBLE_FROM_MIDRULE (1 << 1) +#define VARIANT_NOT_VISIBLE_FROM_MIDRULE (1 << 2) static variant *variant_table = 0; static unsigned variant_table_size = 0; @@ -346,9 +359,9 @@ variant_table_grow (void) if (variant_count > variant_table_size) { while (variant_count > variant_table_size) - variant_table_size = 2 * variant_table_size + 3; + variant_table_size = 2 * variant_table_size + 3; variant_table = xnrealloc (variant_table, variant_table_size, - sizeof *variant_table); + sizeof *variant_table); } return &variant_table[variant_count - 1]; } @@ -361,25 +374,31 @@ variant_table_free (void) variant_table_size = variant_count = 0; } -/* Return TRUE if ID matches the string from CP up to CP_END. - The string does not contain null bytes. */ -static bool -identifier_matches (char const *id, char const *cp, char const *cp_end) +static char * +find_prefix_end (const char *prefix, char *begin, char *end) { - while (cp != cp_end) - if (*id++ != *cp++) - return false; - return !*id; + char *ptr = begin; + + for (; *prefix && ptr != end; ++prefix, ++ptr) + if (*prefix != *ptr) + return 0; + + if (*prefix) + return 0; + + return ptr; } -/* If scanning ID, return a new variant with that ID, at location - ID_LOC with index SYMBOL_INDEX. Otherwise, return NULL. The - currently scanned identifier starts at CP and ends at CP_END. */ static variant * variant_add (uniqstr id, location id_loc, unsigned symbol_index, - char const *cp, char const *cp_end) + char *cp, char *cp_end, bool explicit_bracketing) { - if (identifier_matches (id, cp, cp_end)) + char *prefix_end; + + prefix_end = find_prefix_end (id, cp, cp_end); + if (prefix_end && + (prefix_end == cp_end || + (!explicit_bracketing && is_dot_or_dash (*prefix_end)))) { variant *r = variant_table_grow (); r->symbol_index = symbol_index; @@ -404,15 +423,11 @@ get_at_spec(unsigned symbol_index) return at_buf; } -/* Show a subsidiary message for a problem with a grammar rule. TEXT - points to the problematic reference. MIDRULE_RHS_INDEX is the rhs - index (1-origin) in the rule. If IS_WARNING, it is a warning, - otherwise a complaint. Indent the message INDENT spaces. */ static void -show_sub_messages (char const *text, int midrule_rhs_index, +show_sub_messages (const char* cp, bool explicit_bracketing, + int midrule_rhs_index, char dollar_or_at, bool is_warning, unsigned indent) { - char dollar_or_at = *text; unsigned i; for (i = 0; i < variant_count; ++i) @@ -423,56 +438,62 @@ show_sub_messages (char const *text, int midrule_rhs_index, if (var->err == 0) { if (is_warning) - warn_at_indent (var->loc, &indent, _("refers to: %c%s at %s"), - dollar_or_at, var->id, at_spec); + complain_at_indent (var->loc, Wother, &indent, + _("refers to: %c%s at %s"), dollar_or_at, + var->id, at_spec); else - complain_at_indent (var->loc, &indent, _("refers to: %c%s at %s"), - dollar_or_at, var->id, at_spec); + complain_at_indent (var->loc, complaint, &indent, + _("refers to: %c%s at %s"), dollar_or_at, + var->id, at_spec); } else - { - static struct obstack msg_buf; - const char *id = var->hidden_by ? var->hidden_by->id : - var->id; - location id_loc = var->hidden_by ? var->hidden_by->loc : - var->loc; - - /* Create the explanation message. */ - obstack_init (&msg_buf); - - obstack_fgrow1 (&msg_buf, _("possibly meant: %c"), dollar_or_at); - if (contains_dot_or_dash (id)) - obstack_fgrow1 (&msg_buf, "[%s]", id); - else - obstack_sgrow (&msg_buf, id); - - if (var->err & VARIANT_HIDDEN) - { - obstack_fgrow1 (&msg_buf, _(", hiding %c"), dollar_or_at); - if (contains_dot_or_dash (var->id)) - obstack_fgrow1 (&msg_buf, "[%s]", var->id); - else - obstack_sgrow (&msg_buf, var->id); - } - - obstack_fgrow1 (&msg_buf, _(" at %s"), at_spec); - - if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE) + { + static struct obstack msg_buf; + const char *tail = explicit_bracketing ? "" : + cp + strlen (var->id); + const char *id = var->hidden_by ? var->hidden_by->id : + var->id; + location id_loc = var->hidden_by ? var->hidden_by->loc : + var->loc; + + /* Create the explanation message. */ + obstack_init (&msg_buf); + + obstack_fgrow1 (&msg_buf, _("possibly meant: %c"), dollar_or_at); + if (contains_dot_or_dash (id)) + obstack_fgrow1 (&msg_buf, "[%s]", id); + else + obstack_sgrow (&msg_buf, id); + obstack_sgrow (&msg_buf, tail); + + if (var->err & VARIANT_HIDDEN) + { + obstack_fgrow1 (&msg_buf, _(", hiding %c"), dollar_or_at); + if (contains_dot_or_dash (var->id)) + obstack_fgrow1 (&msg_buf, "[%s]", var->id); + else + obstack_sgrow (&msg_buf, var->id); + obstack_sgrow (&msg_buf, tail); + } + + obstack_fgrow1 (&msg_buf, _(" at %s"), at_spec); + + if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE) { const char *format = _(", cannot be accessed from mid-rule action at $%d"); obstack_fgrow1 (&msg_buf, format, midrule_rhs_index); } - obstack_1grow (&msg_buf, '\0'); + obstack_1grow (&msg_buf, '\0'); if (is_warning) - warn_at_indent (id_loc, &indent, "%s", - (char *) obstack_finish (&msg_buf)); + complain_at_indent (id_loc, Wother, &indent, "%s", + (char *) obstack_finish (&msg_buf)); else - complain_at_indent (id_loc, &indent, "%s", + complain_at_indent (id_loc, complaint, &indent, "%s", (char *) obstack_finish (&msg_buf)); - obstack_free (&msg_buf, 0); - } + obstack_free (&msg_buf, 0); + } } } @@ -487,22 +508,16 @@ show_sub_messages (char const *text, int midrule_rhs_index, /* Sub-messages indent. */ #define SUB_INDENT (4) -/* Return the index of a named or positional reference starting at CP - for a rule RULE of length RULE_LENGTH. If MIDRULE_RHS_INDEX is - nonzero, this is a generated midrule whose rhs index (1-origin) is - MIDRULE_RHS_INDEX in the parent rule. The entire semantic value - containing the reference is TEXT, of length TEXTLEN. Its location - is TEXT_LOC. - - In case of positional references, this can return negative values - for $-n "deep" stack accesses. */ +/* Parse named or positional reference. In case of positional + references, can return negative values for $-n "deep" stack + accesses. */ static long int -parse_ref (char const *cp, symbol_list const *rule, int rule_length, - int midrule_rhs_index, char const *text, unsigned textlen, - location text_loc) +parse_ref (char *cp, symbol_list *rule, int rule_length, + int midrule_rhs_index, char *text, location text_loc, + char dollar_or_at) { - symbol_list const *l; - char const *cp_end; + symbol_list *l; + char *cp_end; bool explicit_bracketing; unsigned i; unsigned valid_variants = 0; @@ -511,22 +526,45 @@ parse_ref (char const *cp, symbol_list const *rule, int rule_length, if ('$' == *cp) return LHS_REF; - if (c_isdigit (*cp) || *cp == '-') + if (c_isdigit (*cp) || (*cp == '-' && c_isdigit (* (cp + 1)))) { - long int num = strtol (cp, NULL, 10); + long int num = strtol (cp, &cp, 10); if (1 - INT_MAX + rule_length <= num && num <= rule_length) - return num; + return num; else - { - complain_at (text_loc, _("integer out of range: %s"), + { + complain_at (text_loc, complaint, _("integer out of range: %s"), quote (text)); - return INVALID_REF; - } + return INVALID_REF; + } } - explicit_bracketing = (*cp == '['); - cp += explicit_bracketing; - cp_end = text + textlen - explicit_bracketing; + if ('[' == *cp) + { + /* Ignore the brackets. */ + char *p; + for (p = ++cp; *p != ']'; ++p) + continue; + cp_end = p; + + explicit_bracketing = true; + } + else + { + /* Take all characters of the name. */ + char* p; + for (p = cp; *p; ++p) + if (is_dot_or_dash (*p)) + { + ref_tail_fields = p; + break; + } + for (p = cp; *p; ++p) + continue; + cp_end = p; + + explicit_bracketing = false; + } /* Add all relevant variants. */ { @@ -535,18 +573,18 @@ parse_ref (char const *cp, symbol_list const *rule, int rule_length, for (symbol_index = 0, l = rule; !symbol_list_null (l); ++symbol_index, l = l->next) { - variant *var; - if (l->content_type != SYMLIST_SYMBOL) - continue; - - var = variant_add (l->content.sym->tag, l->sym_loc, - symbol_index, cp, cp_end); - if (var && l->named_ref) - var->hidden_by = l->named_ref; - - if (l->named_ref) - variant_add (l->named_ref->id, l->named_ref->loc, - symbol_index, cp, cp_end); + variant *var; + if (l->content_type != SYMLIST_SYMBOL) + continue; + + var = variant_add (l->content.sym->tag, l->sym_loc, + symbol_index, cp, cp_end, explicit_bracketing); + if (var && l->named_ref) + var->hidden_by = l->named_ref; + + if (l->named_ref) + variant_add (l->named_ref->id, l->named_ref->loc, + symbol_index, cp, cp_end, explicit_bracketing); } } @@ -558,9 +596,13 @@ parse_ref (char const *cp, symbol_list const *rule, int rule_length, /* Check visibility from mid-rule actions. */ if (midrule_rhs_index != 0 - && (symbol_index == 0 || midrule_rhs_index < symbol_index)) + && (symbol_index == 0 || midrule_rhs_index < symbol_index)) var->err |= VARIANT_NOT_VISIBLE_FROM_MIDRULE; + /* Check correct bracketing. */ + if (!explicit_bracketing && contains_dot_or_dash (var->id)) + var->err |= VARIANT_BAD_BRACKETING; + /* Check using of hidden symbols. */ if (var->hidden_by) var->err |= VARIANT_HIDDEN; @@ -576,11 +618,12 @@ parse_ref (char const *cp, symbol_list const *rule, int rule_length, { case 0: { - unsigned len = cp_end - cp; + unsigned len = (explicit_bracketing || !ref_tail_fields) ? + cp_end - cp : ref_tail_fields - cp; unsigned indent = 0; - complain_at_indent (text_loc, &indent, _("invalid reference: %s"), - quote (text)); + complain_at_indent (text_loc, complaint, &indent, + _("invalid reference: %s"), quote (text)); indent += SUB_INDENT; if (len == 0) { @@ -588,27 +631,29 @@ parse_ref (char const *cp, symbol_list const *rule, int rule_length, sym_loc.start.column += 1; sym_loc.end = sym_loc.start; const char *format = - _("syntax error after `%c', expecting integer, letter," - " `_', `[', or `$'"); - complain_at_indent (sym_loc, &indent, format, *text); + _("syntax error after '%c', expecting integer, letter," + " '_', '[', or '$'"); + complain_at_indent (sym_loc, complaint, &indent, format, + dollar_or_at); } else if (midrule_rhs_index) { const char *format = _("symbol not found in production before $%d: %.*s"); - complain_at_indent (rule->location, &indent, format, + complain_at_indent (rule->location, complaint, &indent, format, midrule_rhs_index, len, cp); } else { const char *format = _("symbol not found in production: %.*s"); - complain_at_indent (rule->location, &indent, format, + complain_at_indent (rule->location, complaint, &indent, format, len, cp); } if (variant_count > 0) - show_sub_messages (text, midrule_rhs_index, false, indent); + show_sub_messages (cp, explicit_bracketing, midrule_rhs_index, + dollar_or_at, false, indent); return INVALID_REF; } case 1: @@ -616,10 +661,10 @@ parse_ref (char const *cp, symbol_list const *rule, int rule_length, unsigned indent = 0; if (variant_count > 1) { - warn_at_indent (text_loc, &indent, _("misleading reference: %s"), - quote (text)); - show_sub_messages (text, midrule_rhs_index, true, - indent + SUB_INDENT); + complain_at_indent (text_loc, Wother, &indent, + _("misleading reference: %s"), quote (text)); + show_sub_messages (cp, explicit_bracketing, midrule_rhs_index, + dollar_or_at, true, indent + SUB_INDENT); } { unsigned symbol_index = @@ -631,10 +676,10 @@ parse_ref (char const *cp, symbol_list const *rule, int rule_length, default: { unsigned indent = 0; - complain_at_indent (text_loc, &indent, _("ambiguous reference: %s"), - quote (text)); - show_sub_messages (text, midrule_rhs_index, false, - indent + SUB_INDENT); + complain_at_indent (text_loc, complaint, &indent, + _("ambiguous reference: %s"), quote (text)); + show_sub_messages (cp, explicit_bracketing, midrule_rhs_index, + dollar_or_at, false, indent + SUB_INDENT); return INVALID_REF; } } @@ -650,16 +695,15 @@ int max_left_semantic_context = 0; /*------------------------------------------------------------------. -| TEXT is pointing to a wannabee semantic value (i.e., a `$'). | +| TEXT is pointing to a wannabee semantic value (i.e., a '$'). | | | -| Possible inputs: $(|)($|integer|c_id|[id]) | +| Possible inputs: $[]($|integer) | | | | Output to OBSTACK_FOR_STRING a reference to this semantic value. | `------------------------------------------------------------------*/ static void -handle_action_dollar (symbol_list *rule, char *text, unsigned textlen, - location dollar_loc) +handle_action_dollar (symbol_list *rule, char *text, location dollar_loc) { char const *type_name = NULL; char *cp = text + 1; @@ -684,19 +728,20 @@ handle_action_dollar (symbol_list *rule, char *text, unsigned textlen, { type_name = ++cp; while (*cp != '>') - ++cp; + ++cp; /* The '>' symbol will be later replaced by '\0'. Original - 'text' is needed for error messages. */ + 'text' is needed for error messages. */ gt_ptr = cp; ++cp; if (untyped_var_seen) - complain_at (dollar_loc, _("explicit type given in untyped grammar")); + complain_at (dollar_loc, complaint, + _("explicit type given in untyped grammar")); tag_seen = true; } n = parse_ref (cp, effective_rule, effective_rule_length, - rule->midrule_parent_rhs_index, text, textlen, dollar_loc); + rule->midrule_parent_rhs_index, text, dollar_loc, '$'); if (gt_ptr) *gt_ptr = '\0'; @@ -708,70 +753,71 @@ handle_action_dollar (symbol_list *rule, char *text, unsigned textlen, case LHS_REF: if (!type_name) - type_name = symbol_list_n_type_name_get (rule, dollar_loc, 0); + type_name = symbol_list_n_type_name_get (rule, dollar_loc, 0); if (!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 = ""; - } + { + if (union_seen | tag_seen) + { + if (rule->midrule_parent_rule) + complain_at (dollar_loc, complaint, + _("$$ for the midrule at $%d of %s" + " has no declared type"), + rule->midrule_parent_rhs_index, + quote (effective_rule->content.sym->tag)); + else + complain_at (dollar_loc, complaint, + _("$$ of %s has no declared type"), + quote (rule->content.sym->tag)); + } + else + untyped_var_seen = true; + type_name = ""; + } obstack_fgrow1 (&obstack_for_string, - "]b4_lhs_value([%s])[", type_name); + "]b4_lhs_value([%s])[", type_name); rule->action_props.is_value_used = true; break; default: if (max_left_semantic_context < 1 - n) - 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); + type_name = + symbol_list_n_type_name_get (effective_rule, dollar_loc, n); if (!type_name) - { - if (union_seen | tag_seen) - complain_at (dollar_loc, _("$%s of `%s' has no declared type"), - cp, effective_rule->content.sym->tag); - else - untyped_var_seen = true; - type_name = ""; - } + { + if (union_seen | tag_seen) + complain_at (dollar_loc, complaint, + _("$%s of %s has no declared type"), cp, + quote (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); + "]b4_rhs_value(%d, %d, [%s])[", + effective_rule_length, n, type_name); if (n > 0) - symbol_list_n_get (effective_rule, n)->action_props.is_value_used = - true; + symbol_list_n_get (effective_rule, n)->action_props.is_value_used = + true; break; } } /*------------------------------------------------------. -| TEXT is a location token (i.e., a `@...'). Output to | +| TEXT is a location token (i.e., a '@...'). Output to | | OBSTACK_FOR_STRING a reference to this location. | `------------------------------------------------------*/ static void -handle_action_at (symbol_list const *rule, char const *text, unsigned textlen, - location at_loc) +handle_action_at (symbol_list *rule, char *text, location at_loc) { - char const *cp = text + 1; - symbol_list const *effective_rule; + char *cp = text + 1; + symbol_list *effective_rule; int effective_rule_length; int n; @@ -789,7 +835,7 @@ handle_action_at (symbol_list const *rule, char const *text, unsigned textlen, muscle_percent_define_ensure("locations", at_loc, true); n = parse_ref (cp, effective_rule, effective_rule_length, - rule->midrule_parent_rhs_index, text, textlen, at_loc); + rule->midrule_parent_rhs_index, text, at_loc, '@'); switch (n) { case INVALID_REF: @@ -801,7 +847,7 @@ handle_action_at (symbol_list const *rule, char const *text, unsigned textlen, default: obstack_fgrow2 (&obstack_for_string, "]b4_rhs_location(%d, %d)[", - effective_rule_length, n); + effective_rule_length, n); break; } } @@ -848,37 +894,33 @@ code_props const code_props_none = CODE_PROPS_NONE_INIT; void code_props_plain_init (code_props *self, char const *code, - location code_loc) + location code_loc) { + code_props_none_init (self); self->kind = CODE_PROPS_PLAIN; self->code = code; self->location = code_loc; - self->is_value_used = false; - self->rule = NULL; - self->named_ref = NULL; } void code_props_symbol_action_init (code_props *self, char const *code, location code_loc) { + code_props_none_init (self); self->kind = CODE_PROPS_SYMBOL_ACTION; self->code = code; self->location = code_loc; - self->is_value_used = false; - self->rule = NULL; - self->named_ref = NULL; } void code_props_rule_action_init (code_props *self, char const *code, location code_loc, symbol_list *rule, - named_ref *name, bool is_predicate) + named_ref *name, bool is_predicate) { + code_props_none_init (self); self->kind = CODE_PROPS_RULE_ACTION; self->code = code; self->location = code_loc; - self->is_value_used = false; self->rule = rule; self->named_ref = name; self->is_predicate = is_predicate;