diff options
| author | Akim Demaille <demaille@gostai.com> | 2010-09-01 15:13:27 +0200 |
|---|---|---|
| committer | Akim Demaille <demaille@gostai.com> | 2010-09-01 15:13:27 +0200 |
| commit | c49784f5f5c0b8a4ffda574e2cf5a1e3e63110ba (patch) | |
| tree | f33c04daa565d2cebf9267e1527deffb25b6848a | |
| parent | 64877e5e04bd7d59493c8c58d9fc25ca91139f07 (diff) | |
| download | bison-c49784f5f5c0b8a4ffda574e2cf5a1e3e63110ba.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | data/glr.c | 24 |
2 files changed, 20 insertions, 15 deletions
@@ -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> Version 2.4.3. @@ -119,7 +126,7 @@ (packgram): Transfer is_predicate value. * src/reader.h (grammar_current_rule_action_append): New interface. * doc/bison.texinfo: Document semantic predicates (%?). - + * data/glr.c (yylhsNonterm, yyisDefaultedState,yyDefaultAction) (yygetLRActions,yynewGLRStackItem,yyaddDeferredAction,yyinitStateSet) (yyinitGLRStack,yyexpandGLRStack,yyupdateSplit,yymarkStackDeleted) @@ -130,7 +137,7 @@ (struct yyGLRState): Fix description of yyposn field. (yyresolveLocations): Correct comment so as not to imply action when yyn1==0. - + 2010-06-17 Paul Eggert <eggert@cs.ucla.edu> Update from GFDL GFDL 1.2 to 1.3. @@ -511,9 +511,9 @@ typedef enum { yyok, yyaccept, yyabort, yyerr } YYRESULTTAG; #define YYCHK(YYE) \ do { \ - YYRESULTTAG yyflag = YYE; \ - if (yyflag != yyok) \ - return yyflag; \ + YYRESULTTAG yychk_flag = YYE; \ + if (yychk_flag != yyok) \ + return yychk_flag; \ } while (YYID (0)) #if YYDEBUG @@ -1429,7 +1429,7 @@ yyglrReduce (yyGLRStack* yystackp, size_t yyk, yyRuleNum yyrule, (unsigned long int) yyk, yyrule - 1)); } if (yyflag != yyok) - return yyflag; + return yyflag; YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyrule], &yysval, &yyloc); yyglrShift (yystackp, yyk, yyLRgotoState (yystackp->yytops.yystates[yyk]->yylrState, @@ -1964,11 +1964,6 @@ static YYRESULTTAG yyprocessOneStack (yyGLRStack* yystackp, size_t yyk, size_t yyposn]b4_pure_formals[) { - int yyaction; - const short int* yyconflicts; - yyRuleNum yyrule; - YYRESULTTAG yyflag; - while (yystackp->yytops.yystates[yyk] != NULL) { yyStateNum yystate = yystackp->yytops.yystates[yyk]->yylrState; @@ -1979,7 +1974,8 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk, if (yyisDefaultedState (yystate)) { - yyrule = yydefaultAction (yystate); + YYRESULTTAG yyflag; + yyRuleNum yyrule = yydefaultAction (yystate); if (yyrule == 0) { YYDPRINTF ((stderr, "Stack %lu dies.\n", @@ -2001,6 +1997,8 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk, else { yySymbol yytoken; + int yyaction; + const short int* yyconflicts; yystackp->yytops.yylookaheadNeeds[yyk] = yytrue; if (yychar == YYEMPTY) @@ -2037,7 +2035,7 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk, yyposn]b4_pure_args[)); else if (yyflag == yyerr) { - YYDPRINTF ((stderr, "Stack %lu dies.\n", + YYDPRINTF ((stderr, "Stack %lu dies.\n", (unsigned long int) yynewStack)); yymarkStackDeleted (yystackp, yynewStack); } @@ -2057,8 +2055,8 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk, } else { - yyflag = yyglrReduce (yystackp, yyk, -yyaction, - yyimmediate[-yyaction]]b4_user_args[); + YYRESULTTAG yyflag = yyglrReduce (yystackp, yyk, -yyaction, + yyimmediate[-yyaction]]b4_user_args[); if (yyflag == yyerr) { YYDPRINTF ((stderr, "Stack %lu dies (predicate failure or explicit user error).\n", |