* src/reader.c, src/reader.h (user_toknums): Remove.

Adjust all users to use symbols[i]->user_token_number.
This commit is contained in:
Akim Demaille
2001-12-29 14:19:31 +00:00
parent 5a670b1ed9
commit c03ae96659
4 changed files with 16 additions and 8 deletions

View File

@@ -1,3 +1,9 @@
2001-12-29 Akim Demaille <akim@epita.fr>
* src/reader.c, src/reader.h (user_toknums): Remove.
Adjust all users to use symbols[i]->user_token_number.
2001-12-29 Akim Demaille <akim@epita.fr>
* src/gram.c, src/gram.h (sprec, sassoc): Remove.

View File

@@ -276,9 +276,16 @@ output_rule_data (void)
muscle_insert ("tname", obstack_finish (&format_obstack));
/* Output YYTOKNUM. */
output_table_data (&format_obstack, user_toknums,
0, 1, ntokens + 1);
muscle_insert ("toknum", obstack_finish (&format_obstack));
{
short *values = XCALLOC (short, ntokens + 1);
for (i = 0; i < ntokens + 1; ++i)
values[i] = symbols[i]->user_token_number;
output_table_data (&format_obstack, values,
0, 1, ntokens + 1);
muscle_insert ("toknum", obstack_finish (&format_obstack));
XFREE (values);
}
/* Output YYR1. */
{
@@ -1102,7 +1109,6 @@ output (void)
if (semantic_parser)
output_stos ();
output_rule_data ();
XFREE (user_toknums);
output_actions ();
prepare ();

View File

@@ -52,7 +52,6 @@ typedef struct symbol_list
} symbol_list;
int lineno;
short *user_toknums;
static symbol_list *grammar;
static int start_flag;
static bucket *startval;
@@ -1567,7 +1566,6 @@ packsymbols (void)
int tokno = 1;
int last_user_token_number;
user_toknums = XCALLOC (short, nsyms + 1);
symbols = XCALLOC (bucket *, nsyms);
max_user_token_number = 256;
@@ -1640,7 +1638,6 @@ packsymbols (void)
}
symbols[bp->value] = bp;
user_toknums[bp->value] = bp->user_token_number;
}
token_translations_init ();

View File

@@ -31,6 +31,5 @@ extern void reader PARAMS ((void));
extern int lineno;
extern short *user_toknums;
#endif /* !READER_H_ */