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 const char *default_tagged_destructor = NULL;
+static location default_tagged_destructor_location;
+static const char *default_tagless_destructor = NULL;
+static location default_tagless_destructor_location;
+
+static const char *default_tagged_printer = NULL;
+static location default_tagged_printer_location;
+static const char *default_tagless_printer = NULL;
+static location default_tagless_printer_location;
/*---------------------------------.
| Create a new symbol, named TAG. |
if (nsyms == SYMBOL_NUMBER_MAXIMUM)
fatal (_("too many symbols in input grammar (limit is %d)"),
SYMBOL_NUMBER_MAXIMUM);
- if (tag[0] != '"')
- nsyms++;
+ nsyms++;
+ 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;
+ res->destructor = NULL;
+ res->printer = NULL;
+
return res;
}
`------------------------------------------------------------------*/
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 |
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;
if (destructor)
{
if (sym->destructor)
- redeclaration (sym, "%destructor", sym->destructor_location, loc);
+ symbol_redeclaration (sym, "%destructor", sym->destructor_location,
+ loc);
sym->destructor = destructor;
sym->destructor_location = loc;
}
}
+/*-------------------------------------------------------------------.
+| Set the DESTRUCTOR associated with TYPE. Do nothing if passed 0. |
+`-------------------------------------------------------------------*/
+
+void
+semantic_type_destructor_set (semantic_type *type, const char *destructor,
+ location loc)
+{
+ if (destructor)
+ {
+ if (type->destructor)
+ semantic_type_redeclaration (type, "%destructor",
+ type->destructor_location, loc);
+ type->destructor = destructor;
+ type->destructor_location = loc;
+ }
+}
+
/*---------------------------------------.
| Get the computed %destructor for SYM. |
`---------------------------------------*/
const char *
symbol_destructor_get (symbol *sym)
{
- /* Token 0 cannot have a %destructor unless the user renames it. */
- if (UNIQSTR_EQ (sym->tag, uniqstr_new ("$end")))
- return NULL;
-
+ /* Per-symbol %destructor. */
if (sym->destructor != NULL)
return sym->destructor;
- return default_destructor;
+
+ /* Per-type %destructor. */
+ if (sym->type_name)
+ {
+ semantic_type *type = semantic_type_get (sym->type_name);
+ if (type->destructor)
+ return type->destructor;
+ }
+
+ /* Apply default %destructor's only to user-defined symbols. */
+ if (sym->tag[0] == '$' || sym == errtoken)
+ return NULL;
+
+ if (sym->type_name)
+ return default_tagged_destructor;
+ return default_tagless_destructor;
}
/*---------------------------------------------------------------.
{
if (sym->destructor != NULL)
return sym->destructor_location;
- return default_destructor_location;
+ if (sym->type_name)
+ {
+ semantic_type *type = semantic_type_get (sym->type_name);
+ if (type->destructor)
+ return type->destructor_location;
+ return default_tagged_destructor_location;
+ }
+ return default_tagless_destructor_location;
}
/*---------------------------------------------------------------.
if (printer)
{
if (sym->printer)
- redeclaration (sym, "%printer", sym->printer_location, loc);
+ symbol_redeclaration (sym, "%printer", sym->printer_location, loc);
sym->printer = printer;
sym->printer_location = loc;
}
}
+/*----------------------------------------------------------------.
+| Set the PRINTER associated with TYPE. Do nothing if passed 0. |
+`----------------------------------------------------------------*/
+
+void
+semantic_type_printer_set (semantic_type *type, const char *printer,
+ location loc)
+{
+ if (printer)
+ {
+ if (type->printer)
+ semantic_type_redeclaration (type, "%printer", type->printer_location,
+ loc);
+ type->printer = printer;
+ type->printer_location = loc;
+ }
+}
+
/*------------------------------------.
| Get the computed %printer for SYM. |
`------------------------------------*/
const char *
symbol_printer_get (symbol *sym)
{
- /* Token 0 cannot have a %printer unless the user renames it. */
- if (UNIQSTR_EQ (sym->tag, uniqstr_new ("$end")))
- return NULL;
-
+ /* Per-symbol %printer. */
if (sym->printer != NULL)
return sym->printer;
- return default_printer;
+
+ /* Per-type %printer. */
+ if (sym->type_name)
+ {
+ semantic_type *type = semantic_type_get (sym->type_name);
+ if (type->printer)
+ return type->printer;
+ }
+
+ /* Apply the default %printer only to user-defined symbols. */
+ if (sym->tag[0] == '$' || sym == errtoken)
+ return NULL;
+
+ if (sym->type_name)
+ return default_tagged_printer;
+ return default_tagless_printer;
}
/*------------------------------------------------------------.
{
if (sym->printer != NULL)
return sym->printer_location;
- return default_printer_location;
+ if (sym->type_name)
+ {
+ semantic_type *type = semantic_type_get (sym->type_name);
+ if (type->printer)
+ return type->printer_location;
+ return default_tagged_printer_location;
+ }
+ return default_tagless_printer_location;
}
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;
if (class == nterm_sym && sym->class != nterm_sym)
sym->number = nvars++;
- else if (class == token_sym && sym->number == NUMBER_UNDEFINED
- && sym->tag[0] != '"')
+ else if (class == token_sym && sym->number == NUMBER_UNDEFINED)
sym->number = ntokens++;
sym->class = class;
{
int *user_token_numberp;
- assert (sym->class == token_sym);
+ aver (sym->class == token_sym);
if (sym->user_token_number != USER_NUMBER_ALIAS)
user_token_numberp = &sym->user_token_number;
symbol *alias = this;
symbol *orig = this->alias;
- if (this->tag[0] == '"' && !this->alias)
- complain_at (this->location, _("%s undeclared"), this->tag);
-
/* Check only those that _are_ the aliases. */
if (!(this->alias && this->user_token_number == USER_NUMBER_ALIAS))
return;
this->number = this->alias->number = 0;
else
{
- assert (this->alias->number != NUMBER_UNDEFINED);
+ aver (this->alias->number != NUMBER_UNDEFINED);
this->number = this->alias->number;
}
}
return true;
}
else /* this->class == token_sym */
- assert (this->number != NUMBER_UNDEFINED);
+ aver (this->number != NUMBER_UNDEFINED);
symbols[this->number] = this;
return true;
}
-/*----------------------.
-| 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)
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)
{
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. |
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);
}
}
+/*-----------------------------------------------------------------------.
+| 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. |
}
+/*-----------------------------------------------------------------------.
+| 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. |
symbol *sym;
- sprintf (buf, "@%d", ++dummy_count);
+ sprintf (buf, "$@%d", ++dummy_count);
sym = symbol_get (buf, loc);
sym->class = nterm_sym;
sym->number = nvars++;
return sym;
}
+bool
+symbol_is_dummy (const symbol *sym)
+{
+ return sym->tag[0] == '@' || (sym->tag[0] == '$' && sym->tag[1] == '@');
+}
/*-------------------.
| Free the symbols. |
symbols_free (void)
{
hash_free (symbol_table);
+ hash_free (semantic_type_table);
free (symbols);
}
void
symbols_pack (void)
{
- symbols = xcalloc (nsyms, sizeof *symbols);
-
symbols_do (symbol_check_alias_consistency_processor, NULL);
- if (complaint_issued)
- return;
+
+ symbols = xcalloc (nsyms, sizeof *symbols);
symbols_do (symbol_pack_processor, NULL);
+ /* Aliases leave empty slots in symbols, so remove them. */
+ {
+ int writei;
+ int readi;
+ int nsyms_old = nsyms;
+ for (writei = 0, readi = 0; readi < nsyms_old; readi += 1)
+ {
+ if (symbols[readi] == NULL)
+ {
+ nsyms -= 1;
+ ntokens -= 1;
+ }
+ else
+ {
+ symbols[writei] = symbols[readi];
+ symbols[writei]->number = writei;
+ if (symbols[writei]->alias)
+ symbols[writei]->alias->number = writei;
+ writei += 1;
+ }
+ }
+ }
+ symbols = xnrealloc (symbols, nsyms, sizeof *symbols);
+
symbols_token_translations_init ();
if (startsymbol->class == unknown_sym)
}
-/*-----------------------------------.
-| Set default %destructor/%printer. |
-`-----------------------------------*/
+/*--------------------------------------------------.
+| Set default tagged/tagless %destructor/%printer. |
+`--------------------------------------------------*/
+
+void
+default_tagged_destructor_set (const char *destructor, location loc)
+{
+ if (default_tagged_destructor != NULL)
+ {
+ complain_at (loc, _("redeclaration for default tagged %%destructor"));
+ complain_at (default_tagged_destructor_location,
+ _("previous declaration"));
+ }
+ default_tagged_destructor = destructor;
+ default_tagged_destructor_location = loc;
+}
+
+void
+default_tagless_destructor_set (const char *destructor, location loc)
+{
+ if (default_tagless_destructor != NULL)
+ {
+ complain_at (loc, _("redeclaration for default tagless %%destructor"));
+ complain_at (default_tagless_destructor_location,
+ _("previous declaration"));
+ }
+ default_tagless_destructor = destructor;
+ default_tagless_destructor_location = loc;
+}
void
-default_destructor_set (const char *destructor, location loc)
+default_tagged_printer_set (const char *printer, location loc)
{
- if (default_destructor != NULL)
+ if (default_tagged_printer != NULL)
{
- complain_at (loc, _("redeclaration for default %%destructor"));
- complain_at (default_destructor_location, _("previous declaration"));
+ complain_at (loc, _("redeclaration for default tagged %%printer"));
+ complain_at (default_tagged_printer_location,
+ _("previous declaration"));
}
- default_destructor = destructor;
- default_destructor_location = loc;
+ default_tagged_printer = printer;
+ default_tagged_printer_location = loc;
}
void
-default_printer_set (const char *printer, location loc)
+default_tagless_printer_set (const char *printer, location loc)
{
- if (default_printer != NULL)
+ if (default_tagless_printer != NULL)
{
- complain_at (loc, _("redeclaration for default %%printer"));
- complain_at (default_printer_location, _("previous declaration"));
+ complain_at (loc, _("redeclaration for default tagless %%printer"));
+ complain_at (default_tagless_printer_location,
+ _("previous declaration"));
}
- default_printer = printer;
- default_printer_location = loc;
+ default_tagless_printer = printer;
+ default_tagless_printer_location = loc;
}
projects / bison.git / blobdiff