Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-10 21:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Redo some of the previous commit: add back the ability to use

Browse Source 
non-aliased/undeclared string literals since it might be useful to
those declaring %token-table.
* src/reader.c (check_and_convert_grammar): Undo changes in previous
commit: don't worry about complaints from symbols_pack.
* src/symtab.c (symbol_new, symbol_class_set,
symbol_check_alias_consistency): Undo changes in previous commit: count         each string literal as a new symbol and token, assign it a symbol
number, and don't complain about non-aliased string literals.
(symbols_pack): Since symbol_make_alias still does not decrement symbol
and token counts but does still set aliased tokens to the same number,
symbol_pack_processor now leaves empty slots in the symbols array.
Remove those slots.
* tests/regression.at (Undeclared string literal): Remove test case
added in previous commit since non-aliased string literals are allowed
again.
(Characters Escapes, Web2c Actions): Undo changes in previous commit:
remove unnecessary string literal declarations.
* tests/sets.at (Firsts): Likewise.
This commit is contained in:
Joel E. Denny
2006-08-18 21:43:18 +00:00
parent 965537bc54
commit 6d0ef4ec20
5 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/reader.c
View File

@@ -630,8 +630,7 @@ check_and_convert_grammar (void)
symbols_pack ();
/* Convert the grammar into the format described in gram.h. */
if (!complaint_issued)
packgram ();
packgram ();
/* The grammar as a symbol_list is no longer needed. */
LIST_FREE (symbol_list, grammar);

39
src/symtab.c
View File

@@ -79,8 +79,7 @@ symbol_new (uniqstr tag, location loc)
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;
}
@@ -267,8 +266,7 @@ symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
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;
@@ -380,9 +378,6 @@ symbol_check_alias_consistency (symbol *this)
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;
@@ -720,13 +715,35 @@ symbols_token_translations_init (void)
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)