X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9350499cfce9122ebb065a582ab17e321b2e8ff3..e0c653e7e660c353c59b054de571474450aa4c92:/src/symtab.c
diff --git a/src/symtab.c b/src/symtab.c
index 92d892a5..b65bdd48 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,24 +1,22 @@
/* Symbol table manager for Bison.
- Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2006 Free
- Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008
+ 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"
@@ -41,14 +39,14 @@ symbol *accept = NULL;
symbol *startsymbol = NULL;
location startsymbol_location;
-/*-----------------------------------.
-| Default %destructor and %printer. |
-`-----------------------------------*/
+/*---------------------------------------.
+| Default %destructor's and %printer's. |
+`---------------------------------------*/
-static const char *default_destructor = NULL;
-static location default_destructor_location;
-static const char *default_printer = NULL;
-static location default_printer_location;
+static code_props default_tagged_destructor = CODE_PROPS_NONE_INIT;
+static code_props default_tagless_destructor = CODE_PROPS_NONE_INIT;
+static code_props default_tagged_printer = CODE_PROPS_NONE_INIT;
+static code_props default_tagless_printer = CODE_PROPS_NONE_INIT;
/*---------------------------------.
| Create a new symbol, named TAG. |
@@ -64,8 +62,8 @@ symbol_new (uniqstr tag, location loc)
res->location = loc;
res->type_name = NULL;
- res->destructor = NULL;
- res->printer = NULL;
+ code_props_none_init (&res->destructor);
+ code_props_none_init (&res->printer);
res->number = NUMBER_UNDEFINED;
res->prec = 0;
@@ -83,6 +81,23 @@ symbol_new (uniqstr tag, location loc)
return res;
}
+/*----------------------------------------.
+| Create a new semantic type, named TAG. |
+`----------------------------------------*/
+
+static semantic_type *
+semantic_type_new (uniqstr tag)
+{
+ semantic_type *res = xmalloc (sizeof *res);
+
+ uniqstr_assert (tag);
+ res->tag = tag;
+ code_props_none_init (&res->destructor);
+ code_props_none_init (&res->printer);
+
+ return res;
+}
+
/*-----------------.
| Print a symbol. |
@@ -92,6 +107,10 @@ symbol_new (uniqstr tag, location loc)
if (s->Attr) \
fprintf (f, " %s { %s }", #Attr, 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)
{
@@ -99,14 +118,50 @@ symbol_print (symbol *s, FILE *f)
{
fprintf (f, "\"%s\"", s->tag);
SYMBOL_ATTR_PRINT (type_name);
- SYMBOL_ATTR_PRINT (destructor);
- SYMBOL_ATTR_PRINT (printer);
+ SYMBOL_CODE_PRINT (destructor);
+ SYMBOL_CODE_PRINT (printer);
}
else
fprintf (f, "");
}
#undef SYMBOL_ATTR_PRINT
+#undef SYMBOL_CODE_PRINT
+
+
+/*----------------------------------.
+| Whether S is a valid identifier. |
+`----------------------------------*/
+
+static bool
+is_identifier (uniqstr s)
+{
+ static char const alphanum[26 + 26 + 1 + 10] =
+ "abcdefghijklmnopqrstuvwxyz"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ "_"
+ "0123456789";
+ if (!s || ! memchr (alphanum, *s, sizeof alphanum - 10))
+ return false;
+ for (++s; *s; ++s)
+ if (! memchr (alphanum, *s, sizeof alphanum))
+ return false;
+ return true;
+}
+
+
+/*-----------------------------------------------.
+| Get the identifier associated to this symbol. |
+`-----------------------------------------------*/
+uniqstr
+symbol_id_get (symbol const *sym)
+{
+ aver (sym->user_token_number != USER_NUMBER_ALIAS);
+ if (sym->alias)
+ sym = sym->alias;
+ return is_identifier (sym->tag) ? sym->tag : 0;
+}
+
/*------------------------------------------------------------------.
| Complain that S's WHAT is redeclared at SECOND, and was first set |
@@ -114,12 +169,21 @@ symbol_print (symbol *s, FILE *f)
`------------------------------------------------------------------*/
static void
-redeclaration (symbol* s, const char *what, location first, location second)
+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"));
}
+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"));
+}
+
/*-----------------------------------------------------------------.
| Set the TYPE_NAME associated with SYM. Does nothing if passed 0 |
@@ -132,107 +196,142 @@ symbol_type_set (symbol *sym, uniqstr type_name, location loc)
if (type_name)
{
if (sym->type_name)
- redeclaration (sym, "%type", sym->type_location, loc);
+ symbol_redeclaration (sym, "%type", sym->type_location, loc);
uniqstr_assert (type_name);
sym->type_name = type_name;
sym->type_location = loc;
}
}
+/*-----------------------------------.
+| Get the CLASS associated with SYM. |
+`-----------------------------------*/
-/*------------------------------------------------------------------.
-| Set the DESTRUCTOR associated with SYM. Do nothing if passed 0. |
-`------------------------------------------------------------------*/
-
-void
-symbol_destructor_set (symbol *sym, const char *destructor, location loc)
+const char *
+symbol_class_get_string (symbol *sym)
{
- if (destructor)
+ if (sym->class)
{
- if (sym->destructor)
- redeclaration (sym, "%destructor", sym->destructor_location, loc);
- sym->destructor = destructor;
- sym->destructor_location = loc;
+ if (sym->class == token_sym)
+ return "terminal";
+ else if (sym->class == nterm_sym)
+ return "nonterminal";
}
+ return "unknown";
+}
+
+
+/*-----------------------------------------.
+| Set the DESTRUCTOR associated with SYM. |
+`-----------------------------------------*/
+
+void
+symbol_destructor_set (symbol *sym, code_props const *destructor)
+{
+ if (sym->destructor.code)
+ symbol_redeclaration (sym, "%destructor", sym->destructor.location,
+ destructor->location);
+ sym->destructor = *destructor;
+}
+
+/*------------------------------------------.
+| Set the DESTRUCTOR associated with TYPE. |
+`------------------------------------------*/
+
+void
+semantic_type_destructor_set (semantic_type *type,
+ code_props const *destructor)
+{
+ if (type->destructor.code)
+ semantic_type_redeclaration (type, "%destructor",
+ type->destructor.location,
+ destructor->location);
+ type->destructor = *destructor;
}
/*---------------------------------------.
| Get the computed %destructor for SYM. |
`---------------------------------------*/
-const char *
-symbol_destructor_get (symbol *sym)
+code_props const *
+symbol_destructor_get (symbol const *sym)
{
/* Per-symbol %destructor. */
- if (sym->destructor != NULL)
- return sym->destructor;
+ if (sym->destructor.code)
+ return &sym->destructor;
+
+ /* Per-type %destructor. */
+ if (sym->type_name)
+ {
+ 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;
- /* Apply the default %destructor only to user-defined symbols. */
- if (sym == errtoken || sym == undeftoken || sym == accept
- || UNIQSTR_EQ (sym->tag, uniqstr_new ("$end")))
- return NULL;
- return default_destructor;
+ if (sym->type_name)
+ return &default_tagged_destructor;
+ return &default_tagless_destructor;
}
-/*---------------------------------------------------------------.
-| Get the grammar location of the %destructor computed for SYM. |
-`---------------------------------------------------------------*/
+/*--------------------------------------.
+| Set the PRINTER associated with SYM. |
+`--------------------------------------*/
-location
-symbol_destructor_location_get (symbol *sym)
+void
+symbol_printer_set (symbol *sym, code_props const *printer)
{
- if (sym->destructor != NULL)
- return sym->destructor_location;
- return default_destructor_location;
+ if (sym->printer.code)
+ symbol_redeclaration (sym, "%printer",
+ sym->printer.location, printer->location);
+ sym->printer = *printer;
}
-/*---------------------------------------------------------------.
-| Set the PRINTER associated with SYM. Do nothing if passed 0. |
-`---------------------------------------------------------------*/
+/*---------------------------------------.
+| Set the PRINTER associated with TYPE. |
+`---------------------------------------*/
void
-symbol_printer_set (symbol *sym, const char *printer, location loc)
+semantic_type_printer_set (semantic_type *type, code_props const *printer)
{
- if (printer)
- {
- if (sym->printer)
- redeclaration (sym, "%printer", sym->printer_location, loc);
- sym->printer = printer;
- sym->printer_location = loc;
- }
+ if (type->printer.code)
+ semantic_type_redeclaration (type, "%printer",
+ type->printer.location, printer->location);
+ type->printer = *printer;
}
/*------------------------------------.
| Get the computed %printer for SYM. |
`------------------------------------*/
-const char *
-symbol_printer_get (symbol *sym)
+code_props const *
+symbol_printer_get (symbol const *sym)
{
/* Per-symbol %printer. */
- if (sym->printer != NULL)
- return sym->printer;
+ if (sym->printer.code)
+ return &sym->printer;
- /* Apply the default %printer only to user-defined symbols. */
- if (sym == errtoken || sym == undeftoken || sym == accept
- || UNIQSTR_EQ (sym->tag, uniqstr_new ("$end")))
- return NULL;
- return default_printer;
-}
+ /* Per-type %printer. */
+ if (sym->type_name)
+ {
+ code_props const *printer = &semantic_type_get (sym->type_name)->printer;
+ if (printer->code)
+ return printer;
+ }
-/*------------------------------------------------------------.
-| Get the grammar location of the %printer computed for SYM. |
-`------------------------------------------------------------*/
+ /* Apply the default %printer only to user-defined symbols. */
+ if (sym->tag[0] == '$' || sym == errtoken)
+ return &code_props_none;
-location
-symbol_printer_location_get (symbol *sym)
-{
- if (sym->printer != NULL)
- return sym->printer_location;
- return default_printer_location;
+ if (sym->type_name)
+ return &default_tagged_printer;
+ return &default_tagless_printer;
}
-
/*-----------------------------------------------------------------.
| Set the PRECEDENCE associated with SYM. Does nothing if invoked |
| with UNDEF_ASSOC as ASSOC. |
@@ -244,7 +343,8 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc)
if (a != undef_assoc)
{
if (sym->prec != 0)
- redeclaration (sym, assoc_to_string (a), sym->prec_location, loc);
+ symbol_redeclaration (sym, assoc_to_string (a), sym->prec_location,
+ loc);
sym->prec = prec;
sym->assoc = a;
sym->prec_location = loc;
@@ -293,8 +393,6 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
{
int *user_token_numberp;
- assert (sym->class == token_sym);
-
if (sym->user_token_number != USER_NUMBER_ALIAS)
user_token_numberp = &sym->user_token_number;
else
@@ -395,22 +493,20 @@ symbol_check_alias_consistency (symbol *this)
}
- if (orig->destructor || alias->destructor)
+ if (orig->destructor.code || alias->destructor.code)
{
- if (orig->destructor)
- symbol_destructor_set (alias, orig->destructor,
- orig->destructor_location);
+ if (orig->destructor.code)
+ symbol_destructor_set (alias, &orig->destructor);
else
- symbol_destructor_set (orig, alias->destructor,
- alias->destructor_location);
+ symbol_destructor_set (orig, &alias->destructor);
}
- if (orig->printer || alias->printer)
+ if (orig->printer.code || alias->printer.code)
{
- if (orig->printer)
- symbol_printer_set (alias, orig->printer, orig->printer_location);
+ if (orig->printer.code)
+ symbol_printer_set (alias, &orig->printer);
else
- symbol_printer_set (orig, alias->printer, alias->printer_location);
+ symbol_printer_set (orig, &alias->printer);
}
if (alias->prec || orig->prec)
@@ -456,7 +552,7 @@ symbol_pack (symbol *this)
this->number = this->alias->number = 0;
else
{
- assert (this->alias->number != NUMBER_UNDEFINED);
+ aver (this->alias->number != NUMBER_UNDEFINED);
this->number = this->alias->number;
}
}
@@ -465,7 +561,7 @@ symbol_pack (symbol *this)
return true;
}
else /* this->class == token_sym */
- assert (this->number != NUMBER_UNDEFINED);
+ aver (this->number != NUMBER_UNDEFINED);
symbols[this->number] = this;
return true;
@@ -511,14 +607,15 @@ symbol_translation_processor (void *this, void *null ATTRIBUTE_UNUSED)
}
-/*----------------------.
-| A symbol hash table. |
-`----------------------*/
+/*---------------------------------------.
+| Symbol and semantic type hash tables. |
+`---------------------------------------*/
-/* Initial capacity of symbols hash table. */
+/* Initial capacity of symbol and semantic type hash table. */
#define HT_INITIAL_CAPACITY 257
static struct hash_table *symbol_table = NULL;
+static struct hash_table *semantic_type_table = NULL;
static inline bool
hash_compare_symbol (const symbol *m1, const symbol *m2)
@@ -527,12 +624,25 @@ hash_compare_symbol (const symbol *m1, const symbol *m2)
return UNIQSTR_EQ (m1->tag, m2->tag);
}
+static inline bool
+hash_compare_semantic_type (const semantic_type *m1, const semantic_type *m2)
+{
+ /* Since names are unique, we can compare the pointers themselves. */
+ return UNIQSTR_EQ (m1->tag, m2->tag);
+}
+
static bool
hash_symbol_comparator (void const *m1, void const *m2)
{
return hash_compare_symbol (m1, m2);
}
+static bool
+hash_semantic_type_comparator (void const *m1, void const *m2)
+{
+ return hash_compare_semantic_type (m1, m2);
+}
+
static inline size_t
hash_symbol (const symbol *m, size_t tablesize)
{
@@ -540,12 +650,24 @@ hash_symbol (const symbol *m, size_t tablesize)
return ((uintptr_t) m->tag) % tablesize;
}
+static inline size_t
+hash_semantic_type (const semantic_type *m, size_t tablesize)
+{
+ /* Since names are unique, we can hash the pointer itself. */
+ return ((uintptr_t) m->tag) % tablesize;
+}
+
static size_t
hash_symbol_hasher (void const *m, size_t tablesize)
{
return hash_symbol (m, tablesize);
}
+static size_t
+hash_semantic_type_hasher (void const *m, size_t tablesize)
+{
+ return hash_semantic_type (m, tablesize);
+}
/*-------------------------------.
| Create the symbol hash table. |
@@ -559,6 +681,11 @@ symbols_new (void)
hash_symbol_hasher,
hash_symbol_comparator,
free);
+ semantic_type_table = hash_initialize (HT_INITIAL_CAPACITY,
+ NULL,
+ hash_semantic_type_hasher,
+ hash_semantic_type_comparator,
+ free);
}
@@ -586,6 +713,30 @@ symbol_from_uniqstr (const uniqstr key, location loc)
}
+/*-----------------------------------------------------------------------.
+| Find the semantic type named KEY, and return it. If it does not exist |
+| yet, create it. |
+`-----------------------------------------------------------------------*/
+
+semantic_type *
+semantic_type_from_uniqstr (const uniqstr key)
+{
+ semantic_type probe;
+ semantic_type *entry;
+
+ probe.tag = key;
+ entry = hash_lookup (semantic_type_table, &probe);
+
+ if (!entry)
+ {
+ /* First insertion in the hash. */
+ entry = semantic_type_new (key);
+ hash_insert (semantic_type_table, entry);
+ }
+ return entry;
+}
+
+
/*----------------------------------------------------------------.
| Find the symbol named KEY, and return it. If it does not exist |
| yet, create it. |
@@ -598,6 +749,18 @@ symbol_get (const char *key, location loc)
}
+/*-----------------------------------------------------------------------.
+| Find the semantic type named KEY, and return it. If it does not exist |
+| yet, create it. |
+`-----------------------------------------------------------------------*/
+
+semantic_type *
+semantic_type_get (const char *key)
+{
+ return semantic_type_from_uniqstr (uniqstr_new (key));
+}
+
+
/*------------------------------------------------------------------.
| Generate a dummy nonterminal, whose name cannot conflict with the |
| user's names. |
@@ -612,7 +775,7 @@ dummy_symbol_get (location loc)
symbol *sym;
- sprintf (buf, "@%d", ++dummy_count);
+ sprintf (buf, "$@%d", ++dummy_count);
sym = symbol_get (buf, loc);
sym->class = nterm_sym;
sym->number = nvars++;
@@ -622,7 +785,7 @@ dummy_symbol_get (location loc)
bool
symbol_is_dummy (const symbol *sym)
{
- return sym->tag[0] == '@';
+ return sym->tag[0] == '@' || (sym->tag[0] == '$' && sym->tag[1] == '@');
}
/*-------------------.
@@ -633,6 +796,7 @@ void
symbols_free (void)
{
hash_free (symbol_table);
+ hash_free (semantic_type_table);
free (symbols);
}
@@ -707,9 +871,8 @@ symbols_token_translations_init (void)
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.
- */
+ /* Initialize all entries for literal tokens to the internal token
+ number for $undefined, which represents all invalid inputs. */
for (i = 0; i < max_user_token_number + 1; i++)
token_translations[i] = undeftoken->number;
symbols_do (symbol_translation_processor, NULL);
@@ -766,30 +929,58 @@ symbols_pack (void)
}
-/*-----------------------------------.
-| Set default %destructor/%printer. |
-`-----------------------------------*/
+/*--------------------------------------------------.
+| Set default tagged/tagless %destructor/%printer. |
+`--------------------------------------------------*/
+
+void
+default_tagged_destructor_set (code_props const *destructor)
+{
+ if (default_tagged_destructor.code)
+ {
+ complain_at (destructor->location,
+ _("redeclaration for default tagged %%destructor"));
+ complain_at (default_tagged_destructor.location,
+ _("previous declaration"));
+ }
+ default_tagged_destructor = *destructor;
+}
+
+void
+default_tagless_destructor_set (code_props const *destructor)
+{
+ if (default_tagless_destructor.code)
+ {
+ complain_at (destructor->location,
+ _("redeclaration for default tagless %%destructor"));
+ complain_at (default_tagless_destructor.location,
+ _("previous declaration"));
+ }
+ default_tagless_destructor = *destructor;
+}
void
-default_destructor_set (const char *destructor, location loc)
+default_tagged_printer_set (code_props const *printer)
{
- if (default_destructor != NULL)
+ if (default_tagged_printer.code)
{
- complain_at (loc, _("redeclaration for default %%destructor"));
- complain_at (default_destructor_location, _("previous declaration"));
+ complain_at (printer->location,
+ _("redeclaration for default tagged %%printer"));
+ complain_at (default_tagged_printer.location,
+ _("previous declaration"));
}
- default_destructor = destructor;
- default_destructor_location = loc;
+ default_tagged_printer = *printer;
}
void
-default_printer_set (const char *printer, location loc)
+default_tagless_printer_set (code_props const *printer)
{
- if (default_printer != NULL)
+ if (default_tagless_printer.code)
{
- complain_at (loc, _("redeclaration for default %%printer"));
- complain_at (default_printer_location, _("previous declaration"));
+ complain_at (printer->location,
+ _("redeclaration for default tagless %%printer"));
+ complain_at (default_tagless_printer.location,
+ _("previous declaration"));
}
- default_printer = printer;
- default_printer_location = loc;
+ default_tagless_printer = *printer;
}