symbol *startsymbol = NULL;
location startsymbol_location;
-/*---------------------------------------.
-| Default %destructor's and %printer's. |
-`---------------------------------------*/
-
-static code_props default_tagged_code_props[CODE_PROPS_SIZE] =
- {
- CODE_PROPS_NONE_INIT,
- CODE_PROPS_NONE_INIT,
- };
-static code_props default_tagless_code_props[CODE_PROPS_SIZE] =
- {
- CODE_PROPS_NONE_INIT,
- CODE_PROPS_NONE_INIT,
- };
/*---------------------------------.
| Create a new symbol, named TAG. |
/* If the tag is not a string (starts with a double quote), check
that it is valid for Yacc. */
if (tag[0] != '\"' && tag[0] != '\'' && strchr (tag, '-'))
- complain_at (loc, Wyacc,
- _("POSIX Yacc forbids dashes in symbol names: %s"), tag);
+ complain (&loc, Wyacc,
+ _("POSIX Yacc forbids dashes in symbol names: %s"), tag);
res->tag = tag;
res->location = loc;
res->status = undeclared;
if (nsyms == SYMBOL_NUMBER_MAXIMUM)
- complain (fatal, _("too many symbols in input grammar (limit is %d)"),
+ complain (NULL, fatal, _("too many symbols in input grammar (limit is %d)"),
SYMBOL_NUMBER_MAXIMUM);
nsyms++;
return res;
uniqstr_assert (tag);
res->tag = tag;
- if (loc)
- res->location = *loc;
+ res->location = loc ? *loc : empty_location;
+ res->status = undeclared;
for (int i = 0; i < CODE_PROPS_SIZE; ++i)
code_props_none_init (&res->props[i]);
fprintf (f, " %s { %s }", #Attr, s->props[Attr].code)
void
-symbol_print (symbol *s, FILE *f)
+symbol_print (symbol const *s, FILE *f)
{
if (s)
{
symbol_redeclaration (symbol *s, const char *what, location first,
location second)
{
- complain_at (second, complaint, _("%s redeclaration for %s"), what, s->tag);
- complain_at (first, complaint, _("previous declaration"));
+ unsigned i = 0;
+ complain_indent (&second, complaint, &i,
+ _("%s redeclaration for %s"), what, s->tag);
+ i += SUB_INDENT;
+ complain_indent (&first, complaint, &i,
+ _("previous declaration"));
}
static void
semantic_type_redeclaration (semantic_type *s, const char *what, location first,
location second)
{
- complain_at (second, complaint, _("%s redeclaration for <%s>"), what, s->tag);
- complain_at (first, complaint, _("previous declaration"));
+ unsigned i = 0;
+ complain_indent (&second, complaint, &i,
+ _("%s redeclaration for <%s>"), what, s->tag);
+ i += SUB_INDENT;
+ complain_indent (&first, complaint, &i,
+ _("previous declaration"));
}
| Get the computed %destructor or %printer for SYM. |
`---------------------------------------------------*/
-code_props const *
-symbol_code_props_get (symbol const *sym,
- code_props_type kind)
+code_props *
+symbol_code_props_get (symbol *sym, code_props_type kind)
{
/* Per-symbol code props. */
if (sym->props[kind].code)
/* Per-type code props. */
if (sym->type_name)
{
- code_props const *code =
+ code_props *code =
&semantic_type_get (sym->type_name, NULL)->props[kind];
if (code->code)
return code;
}
/* Apply default code props's only to user-defined symbols. */
- if (sym->tag[0] == '$' || sym == errtoken)
- return &code_props_none;
-
- if (sym->type_name)
- return &default_tagged_code_props[kind];
- return &default_tagless_code_props[kind];
+ if (sym->tag[0] != '$' && sym != errtoken)
+ {
+ code_props *code =
+ &semantic_type_get (sym->type_name ? "*" : "", NULL)->props[kind];
+ if (code->code)
+ return code;
+ }
+ return &code_props_none;
}
/*-----------------------------------------------------------------.
bool warned = false;
if (sym->class != unknown_sym && sym->class != class)
{
- complain_at (loc, complaint, _("symbol %s redefined"), sym->tag);
+ complain (&loc, complaint, _("symbol %s redefined"), sym->tag);
// Don't report both "redefined" and "redeclared".
warned = true;
}
if (declaring)
{
if (sym->status == declared && !warned)
- complain_at (loc, Wother, _("symbol %s redeclared"), sym->tag);
+ complain (&loc, Wother, _("symbol %s redeclared"), sym->tag);
sym->status = declared;
}
}
user_token_numberp = &sym->alias->user_token_number;
if (*user_token_numberp != USER_NUMBER_UNDEFINED
&& *user_token_numberp != user_token_number)
- complain_at (loc, complaint, _("redefining user token number of %s"),
- sym->tag);
+ complain (&loc, complaint, _("redefining user token number of %s"),
+ sym->tag);
*user_token_numberp = user_token_number;
/* User defined $end token? */
{
if (sym->class == unknown_sym)
{
- switch (sym->status)
- {
- case used:
- complain_at (sym->location, Wother,
- _("symbol %s is used, but is not defined as a token"
- " and has no rules"),
- sym->tag);
- break;
- case undeclared:
- case needed:
- complain_at (sym->location, complaint,
- _("symbol %s is used, but is not defined as a token"
- " and has no rules"),
- sym->tag);
- break;
- case declared:
- /* If declared, then sym->class != unknown_sym. */
- assert (0);
- }
-
+ assert (sym->status != declared);
+ complain (&sym->location,
+ sym->status == needed ? complaint : Wother,
+ _("symbol %s is used, but is not defined as a token"
+ " and has no rules"),
+ sym->tag);
sym->class = nterm_sym;
sym->number = nvars++;
}
for (int i = 0; i < 2; ++i)
- if (sym->props[i].kind == CODE_PROPS_NONE && sym->type_name)
- {
- semantic_type *sem_type = semantic_type_get (sym->type_name, NULL);
- if (sem_type
- && sem_type->props[i].kind != CODE_PROPS_NONE)
- sem_type->props[i].is_used = true;
- }
+ symbol_code_props_get (sym, i)->is_used = true;
/* Set the semantic type status associated to the current symbol to
'declared' so that we could check semantic types unnecessary uses. */
static inline bool
semantic_type_check_defined (semantic_type *sem_type)
{
- if (sem_type->status == declared)
+ // <*> and <> do not have to be "declared".
+ if (sem_type->status == declared
+ || !*sem_type->tag
+ || STREQ(sem_type->tag, "*"))
{
for (int i = 0; i < 2; ++i)
if (sem_type->props[i].kind != CODE_PROPS_NONE
&& ! sem_type->props[i].is_used)
- complain_at (sem_type->location, Wother,
- _("useless %s for type <%s>"),
- code_props_type_string (i), sem_type->tag);
+ complain (&sem_type->location, Wother,
+ _("useless %s for type <%s>"),
+ code_props_type_string (i), sem_type->tag);
}
else
- complain_at (sem_type->location, Wother,
- _("type <%s> is used, but is not associated to any symbol"),
- sem_type->tag);
+ complain (&sem_type->location, Wother,
+ _("type <%s> is used, but is not associated to any symbol"),
+ sem_type->tag);
return true;
}
symbol_make_alias (symbol *sym, symbol *str, location loc)
{
if (str->alias)
- complain_at (loc, Wother,
+ complain (&loc, Wother,
_("symbol %s used more than once as a literal string"), str->tag);
else if (sym->alias)
- complain_at (loc, Wother,
+ complain (&loc, Wother,
_("symbol %s given more than one literal string"), sym->tag);
else
{
static void
user_token_number_redeclaration (int num, symbol *first, symbol *second)
{
+ unsigned i = 0;
/* User token numbers are not assigned during the parsing, but in a
second step, via a traversal of the symbol table sorted on tag.
first = second;
second = tmp;
}
- complain_at (second->location, complaint,
- _("user token number %d redeclaration for %s"),
- num, second->tag);
- complain_at (first->location, complaint, _("previous declaration for %s"),
- first->tag);
+ complain_indent (&second->location, complaint, &i,
+ _("user token number %d redeclaration for %s"),
+ num, second->tag);
+ i += SUB_INDENT;
+ complain_indent (&first->location, complaint, &i,
+ _("previous declaration for %s"),
+ first->tag);
}
/*--------------------------------------------------.
hash_free (semantic_type_table);
free (symbols);
free (symbols_sorted);
+ free (semantic_types_sorted);
}
static void
symbols_do (Hash_processor processor, void *processor_data,
- struct hash_table *table, symbol **sorted)
+ struct hash_table *table, symbol ***sorted)
{
size_t count = hash_get_n_entries (table);
- if (!sorted)
+ if (!*sorted)
{
- sorted = xnmalloc (count, sizeof *sorted);
- hash_get_entries (table, (void**)sorted, count);
- qsort (sorted, count, sizeof *sorted, symbols_cmp_qsort);
+ *sorted = xnmalloc (count, sizeof **sorted);
+ hash_get_entries (table, (void**)*sorted, count);
+ qsort (*sorted, count, sizeof **sorted, symbols_cmp_qsort);
}
{
size_t i;
for (i = 0; i < count; ++i)
- processor (sorted[i], processor_data);
+ processor ((*sorted)[i], processor_data);
}
}
symbols_check_defined (void)
{
symbols_do (symbol_check_defined_processor, NULL,
- symbol_table, symbols_sorted);
+ symbol_table, &symbols_sorted);
symbols_do (semantic_type_check_defined_processor, NULL,
- semantic_type_table, semantic_types_sorted);
+ semantic_type_table, &semantic_types_sorted);
}
/*------------------------------------------------------------------.
for (i = 0; i < max_user_token_number + 1; i++)
token_translations[i] = undeftoken->number;
symbols_do (symbol_translation_processor, NULL,
- symbol_table, symbols_sorted);
+ symbol_table, &symbols_sorted);
}
symbols_pack (void)
{
symbols_do (symbol_check_alias_consistency_processor, NULL,
- symbol_table, symbols_sorted);
+ symbol_table, &symbols_sorted);
symbols = xcalloc (nsyms, sizeof *symbols);
- symbols_do (symbol_pack_processor, NULL, symbol_table, symbols_sorted);
+ symbols_do (symbol_pack_processor, NULL, symbol_table, &symbols_sorted);
/* Aliases leave empty slots in symbols, so remove them. */
{
symbols_token_translations_init ();
if (startsymbol->class == unknown_sym)
- complain_at (startsymbol_location, fatal,
- _("the start symbol %s is undefined"),
- startsymbol->tag);
+ complain (&startsymbol_location, fatal,
+ _("the start symbol %s is undefined"),
+ startsymbol->tag);
else if (startsymbol->class == token_sym)
- complain_at (startsymbol_location, fatal,
- _("the start symbol %s is a token"),
- startsymbol->tag);
-}
-
-
-/*--------------------------------------------------.
-| Set default tagged/tagless %destructor/%printer. |
-`--------------------------------------------------*/
-
-void
-default_tagged_code_props_set (code_props_type kind, code_props const *code)
-{
- if (default_tagged_code_props[kind].code)
- {
- complain_at (code->location, complaint,
- _("redeclaration for default tagged %s"),
- code_props_type_string (kind));
- complain_at (default_tagged_code_props[kind].location, complaint,
- _("previous declaration"));
- }
- default_tagged_code_props[kind] = *code;
-}
-
-void
-default_tagless_code_props_set (code_props_type kind, code_props const *code)
-{
- if (default_tagless_code_props[kind].code)
- {
- complain_at (code->location, complaint,
- _("redeclaration for default tagless %s"),
- code_props_type_string (kind));
- complain_at (default_tagless_code_props[kind].location, complaint,
- _("previous declaration"));
- }
- default_tagless_code_props[kind] = *code;
+ complain (&startsymbol_location, fatal,
+ _("the start symbol %s is a token"),
+ startsymbol->tag);
}
projects / bison.git / blobdiff