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

tests: don't require YYSTYPE/YYLTYPE to be defined in C++

Browse Source 
* tests/glr-regression.at: Use AT_YYSTYPE/AT_YYLTYPE to generate
yy::parser::value_type and yy::parser::location_type in C++.
This commit is contained in:
Akim Demaille
2020-12-26 09:36:29 +01:00
parent 2157ced3dd
commit 8db99c54f4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/glr-regression.at
View File

@@ -56,7 +56,7 @@ AT_DATA_GRAMMAR([glr-regr1.y],
%code { %code {
#include <assert.h> #include <assert.h>
static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1); static ]AT_YYSTYPE[ exprMerge (]AT_YYSTYPE[ x0, ]AT_YYSTYPE[ x1);
]AT_YYERROR_DECLARE[ ]AT_YYERROR_DECLARE[
]AT_YYLEX_DECLARE[ ]AT_YYLEX_DECLARE[
} }
@@ -82,7 +82,7 @@ E: E 'P' E { $$=1; printf("E -> E 'P' E\n"); } %merge <exprMerge>
/* ---------- C code ----------- */ /* ---------- C code ----------- */
%% %%
static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1) static ]AT_YYSTYPE[ exprMerge (]AT_YYSTYPE[ x0, ]AT_YYSTYPE[ x1)
{ {
(void) x0; (void) x0;
(void) x1; (void) x1;
@@ -440,7 +440,7 @@ AT_DATA_GRAMMAR([glr-regr4.y],
%code { %code {
#include <string.h> #include <string.h>
static char *merge (YYSTYPE, YYSTYPE); static char *merge (]AT_YYSTYPE[, ]AT_YYSTYPE[);
static char *make_value (char const *, char const *); static char *make_value (char const *, char const *);
]AT_YYERROR_DECLARE[ ]AT_YYERROR_DECLARE[
]AT_YYLEX_DECLARE[ ]AT_YYLEX_DECLARE[
@@ -494,7 +494,7 @@ make_value (char const *parent, char const *child)
} }
static char * static char *
merge (YYSTYPE s1, YYSTYPE s2) merge (]AT_YYSTYPE[ s1, ]AT_YYSTYPE[ s2)
{ {
char const format[] = "merge{ %s and %s }"; char const format[] = "merge{ %s and %s }";
char *value = *ptrs_next++ = char *value = *ptrs_next++ =
@@ -1126,7 +1126,7 @@ AT_DATA_GRAMMAR([glr-regr12.y],
%code { %code {
# include <assert.h> # include <assert.h>
static int merge (YYSTYPE, YYSTYPE); static int merge (]AT_YYSTYPE[, ]AT_YYSTYPE[);
]AT_YYERROR_DECLARE[ ]AT_YYERROR_DECLARE[
]AT_YYLEX_DECLARE[ ]AT_YYLEX_DECLARE[
static int parent_rhs_before_value = 0; static int parent_rhs_before_value = 0;
@@ -1181,7 +1181,7 @@ cut: { YYACCEPT; } ;
%% %%
static int static int
merge (YYSTYPE s1, YYSTYPE s2) merge (]AT_YYSTYPE[ s1, ]AT_YYSTYPE[ s2)
{ {
/* Not invoked. */ /* Not invoked. */
return s1.dummy + s2.dummy; return s1.dummy + s2.dummy;
@@ -1428,7 +1428,7 @@ AT_DATA_GRAMMAR([glr-regr14.y],
static void static void
print_lookahead (int yychr, ]AT_YYSTYPE[ *yylvalp, ]AT_YYLTYPE[ *yyllocp, print_lookahead (int yychr, ]AT_YYSTYPE[ *yylvalp, ]AT_YYLTYPE[ *yyllocp,
char const *reduction); char const *reduction);
static char merge (union YYSTYPE, union YYSTYPE); static char merge (]AT_YYSTYPE[, ]AT_YYSTYPE[);
#define USE(value) #define USE(value)
} }
@@ -1546,7 +1546,7 @@ no_look:
} }
static char static char
merge (union YYSTYPE s1, union YYSTYPE s2) merge (]AT_YYSTYPE[ s1, ]AT_YYSTYPE[ s2)
{ {
return YY_CAST (char, s1.value + s2.value); return YY_CAST (char, s1.value + s2.value);
} }