X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1a31ed21b1013f6bf6bbbb4aac07c4249764371f..78bcec17c82fe777c90f86717773de35bb5018e7:/src/symtab.c diff --git a/src/symtab.c b/src/symtab.c index bb1b275e..2eb2368f 100644 --- a/src/symtab.c +++ b/src/symtab.c @@ -32,8 +32,8 @@ 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; @@ -51,11 +51,13 @@ symbol_new (const char *tag, location_t location) res->type_name = NULL; res->destructor = NULL; + res->printer = 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; res->class = unknown_sym; @@ -64,41 +66,6 @@ symbol_new (const char *tag, location_t location) } -/*-----------------------------------------------------------------. -| Return the tag of this SYMBOL in a printable form. Warning: use | -| the first QUOTEARG slot: 0. | -`-----------------------------------------------------------------*/ - -const char * -symbol_tag_get (symbol_t *symbol) -{ - return quotearg_style (escape_quoting_style, symbol->tag); -} - - -/*------------------------------------------------------------. -| Return the tag of this SYMBOL in a printable form. Use the | -| QUOTEARG slot number N. | -`------------------------------------------------------------*/ - -const char * -symbol_tag_get_n (symbol_t *symbol, int n) -{ - return quotearg_n_style (n, escape_quoting_style, symbol->tag); -} - - -/*-------------------------------. -| Print the tag of this SYMBOL. | -`-------------------------------*/ - -void -symbol_tag_print (symbol_t *symbol, FILE *out) -{ - fputs (symbol_tag_get (symbol), out); -} - - /*------------------------------------------------------------------. | Set the TYPE_NAME associated to SYMBOL. Does nothing if passed 0 | | as TYPE_NAME. | @@ -111,7 +78,7 @@ symbol_type_set (symbol_t *symbol, char *type_name, location_t location) { if (symbol->type_name) complain_at (location, - _("type redeclaration for %s"), symbol_tag_get (symbol)); + _("type redeclaration for %s"), symbol->tag); symbol->type_name = type_name; } } @@ -129,7 +96,7 @@ symbol_destructor_set (symbol_t *symbol, char *destructor, location_t location) if (symbol->destructor) complain_at (location, _("%s redeclaration for %s"), - "%destructor", symbol_tag_get (symbol)); + "%destructor", symbol->tag); symbol->destructor = destructor; symbol->destructor_location = location; } @@ -148,7 +115,7 @@ symbol_printer_set (symbol_t *symbol, char *printer, location_t location) if (symbol->printer) complain_at (location, _("%s redeclaration for %s"), - "%printer", symbol_tag_get (symbol)); + "%printer", symbol->tag); symbol->printer = printer; symbol->printer_location = location; } @@ -162,14 +129,14 @@ symbol_printer_set (symbol_t *symbol, char *printer, location_t location) 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) { if (symbol->prec != 0) complain_at (location, _("redefining precedence of %s"), - symbol_tag_get (symbol)); + symbol->tag); symbol->prec = prec; symbol->assoc = assoc; } @@ -187,7 +154,7 @@ void symbol_class_set (symbol_t *symbol, symbol_class class, location_t location) { if (symbol->class != unknown_sym && symbol->class != class) - complain_at (location, _("symbol %s redefined"), symbol_tag_get (symbol)); + complain_at (location, _("symbol %s redefined"), symbol->tag); if (class == nterm_sym && symbol->class != nterm_sym) symbol->number = nvars++; @@ -211,14 +178,14 @@ symbol_user_token_number_set (symbol_t *symbol, if (symbol->user_token_number != USER_NUMBER_UNDEFINED && symbol->user_token_number != user_token_number) complain_at (location, _("redefining user token number of %s"), - symbol_tag_get (symbol)); + 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; @@ -256,12 +223,12 @@ symbol_check_defined (symbol_t *this) complain_at (this->location, _("symbol %s is used, but is not defined as a token and has no rules"), - symbol_tag_get (this)); + this->tag); this->class = nterm_sym; this->number = nvars++; } - return TRUE; + return true; } @@ -271,14 +238,14 @@ symbol_check_defined (symbol_t *this) `-------------------------------------------------------------------*/ 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"), - symbol_tag_get (symval)); + 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"), - symbol_tag_get (symbol)); + warn_at (loc, _("symbol `%s' given more than one literal string"), + symbol->tag); else { symval->class = token_sym; @@ -310,8 +277,9 @@ symbol_check_alias_consistence (symbol_t *this) if (this->prec != this->alias->prec) { if (this->prec != 0 && this->alias->prec != 0) - complain (_("conflicting precedences for %s and %s"), - symbol_tag_get (this), symbol_tag_get (this->alias)); + 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 @@ -320,20 +288,18 @@ symbol_check_alias_consistence (symbol_t *this) 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"), - symbol_tag_get (this), symbol_tag_get (this->alias)); - 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; } @@ -356,7 +322,7 @@ symbol_pack (symbol_t *this) 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 { @@ -366,7 +332,7 @@ symbol_pack (symbol_t *this) } /* Do not do processing below for USER_NUMBER_ALIASs. */ if (this->user_token_number == USER_NUMBER_ALIAS) - return TRUE; + return true; } else /* this->class == token_sym */ { @@ -374,7 +340,7 @@ symbol_pack (symbol_t *this) } symbols[this->number] = this; - return TRUE; + return true; } @@ -393,14 +359,15 @@ symbol_translation (symbol_t *this) { /* 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"), - symbol_tag_get (symbols[token_translations[this->user_token_number]]), - symbol_tag_get (this), 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; } @@ -416,7 +383,7 @@ static struct hash_table *symbol_table = NULL; static bool hash_compare_symbol_t (const symbol_t *m1, const symbol_t *m2) { - return strcmp (m1->tag, m2->tag) ? FALSE : TRUE; + return strcmp (m1->tag, m2->tag) == 0; } static unsigned int @@ -447,12 +414,14 @@ symbols_new (void) `----------------------------------------------------------------*/ symbol_t * -getsym (const char *key, location_t location) +symbol_get (const char *key, location_t location) { symbol_t probe; symbol_t *entry; - (const char *) probe.tag = key; + /* Keep the symbol in a printable form. */ + key = quotearg_style (escape_quoting_style, key); + *(char const **) &probe.tag = key; entry = hash_lookup (symbol_table, &probe); if (!entry) @@ -465,6 +434,28 @@ getsym (const char *key, location_t location) } +/*------------------------------------------------------------------. +| Generate a dummy nonterminal, whose name cannot conflict with the | +| user's names. | +`------------------------------------------------------------------*/ + +symbol_t * +dummy_symbol_get (location_t location) +{ + /* Incremented for each generated symbol. */ + static int dummy_count = 0; + static char buf[256]; + + symbol_t *sym; + + sprintf (buf, "@%d", ++dummy_count); + sym = symbol_get (buf, location); + sym->class = nterm_sym; + sym->number = nvars++; + return sym; +} + + /*-------------------. | Free the symbols. | `-------------------*/ @@ -473,6 +464,7 @@ void symbols_free (void) { hash_free (symbol_table); + free (symbols); } @@ -509,7 +501,7 @@ symbols_check_defined (void) 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 @@ -523,7 +515,7 @@ symbols_token_translations_init (void) 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; } } @@ -548,8 +540,8 @@ symbols_token_translations_init (void) 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); @@ -574,9 +566,9 @@ symbols_pack (void) if (startsymbol->class == unknown_sym) fatal_at (startsymbol_location, _("the start symbol %s is undefined"), - symbol_tag_get (startsymbol)); + startsymbol->tag); else if (startsymbol->class == token_sym) fatal_at (startsymbol_location, _("the start symbol %s is a token"), - symbol_tag_get (startsymbol)); + startsymbol->tag); }