X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/76290368d48b584808a120dfbd415be93aef04f6..a68b1f237e63c96ee905916424013f79d01908ba:/src/symtab.c?ds=inline
diff --git a/src/symtab.c b/src/symtab.c
index 81a938ce..002f6e37 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,35 +1,39 @@
/* Symbol table manager for Bison.
- Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2006 Free
- Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 2000-2002, 2004-2012 Free Software
+ Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
- Bison is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- Bison is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Bison; see the file COPYING. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include "system.h"
#include
-#include
#include "complain.h"
#include "gram.h"
#include "symtab.h"
+/*-------------------------------------------------------------------.
+| Symbols sorted by tag. Allocated by the first invocation of |
+| symbols_do, after which no more symbols should be created. |
+`-------------------------------------------------------------------*/
+
+static symbol **symbols_sorted = NULL;
+
/*------------------------.
| Distinguished symbols. |
`------------------------*/
@@ -60,6 +64,13 @@ 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] != '\'' && mbschr (tag, '-'))
+ yacc_at (loc, _("POSIX Yacc forbids dashes in symbol names: %s"),
+ tag);
+
res->tag = tag;
res->location = loc;
@@ -109,9 +120,9 @@ semantic_type_new (uniqstr tag)
if (s->Attr) \
fprintf (f, " %s { %s }", #Attr, s->Attr)
-#define SYMBOL_CODE_PRINT(Attr) \
- if (code_props_code_get (s->Attr)) \
- fprintf (f, " %s { %s }", #Attr, code_props_code_get(s->Attr))
+#define SYMBOL_CODE_PRINT(Attr) \
+ if (s->Attr.code) \
+ fprintf (f, " %s { %s }", #Attr, s->Attr.code)
void
symbol_print (symbol *s, FILE *f)
@@ -152,6 +163,7 @@ semantic_type_redeclaration (semantic_type *s, const char *what, location first,
}
+
/*-----------------------------------------------------------------.
| Set the TYPE_NAME associated with SYM. Does nothing if passed 0 |
| as TYPE_NAME. |
@@ -170,19 +182,17 @@ symbol_type_set (symbol *sym, uniqstr type_name, location loc)
}
}
-
/*-----------------------------------------.
| Set the DESTRUCTOR associated with SYM. |
`-----------------------------------------*/
void
-symbol_destructor_set (symbol *sym, code_props destructor)
+symbol_destructor_set (symbol *sym, code_props const *destructor)
{
- if (code_props_code_get (sym->destructor))
- symbol_redeclaration (sym, "%destructor",
- code_props_location_get (sym->destructor),
- code_props_location_get (destructor));
- sym->destructor = destructor;
+ if (sym->destructor.code)
+ symbol_redeclaration (sym, "%destructor", sym->destructor.location,
+ destructor->location);
+ sym->destructor = *destructor;
}
/*------------------------------------------.
@@ -190,41 +200,43 @@ symbol_destructor_set (symbol *sym, code_props destructor)
`------------------------------------------*/
void
-semantic_type_destructor_set (semantic_type *type, code_props destructor)
+semantic_type_destructor_set (semantic_type *type,
+ code_props const *destructor)
{
- if (code_props_code_get (type->destructor))
+ if (type->destructor.code)
semantic_type_redeclaration (type, "%destructor",
- code_props_location_get (type->destructor),
- code_props_location_get (destructor));
- type->destructor = destructor;
+ type->destructor.location,
+ destructor->location);
+ type->destructor = *destructor;
}
/*---------------------------------------.
| Get the computed %destructor for SYM. |
`---------------------------------------*/
-code_props
-symbol_destructor_get (symbol *sym)
+code_props const *
+symbol_destructor_get (symbol const *sym)
{
/* Per-symbol %destructor. */
- if (code_props_code_get (sym->destructor))
- return sym->destructor;
+ if (sym->destructor.code)
+ return &sym->destructor;
/* Per-type %destructor. */
if (sym->type_name)
{
- code_props destructor = semantic_type_get (sym->type_name)->destructor;
- if (code_props_code_get (destructor))
+ code_props const *destructor =
+ &semantic_type_get (sym->type_name)->destructor;
+ if (destructor->code)
return destructor;
}
/* Apply default %destructor's only to user-defined symbols. */
if (sym->tag[0] == '$' || sym == errtoken)
- return code_props_none;
+ return &code_props_none;
if (sym->type_name)
- return default_tagged_destructor;
- return default_tagless_destructor;
+ return &default_tagged_destructor;
+ return &default_tagless_destructor;
}
/*--------------------------------------.
@@ -232,13 +244,12 @@ symbol_destructor_get (symbol *sym)
`--------------------------------------*/
void
-symbol_printer_set (symbol *sym, code_props printer)
+symbol_printer_set (symbol *sym, code_props const *printer)
{
- if (code_props_code_get (sym->printer))
+ if (sym->printer.code)
symbol_redeclaration (sym, "%printer",
- code_props_location_get (sym->printer),
- code_props_location_get (printer));
- sym->printer = printer;
+ sym->printer.location, printer->location);
+ sym->printer = *printer;
}
/*---------------------------------------.
@@ -246,41 +257,40 @@ symbol_printer_set (symbol *sym, code_props printer)
`---------------------------------------*/
void
-semantic_type_printer_set (semantic_type *type, code_props printer)
+semantic_type_printer_set (semantic_type *type, code_props const *printer)
{
- if (code_props_code_get (type->printer))
+ if (type->printer.code)
semantic_type_redeclaration (type, "%printer",
- code_props_location_get (type->printer),
- code_props_location_get (printer));
- type->printer = printer;
+ type->printer.location, printer->location);
+ type->printer = *printer;
}
/*------------------------------------.
| Get the computed %printer for SYM. |
`------------------------------------*/
-code_props
-symbol_printer_get (symbol *sym)
+code_props const *
+symbol_printer_get (symbol const *sym)
{
/* Per-symbol %printer. */
- if (code_props_code_get (sym->printer))
- return sym->printer;
+ if (sym->printer.code)
+ return &sym->printer;
/* Per-type %printer. */
if (sym->type_name)
{
- code_props printer = semantic_type_get (sym->type_name)->printer;
- if (code_props_code_get (printer))
+ code_props const *printer = &semantic_type_get (sym->type_name)->printer;
+ if (printer->code)
return printer;
}
/* Apply the default %printer only to user-defined symbols. */
if (sym->tag[0] == '$' || sym == errtoken)
- return code_props_none;
+ return &code_props_none;
if (sym->type_name)
- return default_tagged_printer;
- return default_tagless_printer;
+ return &default_tagged_printer;
+ return &default_tagless_printer;
}
/*-----------------------------------------------------------------.
@@ -344,9 +354,7 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
{
int *user_token_numberp;
- aver (sym->class == token_sym);
-
- if (sym->user_token_number != USER_NUMBER_ALIAS)
+ if (sym->user_token_number != USER_NUMBER_HAS_STRING_ALIAS)
user_token_numberp = &sym->user_token_number;
else
user_token_numberp = &sym->alias->user_token_number;
@@ -359,10 +367,11 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
if (user_token_number == 0)
{
endtoken = sym;
- endtoken->number = 0;
/* It is always mapped to 0, so it was already counted in
NTOKENS. */
- --ntokens;
+ if (endtoken->number != NUMBER_UNDEFINED)
+ --ntokens;
+ endtoken->number = 0;
}
}
@@ -395,29 +404,24 @@ symbol_check_defined_processor (void *sym, void *null ATTRIBUTE_UNUSED)
}
-/*------------------------------------------------------------------.
-| Declare the new symbol SYM. Make it an alias of SYMVAL, and type |
-| SYMVAL with SYM's type. |
-`------------------------------------------------------------------*/
-
void
-symbol_make_alias (symbol *sym, symbol *symval, location loc)
+symbol_make_alias (symbol *sym, symbol *str, location loc)
{
- if (symval->alias)
- warn_at (loc, _("symbol `%s' used more than once as a literal string"),
- symval->tag);
+ if (str->alias)
+ warn_at (loc, _("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);
+ warn_at (loc, _("symbol %s given more than one literal string"),
+ sym->tag);
else
{
- symval->class = token_sym;
- symval->user_token_number = sym->user_token_number;
- sym->user_token_number = USER_NUMBER_ALIAS;
- symval->alias = sym;
- sym->alias = symval;
- symval->number = sym->number;
- symbol_type_set (symval, sym->type_name, loc);
+ str->class = token_sym;
+ str->user_token_number = sym->user_token_number;
+ sym->user_token_number = USER_NUMBER_HAS_STRING_ALIAS;
+ str->alias = sym;
+ sym->alias = str;
+ str->number = sym->number;
+ symbol_type_set (str, sym->type_name, loc);
}
}
@@ -430,48 +434,47 @@ symbol_make_alias (symbol *sym, symbol *symval, location loc)
static inline void
symbol_check_alias_consistency (symbol *this)
{
- symbol *alias = this;
- symbol *orig = this->alias;
+ symbol *sym = this;
+ symbol *str = this->alias;
- /* Check only those that _are_ the aliases. */
- if (!(this->alias && this->user_token_number == USER_NUMBER_ALIAS))
+ /* Check only the symbol in the symbol-string pair. */
+ if (!(this->alias
+ && this->user_token_number == USER_NUMBER_HAS_STRING_ALIAS))
return;
- if (orig->type_name != alias->type_name)
+ if (str->type_name != sym->type_name)
{
- if (orig->type_name)
- symbol_type_set (alias, orig->type_name, orig->type_location);
+ if (str->type_name)
+ symbol_type_set (sym, str->type_name, str->type_location);
else
- symbol_type_set (orig, alias->type_name, alias->type_location);
+ symbol_type_set (str, sym->type_name, sym->type_location);
}
- if (code_props_code_get (orig->destructor)
- || code_props_code_get (alias->destructor))
+ if (str->destructor.code || sym->destructor.code)
{
- if (code_props_code_get (orig->destructor))
- symbol_destructor_set (alias, orig->destructor);
+ if (str->destructor.code)
+ symbol_destructor_set (sym, &str->destructor);
else
- symbol_destructor_set (orig, alias->destructor);
+ symbol_destructor_set (str, &sym->destructor);
}
- if (code_props_code_get (orig->printer)
- || code_props_code_get (alias->printer))
+ if (str->printer.code || sym->printer.code)
{
- if (code_props_code_get (orig->printer))
- symbol_printer_set (alias, orig->printer);
+ if (str->printer.code)
+ symbol_printer_set (sym, &str->printer);
else
- symbol_printer_set (orig, alias->printer);
+ symbol_printer_set (str, &sym->printer);
}
- if (alias->prec || orig->prec)
+ if (sym->prec || str->prec)
{
- if (orig->prec)
- symbol_precedence_set (alias, orig->prec, orig->assoc,
- orig->prec_location);
+ if (str->prec)
+ symbol_precedence_set (sym, str->prec, str->assoc,
+ str->prec_location);
else
- symbol_precedence_set (orig, alias->prec, alias->assoc,
- alias->prec_location);
+ symbol_precedence_set (str, sym->prec, sym->assoc,
+ sym->prec_location);
}
}
@@ -492,31 +495,11 @@ symbol_check_alias_consistency_processor (void *this,
static inline bool
symbol_pack (symbol *this)
{
+ aver (this->number != NUMBER_UNDEFINED);
if (this->class == nterm_sym)
- {
- this->number += ntokens;
- }
- else if (this->alias)
- {
- /* This symbol and its alias are a single token defn.
- Allocate a tokno, and assign to both check agreement of
- prec and assoc fields and make both the same */
- if (this->number == NUMBER_UNDEFINED)
- {
- if (this == endtoken || this->alias == endtoken)
- this->number = this->alias->number = 0;
- else
- {
- aver (this->alias->number != NUMBER_UNDEFINED);
- this->number = this->alias->number;
- }
- }
- /* Do not do processing below for USER_NUMBER_ALIASes. */
- if (this->user_token_number == USER_NUMBER_ALIAS)
- return true;
- }
- else /* this->class == token_sym */
- aver (this->number != NUMBER_UNDEFINED);
+ this->number += ntokens;
+ else if (this->user_token_number == USER_NUMBER_HAS_STRING_ALIAS)
+ return true;
symbols[this->number] = this;
return true;
@@ -529,7 +512,26 @@ symbol_pack_processor (void *this, void *null ATTRIBUTE_UNUSED)
}
+static void
+user_token_number_redeclaration (int num, symbol *first, symbol *second)
+{
+ /* User token numbers are not assigned during the parsing, but in a
+ second step, via a traversal of the symbol table sorted on tag.
+ However, error messages make more sense if we keep the first
+ declaration first. */
+ if (location_cmp (first->location, second->location) > 0)
+ {
+ symbol* tmp = first;
+ 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);
+}
/*--------------------------------------------------.
| Put THIS in TOKEN_TRANSLATIONS if it is a token. |
@@ -540,14 +542,14 @@ symbol_translation (symbol *this)
{
/* Non-terminal? */
if (this->class == token_sym
- && this->user_token_number != USER_NUMBER_ALIAS)
+ && this->user_token_number != USER_NUMBER_HAS_STRING_ALIAS)
{
/* A token which translation has already been set? */
if (token_translations[this->user_token_number] != undeftoken->number)
- complain_at (this->location,
- _("tokens %s and %s both assigned number %d"),
- symbols[token_translations[this->user_token_number]]->tag,
- this->tag, this->user_token_number);
+ user_token_number_redeclaration
+ (this->user_token_number,
+ symbols[token_translations[this->user_token_number]],
+ this);
token_translations[this->user_token_number] = this->number;
}
@@ -661,8 +663,10 @@ symbol_from_uniqstr (const uniqstr key, location loc)
if (!entry)
{
/* First insertion in the hash. */
+ aver (!symbols_sorted);
entry = symbol_new (key, loc);
- hash_insert (symbol_table, entry);
+ if (!hash_insert (symbol_table, entry))
+ xalloc_die ();
}
return entry;
}
@@ -686,7 +690,8 @@ semantic_type_from_uniqstr (const uniqstr key)
{
/* First insertion in the hash. */
entry = semantic_type_new (key);
- hash_insert (semantic_type_table, entry);
+ if (!hash_insert (semantic_type_table, entry))
+ xalloc_die ();
}
return entry;
}
@@ -753,6 +758,7 @@ symbols_free (void)
hash_free (symbol_table);
hash_free (semantic_type_table);
free (symbols);
+ free (symbols_sorted);
}
@@ -761,13 +767,36 @@ symbols_free (void)
| terminals. |
`---------------------------------------------------------------*/
+static int
+symbols_cmp (symbol const *a, symbol const *b)
+{
+ return strcmp (a->tag, b->tag);
+}
+
+static int
+symbols_cmp_qsort (void const *a, void const *b)
+{
+ return symbols_cmp (*(symbol * const *)a, *(symbol * const *)b);
+}
+
static void
symbols_do (Hash_processor processor, void *processor_data)
{
- hash_do_for_each (symbol_table, processor, processor_data);
+ size_t count = hash_get_n_entries (symbol_table);
+ if (!symbols_sorted)
+ {
+ symbols_sorted = xnmalloc (count, sizeof *symbols_sorted);
+ hash_get_entries (symbol_table, (void**)symbols_sorted, count);
+ qsort (symbols_sorted, count, sizeof *symbols_sorted,
+ symbols_cmp_qsort);
+ }
+ {
+ size_t i;
+ for (i = 0; i < count; ++i)
+ processor (symbols_sorted[i], processor_data);
+ }
}
-
/*--------------------------------------------------------------.
| Check that all the symbols are defined. Report any undefined |
| symbols and consider them nonterminals. |
@@ -890,54 +919,53 @@ symbols_pack (void)
`--------------------------------------------------*/
void
-default_tagged_destructor_set (code_props destructor)
+default_tagged_destructor_set (code_props const *destructor)
{
- if (code_props_code_get (default_tagged_destructor))
+ if (default_tagged_destructor.code)
{
- complain_at (code_props_location_get (destructor),
+ complain_at (destructor->location,
_("redeclaration for default tagged %%destructor"));
- complain_at (code_props_location_get (default_tagged_destructor),
+ complain_at (default_tagged_destructor.location,
_("previous declaration"));
}
- default_tagged_destructor = destructor;
+ default_tagged_destructor = *destructor;
}
void
-default_tagless_destructor_set (code_props destructor)
+default_tagless_destructor_set (code_props const *destructor)
{
- if (code_props_code_get (default_tagless_destructor))
+ if (default_tagless_destructor.code)
{
- complain_at (code_props_location_get (destructor),
+ complain_at (destructor->location,
_("redeclaration for default tagless %%destructor"));
- complain_at (code_props_location_get (default_tagless_destructor),
+ complain_at (default_tagless_destructor.location,
_("previous declaration"));
}
- default_tagless_destructor = destructor;
+ default_tagless_destructor = *destructor;
}
void
-default_tagged_printer_set (code_props printer)
+default_tagged_printer_set (code_props const *printer)
{
- if (code_props_code_get (default_tagged_printer))
+ if (default_tagged_printer.code)
{
- complain_at (code_props_location_get (printer),
+ complain_at (printer->location,
_("redeclaration for default tagged %%printer"));
- complain_at (code_props_location_get (default_tagged_printer),
+ complain_at (default_tagged_printer.location,
_("previous declaration"));
}
- default_tagged_printer = printer;
+ default_tagged_printer = *printer;
}
void
-default_tagless_printer_set (code_props printer)
+default_tagless_printer_set (code_props const *printer)
{
- if (code_props_code_get (default_tagless_printer))
+ if (default_tagless_printer.code)
{
- complain_at (code_props_location_get (printer),
+ complain_at (printer->location,
_("redeclaration for default tagless %%printer"));
- complain_at (code_props_location_get (default_tagless_printer),
+ complain_at (default_tagless_printer.location,
_("previous declaration"));
}
- default_tagless_printer = printer;
+ default_tagless_printer = *printer;
}
-