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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -1,3 +1,17 @@
2002-05-20 Paul Hilfinger <Hilfinger@CS.Berkeley.EDU>
* 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.
2002-05-13 Florian Krohm <florian@edamail.fishkill.ibm.com> 2002-05-13 Florian Krohm <florian@edamail.fishkill.ibm.com>
* src/reader.c (parse_action): Use copy_character instead of * src/reader.c (parse_action): Use copy_character instead of

4
data/bison.c++
View File

@@ -260,7 +260,7 @@ namespace yy
static const short defgoto_[[]]; static const short defgoto_[[]];
static const short table_[[]]; static const short table_[[]];
static const short check_[[]]; 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_[[]]; static const b4_uint_type(b4_r2_max) r2_[[]];
#if YYDEBUG || YYERROR_VERBOSE #if YYDEBUG || YYERROR_VERBOSE
@@ -687,7 +687,7 @@ yy::b4_name::check_[[]] =
}; };
/* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives. */ /* 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_[[]] = yy::b4_name::r1_[[]] =
{ {
b4_r1 b4_r1

5
data/bison.simple
View File

@@ -332,12 +332,11 @@ b4_token_defines(b4_tokens)
#define YYUNDEFTOK b4_undef_token_number #define YYUNDEFTOK b4_undef_token_number
#define YYMAXUTOK b4_user_token_number_max #define YYMAXUTOK b4_user_token_number_max
typedef b4_uint_type(b4_translate_max) yy_token_number_type;
#define YYTRANSLATE(X) \ #define YYTRANSLATE(X) \
((unsigned)(X) <= YYMAXUTOK ? yytranslate[[X]] : YYUNDEFTOK) ((unsigned)(X) <= YYMAXUTOK ? yytranslate[[X]] : YYUNDEFTOK)
/* YYTRANSLATE[[YYLEX]] -- Bison symbol number corresponding to YYLEX. */ /* 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 b4_translate
}; };
@@ -379,7 +378,7 @@ static const short yytoknum[[]] =
}; };
/* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives. */ /* 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 b4_r1
}; };

4
tests/regression.at
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 # Check only the tables. We don't use --no-parser, because it is
# still to be implemented in the experimental branch of Bison. # still to be implemented in the experimental branch of Bison.
AT_CHECK([[sed -n 's/ *$//;/^static const.*\[\] =/,/^}/p' input.c]], 0, 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, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 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 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 0, 7, 8, 9, 9, 10, 11
}; };