diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-11-26 09:05:28 +0100 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-11-26 09:05:28 +0100 |
| commit | c6bf97ccb45672a004ef376b9f3e578d2f558d5f (patch) | |
| tree | 848e9f1b3375f18c79b6ea2a4d1386a28b0eeb70 /data | |
| parent | 68ac70bc7bf365fa17bd6d7ea597fa0a05488b8d (diff) | |
| parent | fb4c8a7cb97844f6c66921a77e79311a19d12fc2 (diff) | |
| download | bison-c6bf97ccb45672a004ef376b9f3e578d2f558d5f.tar.gz | |
Merge remote-tracking branch 'origin/branch-2.6' into maint
* origin/branch-2.6:
yacc.c: always initialize yylloc
doc: one of the fixes for an ambiguous grammar was ambiguous too
doc: fix the dangling else with precedence directives
doc: prefer "token" to TOKEN
doc: formatting changes
Conflicts:
NEWS
doc/bison.texi
Diffstat (limited to 'data')
| -rw-r--r-- | data/yacc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/data/yacc.c b/data/yacc.c index 2e0ecc25..bbc9d915 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -184,7 +184,8 @@ int yychar; or non-GCC compilers. */ static YYSTYPE yyval_default; # define YY_INITIAL_VALUE(Value) = Value -#endif]])[ +#endif]b4_locations_if([[ +static YYLTYPE yyloc_default][]b4_yyloc_default[;]])])[ #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN # define YY_IGNORE_MAYBE_UNINITIALIZED_END @@ -197,7 +198,7 @@ static YYSTYPE yyval_default; YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);]b4_locations_if([[ /* Location data for the lookahead symbol. */ -YYLTYPE yylloc][]b4_yyloc_default[; +YYLTYPE yylloc]b4_pure_if([ = yyloc_default], [b4_yyloc_default])[; ]])b4_pure_if([], [[ /* Number of syntax errors so far. */ @@ -1410,7 +1411,8 @@ b4_c_function_def([[yyparse]], [[int]], b4_parse_param)[ yypstate *yyps_local;]b4_pure_if([[ int yychar; YYSTYPE yylval;]b4_locations_if([[ - YYLTYPE yylloc][]b4_yyloc_default[;]])])[ + static YYLTYPE yyloc_default][]b4_yyloc_default[; + YYLTYPE yylloc = yyloc_default;]])])[ if (yyps) yyps_local = yyps; else @@ -1559,8 +1561,7 @@ b4_c_function_def([[yyparse]], [[int]], b4_parse_param)[ yychar = YYEMPTY; /* Cause a token to be read. */ ]m4_ifdef([b4_initial_action], [ b4_dollar_pushdef([m4_define([b4_dollar_dollar_used])yylval], [], - [m4_define([b4_at_dollar_used])dnl -b4_push_if([b4_pure_if([*])yypushed_loc], [yylloc])])dnl + [b4_push_if([b4_pure_if([*])yypushed_loc], [yylloc])])dnl /* User initialization code. */ b4_user_initial_action b4_dollar_popdef[]dnl |