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

More fixes related to last two patches.

Browse Source 
* data/c.m4 (b4_table_value_equals): Comment that YYID must be
defined.
* data/glr.c, data/lalr1.cc, data/lalr1.java, data/yacc.c: Fix
yytable comments: zero indicates syntax error not default
action.
* data/glr.c (yyis_pact_ninf): Rename to...
(yypact_value_is_default): ... this.
(yyisDefaultedState): Update for rename.
(yyis_table_ninf): Rename to...
(yytable_value_is_error): ... this, and check for value zero
besides just YYTABLE_NINF.
(yygetLRActions): Check for default value from yypact.  It
appears that this check is always performed before this function
is invoked, and so adding the check here is probably redundant.
However, the code may evolve after this subtlety is forgotten.
Also, update for rename to yytable_value_is_error.  Because that
macro now checks for zero, a different but equivalent branch of
the if-then-else here is evaluated.
(yyreportSyntaxError): Update for rename to
yytable_value_is_error.  The zero condition was mishandled
before.
(yyrecoverSyntaxError): Update for renames.  No behavioral
changes.
* data/lalr1.cc, data/lalr1.java (yy_pact_value_is_default_):
New function.
(yy_table_value_is_error_): New function.
(parse): Use new functions where possible.  No behavioral
changes.
(yysyntax_error_, yysyntax_error): Use yy_table_value_is_error_.
The zero condition was mishandled before.
* data/yacc.c (yyis_pact_ninf): Rename to...
(yypact_value_is_default): ... this.
(yyis_table_ninf): Rename to...
(yytable_value_is_error): ... this, and check for value zero
besides just YYTABLE_NINF.
(yysyntax_error): Update for rename to yytable_value_is_error.
The zero condition was mishandled before.
(yyparse): Update for renames.  No behavioral changes.
* src/tables.h: Improve comments about yypact, yytable, etc.
more.  Most importantly, say yytable value of zero means syntax
error not default action.
(cherry picked from commit f2b30bdf37)

Conflicts:

	data/bison.m4
	data/lalr1.cc
	data/lalr1.java
	data/yacc.c
	src/parse-gram.c
	src/parse-gram.h
This commit is contained in:
Joel E. Denny
2009-08-25 19:41:49 -04:00
parent 1fa303077d
commit d5eb0826af
9 changed files with 162 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/parse-gram.c
View File

@@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 2.4.1.120-890ab. */
/* A Bison parser, made by GNU Bison 2.4.1.122-1fa3-dirty. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
@@ -45,7 +45,7 @@
#define YYBISON 1
/* Bison version. */
#define YYBISON_VERSION "2.4.1.120-890ab"
#define YYBISON_VERSION "2.4.1.122-1fa3-dirty"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -823,8 +823,7 @@ static const yytype_int16 yypgoto[] =
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
number is the opposite. If zero or YYTABLE_NINF, syntax error. */
#define YYTABLE_NINF -107
static const yytype_int16 yytable[] =
{
@@ -846,11 +845,12 @@ static const yytype_int16 yytable[] =
44, 39, 129, 40, 41, 95, 104, 114, 141, 42
};
#define yyis_pact_ninf(yystate) \
#define yypact_value_is_default(yystate) \
((yystate) == (-60))
#define yyis_table_ninf(yytable_value) \
YYID (0)
#define yytable_value_is_error(yytable_value) \
(YYID (0) \
|| ((yytable_value) == (0)))
static const yytype_uint8 yycheck[] =
{
@@ -1476,7 +1476,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
for (yyx = yyxbegin; yyx < yyxend; ++yyx)
if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
&& !yyis_table_ninf (yytable[yyx + yyn]))
&& !yytable_value_is_error (yytable[yyx + yyn]))
{
if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
{
@@ -1810,7 +1810,7 @@ yybackup:
/* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate];
if (yyis_pact_ninf (yyn))
if (yypact_value_is_default (yyn))
goto yydefault;
/* Not known => get a lookahead token if don't already have one. */
@@ -1841,7 +1841,7 @@ yybackup:
yyn = yytable[yyn];
if (yyn <= 0)
{
if (yyn == 0 || yyis_table_ninf (yyn))
if (yytable_value_is_error (yyn))
goto yyerrlab;
yyn = -yyn;
goto yyreduce;
@@ -2782,7 +2782,7 @@ yyerrlab1:
for (;;)
{
yyn = yypact[yystate];
if (!yyis_pact_ninf (yyn))
if (!yypact_value_is_default (yyn))
{
yyn += YYTERROR;
if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)

2
src/parse-gram.h
View File

@@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 2.4.1.120-890ab. */
/* A Bison parser, made by GNU Bison 2.4.1.122-1fa3-dirty. */
/* Skeleton interface for Bison's Yacc-like parsers in C

56
src/tables.h
View File

@@ -45,6 +45,24 @@
YYSTOS[S] = the symbol number of the symbol that leads to state S.
YYFINAL = the state number of the termination state.
YYTABLE = a vector filled with portions for different uses, found
via YYPACT and YYPGOTO.
YYLAST ( = high) the number of the last element of YYTABLE, i.e.,
sizeof (YYTABLE) - 1.
YYCHECK = a vector indexed in parallel with YYTABLE. It indicates,
in a roundabout way, the bounds of the portion you are trying to
examine.
Suppose that the portion of YYTABLE starts at index P and the index
to be examined within the portion is I. Then if YYCHECK[P+I] != I,
I is outside the bounds of what is actually allocated, and the
default (from YYDEFACT or YYDEFGOTO) should be used. Otherwise,
YYTABLE[P+I] should be used.
YYDEFACT[S] = default reduction number in state s. Performed when
YYTABLE doesn't specify something else to do. Zero means the default
is an error.
@@ -58,10 +76,10 @@
YYTABLE to find out what action to perform.
If YYPACT[S] == YYPACT_NINF, if YYPACT[S] + I is outside the bounds
of YYTABLE (from 0 to YYLAST), or if YYCHECK indicates that I is
outside the bounds of the portion for S, then the default action
(from YYDEFACT and YYDEFGOTO) should be used instead of YYTABLE.
Otherwise, the value YYTABLE[YYPACT[S] + I] should be used even if
of YYTABLE (from 0 to YYLAST), or I is outside the bounds for portion
S (that is, YYCHECK[YYPACT[S] + I] != I), then the default action
(that is, YYDEFACT[S]) should be used instead of YYTABLE. Otherwise,
the value YYTABLE[YYPACT[S] + I] should be used even if
YYPACT[S] < 0.
If the value in YYTABLE is positive, we shift the token and go to
@@ -69,33 +87,19 @@
If the value is negative, it is minus a rule number to reduce by.
If the value is zero, the default action from YYDEFACT[S] is used.
If the value is YYTABLE_NINF, it's a syntax error.
If the value is zero or YYTABLE_NINF, it's a syntax error.
YYPGOTO[I] = the index in YYTABLE of the portion describing what to
do after reducing a rule that derives variable I + NTOKENS. This
portion is indexed by the parser state number, S, as of before the
text for this nonterminal was read. The value from YYTABLE is the
state to go to if the corresponding value in YYCHECK is S.
text for this nonterminal was read.
YYTABLE = a vector filled with portions for different uses, found
via YYPACT and YYPGOTO.
YYCHECK = a vector indexed in parallel with YYTABLE. It indicates,
in a roundabout way, the bounds of the portion you are trying to
examine.
Suppose that the portion of YYTABLE starts at index P and the index
to be examined within the portion is I. Then if YYCHECK[P+I] != I,
I is outside the bounds of what is actually allocated, and the
default (from YYDEFACT or YYDEFGOTO) should be used. Otherwise,
YYTABLE[P+I] should be used.
YYFINAL = the state number of the termination state.
YYLAST ( = high) the number of the last element of YYTABLE, i.e.,
sizeof (YYTABLE) - 1. */
If YYPGOTO[I] + S is outside the bounds of YYTABLE (from 0 to YYLAST)
or if S is outside the bounds of the portion for I (that is,
YYCHECK[YYPGOTO[I] + S] != S), then the default state (that is,
YYDEFGOTO[I]) should be used instead of YYTABLE. Otherwise,
YYTABLE[YYPGOTO[I] + S] is the state to go to even if YYPGOTO[I] < 0.
*/
extern int nvectors;