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

Address GCC warnings about shadowed local variables (yyflag).

Browse Source 
* data/glr.c (YYCHK): Rename yyflag as yychk_flag.
	(yyprocessOneStack): Reduce the scope of yyaction, yyconflicts,
	yyrule, and yyflag.
This commit is contained in:
Akim Demaille
2010-09-01 15:13:27 +02:00
parent 64877e5e04
commit c49784f5f5
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,3 +1,10 @@
2010-09-01 Akim Demaille <demaille@gostai.com>
Address GCC warnings about shadowed local variables (yyflag).
* data/glr.c (YYCHK): Rename yyflag as yychk_flag.
(yyprocessOneStack): Reduce the scope of yyaction, yyconflicts,
yyrule, and yyflag.
2010-08-05 Joel E. Denny <joeldenny@joeldenny.org> 2010-08-05 Joel E. Denny <joeldenny@joeldenny.org>
Version 2.4.3. Version 2.4.3.
@@ -119,7 +126,7 @@
(packgram): Transfer is_predicate value. (packgram): Transfer is_predicate value.
* src/reader.h (grammar_current_rule_action_append): New interface. * src/reader.h (grammar_current_rule_action_append): New interface.
* doc/bison.texinfo: Document semantic predicates (%?). * doc/bison.texinfo: Document semantic predicates (%?).
* data/glr.c (yylhsNonterm, yyisDefaultedState,yyDefaultAction) * data/glr.c (yylhsNonterm, yyisDefaultedState,yyDefaultAction)
(yygetLRActions,yynewGLRStackItem,yyaddDeferredAction,yyinitStateSet) (yygetLRActions,yynewGLRStackItem,yyaddDeferredAction,yyinitStateSet)
(yyinitGLRStack,yyexpandGLRStack,yyupdateSplit,yymarkStackDeleted) (yyinitGLRStack,yyexpandGLRStack,yyupdateSplit,yymarkStackDeleted)
@@ -130,7 +137,7 @@
(struct yyGLRState): Fix description of yyposn field. (struct yyGLRState): Fix description of yyposn field.
(yyresolveLocations): Correct comment so as not to imply action when (yyresolveLocations): Correct comment so as not to imply action when
yyn1==0. yyn1==0.
2010-06-17 Paul Eggert <eggert@cs.ucla.edu> 2010-06-17 Paul Eggert <eggert@cs.ucla.edu>
Update from GFDL GFDL 1.2 to 1.3. Update from GFDL GFDL 1.2 to 1.3.

24
data/glr.c
View File

@@ -511,9 +511,9 @@ typedef enum { yyok, yyaccept, yyabort, yyerr } YYRESULTTAG;
#define YYCHK(YYE) \ #define YYCHK(YYE) \
do { \ do { \
YYRESULTTAG yyflag = YYE; \ YYRESULTTAG yychk_flag = YYE; \
if (yyflag != yyok) \ if (yychk_flag != yyok) \
return yyflag; \ return yychk_flag; \
} while (YYID (0)) } while (YYID (0))
#if YYDEBUG #if YYDEBUG
@@ -1429,7 +1429,7 @@ yyglrReduce (yyGLRStack* yystackp, size_t yyk, yyRuleNum yyrule,
(unsigned long int) yyk, yyrule - 1)); (unsigned long int) yyk, yyrule - 1));
} }
if (yyflag != yyok) if (yyflag != yyok)
return yyflag; return yyflag;
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyrule], &yysval, &yyloc); YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyrule], &yysval, &yyloc);
yyglrShift (yystackp, yyk, yyglrShift (yystackp, yyk,
yyLRgotoState (yystackp->yytops.yystates[yyk]->yylrState, yyLRgotoState (yystackp->yytops.yystates[yyk]->yylrState,
@@ -1964,11 +1964,6 @@ static YYRESULTTAG
yyprocessOneStack (yyGLRStack* yystackp, size_t yyk, yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
size_t yyposn]b4_pure_formals[) size_t yyposn]b4_pure_formals[)
{ {
int yyaction;
const short int* yyconflicts;
yyRuleNum yyrule;
YYRESULTTAG yyflag;
while (yystackp->yytops.yystates[yyk] != NULL) while (yystackp->yytops.yystates[yyk] != NULL)
{ {
yyStateNum yystate = yystackp->yytops.yystates[yyk]->yylrState; yyStateNum yystate = yystackp->yytops.yystates[yyk]->yylrState;
@@ -1979,7 +1974,8 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
if (yyisDefaultedState (yystate)) if (yyisDefaultedState (yystate))
{ {
yyrule = yydefaultAction (yystate); YYRESULTTAG yyflag;
yyRuleNum yyrule = yydefaultAction (yystate);
if (yyrule == 0) if (yyrule == 0)
{ {
YYDPRINTF ((stderr, "Stack %lu dies.\n", YYDPRINTF ((stderr, "Stack %lu dies.\n",
@@ -2001,6 +1997,8 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
else else
{ {
yySymbol yytoken; yySymbol yytoken;
int yyaction;
const short int* yyconflicts;
yystackp->yytops.yylookaheadNeeds[yyk] = yytrue; yystackp->yytops.yylookaheadNeeds[yyk] = yytrue;
if (yychar == YYEMPTY) if (yychar == YYEMPTY)
@@ -2037,7 +2035,7 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
yyposn]b4_pure_args[)); yyposn]b4_pure_args[));
else if (yyflag == yyerr) else if (yyflag == yyerr)
{ {
YYDPRINTF ((stderr, "Stack %lu dies.\n", YYDPRINTF ((stderr, "Stack %lu dies.\n",
(unsigned long int) yynewStack)); (unsigned long int) yynewStack));
yymarkStackDeleted (yystackp, yynewStack); yymarkStackDeleted (yystackp, yynewStack);
} }
@@ -2057,8 +2055,8 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
} }
else else
{ {
yyflag = yyglrReduce (yystackp, yyk, -yyaction, YYRESULTTAG yyflag = yyglrReduce (yystackp, yyk, -yyaction,
yyimmediate[-yyaction]]b4_user_args[); yyimmediate[-yyaction]]b4_user_args[);
if (yyflag == yyerr) if (yyflag == yyerr)
{ {
YYDPRINTF ((stderr, "Stack %lu dies (predicate failure or explicit user error).\n", YYDPRINTF ((stderr, "Stack %lu dies (predicate failure or explicit user error).\n",