X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9534d2be80292c1a2f52997964cb4436039781c0..7d6bad195977b0204fc8406cac57cf5a4f1c769b:/src/symtab.c diff --git a/src/symtab.c b/src/symtab.c index 68c33c7a..9014acf2 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. @@ -55,21 +55,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, '-')) - 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->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; @@ -81,7 +83,7 @@ symbol_new (uniqstr tag, 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; @@ -111,10 +113,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; } @@ -193,16 +198,24 @@ static void 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")); } @@ -320,8 +333,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, complaint, _("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; } @@ -335,7 +348,7 @@ symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring) 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; } } @@ -356,8 +369,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, 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? */ @@ -383,32 +396,21 @@ symbol_check_defined (symbol *sym) { 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) - symbol_code_props_get (sym, 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. */ @@ -425,22 +427,23 @@ symbol_check_defined (symbol *sym) static inline bool semantic_type_check_defined (semantic_type *sem_type) { - // <*> and <> do not have to be "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) - 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; } @@ -463,10 +466,10 @@ void 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 { @@ -506,11 +509,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) { @@ -560,6 +566,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. @@ -571,11 +578,13 @@ user_token_number_redeclaration (int num, symbol *first, symbol *second) 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); } /*--------------------------------------------------. @@ -804,6 +813,7 @@ symbols_free (void) hash_free (semantic_type_table); free (symbols); free (symbols_sorted); + free (semantic_types_sorted); } @@ -826,19 +836,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); } } @@ -851,9 +861,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); } /*------------------------------------------------------------------. @@ -908,7 +918,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); } @@ -921,10 +931,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. */ { @@ -953,11 +963,11 @@ symbols_pack (void) 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); + complain (&startsymbol_location, fatal, + _("the start symbol %s is a token"), + startsymbol->tag); }