/* Symbol table manager for Bison.
- Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2006 Free
+ Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
+#include <config.h>
#include "system.h"
#include <hash.h>
static symbol *
symbol_new (uniqstr tag, location loc)
{
- symbol *res = MALLOC (res, 1);
+ symbol *res = xmalloc (sizeof *res);
uniqstr_assert (tag);
res->tag = tag;
res->alias = NULL;
res->class = unknown_sym;
+ res->declared = false;
+ if (nsyms == SYMBOL_NUMBER_MAXIMUM)
+ fatal (_("too many symbols in input grammar (limit is %d)"),
+ SYMBOL_NUMBER_MAXIMUM);
nsyms++;
return res;
}
+/*-----------------.
+| Print a symbol. |
+`-----------------*/
+
+#define SYMBOL_ATTR_PRINT(Attr) \
+ if (s->Attr) \
+ fprintf (f, " %s { %s }", #Attr, s->Attr)
+
+void
+symbol_print (symbol *s, FILE *f)
+{
+ if (s)
+ {
+ fprintf (f, "\"%s\"", s->tag);
+ SYMBOL_ATTR_PRINT (type_name);
+ SYMBOL_ATTR_PRINT (destructor);
+ SYMBOL_ATTR_PRINT (printer);
+ }
+ else
+ fprintf (f, "<NULL>");
+}
+
+#undef SYMBOL_ATTR_PRINT
+
+/*------------------------------------------------------------------.
+| Complain that S's WHAT is redeclared at SECOND, and was first set |
+| at FIRST. |
+`------------------------------------------------------------------*/
+
+static void
+redeclaration (symbol* s, const char *what, location first, location second)
+{
+ complain_at (second, _("%s redeclaration for %s"), what, s->tag);
+ complain_at (first, _("first declaration"));
+}
+
+
/*-----------------------------------------------------------------.
| Set the TYPE_NAME associated with SYM. Does nothing if passed 0 |
| as TYPE_NAME. |
if (type_name)
{
if (sym->type_name)
- complain_at (loc, _("type redeclaration for %s"), sym->tag);
+ redeclaration (sym, "%type", sym->type_location, loc);
uniqstr_assert (type_name);
sym->type_name = type_name;
+ sym->type_location = loc;
}
}
`------------------------------------------------------------------*/
void
-symbol_destructor_set (symbol *sym, char *destructor, location loc)
+symbol_destructor_set (symbol *sym, const char *destructor, location loc)
{
if (destructor)
{
if (sym->destructor)
- complain_at (loc, _("%s redeclaration for %s"),
- "%destructor", sym->tag);
+ redeclaration (sym, "%destructor", sym->destructor_location, loc);
sym->destructor = destructor;
sym->destructor_location = loc;
}
`---------------------------------------------------------------*/
void
-symbol_printer_set (symbol *sym, char *printer, location loc)
+symbol_printer_set (symbol *sym, const char *printer, location loc)
{
if (printer)
{
if (sym->printer)
- complain_at (loc, _("%s redeclaration for %s"),
- "%printer", sym->tag);
+ redeclaration (sym, "%printer", sym->destructor_location, loc);
sym->printer = printer;
sym->printer_location = loc;
}
if (a != undef_assoc)
{
if (sym->prec != 0)
- complain_at (loc, _("redefining precedence of %s"), sym->tag);
+ redeclaration (sym, assoc_to_string (a), sym->prec_location, loc);
sym->prec = prec;
sym->assoc = a;
+ sym->prec_location = loc;
}
/* Only terminals have a precedence. */
- symbol_class_set (sym, token_sym, loc);
+ symbol_class_set (sym, token_sym, loc, false);
}
`------------------------------------*/
void
-symbol_class_set (symbol *sym, symbol_class class, location loc)
+symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
{
if (sym->class != unknown_sym && sym->class != class)
- complain_at (loc, _("symbol %s redefined"), sym->tag);
+ {
+ complain_at (loc, _("symbol %s redefined"), sym->tag);
+ sym->declared = false;
+ }
if (class == nterm_sym && sym->class != nterm_sym)
sym->number = nvars++;
sym->number = ntokens++;
sym->class = class;
+
+ if (declaring)
+ {
+ if (sym->declared)
+ warn_at (loc, _("symbol %s redeclared"), sym->tag);
+ sym->declared = true;
+ }
}
void
symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
{
- if (sym->class != token_sym)
- abort ();
+ assert (sym->class == token_sym);
if (sym->user_token_number != USER_NUMBER_UNDEFINED
&& sym->user_token_number != user_token_number)
/*------------------------------------------------------------------.
| Declare the new symbol SYM. Make it an alias of SYMVAL, and type |
-| them with TYPENAME. |
+| SYMVAL with SYM's type. |
`------------------------------------------------------------------*/
void
{
if (symval->alias)
warn_at (loc, _("symbol `%s' used more than once as a literal string"),
- symval->tag);
+ symval->tag);
else if (sym->alias)
warn_at (loc, _("symbol `%s' given more than one literal string"),
- sym->tag);
+ sym->tag);
else
{
symval->class = token_sym;
/* sym and symval combined are only one symbol. */
nsyms--;
ntokens--;
- if (ntokens != sym->number && ntokens != symval->number)
- abort ();
+ assert (ntokens == sym->number || ntokens == symval->number);
sym->number = symval->number =
(symval->number < sym->number) ? symval->number : sym->number;
+ symbol_type_set (symval, sym->type_name, loc);
}
}
| associativity. |
`---------------------------------------------------------*/
-static inline bool
+static inline void
symbol_check_alias_consistency (symbol *this)
{
- /* Check only those who _are_ the aliases. */
- if (this->alias && this->user_token_number == USER_NUMBER_ALIAS)
+ symbol *alias = this;
+ symbol *orig = this->alias;
+
+ /* Check only those that _are_ the aliases. */
+ if (!(this->alias && this->user_token_number == USER_NUMBER_ALIAS))
+ return;
+
+ if (orig->type_name != alias->type_name)
{
- if (this->prec != this->alias->prec)
- {
- if (this->prec != 0 && this->alias->prec != 0)
- complain_at (this->alias->location,
- _("conflicting precedences for %s and %s"),
- this->tag, this->alias->tag);
- if (this->prec != 0)
- this->alias->prec = this->prec;
- else
- this->prec = this->alias->prec;
- }
+ if (orig->type_name)
+ symbol_type_set (alias, orig->type_name, orig->type_location);
+ else
+ symbol_type_set (orig, alias->type_name, alias->type_location);
+ }
- if (this->assoc != this->alias->assoc)
- {
- if (this->assoc != undef_assoc && this->alias->assoc != undef_assoc)
- complain_at (this->alias->location,
- _("conflicting associativities for %s (%s) and %s (%s)"),
- this->tag, assoc_to_string (this->assoc),
- this->alias->tag, assoc_to_string (this->alias->assoc));
- if (this->assoc != undef_assoc)
- this->alias->assoc = this->assoc;
- else
- this->assoc = this->alias->assoc;
- }
+
+ if (orig->destructor || alias->destructor)
+ {
+ if (orig->destructor)
+ symbol_destructor_set (alias, orig->destructor,
+ orig->destructor_location);
+ else
+ symbol_destructor_set (orig, alias->destructor,
+ alias->destructor_location);
+ }
+
+ if (orig->printer || alias->printer)
+ {
+ if (orig->printer)
+ symbol_printer_set (alias, orig->printer, orig->printer_location);
+ else
+ symbol_printer_set (orig, alias->printer, alias->printer_location);
+ }
+
+ if (alias->prec || orig->prec)
+ {
+ if (orig->prec)
+ symbol_precedence_set (alias, orig->prec, orig->assoc,
+ orig->prec_location);
+ else
+ symbol_precedence_set (orig, alias->prec, alias->assoc,
+ alias->prec_location);
}
- return true;
}
static bool
symbol_check_alias_consistency_processor (void *this,
void *null ATTRIBUTE_UNUSED)
{
- return symbol_check_alias_consistency (this);
+ symbol_check_alias_consistency (this);
+ return true;
}
this->number = this->alias->number = 0;
else
{
- if (this->alias->number == NUMBER_UNDEFINED)
- abort ();
+ assert (this->alias->number != NUMBER_UNDEFINED);
this->number = this->alias->number;
}
}
return true;
}
else /* this->class == token_sym */
- {
- if (this->number == NUMBER_UNDEFINED)
- abort ();
- }
+ assert (this->number != NUMBER_UNDEFINED);
symbols[this->number] = this;
return true;
return hash_compare_symbol (m1, m2);
}
-static inline unsigned int
-hash_symbol (const symbol *m, unsigned int tablesize)
+static inline size_t
+hash_symbol (const symbol *m, size_t tablesize)
{
/* Since tags are unique, we can hash the pointer itself. */
return ((uintptr_t) m->tag) % tablesize;
}
-static unsigned int
-hash_symbol_hasher (void const *m, unsigned int tablesize)
+static size_t
+hash_symbol_hasher (void const *m, size_t tablesize)
{
return hash_symbol (m, tablesize);
}
symbol probe;
symbol *entry;
- /* Keep the symbol in a printable form. */
- key = uniqstr_new (quotearg_style (escape_quoting_style, key));
+ key = uniqstr_new (key);
probe.tag = key;
entry = hash_lookup (symbol_table, &probe);
max_user_token_number = this->user_token_number;
}
- CALLOC (token_translations, max_user_token_number + 1);
+ token_translations = xnmalloc (max_user_token_number + 1,
+ sizeof *token_translations);
/* Initialize all entries for literal tokens to 2, the internal
token number for $undefined, which represents all invalid inputs.
void
symbols_pack (void)
{
- CALLOC (symbols, nsyms);
+ symbols = xcalloc (nsyms, sizeof *symbols);
symbols_do (symbol_check_alias_consistency_processor, NULL);
symbols_do (symbol_pack_processor, NULL);
projects / bison.git / blobdiff