symbol_t *errtoken = NULL;
symbol_t *undeftoken = NULL;
-symbol_t *eoftoken = NULL;
-symbol_t *axiom = NULL;
+symbol_t *endtoken = NULL;
+symbol_t *accept = NULL;
symbol_t *startsymbol = NULL;
location_t startsymbol_location;
`---------------------------------*/
static symbol_t *
-symbol_new (const char *tag, location_t location)
+symbol_new (struniq_t tag, location_t location)
{
symbol_t *res = XMALLOC (symbol_t, 1);
- res->tag = xstrdup (tag);
+ struniq_assert (tag);
+ res->tag = tag;
res->location = location;
res->type_name = NULL;
res->number = NUMBER_UNDEFINED;
res->prec = 0;
- res->assoc = right_assoc;
+ res->assoc = undef_assoc;
res->user_token_number = USER_NUMBER_UNDEFINED;
res->alias = NULL;
`------------------------------------------------------------------*/
void
-symbol_type_set (symbol_t *symbol, char *type_name, location_t location)
+symbol_type_set (symbol_t *symbol, struniq_t type_name, location_t location)
{
if (type_name)
{
if (symbol->type_name)
complain_at (location,
_("type redeclaration for %s"), symbol->tag);
+ struniq_assert (type_name);
symbol->type_name = type_name;
}
}
/*----------------------------------------------------------------.
-| Set the PRITNER associated to SYMBOL. Do nothing if passed 0. |
+| Set the PRINTER associated to SYMBOL. Do nothing if passed 0. |
`----------------------------------------------------------------*/
void
void
symbol_precedence_set (symbol_t *symbol,
- int prec, associativity assoc, location_t location)
+ int prec, assoc_t assoc, location_t location)
{
if (assoc != undef_assoc)
{
symbol_user_token_number_set (symbol_t *symbol,
int user_token_number, location_t location)
{
- assert (symbol->class == token_sym);
+ if (symbol->class != token_sym)
+ abort ();
if (symbol->user_token_number != USER_NUMBER_UNDEFINED
&& symbol->user_token_number != user_token_number)
symbol->tag);
symbol->user_token_number = user_token_number;
- /* User defined EOF token? */
+ /* User defined $end token? */
if (user_token_number == 0)
{
- eoftoken = symbol;
- eoftoken->number = 0;
+ endtoken = symbol;
+ endtoken->number = 0;
/* It is always mapped to 0, so it was already counted in
NTOKENS. */
--ntokens;
static void
symbol_free (symbol_t *this)
{
-#if 0
- /* This causes crashes because one string can appear more
- than once. */
- XFREE (this->type_name);
-#endif
- XFREE (this->tag);
- XFREE (this);
+ free (this);
}
this->number = nvars++;
}
- return TRUE;
+ return true;
}
`-------------------------------------------------------------------*/
void
-symbol_make_alias (symbol_t *symbol, symbol_t *symval)
+symbol_make_alias (symbol_t *symbol, symbol_t *symval, location_t loc)
{
if (symval->alias)
- warn (_("symbol `%s' used more than once as a literal string"),
+ warn_at (loc, _("symbol `%s' used more than once as a literal string"),
symval->tag);
else if (symbol->alias)
- warn (_("symbol `%s' given more than one literal string"),
+ warn_at (loc, _("symbol `%s' given more than one literal string"),
symbol->tag);
else
{
/* symbol and symval combined are only one symbol */
nsyms--;
ntokens--;
- assert (ntokens == symbol->number || ntokens == symval->number);
+ if (ntokens != symbol->number && ntokens != symval->number)
+ abort ();
symbol->number = symval->number =
(symval->number < symbol->number) ? symval->number : symbol->number;
}
if (this->prec != this->alias->prec)
{
if (this->prec != 0 && this->alias->prec != 0)
- complain (_("conflicting precedences for %s and %s"),
- this->tag, this->alias->tag);
+ 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
if (this->assoc != this->alias->assoc)
{
- /* FIXME: For some reason (probably the S/R => keep the S),
- the right assoc is chosen has the ``not set''. This is
- not nice, fix this! */
- if (this->assoc != right_assoc
- && this->alias->assoc != right_assoc)
- complain (_("conflicting associativities for %s and %s"),
- this->tag, this->alias->tag);
- if (this->assoc != 0)
+ 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;
}
}
- return TRUE;
+ return true;
}
prec and assoc fields and make both the same */
if (this->number == NUMBER_UNDEFINED)
{
- if (this == eoftoken || this->alias == eoftoken)
+ if (this == endtoken || this->alias == endtoken)
this->number = this->alias->number = 0;
else
{
- assert (this->alias->number != NUMBER_UNDEFINED);
+ if (this->alias->number == NUMBER_UNDEFINED)
+ abort ();
this->number = this->alias->number;
}
}
- /* Do not do processing below for USER_NUMBER_ALIASs. */
+ /* Do not do processing below for USER_NUMBER_ALIASes. */
if (this->user_token_number == USER_NUMBER_ALIAS)
- return TRUE;
+ return true;
}
else /* this->class == token_sym */
{
- assert (this->number != NUMBER_UNDEFINED);
+ if (this->number == NUMBER_UNDEFINED)
+ abort ();
}
symbols[this->number] = this;
- return TRUE;
+ return true;
}
{
/* A token which translation has already been set? */
if (token_translations[this->user_token_number] != undeftoken->number)
- complain (_("tokens %s and %s both assigned number %d"),
- symbols[token_translations[this->user_token_number]]->tag,
- this->tag, this->user_token_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);
token_translations[this->user_token_number] = this->number;
}
- return TRUE;
+ return true;
}
static struct hash_table *symbol_table = NULL;
static bool
-hash_compare_symbol_t (const symbol_t *m1, const symbol_t *m2)
+hash_compare_symbol (const symbol_t *m1, const symbol_t *m2)
{
- return strcmp (m1->tag, m2->tag) ? FALSE : TRUE;
+ /* Since tags are unique, we can compare the pointers themselves. */
+ return STRUNIQ_EQ (m1->tag, m2->tag);
}
static unsigned int
-hash_symbol_t (const symbol_t *m, unsigned int tablesize)
+hash_symbol (const symbol_t *m, unsigned int tablesize)
{
- return hash_string (m->tag, tablesize);
+ /* Since tags are unique, we can hash the pointer itself. */
+ return ((size_t) m->tag) % tablesize;
}
{
symbol_table = hash_initialize (HT_INITIAL_CAPACITY,
NULL,
- (Hash_hasher) hash_symbol_t,
- (Hash_comparator) hash_compare_symbol_t,
+ (Hash_hasher) hash_symbol,
+ (Hash_comparator) hash_compare_symbol,
(Hash_data_freer) symbol_free);
}
symbol_t *entry;
/* Keep the symbol in a printable form. */
- key = quotearg_style (escape_quoting_style, key);
- (const char *) probe.tag = key;
+ key = struniq_new (quotearg_style (escape_quoting_style, key));
+ *(char const **) &probe.tag = key;
entry = hash_lookup (symbol_table, &probe);
if (!entry)
symbols_free (void)
{
hash_free (symbol_table);
+ free (symbols);
}
static void
symbols_token_translations_init (void)
{
- int num_256_available_p = TRUE;
+ bool num_256_available_p = true;
int i;
/* Find the highest user token number, and whether 256, the POSIX
if (this->user_token_number > max_user_token_number)
max_user_token_number = this->user_token_number;
if (this->user_token_number == 256)
- num_256_available_p = FALSE;
+ num_256_available_p = false;
}
}
token_translations = XCALLOC (symbol_number_t, max_user_token_number + 1);
/* Initialize all entries for literal tokens to 2, the internal
- token number for $undefined., which represents all invalid
- inputs. */
+ 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, NULL);
projects / bison.git / blobdiff