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

glr.c: omit yyresolveLocations when locations are disabled.

Browse Source 
This prevents gcc 4.6.0's -Wunused-but-set-variable from warning
about yyresolveLocations's local yyrhsloc.  When locations are
enabled, there's no such warning because YYLLOC_DEFAULT then uses
yyrhsloc.  Reported by Jim Meyering at
<http://lists.gnu.org/archive/html/bug-bison/2011-04/msg00002.html>.
* data/glr.c (yyresolveLocations): Omit definition when locations
are disabled.
(yyresolveValue): Omit yyresolveLocations invocation when
locations are disabled.
(cherry picked from commit 55dd356336)
This commit is contained in:
Joel E. Denny
2011-04-16 18:15:40 -04:00
parent a801089ca3
commit 67b8cfbd94
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@@ -1,3 +1,16 @@
2011-04-16 Joel E. Denny <joeldenny@joeldenny.org>
glr.c: omit yyresolveLocations when locations are disabled.
This prevents gcc 4.6.0's -Wunused-but-set-variable from warning
about yyresolveLocations's local yyrhsloc. When locations are
enabled, there's no such warning because YYLLOC_DEFAULT then uses
yyrhsloc. Reported by Jim Meyering at
<http://lists.gnu.org/archive/html/bug-bison/2011-04/msg00002.html>.
* data/glr.c (yyresolveLocations): Omit definition when locations
are disabled.
(yyresolveValue): Omit yyresolveLocations invocation when
locations are disabled.
2011-04-16 Joel E. Denny <joeldenny@joeldenny.org> 2011-04-16 Joel E. Denny <joeldenny@joeldenny.org>
gnulib, autoconf: update. gnulib, autoconf: update.

8
data/glr.c
View File

@@ -1757,7 +1757,7 @@ yyreportAmbiguity (yySemanticOption* yyx0,
yyerror (]b4_yyerror_args[YY_("syntax is ambiguous")); yyerror (]b4_yyerror_args[YY_("syntax is ambiguous"));
return yyabort; return yyabort;
} }]b4_locations_if([[
/** Resolve the locations for each of the YYN1 states in *YYSTACKP, /** Resolve the locations for each of the YYN1 states in *YYSTACKP,
* ending at YYS1. Has no effect on previously resolved states. * ending at YYS1. Has no effect on previously resolved states.
@@ -1815,7 +1815,7 @@ yyresolveLocations (yyGLRState* yys1, int yyn1,
yylloc = yylloc_current; yylloc = yylloc_current;
} }
} }
} }]])[
/** Resolve the ambiguity represented in state YYS in *YYSTACKP, /** Resolve the ambiguity represented in state YYS in *YYSTACKP,
* perform the indicated actions, and set the semantic value of YYS. * perform the indicated actions, and set the semantic value of YYS.
@@ -1850,8 +1850,8 @@ yyresolveValue (yyGLRState* yys, yyGLRStack* yystackp]b4_user_formals[)
{ {
switch (yypreference (yybest, yyp)) switch (yypreference (yybest, yyp))
{ {
case 0: case 0:]b4_locations_if([[
yyresolveLocations (yys, 1, yystackp]b4_user_args[); yyresolveLocations (yys, 1, yystackp]b4_user_args[);]])[
return yyreportAmbiguity (yybest, yyp]b4_pure_args[); return yyreportAmbiguity (yybest, yyp]b4_pure_args[);
break; break;
case 1: case 1: