#include <src/complain.h>
#include <src/reader.h>
#include <src/getargs.h>
-#include <get-errno.h>
-#include <quote.h>
#include <src/muscle-tab.h>
#include <src/scan-code.h>
#include <src/symlist.h>
+#include <c-ctype.h>
+#include <get-errno.h>
+#include <quote.h>
+
/* The current calling start condition: SC_RULE_ACTION or
SC_SYMBOL_ACTION. */
# define YY_DECL static char *code_lex (code_props *self, int sc_context)
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 */
+/* A string to be pushed to obstack after dollar/at has been handled. */
static char *ref_tail_fields;
static location the_location;
splice (\\[ \f\t\v]*\n)*
/* C style identifier. Must start with letter. Will be used for
- named symbol references. */
+ 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}"]"|"$"
"$"("<"{tag}">")?{ref} {
ref_tail_fields = 0;
handle_action_dollar (self->rule, yytext, *loc);
- if (ref_tail_fields != NULL) {
+ if (ref_tail_fields) {
obstack_sgrow (&obstack_for_string, ref_tail_fields);
}
need_semicolon = true;
"@"{ref} {
ref_tail_fields = 0;
handle_action_at (self->rule, yytext, *loc);
- if (ref_tail_fields != NULL) {
+ if (ref_tail_fields) {
obstack_sgrow (&obstack_for_string, ref_tail_fields);
}
need_semicolon = true;
%%
-
-static inline bool
-symbol_list_null(symbol_list *l)
-{
- if (l && !(l->content_type == SYMLIST_SYMBOL && l->content.sym == NULL))
- return false;
- else
- return true;
-}
-
static inline bool
-is_dot_or_dash(char ch)
+is_dot_or_dash (char ch)
{
return ch == '.' || ch == '-';
}
static inline bool
-is_digit(char ch)
-{
- return '0' <= ch && ch <= '9';
-}
-
-static inline bool
-contains_dot_or_dash(const char* str)
+contains_dot_or_dash (const char* p)
{
- return strpbrk(str, ".-") != NULL;
+ for (; *p; ++p)
+ if (is_dot_or_dash (*p))
+ return true;
+ return false;
}
-#define VARIANT_HIDDEN (1 << 0)
-#define VARIANT_BAD_BRACKETING (1 << 1)
-#define VARIANT_NOT_VISIBLE_FROM_MIDRULE (1 << 2)
-
+/* Defines a variant of a symbolic name resolution. */
typedef struct
{
/* Index in symbol list. */
- long int ind;
+ unsigned index;
/* Matched symbol id and loc. */
uniqstr id;
location loc;
- /* Hidding named reference. */
+ /* Hiding named reference. */
named_ref* hidden_by;
- /* Error flags. */
+ /* Error flags. May contain zero (no errors) or
+ a combination of VARIANT_* values. */
unsigned err;
} variant;
+/* Set when the variant refers to a symbol hidden
+ 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 << 2)
+
static variant *variant_table = 0;
static unsigned variant_table_size = 0;
static unsigned variant_count = 0;
static variant *
-variant_table_grow()
+variant_table_grow ()
{
++variant_count;
if (variant_count > variant_table_size)
}
static char *
-find_prefix_end(const char *prefix, char *begin, char *end)
+find_prefix_end (const char *prefix, char *begin, char *end)
{
char *ptr = begin;
- while (*prefix && ptr != end)
- {
- if (*prefix != *ptr)
- return 0;
- ++prefix, ++ptr;
- }
+ for (; *prefix && ptr != end; ++prefix, ++ptr)
+ if (*prefix != *ptr)
+ return 0;
if (*prefix)
return 0;
}
static variant *
-variant_add(uniqstr id, location loc, long int ind,
- char *cp, char *cp_end, bool exact_mode)
+variant_add (uniqstr id, location loc, unsigned index,
+ char *cp, char *cp_end, bool exact_mode)
{
char *prefix_end;
- prefix_end = find_prefix_end(id, cp, cp_end);
+ prefix_end = find_prefix_end (id, cp, cp_end);
if (prefix_end &&
(prefix_end == cp_end ||
- (!exact_mode && is_dot_or_dash(*prefix_end))))
+ (!exact_mode && is_dot_or_dash (*prefix_end))))
{
- variant *r = variant_table_grow();
- r->ind = ind;
+ variant *r = variant_table_grow ();
+ r->index = index;
r->id = id;
r->loc = loc;
r->hidden_by = NULL;
return NULL;
}
+static const char *
+get_at_spec(unsigned index)
+{
+ static char at_buf[20];
+ if (index == 0)
+ strcpy (at_buf, "$$");
+ else
+ snprintf (at_buf, sizeof at_buf, "$%u", index);
+ return at_buf;
+}
+
+/* Returned from "parse_ref" when the reference
+ is inappropriate. */
#define INVALID_REF (INT_MIN)
+
+/* Returned from "parse_ref" when the reference
+ points to LHS ($$) of the current rule. */
#define LHS_REF (INT_MIN + 1)
+/* Parse named or positional reference. In case of positional
+ references, can return negative values for $-n "deep" stack
+ accesses. */
static long int
-parse_named_ref(char *cp, symbol_list *rule, int rule_length,
- int midrule_rhs_index, char *text, location loc,
- char dollar_or_at)
+parse_ref (char *cp, symbol_list *rule, int rule_length,
+ int midrule_rhs_index, char *text, location loc,
+ char dollar_or_at)
{
symbol_list *l;
char *cp_end;
bool exact_mode;
bool has_error;
bool has_valid;
- long int ind, i;
- variant* variant;
- char* p;
+ unsigned i;
if ('$' == *cp)
return LHS_REF;
- if (is_digit (*cp) || (*cp == '-' && is_digit (* (cp + 1))))
+ if (c_isdigit (*cp) || (*cp == '-' && c_isdigit (* (cp + 1))))
{
long int num = strtol (cp, &cp, 10);
if (1 - INT_MAX + rule_length <= num && num <= rule_length)
if ('[' == *cp)
{
- exact_mode = true;
-
/* Ignore the brackets. */
- ++cp;
- for (p = cp; *p != ']'; ++p);
+ char *p;
+ for (p = ++cp; *p != ']'; ++p)
+ continue;
cp_end = p;
+
+ exact_mode = true;
}
else
{
- exact_mode = false;
-
/* Take all characters of the name. */
+ char* p;
for (p = cp; *p; ++p)
- if (is_dot_or_dash(*p))
+ if (is_dot_or_dash (*p))
{
ref_tail_fields = p;
break;
}
- for (p = cp; *p; ++p);
+ for (p = cp; *p; ++p)
+ continue;
cp_end = p;
+
+ exact_mode = false;
}
/* Add all relevant variants. */
- variant_count = 0;
- for (ind = 0, l = rule; !symbol_list_null(l); ++ind, l = l->next)
- {
- if (l->content_type != SYMLIST_SYMBOL)
- continue;
+ {
+ unsigned index;
+ variant_count = 0;
+ for (index = 0, l = rule; !symbol_list_null (l); ++index, l = l->next)
+ {
+ variant *variant;
+ if (l->content_type != SYMLIST_SYMBOL)
+ continue;
- variant = variant_add(l->content.sym->tag, l->sym_loc, ind,
- cp, cp_end, exact_mode);
+ variant = variant_add (l->content.sym->tag, l->sym_loc, index,
+ cp, cp_end, exact_mode);
- if (variant && l->named_ref)
- variant->hidden_by = l->named_ref;
+ if (variant && l->named_ref)
+ variant->hidden_by = l->named_ref;
- if (l->named_ref)
- variant_add(l->named_ref->id, l->named_ref->loc, ind,
- cp, cp_end, exact_mode);
- }
+ if (l->named_ref)
+ variant_add (l->named_ref->id, l->named_ref->loc, index,
+ cp, cp_end, exact_mode);
+ }
+ }
/* Check errors. */
has_error = false;
has_valid = false;
for (i = 0; i < variant_count; ++i)
{
- variant = &variant_table[i];
- ind = variant->ind;
+ variant *variant = &variant_table[i];
+ unsigned index = variant->index;
/* Check visibility from mid-rule actions. */
- if (midrule_rhs_index != 0 &&
- (ind == 0 || ind > midrule_rhs_index))
+ if (midrule_rhs_index != 0
+ && (index == 0 || midrule_rhs_index < index))
{
variant->err |= VARIANT_NOT_VISIBLE_FROM_MIDRULE;
has_error = true;
}
/* Check correct bracketing. */
- if (!exact_mode && contains_dot_or_dash(variant->id))
+ if (!exact_mode && contains_dot_or_dash (variant->id))
{
variant->err |= VARIANT_BAD_BRACKETING;
has_error = true;
}
/* Check using of hidden symbols. */
- if (variant->hidden_by != NULL)
+ if (variant->hidden_by)
{
variant->err |= VARIANT_HIDDEN;
has_error = true;
if (variant_count == 1 && has_valid)
{
/* The only "good" case is here. */
- ind = variant_table[0].ind;
- if (ind == midrule_rhs_index)
+ unsigned index = variant_table[0].index;
+ if (index == midrule_rhs_index)
return LHS_REF;
else
- return ind;
+ return index;
}
/* Start complaining. */
if (variant_count == 0)
- complain_at (loc, _("reference is invalid: %s, symbol not found"),
+ complain_at (loc, _("invalid reference: %s, symbol not found"),
quote (text));
else if (variant_count > 1 && !has_error)
- complain_at (loc, _("reference is ambiguous: %s"),
+ complain_at (loc, _("ambiguous reference: %s"),
quote (text));
else if (variant_count > 1 && has_valid && has_error)
- complain_at (loc, _("reference is misleading: %s"),
+ complain_at (loc, _("misleading reference: %s"),
quote (text));
else
- complain_at (loc, _("reference is invalid: %s"),
+ complain_at (loc, _("invalid reference: %s"),
quote (text));
for (i = 0; i < variant_count; ++i)
{
- static char at_buf[20];
-
- variant = &variant_table[i];
-
- if (variant->ind == 0)
- strcpy(at_buf, "$$");
- else
- snprintf(at_buf, sizeof(at_buf), "$%ld", variant->ind);
+ const variant *variant = &variant_table[i];
+ const char *at_spec = get_at_spec (variant->index);
if (variant->err == 0)
complain_at (variant->loc, _(" refers to: %c%s at %s"),
- dollar_or_at, variant->id, at_buf);
+ dollar_or_at, variant->id, at_spec);
else
{
static struct obstack msg_buf;
- const char *tail = "";
- const char *id;
- location loc;
-
- if (!exact_mode)
- tail = cp + strlen(variant->id);
-
- if (variant->hidden_by)
- {
- id = variant->hidden_by->id;
- loc = variant->hidden_by->loc;
- }
- else
- {
- id = variant->id;
- loc = variant->loc;
- }
+ const char *tail = exact_mode ? "" :
+ cp + strlen (variant->id);
+ const char *id = variant->hidden_by ? variant->hidden_by->id :
+ variant->id;
+ location loc = variant->hidden_by ? variant->hidden_by->loc :
+ variant->loc;
/* Create the explanation message. */
-
obstack_init (&msg_buf);
obstack_fgrow1 (&msg_buf, " possibly meant: %c", dollar_or_at);
obstack_sgrow (&msg_buf, tail);
}
- obstack_fgrow1 (&msg_buf, " at %s", at_buf);
+ obstack_fgrow1 (&msg_buf, " at %s", at_spec);
if (variant->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE)
obstack_fgrow1 (&msg_buf, ", cannot be accessed from "
char *cp = text + 1;
char *gt_ptr = 0;
symbol_list *effective_rule;
- int effective_rule_length, n;
+ int effective_rule_length;
+ int n;
if (rule->midrule_parent_rule)
{
tag_seen = true;
}
- n = parse_named_ref (cp, effective_rule, effective_rule_length,
- rule->midrule_parent_rhs_index, text, dollar_loc, '$');
+ n = parse_ref (cp, effective_rule, effective_rule_length,
+ rule->midrule_parent_rhs_index, text, dollar_loc, '$');
if (gt_ptr)
*gt_ptr = '\0';
{
char *cp = text + 1;
symbol_list *effective_rule;
- int effective_rule_length, n;
+ int effective_rule_length;
+ int n;
if (rule->midrule_parent_rule)
{
muscle_percent_define_ensure("locations", at_loc, true);
- n = parse_named_ref (cp, effective_rule, effective_rule_length,
+ n = parse_ref (cp, effective_rule, effective_rule_length,
rule->midrule_parent_rhs_index, text, at_loc, '@');
switch (n)
{
code_props const code_props_none = CODE_PROPS_NONE_INIT;
void
-code_props_plain_init (code_props *self, char const *code, location code_loc)
+code_props_plain_init (code_props *self, char const *code,
+ location code_loc)
{
self->kind = CODE_PROPS_PLAIN;
self->code = code;
# Named references test. -*- Autotest -*-
-# Copyright (C) 2009 Free Software
-# Foundation, Inc.
+# Copyright (C) 2009 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
]])
AT_BISON_CHECK([-o test.c test.y], 1, [],
-[[test.y:50.51-60: reference is invalid: `$<ival>lo9', symbol not found
-test.y:51.51-60: reference is misleading: `$<ival>exp'
+[[test.y:50.51-60: invalid reference: `$<ival>lo9', symbol not found
+test.y:51.51-60: misleading reference: `$<ival>exp'
test.y:42.1-3: refers to: $exp at $$
test.y:51.7: possibly meant: $x, hiding $exp at $1
test.y:51.41: possibly meant: $r, hiding $exp at $4
test.y:52.51-52: $l of `exp' has no declared type
-test.y:55.46-49: reference is invalid: `$r12', symbol not found
-test.y:56.29-33: reference is invalid: `$expo', symbol not found
+test.y:55.46-49: invalid reference: `$r12', symbol not found
+test.y:56.29-33: invalid reference: `$expo', symbol not found
]])
AT_CLEANUP
foo.bar: '2'
]])
AT_BISON_CHECK([-o test.c test.y], 1, [],
-[[test.y:11.22-29: reference is misleading: `$foo.bar'
+[[test.y:11.22-29: misleading reference: `$foo.bar'
test.y:11.8-10: refers to: $foo at $1
test.y:11.12-18: possibly meant: $[foo.bar] at $2
]])
;
]])
AT_BISON_CHECK([-o test.c test.y], 1, [],
-[[test.y:24.36-41: reference is invalid: `$cond1', symbol not found
-test.y:26.43-53: reference is invalid: `$stmt.field'
+[[test.y:24.36-41: invalid reference: `$cond1', symbol not found
+test.y:26.43-53: invalid reference: `$stmt.field'
test.y:25.35-38: possibly meant: $then.field, hiding $stmt.field at $4
-test.y:28.43-52: reference is invalid: `$stmt.list'
+test.y:28.43-52: invalid reference: `$stmt.list'
test.y:27.30-38: possibly meant: $[stmt.list] at $4
-test.y:30.43-46: reference is ambiguous: `$xyz'
+test.y:30.43-46: ambiguous reference: `$xyz'
test.y:29.35-37: refers to: $xyz at $4
test.y:29.50-52: refers to: $xyz at $6
-test.y:32.43-52: reference is invalid: `$stmt.list'
+test.y:32.43-52: invalid reference: `$stmt.list'
test.y:31.40-43: possibly meant: $then, hiding $[stmt.list] at $4
test.y:31.61-64: possibly meant: $else, hiding $[stmt.list] at $6
-test.y:34.43-58: reference is invalid: `$stmt.list.field'
+test.y:34.43-58: invalid reference: `$stmt.list.field'
test.y:33.40-43: possibly meant: $then.field, hiding $[stmt.list].field at $4
test.y:33.61-64: possibly meant: $else.field, hiding $[stmt.list].field at $6
-test.y:36.43-54: reference is invalid: `$[stmt.list]'
+test.y:36.43-54: invalid reference: `$[stmt.list]'
test.y:35.40-43: possibly meant: $then, hiding $[stmt.list] at $4
test.y:35.61-64: possibly meant: $else, hiding $[stmt.list] at $6
-test.y:38.43-49: reference is invalid: `$then.1'
+test.y:38.43-49: invalid reference: `$then.1'
test.y:37.40-45: possibly meant: $[then.1] at $4
-test.y:40.43-55: reference is invalid: `$then.1.field'
+test.y:40.43-55: invalid reference: `$then.1.field'
test.y:39.40-45: possibly meant: $[then.1].field at $4
-test.y:42.44-50: reference is invalid: `$stmt.x'
+test.y:42.44-50: invalid reference: `$stmt.x'
test.y:41.36-41: possibly meant: $[stmt.x].x, hiding $stmt.x at $4
test.y:41.36-41: possibly meant: $[stmt.x] at $4
-test.y:44.13-22: reference is invalid: `$if-stmt-a'
+test.y:44.13-22: invalid reference: `$if-stmt-a'
test.y:43.1-9: possibly meant: $[if-stmt-a] at $$
-test.y:46.46-54: reference is invalid: `$then-a.f'
+test.y:46.46-54: invalid reference: `$then-a.f'
test.y:45.41-46: possibly meant: $[then-a].f at $4
]])
AT_CLEANUP
{ s = $foo; }
]])
AT_BISON_CHECK([-o test.c test.y], 1, [],
-[[test.y:11.12: a non empty identifier expected
+[[test.y:11.12: an identifier expected
]])
AT_CLEANUP
{ s = $foo; }
]])
AT_BISON_CHECK([-o test.c test.y], 1, [],
-[[test.y:11.15: redundant identifier in bracketed name: `d'
+[[test.y:11.15: unexpected identifier in bracketed name: `d'
]])
AT_CLEANUP
{ s = $foo; }
]])
AT_BISON_CHECK([-o test.c test.y], 1, [],
-[[test.y:11.25: a non empty identifier expected
+[[test.y:11.25: an identifier expected
]])
AT_CLEANUP
start[a s]: foo
]])
AT_BISON_CHECK([-o test.c test.y], 1, [],
-[[test.y:11.9: redundant identifier in bracketed name: `s'
+[[test.y:11.9: unexpected identifier in bracketed name: `s'
]])
AT_CLEANUP
projects / bison.git / commitdiff
