mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 04:13:03 +00:00
* 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:
@@ -260,7 +260,7 @@ namespace yy
|
||||
static const short defgoto_[[]];
|
||||
static const short table_[[]];
|
||||
static const short check_[[]];
|
||||
static const TokenNumberType r1_[[]];
|
||||
static const b4_uint_type(b4_r1_max) r1_[[]];
|
||||
static const b4_uint_type(b4_r2_max) r2_[[]];
|
||||
|
||||
#if YYDEBUG || YYERROR_VERBOSE
|
||||
@@ -687,7 +687,7 @@ yy::b4_name::check_[[]] =
|
||||
};
|
||||
|
||||
/* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives. */
|
||||
const yy::b4_name::TokenNumberType
|
||||
const b4_uint_type(b4_r1_max)
|
||||
yy::b4_name::r1_[[]] =
|
||||
{
|
||||
b4_r1
|
||||
|
||||
@@ -332,12 +332,11 @@ b4_token_defines(b4_tokens)
|
||||
#define YYUNDEFTOK b4_undef_token_number
|
||||
#define YYMAXUTOK b4_user_token_number_max
|
||||
|
||||
typedef b4_uint_type(b4_translate_max) yy_token_number_type;
|
||||
#define YYTRANSLATE(X) \
|
||||
((unsigned)(X) <= YYMAXUTOK ? yytranslate[[X]] : YYUNDEFTOK)
|
||||
|
||||
/* YYTRANSLATE[[YYLEX]] -- Bison symbol number corresponding to YYLEX. */
|
||||
static const yy_token_number_type yytranslate[[]] =
|
||||
static const b4_uint_type(b4_translate_max) yytranslate[[]] =
|
||||
{
|
||||
b4_translate
|
||||
};
|
||||
@@ -379,7 +378,7 @@ static const short yytoknum[[]] =
|
||||
};
|
||||
|
||||
/* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives. */
|
||||
static const yy_token_number_type yyr1[[]] =
|
||||
static const b4_uint_type(b4_r1_max) yyr1[[]] =
|
||||
{
|
||||
b4_r1
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user