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

glr.c: fix signature when using custom error messages

Browse Source 
Reported by Tom Shields <thomas.evans.shields@icloud.com>.

* data/skeletons/glr.c (yypcontext_location): Fix return type.
* tests/calc.at: Check the case pure, location, custom error messages.
This commit is contained in:
Akim Demaille
2021-08-11 17:41:27 +02:00
parent e4e3cbce77
commit c2ba260487
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@@ -185,6 +185,8 @@ Line -1 and -3 should mention CATEGORIE, not CATEGORY.
* Bison 3.8 * Bison 3.8
** Rewrite glr.cc (currently glr2.cc) ** Rewrite glr.cc (currently glr2.cc)
*** custom error messages
*** Remove jumps *** Remove jumps
We can probably replace setjmp/longjmp with exceptions. That would help We can probably replace setjmp/longjmp with exceptions. That would help
tremendously other languages such as D and Java that probably have no tremendously other languages such as D and Java that probably have no

4
data/skeletons/glr.c
View File

@@ -2174,10 +2174,10 @@ yypcontext_token (const yyGLRStack *yystackp)
} }
]b4_locations_if([[/* The location of the lookahead of this context. */ ]b4_locations_if([[/* The location of the lookahead of this context. */
static YYLTYPE * static const YYLTYPE *
yypcontext_location (const yyGLRStack *yystackp) YY_ATTRIBUTE_UNUSED; yypcontext_location (const yyGLRStack *yystackp) YY_ATTRIBUTE_UNUSED;
static YYLTYPE * static const YYLTYPE *
yypcontext_location (const yyGLRStack *yystackp) yypcontext_location (const yyGLRStack *yystackp)
{ {
YY_USE (yystackp); YY_USE (yystackp);

2
tests/calc.at
View File

@@ -1469,6 +1469,8 @@ AT_CHECK_CALC_GLR_CC([%debug])
AT_CHECK_CALC_GLR_CC([%define parse.error verbose %debug %name-prefix "calc" %verbose]) AT_CHECK_CALC_GLR_CC([%define parse.error verbose %debug %name-prefix "calc" %verbose])
AT_CHECK_CALC_GLR_CC([%define parse.error verbose %debug %name-prefix "calc" %define api.token.prefix {TOK_} %verbose]) AT_CHECK_CALC_GLR_CC([%define parse.error verbose %debug %name-prefix "calc" %define api.token.prefix {TOK_} %verbose])
AT_CHECK_CALC_GLR_CC([%define parse.error custom %locations %header %name-prefix "calc" %verbose])
AT_CHECK_CALC_GLR_CC([%locations %header %define parse.error verbose %debug %name-prefix "calc" %verbose %parse-param {semantic_value *result}{int *count}{int *nerrs}]) AT_CHECK_CALC_GLR_CC([%locations %header %define parse.error verbose %debug %name-prefix "calc" %verbose %parse-param {semantic_value *result}{int *count}{int *nerrs}])
AT_CHECK_CALC_GLR_CC([%locations %header %define parse.error verbose %debug %define api.prefix {calc} %verbose %parse-param {semantic_value *result}{int *count}{int *nerrs}]) AT_CHECK_CALC_GLR_CC([%locations %header %define parse.error verbose %debug %define api.prefix {calc} %verbose %parse-param {semantic_value *result}{int *count}{int *nerrs}])