X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/297e263a0050959e0fd139ad66e71383fc9ac4db..cc2235ace2d91338663caeec288743092a6b3aeb:/src/symtab.c diff --git a/src/symtab.c b/src/symtab.c index 124da372..d3ad2fbb 100644 --- a/src/symtab.c +++ b/src/symtab.c @@ -1,6 +1,6 @@ /* Symbol table manager for Bison. - Copyright (C) 1984, 1989, 2000-2002, 2004-2012 Free Software + Copyright (C) 1984, 1989, 2000-2002, 2004-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -46,20 +46,17 @@ symbol *accept = NULL; symbol *startsymbol = NULL; location startsymbol_location; -/*---------------------------------------. -| Default %destructor's and %printer's. | -`---------------------------------------*/ +/*---------------------------. +| Precedence relation graph. | +`---------------------------*/ -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, - }; +static symgraph **prec_nodes; + +/*-----------------------------------. +| Store which associativity is used. | +`-----------------------------------*/ + +bool *used_assoc = NULL; /*---------------------------------. | Create a new symbol, named TAG. | @@ -69,21 +66,23 @@ static symbol * symbol_new (uniqstr tag, location loc) { symbol *res = xmalloc (sizeof *res); - uniqstr_assert (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, '-')) - yacc_at (loc, _("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->type_name = NULL; - for (int i = 0; i < CODE_PROPS_SIZE; ++i) - code_props_none_init (&res->props[i]); + { + int i; + for (i = 0; i < CODE_PROPS_SIZE; ++i) + code_props_none_init (&res->props[i]); + } res->number = NUMBER_UNDEFINED; res->prec = 0; @@ -95,8 +94,8 @@ symbol_new (uniqstr tag, location loc) res->status = undeclared; if (nsyms == SYMBOL_NUMBER_MAXIMUM) - fatal (_("too many symbols in input grammar (limit is %d)"), - SYMBOL_NUMBER_MAXIMUM); + complain (NULL, fatal, _("too many symbols in input grammar (limit is %d)"), + SYMBOL_NUMBER_MAXIMUM); nsyms++; return res; } @@ -125,10 +124,13 @@ semantic_type_new (uniqstr tag, const location *loc) uniqstr_assert (tag); res->tag = tag; - if (loc) - res->location = *loc; - for (int i = 0; i < CODE_PROPS_SIZE; ++i) - code_props_none_init (&res->props[i]); + res->location = loc ? *loc : empty_location; + res->status = undeclared; + { + int i; + for (i = 0; i < CODE_PROPS_SIZE; ++i) + code_props_none_init (&res->props[i]); + } return res; } @@ -147,7 +149,7 @@ semantic_type_new (uniqstr tag, const location *loc) 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) { @@ -207,16 +209,24 @@ static void symbol_redeclaration (symbol *s, const char *what, location first, location second) { - complain_at (second, _("%s redeclaration for %s"), what, s->tag); - complain_at (first, _("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, _("%s redeclaration for <%s>"), what, s->tag); - complain_at (first, _("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")); } @@ -274,9 +284,8 @@ semantic_type_code_props_set (semantic_type *type, | 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) @@ -285,19 +294,21 @@ symbol_code_props_get (symbol const *sym, /* 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; } /*-----------------------------------------------------------------. @@ -333,8 +344,8 @@ symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring) bool warned = false; if (sym->class != unknown_sym && sym->class != class) { - complain_at (loc, _("symbol %s redefined"), sym->tag); - // Don't report both "redefined" and "redeclared". + complain (&loc, complaint, _("symbol %s redefined"), sym->tag); + /* Don't report both "redefined" and "redeclared". */ warned = true; } @@ -348,7 +359,7 @@ symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring) if (declaring) { if (sym->status == declared && !warned) - warn_at (loc, _("symbol %s redeclared"), sym->tag); + complain (&loc, Wother, _("symbol %s redeclared"), sym->tag); sym->status = declared; } } @@ -369,7 +380,8 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc) user_token_numberp = &sym->alias->user_token_number; if (*user_token_numberp != USER_NUMBER_UNDEFINED && *user_token_numberp != user_token_number) - complain_at (loc, _("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? */ @@ -395,38 +407,21 @@ symbol_check_defined (symbol *sym) { if (sym->class == unknown_sym) { - switch (sym->status) - { - case used: - warn_at (sym->location, - _("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, - _("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; - } + { + int i; + for (i = 0; i < 2; ++i) + 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. */ @@ -443,19 +438,23 @@ symbol_check_defined (symbol *sym) 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) + int i; + for (i = 0; i < 2; ++i) if (sem_type->props[i].kind != CODE_PROPS_NONE && ! sem_type->props[i].is_used) - warn_at (sem_type->location, - _("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 - warn_at (sem_type->location, - _("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; } @@ -478,11 +477,11 @@ void symbol_make_alias (symbol *sym, symbol *str, location loc) { if (str->alias) - warn_at (loc, _("symbol %s used more than once as a literal string"), - str->tag); + complain (&loc, Wother, + _("symbol %s used more than once as a literal string"), str->tag); else if (sym->alias) - warn_at (loc, _("symbol %s given more than one literal string"), - sym->tag); + complain (&loc, Wother, + _("symbol %s given more than one literal string"), sym->tag); else { str->class = token_sym; @@ -521,11 +520,14 @@ symbol_check_alias_consistency (symbol *this) } - for (int i = 0; i < CODE_PROPS_SIZE; ++i) - if (str->props[i].code) - symbol_code_props_set (sym, i, &str->props[i]); - else if (sym->props[i].code) - symbol_code_props_set (str, i, &sym->props[i]); + { + int i; + for (i = 0; i < CODE_PROPS_SIZE; ++i) + if (str->props[i].code) + symbol_code_props_set (sym, i, &str->props[i]); + else if (sym->props[i].code) + symbol_code_props_set (str, i, &sym->props[i]); + } if (sym->prec || str->prec) { @@ -575,6 +577,7 @@ symbol_pack_processor (void *this, void *null ATTRIBUTE_UNUSED) 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. @@ -586,11 +589,13 @@ user_token_number_redeclaration (int num, symbol *first, symbol *second) first = second; second = tmp; } - complain_at (second->location, - _("user token number %d redeclaration for %s"), - num, second->tag); - complain_at (first->location, _("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); } /*--------------------------------------------------. @@ -819,6 +824,7 @@ symbols_free (void) hash_free (semantic_type_table); free (symbols); free (symbols_sorted); + free (semantic_types_sorted); } @@ -841,19 +847,19 @@ symbols_cmp_qsort (void const *a, void const *b) 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); } } @@ -866,9 +872,9 @@ void 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); } /*------------------------------------------------------------------. @@ -923,7 +929,7 @@ symbols_token_translations_init (void) 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); } @@ -936,10 +942,10 @@ void 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. */ { @@ -968,44 +974,157 @@ symbols_pack (void) symbols_token_translations_init (); if (startsymbol->class == unknown_sym) - fatal_at (startsymbol_location, + complain (&startsymbol_location, fatal, _("the start symbol %s is undefined"), startsymbol->tag); else if (startsymbol->class == token_sym) - fatal_at (startsymbol_location, + complain (&startsymbol_location, fatal, _("the start symbol %s is a token"), startsymbol->tag); } +/*---------------------------------. +| Initialize relation graph nodes. | +`---------------------------------*/ -/*--------------------------------------------------. -| Set default tagged/tagless %destructor/%printer. | -`--------------------------------------------------*/ +static void +init_prec_nodes (void) +{ + int i; + prec_nodes = xcalloc (nsyms, sizeof *prec_nodes); + for (i = 0; i < nsyms; ++i) + { + prec_nodes[i] = xmalloc (sizeof *prec_nodes[i]); + symgraph *s = prec_nodes[i]; + s->id = i; + s->succ = 0; + s->pred = 0; + } +} -void -default_tagged_code_props_set (code_props_type kind, code_props const *code) +/*----------------. +| Create a link. | +`----------------*/ + +static symgraphlink * +symgraphlink_new (graphid id, symgraphlink *next) { - if (default_tagged_code_props[kind].code) + symgraphlink *l = xmalloc (sizeof *l); + l->id = id; + l->next = next; + return l; +} + + +/*------------------------------------------------------------------. +| Register the second symbol of the precedence relation, and return | +| whether this relation is new. Use only in register_precedence. | +`------------------------------------------------------------------*/ + +static bool +register_precedence_second_symbol (symgraphlink **first, graphid sym) +{ + if (!*first || sym < (*first)->id) + *first = symgraphlink_new (sym, *first); + else { - complain_at (code->location, - _("redeclaration for default tagged %s"), - code_props_type_string (kind)); - complain_at (default_tagged_code_props[kind].location, - _("previous declaration")); + symgraphlink *slist = *first; + + while (slist->next && slist->next->id <= sym) + slist = slist->next; + + if (slist->id == sym) + /* Relation already present. */ + return false; + + slist->next = symgraphlink_new (sym, slist->next); } - default_tagged_code_props[kind] = *code; + return true; } +/*------------------------------------------------------------------. +| Register a new relation between symbols as used. The first symbol | +| has a greater precedence than the second one. | +`------------------------------------------------------------------*/ + void -default_tagless_code_props_set (code_props_type kind, code_props const *code) +register_precedence (graphid first, graphid snd) { - if (default_tagless_code_props[kind].code) + if (!prec_nodes) + init_prec_nodes (); + register_precedence_second_symbol (&(prec_nodes[first]->succ), snd); + register_precedence_second_symbol (&(prec_nodes[snd]->pred), first); +} + + +/*---------------------------------------. +| Initialize association tracking table. | +`---------------------------------------*/ + +static void +init_assoc (void) +{ + graphid i; + used_assoc = xcalloc(nsyms, sizeof(*used_assoc)); + for (i = 0; i < nsyms; ++i) + used_assoc[i] = false; +} + +/*------------------------------------------------------------------. +| Test if the associativity for the symbols is defined and useless. | +`------------------------------------------------------------------*/ + +static inline bool +is_assoc_useless (symbol *s) +{ + return s + && s->assoc != undef_assoc + && s->assoc != precedence_assoc + && !used_assoc[s->number]; +} + +/*-------------------------------. +| Register a used associativity. | +`-------------------------------*/ + +void +register_assoc (graphid i, graphid j) +{ + if (!used_assoc) + init_assoc (); + used_assoc[i] = true; + used_assoc[j] = true; +} + +/*--------------------------------------------------. +| Print a warning for unused precedence relations. | +`--------------------------------------------------*/ + +void +print_precedence_warnings (void) +{ + int i; + if (!prec_nodes) + init_prec_nodes (); + if (!used_assoc) + init_assoc (); + for (i = 0; i < nsyms; ++i) { - complain_at (code->location, - _("redeclaration for default tagless %s"), - code_props_type_string (kind)); - complain_at (default_tagless_code_props[kind].location, - _("previous declaration")); + symbol *s = symbols[i]; + if (s + && s->prec != 0 + && !prec_nodes[i]->pred + && !prec_nodes[i]->succ) + { + if (is_assoc_useless (s)) + complain (&s->location, Wprecedence, + _("useless precedence and associativity for %s"), s->tag); + else if (s->assoc == precedence_assoc) + complain (&s->location, Wprecedence, + _("useless precedence for %s"), s->tag); + } + else if (is_assoc_useless (s)) + complain (&s->location, Wprecedence, + _("useless associativity for %s, use %%precedence"), s->tag); } - default_tagless_code_props[kind] = *code; }