* data/bison.simple (yyr1): Don't use yy_token_number_type as element

type; it isn't always big enough, since it doesn't necessarily
include non-terminals.
(yytranslate): Expand definition of yy_token_number_type, so that
the latter can be removed.
(yy_token_number_type): Remove, only one use.
* data/bison.c++ (r1_): Parallel change to yyr1 in bison.simple---
don't use TokenNumberType as element type.

* tests/regression.at: Modify expected output to agree with change
to yyr1 and yytranslate.
This commit is contained in:
Paul Hilfinger
2002-05-20 22:56:53 +00:00
parent 6390a83f8b
commit c0c9ea051b
4 changed files with 20 additions and 7 deletions

View File

@@ -463,7 +463,7 @@ AT_CHECK([bison -v input.y -o input.c])
# Check only the tables. We don't use --no-parser, because it is
# still to be implemented in the experimental branch of Bison.
AT_CHECK([[sed -n 's/ *$//;/^static const.*\[\] =/,/^}/p' input.c]], 0,
[[static const yy_token_number_type yytranslate[] =
[[static const unsigned char yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -515,7 +515,7 @@ static const short yytoknum[] =
{
0, 256, 257, 258, 259, 260, 261, -1
};
static const yy_token_number_type yyr1[] =
static const unsigned char yyr1[] =
{
0, 7, 8, 9, 9, 10, 11
};