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

Fix minor problems encountered by a fresh bootstrap.

Browse Source 
* data/glr.c, data/yacc.c: Do not use apostrophes in '#' comments,
as they confuse xgettext, which tries to parse them as C character
constants in a preprocessor directive.
* data/yacc.c (yy_lac): Don't use printf %d format on *yyesp, as
that expression might not promote to int on some platforms.
* src/parse-gram.c, src/parse-gram.h: Regenerate.
(cherry picked from commit 3c9b20ff5a)

Conflicts:

	data/yacc.c
	src/parse-gram.c
	src/parse-gram.h
This commit is contained in:
Paul Eggert
2011-01-09 17:08:33 -08:00
committed by Joel E. Denny
parent 8cbbf1786f
commit 7e5ef70679
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/glr.c
View File

@@ -35,8 +35,8 @@ m4_define_default([b4_stack_depth_init], [200])
## ------------------------ ##
b4_define_flag_if([pure])
# If glr.cc is including this file and thus has already set b4_pure_flag, don't
# change the value of b4_pure_flag, and don't record a use of api.pure.
# If glr.cc is including this file and thus has already set b4_pure_flag,
# do not change the value of b4_pure_flag, and do not record a use of api.pure.
m4_ifndef([b4_pure_flag],
[b4_percent_define_default([[api.pure]], [[false]])
m4_define([b4_pure_flag],

8
data/yacc.c
View File

@@ -29,8 +29,8 @@ m4_case(b4_percent_define_get([[api.push-pull]]),
[push], [m4_define([b4_pull_flag], [[0]])])
# Handle BISON_USE_PUSH_FOR_PULL for the test suite. So that push parsing
# tests function as written, don't let BISON_USE_PUSH_FOR_PULL modify Bison's
# behavior at all when push parsing is already requested.
# tests function as written, do not let BISON_USE_PUSH_FOR_PULL modify the
# behavior of Bison at all when push parsing is already requested.
b4_define_flag_if([use_push_for_pull])
b4_use_push_for_pull_if([
b4_push_if([m4_define([b4_use_push_for_pull_flag], [[0]])],
@@ -1134,7 +1134,7 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
}
*++yyesp = yystate;
}
YYDPRINTF ((stderr, " G%d", *yyesp));
YYDPRINTF ((stderr, " G%d", yystate));
}
}
}]])[
@@ -2067,7 +2067,7 @@ yypushreturn:]])[
]b4_epilogue
b4_defines_if(
[@output(b4_spec_defines_file@)@
b4_copyright([Skeleton interface for Bison's Yacc-like parsers in C],
b4_copyright([Bison interface for Yacc-like parsers in C],
[1984, 1989-1990, 2000-2011])
b4_percent_code_get([[requires]])[]dnl