X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/61bc57e533748127986da6efe8a2f058232e3b7b..575619af5e1f61a5f78fb3910bee424ead5fe5a6:/src/scan-code.l diff --git a/src/scan-code.l b/src/scan-code.l index b86f459e..a5f570d7 100644 --- a/src/scan-code.l +++ b/src/scan-code.l @@ -1,6 +1,6 @@ /* Bison Action Scanner -*- C -*- - Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2006-2011 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -246,7 +246,20 @@ ref -?[0-9]+|{id}|"["{id}"]"|"$" {splice} STRING_GROW; [\n\r] STRING_GROW; if (in_cpp) in_cpp = need_semicolon = false; [ \t\f] STRING_GROW; - . STRING_GROW; need_semicolon = true; + + /* YYFAIL is undocumented and was formally deprecated in Bison + 2.4.2. */ + YYFAIL { + STRING_GROW; need_semicolon = true; + warn_at (*loc, _("use of YYFAIL, which is deprecated and will be" + " removed")); + } + + /* The sole purpose of this is to make sure identifiers that merely + contain YYFAIL don't produce the above warning. */ + [A-Za-z_][0-9A-Za-z_]* STRING_GROW; need_semicolon = true; + + . STRING_GROW; need_semicolon = true; } @@ -410,7 +423,8 @@ get_at_spec(unsigned symbol_index) static void show_sub_messages (const char* cp, bool explicit_bracketing, - int midrule_rhs_index, char dollar_or_at, bool is_warning) + int midrule_rhs_index, char dollar_or_at, + bool is_warning, unsigned indent) { unsigned i; @@ -422,11 +436,11 @@ show_sub_messages (const char* cp, bool explicit_bracketing, if (var->err == 0) { if (is_warning) - warn_at (var->loc, _(" refers to: %c%s at %s"), - dollar_or_at, var->id, at_spec); + warn_at_indent (var->loc, &indent, _("refers to: %c%s at %s"), + dollar_or_at, var->id, at_spec); else - complain_at (var->loc, _(" refers to: %c%s at %s"), - dollar_or_at, var->id, at_spec); + complain_at_indent (var->loc, &indent, _("refers to: %c%s at %s"), + dollar_or_at, var->id, at_spec); } else { @@ -441,7 +455,7 @@ show_sub_messages (const char* cp, bool explicit_bracketing, /* Create the explanation message. */ obstack_init (&msg_buf); - obstack_fgrow1 (&msg_buf, " possibly meant: %c", dollar_or_at); + obstack_fgrow1 (&msg_buf, _("possibly meant: %c"), dollar_or_at); if (contains_dot_or_dash (id)) obstack_fgrow1 (&msg_buf, "[%s]", id); else @@ -450,7 +464,7 @@ show_sub_messages (const char* cp, bool explicit_bracketing, if (var->err & VARIANT_HIDDEN) { - obstack_fgrow1 (&msg_buf, ", hiding %c", dollar_or_at); + obstack_fgrow1 (&msg_buf, _(", hiding %c"), dollar_or_at); if (contains_dot_or_dash (var->id)) obstack_fgrow1 (&msg_buf, "[%s]", var->id); else @@ -458,17 +472,22 @@ show_sub_messages (const char* cp, bool explicit_bracketing, obstack_sgrow (&msg_buf, tail); } - obstack_fgrow1 (&msg_buf, " at %s", at_spec); + obstack_fgrow1 (&msg_buf, _(" at %s"), at_spec); if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE) - obstack_fgrow1 (&msg_buf, ", cannot be accessed from " - "mid-rule action at $%d", midrule_rhs_index); + { + 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'); if (is_warning) - warn_at (id_loc, _("%s"), (char *) obstack_finish (&msg_buf)); + warn_at_indent (id_loc, &indent, "%s", + (char *) obstack_finish (&msg_buf)); else - complain_at (id_loc, _("%s"), (char *) obstack_finish (&msg_buf)); + complain_at_indent (id_loc, &indent, "%s", + (char *) obstack_finish (&msg_buf)); obstack_free (&msg_buf, 0); } } @@ -482,6 +501,9 @@ show_sub_messages (const char* cp, bool explicit_bracketing, points to LHS ($$) of the current rule or midrule. */ #define LHS_REF (INT_MIN + 1) +/* Sub-messages indent. */ +#define SUB_INDENT (4) + /* Parse named or positional reference. In case of positional references, can return negative values for $-n "deep" stack accesses. */ @@ -591,37 +613,43 @@ parse_ref (char *cp, symbol_list *rule, int rule_length, switch (valid_variants) { case 0: - if (variant_count == 0) - { - if (explicit_bracketing || !ref_tail_fields) - complain_at (text_loc, _("unresolved reference: %s"), - quote(text)); - else - { - unsigned len = ref_tail_fields - text; - char *str = strndup (text, len); - text_loc.end.column = text_loc.start.column + len; - complain_at (text_loc, _("unresolved reference: %s"), - quote (str)); - free (str); - } - } - else - { - complain_at (text_loc, _("invalid reference: %s"), - quote (text)); + { + 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)); + indent += SUB_INDENT; + if (midrule_rhs_index) + { + const char *format = + _("symbol not found in production before $%d: %.*s"); + complain_at_indent (rule->location, &indent, format, + midrule_rhs_index, len, cp); + } + else + { + const char *format = + _("symbol not found in production: %.*s"); + complain_at_indent (rule->location, &indent, format, + len, cp); + } + + if (variant_count > 0) show_sub_messages (cp, explicit_bracketing, midrule_rhs_index, - dollar_or_at, false); - } - return INVALID_REF; + dollar_or_at, false, indent); + return INVALID_REF; + } case 1: { + unsigned indent = 0; if (variant_count > 1) { - warn_at (text_loc, _("misleading reference: %s"), - quote (text)); + warn_at_indent (text_loc, &indent, _("misleading reference: %s"), + quote (text)); show_sub_messages (cp, explicit_bracketing, midrule_rhs_index, - dollar_or_at, true); + dollar_or_at, true, indent + SUB_INDENT); } { unsigned symbol_index = @@ -631,11 +659,14 @@ parse_ref (char *cp, symbol_list *rule, int rule_length, } case 2: default: - complain_at (text_loc, _("ambiguous reference: %s"), - quote (text)); - show_sub_messages (cp, explicit_bracketing, midrule_rhs_index, - dollar_or_at, false); - return INVALID_REF; + { + unsigned indent = 0; + complain_at_indent (text_loc, &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; + } } /* Not reachable. */ @@ -870,7 +901,7 @@ code_props_symbol_action_init (code_props *self, char const *code, void code_props_rule_action_init (code_props *self, char const *code, location code_loc, symbol_list *rule, - named_ref *name) + named_ref *name, bool is_predicate) { self->kind = CODE_PROPS_RULE_ACTION; self->code = code; @@ -878,6 +909,7 @@ code_props_rule_action_init (code_props *self, char const *code, self->is_value_used = false; self->rule = rule; self->named_ref = name; + self->is_predicate = is_predicate; } void