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

Merge remote-tracking branch 'origin/maint'

Browse Source 
* origin/maint:
  tests: use the generalized default yylex.
  tests: AT_YYERROR_DEFINE: prepare for list of ints.
  skeletons: no longer define YYLSP_NEEDED.
  c++: do not export YYTOKEN_TABLE and YYERROR_VERBOSE.

Conflicts:
	data/c.m4
	data/glr.cc
	data/lalr1.cc
	doc/bison.texi
	tests/regression.at
This commit is contained in:
Akim Demaille
2012-06-28 15:29:18 +02:00
parent 22b081deb7 087dcd7868
commit 7aaaad6c6d
15 changed files with 95 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/actions.at
View File

@@ -51,7 +51,7 @@ exp: { putchar ('0'); }
;
%%
]AT_YYERROR_DEFINE[
]AT_YYLEX_DEFINE(123456789)[
]AT_YYLEX_DEFINE(["123456789"])[
int
main (void)
{
@@ -116,7 +116,7 @@ sum_of_the_five_previous_values:
%%
]AT_YYERROR_DEFINE[
]AT_YYLEX_DEFINE([])[
]AT_YYLEX_DEFINE[
int
main (void)
{
@@ -151,7 +151,7 @@ sum: { printf ("%d\n", $0.val + $-1.val + $-2.val); } ;
%%
]AT_YYERROR_DEFINE[
]AT_YYLEX_DEFINE()[
]AT_YYLEX_DEFINE[
int
main (void)
{
@@ -636,7 +636,7 @@ start: 'a' 'b' 'c' 'd' 'e' { $$ = 'S'; USE(($1, $2, $3, $4, $5)); } ;
%%
]AT_YYERROR_DEFINE[
]AT_YYLEX_DEFINE([abcd], [[yylval = res]])[
]AT_YYLEX_DEFINE(["abcd"], [[yylval = res]])[
int
main (void)
@@ -748,7 +748,7 @@ start:
%%
]AT_YYERROR_DEFINE[
]AT_YYLEX_DEFINE([abcdef])[
]AT_YYLEX_DEFINE(["abcdef"])[
int
main (void)
@@ -966,7 +966,7 @@ start:
%%
]AT_YYERROR_DEFINE[
]AT_YYLEX_DEFINE([abd], [yylval = res])[
]AT_YYLEX_DEFINE(["abd"], [yylval = res])[
int
main (void)
{
@@ -1066,7 +1066,7 @@ start: { USE($$); } ;
%%
]AT_YYERROR_DEFINE[
]AT_YYLEX_DEFINE([])[
]AT_YYLEX_DEFINE[
int
main (void)
{
@@ -1121,7 +1121,7 @@ start:
%%
]AT_YYERROR_DEFINE[
]AT_YYLEX_DEFINE([])[
]AT_YYLEX_DEFINE[
int
main (void)
{
@@ -1381,7 +1381,7 @@ accept: /*empty*/ {
%%
]AT_YYERROR_DEFINE[
]AT_YYLEX_DEFINE([a])[
]AT_YYLEX_DEFINE(["a"])[
int
main (void)
{
@@ -1417,7 +1417,7 @@ AT_DATA_GRAMMAR([input.y],
# include <assert.h>
]AT_YYERROR_DECLARE[
static int yylex (YYSTYPE *yylval);
]AT_YYLEX_DECLARE[
}
%%
input:
@@ -1432,15 +1432,7 @@ exp:
%%
]AT_YYERROR_DEFINE[
static int
yylex (YYSTYPE *yylval)
{
static char const input[] = "bcd";
static size_t toknum;
assert (toknum < sizeof input);
*yylval = (toknum + 1) * 10;
return input[toknum++];
}
]AT_YYLEX_DEFINE(["bcd"], [*lvalp = (toknum + 1) * 10])[
int
main (void)