X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f91b1629440cb52b851004570b7f280e79167383..798096e1deaeb13a06e62de5c73487537e220e3c:/tests/actions.at
diff --git a/tests/actions.at b/tests/actions.at
index 57e6bf7e..602eac8c 100644
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,20 +1,19 @@
# Executing Actions. -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+# Foundation, Inc.
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see .
AT_BANNER([[User Actions.]])
@@ -75,7 +74,7 @@ main (void)
}
]])
-AT_CHECK([bison -d -v -o input.c input.y])
+AT_BISON_CHECK([-d -v -o input.c input.y])
AT_COMPILE([input])
AT_PARSER_CHECK([./input], 0,
[[0123456789
@@ -153,7 +152,7 @@ main (void)
}
]])
-AT_CHECK([bison -d -v -o input.c input.y], 0)
+AT_BISON_CHECK([-d -v -o input.c input.y], 0)
AT_COMPILE([input])
AT_PARSER_CHECK([./input], 0,
[[15
@@ -178,7 +177,7 @@ m4_if([$1$2$3], $[1]$[2]$[3], [],
# helping macros. So don't put any directly in the Bison file.
AT_BISON_OPTION_PUSHDEFS([$5])
AT_DATA_GRAMMAR([[input.y]],
-[[%requires {
+[[%code requires {
#include
#include
#include
@@ -196,8 +195,8 @@ m4_ifval([$6], [%union
{
int ival;
}])
-AT_LALR1_CC_IF([%define "global_tokens_and_yystype"])
-m4_ifval([$6], [[%provides {]], [[%code {]])
+AT_LALR1_CC_IF([%define global_tokens_and_yystype])
+m4_ifval([$6], [[%code provides {]], [[%code {]])
AT_LALR1_CC_IF([typedef yy::location YYLTYPE;])
[static int yylex (]AT_LEX_FORMALS[);
]AT_LALR1_CC_IF([], [static void yyerror (const char *msg);])
@@ -369,9 +368,9 @@ main (int argc, const char *argv[])
]])
AT_LALR1_CC_IF(
- [AT_CHECK([bison -o input.cc input.y])
+ [AT_BISON_CHECK([-o input.cc input.y])
AT_COMPILE_CXX([input])],
- [AT_CHECK([bison -o input.c input.y])
+ [AT_BISON_CHECK([-o input.c input.y])
AT_COMPILE([input])])
@@ -583,14 +582,14 @@ AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser], [with union])
-## --------------------------------- ##
-## Default %printer and %destructor. ##
-## --------------------------------- ##
+## ----------------------------------------- ##
+## Default tagless %printer and %destructor. ##
+## ----------------------------------------- ##
# Check that the right %printer and %destructor are called, that they're not
# called for $end, and that $$ and @$ work correctly.
-AT_SETUP([Default %printer and %destructor])
+AT_SETUP([Default tagless %printer and %destructor])
AT_DATA_GRAMMAR([[input.y]],
[[%error-verbose
@@ -610,11 +609,15 @@ AT_DATA_GRAMMAR([[input.y]],
%}
%printer {
- fprintf (yyoutput, "Default printer for '%c' @ %d", $$, @$.first_column);
-} %symbol-default
+ fprintf (yyoutput, "<*> printer should not be called.\n");
+} <*>
+
+%printer {
+ fprintf (yyoutput, "<> printer for '%c' @ %d", $$, @$.first_column);
+} <>
%destructor {
- fprintf (stdout, "Default destructor for '%c' @ %d.\n", $$, @$.first_column);
-} %symbol-default
+ fprintf (stdout, "<> destructor for '%c' @ %d.\n", $$, @$.first_column);
+} <>
%printer {
fprintf (yyoutput, "'b'/'c' printer for '%c' @ %d", $$, @$.first_column);
@@ -623,6 +626,10 @@ AT_DATA_GRAMMAR([[input.y]],
fprintf (stdout, "'b'/'c' destructor for '%c' @ %d.\n", $$, @$.first_column);
} 'b' 'c'
+%destructor {
+ fprintf (yyoutput, "<*> destructor should not be called.\n");
+} <*>
+
%%
start: 'a' 'b' 'c' 'd' 'e' { $$ = 'S'; USE(($1, $2, $3, $4, $5)); } ;
@@ -656,18 +663,18 @@ main (void)
}
]])
-AT_CHECK([bison -o input.c input.y])
+AT_BISON_CHECK([-o input.c input.y])
AT_COMPILE([input])
AT_PARSER_CHECK([./input], 1,
-[[Default destructor for 'd' @ 4.
+[[<> destructor for 'd' @ 4.
'b'/'c' destructor for 'c' @ 3.
'b'/'c' destructor for 'b' @ 2.
-Default destructor for 'a' @ 1.
+<> destructor for 'a' @ 1.
]],
[[Starting parse
Entering state 0
-Reading a token: Next token is token 'a' (1.1-1.1: Default printer for 'a' @ 1)
-Shifting token 'a' (1.1-1.1: Default printer for 'a' @ 1)
+Reading a token: Next token is token 'a' (1.1-1.1: <> printer for 'a' @ 1)
+Shifting token 'a' (1.1-1.1: <> printer for 'a' @ 1)
Entering state 1
Reading a token: Next token is token 'b' (1.2-1.2: 'b'/'c' printer for 'b' @ 2)
Shifting token 'b' (1.2-1.2: 'b'/'c' printer for 'b' @ 2)
@@ -675,18 +682,18 @@ Entering state 3
Reading a token: Next token is token 'c' (1.3-1.3: 'b'/'c' printer for 'c' @ 3)
Shifting token 'c' (1.3-1.3: 'b'/'c' printer for 'c' @ 3)
Entering state 5
-Reading a token: Next token is token 'd' (1.4-1.4: Default printer for 'd' @ 4)
-Shifting token 'd' (1.4-1.4: Default printer for 'd' @ 4)
+Reading a token: Next token is token 'd' (1.4-1.4: <> printer for 'd' @ 4)
+Shifting token 'd' (1.4-1.4: <> printer for 'd' @ 4)
Entering state 6
Reading a token: Now at end of input.
syntax error, unexpected $end, expecting 'e'
-Error: popping token 'd' (1.4-1.4: Default printer for 'd' @ 4)
+Error: popping token 'd' (1.4-1.4: <> printer for 'd' @ 4)
Stack now 0 1 3 5
Error: popping token 'c' (1.3-1.3: 'b'/'c' printer for 'c' @ 3)
Stack now 0 1 3
Error: popping token 'b' (1.2-1.2: 'b'/'c' printer for 'b' @ 2)
Stack now 0 1
-Error: popping token 'a' (1.1-1.1: Default printer for 'a' @ 1)
+Error: popping token 'a' (1.1-1.1: <> printer for 'a' @ 1)
Stack now 0
Cleanup: discarding lookahead token $end (1.5-1.5: )
Stack now 0
@@ -696,11 +703,11 @@ AT_CLEANUP
-## ----------------------------------- ##
-## Per-type %printer and %destructor. ##
-## ----------------------------------- ##
+## ------------------------------------------------------ ##
+## Default tagged and per-type %printer and %destructor. ##
+## ------------------------------------------------------ ##
-AT_SETUP([Per-type %printer and %destructor])
+AT_SETUP([Default tagged and per-type %printer and %destructor])
AT_DATA_GRAMMAR([[input.y]],
[[%error-verbose
@@ -714,16 +721,20 @@ AT_DATA_GRAMMAR([[input.y]],
# define USE(SYM)
%}
+%printer {
+ fprintf (yyoutput, "<> printer should not be called.\n");
+} <>
+
%union { int field0; int field1; int field2; }
%type start 'a' 'g'
%type 'e'
%type 'f'
%printer {
- fprintf (yyoutput, "%%symbol-default//e printer");
-} %symbol-default 'e'
+ fprintf (yyoutput, "<*>//e printer");
+} <*> 'e'
%destructor {
- fprintf (stdout, "%%symbol-default//e destructor.\n");
-} %symbol-default 'e'
+ fprintf (stdout, "<*>//e destructor.\n");
+} <*> 'e'
%type 'b'
%printer { fprintf (yyoutput, " printer"); }
@@ -737,6 +748,10 @@ AT_DATA_GRAMMAR([[input.y]],
%printer { fprintf (yyoutput, "'d' printer"); } 'd'
%destructor { fprintf (stdout, "'d' destructor.\n"); } 'd'
+%destructor {
+ fprintf (yyoutput, "<> destructor should not be called.\n");
+} <>
+
%%
start:
@@ -773,20 +788,20 @@ main (void)
}
]])
-AT_CHECK([bison -o input.c input.y])
+AT_BISON_CHECK([-o input.c input.y])
AT_COMPILE([input])
AT_PARSER_CHECK([./input], 1,
-[[%symbol-default//e destructor.
-%symbol-default//e destructor.
+[[<*>//e destructor.
+<*>//e destructor.
'd' destructor.
'c' destructor.
destructor.
-%symbol-default//e destructor.
+<*>//e destructor.
]],
[[Starting parse
Entering state 0
-Reading a token: Next token is token 'a' (%symbol-default//e printer)
-Shifting token 'a' (%symbol-default//e printer)
+Reading a token: Next token is token 'a' (<*>//e printer)
+Shifting token 'a' (<*>//e printer)
Entering state 1
Reading a token: Next token is token 'b' ( printer)
Shifting token 'b' ( printer)
@@ -797,17 +812,17 @@ Entering state 5
Reading a token: Next token is token 'd' ('d' printer)
Shifting token 'd' ('d' printer)
Entering state 6
-Reading a token: Next token is token 'e' (%symbol-default//e printer)
-Shifting token 'e' (%symbol-default//e printer)
+Reading a token: Next token is token 'e' (<*>//e printer)
+Shifting token 'e' (<*>//e printer)
Entering state 7
-Reading a token: Next token is token 'f' (%symbol-default//e printer)
-Shifting token 'f' (%symbol-default//e printer)
+Reading a token: Next token is token 'f' (<*>//e printer)
+Shifting token 'f' (<*>//e printer)
Entering state 8
Reading a token: Now at end of input.
syntax error, unexpected $end, expecting 'g'
-Error: popping token 'f' (%symbol-default//e printer)
+Error: popping token 'f' (<*>//e printer)
Stack now 0 1 3 5 6 7
-Error: popping token 'e' (%symbol-default//e printer)
+Error: popping token 'e' (<*>//e printer)
Stack now 0 1 3 5 6
Error: popping token 'd' ('d' printer)
Stack now 0 1 3 5
@@ -815,7 +830,7 @@ Error: popping token 'c' ('c' printer)
Stack now 0 1 3
Error: popping token 'b' ( printer)
Stack now 0 1
-Error: popping token 'a' (%symbol-default//e printer)
+Error: popping token 'a' (<*>//e printer)
Stack now 0
Cleanup: discarding lookahead token $end ()
Stack now 0
@@ -826,12 +841,19 @@ AT_CLEANUP
## ------------------------------------------------------------- ##
-## Default %printer and %destructor for user-defined end token. ##
+## Default %printer and %destructor for user-defined end token. ##
## ------------------------------------------------------------- ##
AT_SETUP([Default %printer and %destructor for user-defined end token])
-AT_DATA_GRAMMAR([[input.y]],
+# _AT_CHECK_DEFAULT_PRINTER_AND_DESTRUCTOR_FOR_END_TOKEN(TYPED)
+# -----------------------------------------------------------------------------
+m4_define([_AT_CHECK_DEFAULT_PRINTER_AND_DESTRUCTOR_FOR_END_TOKEN],
+[m4_if($1, 0,
+ [m4_pushdef([kind], []) m4_pushdef([not_kind], [*])],
+ [m4_pushdef([kind], [*]) m4_pushdef([not_kind], [])])
+
+AT_DATA_GRAMMAR([[input]]$1[[.y]],
[[%error-verbose
%debug
%locations
@@ -848,13 +870,26 @@ AT_DATA_GRAMMAR([[input.y]],
# define USE(SYM)
%}
+%destructor {
+ fprintf (yyoutput, "<]]not_kind[[> destructor should not be called.\n");
+} <]]not_kind[[>
+
%token END 0
%printer {
- fprintf (yyoutput, "Default printer for '%c' @ %d", $$, @$.first_column);
-} %symbol-default
+ fprintf (yyoutput, "<]]kind[[> for '%c' @ %d", $$, @$.first_column);
+} <]]kind[[>
%destructor {
- fprintf (stdout, "Default destructor for '%c' @ %d.\n", $$, @$.first_column);
-} %symbol-default
+ fprintf (stdout, "<]]kind[[> for '%c' @ %d.\n", $$, @$.first_column);
+} <]]kind[[>
+
+%printer {
+ fprintf (yyoutput, "<]]not_kind[[> printer should not be called.\n");
+} <]]not_kind[[>
+
+]]m4_if($1, 0, [[[
+]]],
+[[[%union { char tag; }
+%type start END]]])[[
%%
@@ -868,7 +903,7 @@ yylex (void)
static int called;
if (called++)
abort ();
- yylval = 'E';
+ yylval]]m4_if($1, 0,, [[[.tag]]])[[ = 'E';
yylloc.first_line = yylloc.last_line = 1;
yylloc.first_column = yylloc.last_column = 1;
return 0;
@@ -888,26 +923,33 @@ main (void)
}
]])
-AT_CHECK([bison -o input.c input.y])
-AT_COMPILE([input])
-AT_PARSER_CHECK([./input], 0,
-[[Default destructor for 'E' @ 1.
-Default destructor for 'S' @ 1.
+AT_BISON_CHECK([-o input$1.c input$1.y])
+AT_COMPILE([input$1])
+AT_PARSER_CHECK([./input$1], 0,
+[[<]]kind[[> for 'E' @ 1.
+<]]kind[[> for 'S' @ 1.
]],
[[Starting parse
Entering state 0
-Reducing stack by rule 1 (line 35):
--> $$ = nterm start (1.1-1.1: Default printer for 'S' @ 1)
+Reducing stack by rule 1 (line 46):
+-> $$ = nterm start (1.1-1.1: <]]kind[[> for 'S' @ 1)
Stack now 0
Entering state 1
Reading a token: Now at end of input.
-Shifting token END (1.1-1.1: Default printer for 'E' @ 1)
+Shifting token END (1.1-1.1: <]]kind[[> for 'E' @ 1)
Entering state 2
Stack now 0 1 2
-Cleanup: popping token END (1.1-1.1: Default printer for 'E' @ 1)
-Cleanup: popping nterm start (1.1-1.1: Default printer for 'S' @ 1)
+Cleanup: popping token END (1.1-1.1: <]]kind[[> for 'E' @ 1)
+Cleanup: popping nterm start (1.1-1.1: <]]kind[[> for 'S' @ 1)
]])
+m4_popdef([kind])
+m4_popdef([not_kind])
+])
+
+_AT_CHECK_DEFAULT_PRINTER_AND_DESTRUCTOR_FOR_END_TOKEN(0)
+_AT_CHECK_DEFAULT_PRINTER_AND_DESTRUCTOR_FOR_END_TOKEN(1)
+
AT_CLEANUP
@@ -916,7 +958,7 @@ AT_CLEANUP
## Default %printer and %destructor are not for error or $undefined. ##
## ------------------------------------------------------------------ ##
-AT_SETUP([Default %printer and %destructor are not for error or \$undefined])
+AT_SETUP([Default %printer and %destructor are not for error or $undefined])
# If Bison were to apply the default %printer and %destructor to the error
# token or to $undefined:
@@ -940,10 +982,10 @@ AT_DATA_GRAMMAR([[input.y]],
%printer {
fprintf (yyoutput, "'%c'", $$);
-} %symbol-default
+} <> <*>
%destructor {
fprintf (stderr, "DESTROY '%c'\n", $$);
-} %symbol-default
+} <> <*>
%%
@@ -981,7 +1023,7 @@ main (void)
}
]])
-AT_CHECK([bison -o input.c input.y])
+AT_BISON_CHECK([-o input.c input.y])
AT_COMPILE([input])
AT_PARSER_CHECK([./input], [1], [],
[[Starting parse
@@ -1026,7 +1068,7 @@ AT_CLEANUP
## Default %printer and %destructor are not for $accept. ##
## ------------------------------------------------------ ##
-AT_SETUP([Default %printer and %destructor are not for \$accept])
+AT_SETUP([Default %printer and %destructor are not for $accept])
# If YYSTYPE is a union and Bison were to apply the default %printer and
# %destructor to $accept:
@@ -1055,11 +1097,11 @@ AT_DATA_GRAMMAR([[input.y]],
%printer {
char chr = $$;
fprintf (yyoutput, "'%c'", chr);
-} %symbol-default
+} <> <*>
%destructor {
char chr = $$;
fprintf (stderr, "DESTROY '%c'\n", chr);
-} %symbol-default
+} <> <*>
%union { char chr; }
%type start
@@ -1092,7 +1134,7 @@ main (void)
}
]])
-AT_CHECK([bison -o input.c input.y])
+AT_BISON_CHECK([-o input.c input.y])
AT_COMPILE([input])
AT_CLEANUP
@@ -1119,8 +1161,10 @@ AT_DATA_GRAMMAR([[input.y]],
# define YY_LOCATION_PRINT(File, Loc)
%}
-%printer { fprintf (yyoutput, "%d", @$); } %symbol-default
-%destructor { fprintf (stderr, "DESTROY %d\n", @$); } %symbol-default
+%printer { fprintf (yyoutput, "%d", @$); } <>
+%destructor { fprintf (stderr, "DESTROY %d\n", @$); } <>
+%printer { fprintf (yyoutput, "<*> printer should not be called"); } <*>
+%destructor { fprintf (yyoutput, "<*> destructor should not be called"); } <*>
%%
@@ -1158,28 +1202,28 @@ main (void)
}
]])
-AT_CHECK([bison -o input.c input.y], 0,,
-[[input.y:31.3-23: warning: unset value: $$
-input.y:28.3-33.37: warning: unused value: $3
+AT_BISON_CHECK([-o input.c input.y], 0,,
+[[input.y:33.3-23: warning: unset value: $$
+input.y:30.3-35.37: warning: unused value: $3
]])
AT_COMPILE([input])
AT_PARSER_CHECK([./input], 1,,
[[Starting parse
Entering state 0
-Reducing stack by rule 1 (line 28):
+Reducing stack by rule 1 (line 30):
-> $$ = nterm $@1 (: )
Stack now 0
Entering state 2
-Reducing stack by rule 2 (line 29):
+Reducing stack by rule 2 (line 31):
-> $$ = nterm @2 (: 2)
Stack now 0 2
Entering state 4
-Reducing stack by rule 3 (line 30):
+Reducing stack by rule 3 (line 32):
-> $$ = nterm @3 (: 3)
Stack now 0 2 4
Entering state 5
-Reducing stack by rule 4 (line 31):
+Reducing stack by rule 4 (line 33):
-> $$ = nterm @4 (: 4)
Stack now 0 2 4 5
Entering state 6
@@ -1201,3 +1245,62 @@ Stack now 0
]])
AT_CLEANUP
+
+
+## ----------------------- ##
+## @$ implies %locations. ##
+## ----------------------- ##
+
+# Bison once forgot to check for @$ in actions other than semantic actions.
+
+# AT_CHECK_ACTION_LOCATIONS(ACTION-DIRECTIVE)
+# -------------------------------------------------------
+m4_define([AT_CHECK_ACTION_LOCATIONS],
+[AT_SETUP([[@$ in ]$1[ implies %locations]])
+
+AT_DATA_GRAMMAR([[input.y]],
+[[%code {
+ #include
+ static int yylex (void);
+ static void yyerror (char const *msg);
+}
+
+%debug
+
+]$1[ {
+ printf ("%d\n", @$.first_line);
+} ]m4_if($1, [%initial-action], [], [[start]])[
+
+%%
+
+start: ;
+
+%%
+
+static int
+yylex (void)
+{
+ return 0;
+}
+
+static void
+yyerror (char const *msg)
+{
+ fprintf (stderr, "%s\n", msg);
+}
+
+int
+main (void)
+{
+ return yyparse ();
+}
+]])
+
+AT_BISON_CHECK([[-o input.c input.y]])
+AT_COMPILE([[input]])
+
+AT_CLEANUP])
+
+AT_CHECK_ACTION_LOCATIONS([[%initial-action]])
+AT_CHECK_ACTION_LOCATIONS([[%destructor]])
+AT_CHECK_ACTION_LOCATIONS([[%printer]])