X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/287b314eefdbf95b888f5f13f19bb6f472285b6d..31d3e510949227d55ed7e87c793b3ec571dffec3:/tests/actions.at?ds=sidebyside diff --git a/tests/actions.at b/tests/actions.at index a464bd22..841ae392 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, 2008 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);]) @@ -368,11 +367,7 @@ main (int argc, const char *argv[]) } ]]) -AT_LALR1_CC_IF( - [AT_CHECK([bison -o input.cc input.y]) - AT_COMPILE_CXX([input])], - [AT_CHECK([bison -o input.c input.y]) - AT_COMPILE([input])]) +AT_FULL_COMPILE([input]) # Check the location of "empty" @@ -664,7 +659,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, [[<> destructor for 'd' @ 4. @@ -789,7 +784,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, [[<*>//e destructor. @@ -924,7 +919,7 @@ main (void) } ]]) -AT_CHECK([bison -o input$1.c input$1.y]) +AT_BISON_CHECK([-o input$1.c input$1.y]) AT_COMPILE([input$1]) AT_PARSER_CHECK([./input$1], 0, [[<]]kind[[> for 'E' @ 1. @@ -1024,7 +1019,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 @@ -1135,7 +1130,7 @@ main (void) } ]]) -AT_CHECK([bison -o input.c input.y]) +AT_BISON_CHECK([-o input.c input.y]) AT_COMPILE([input]) AT_CLEANUP @@ -1203,7 +1198,7 @@ main (void) } ]]) -AT_CHECK([bison -o input.c input.y], 0,, +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 ]]) @@ -1246,3 +1241,170 @@ 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]]) + + +## ----------------------------------------------- ## +## Fix user actions without a trailing semicolon. ## +## ----------------------------------------------- ## + +AT_SETUP([[Fix user actions without a trailing semicolon]]) + +# This feature is undocumented, but we accidentally broke it in 2.3a, +# and there was a complaint at: +# . + +AT_DATA([input.y], +[[%% +start: test2 test1 test0 testc; + +test2 +: 'a' { semi; /* TEST:N:2 */ } +| 'b' { if (0) {no_semi} /* TEST:N:2 */ } +| 'c' { if (0) {semi;} /* TEST:N:2 */ } +| 'd' { semi; no_semi /* TEST:Y:2 */ } +| 'e' { semi(); no_semi() /* TEST:Y:2 */ } +| 'f' { semi[]; no_semi[] /* TEST:Y:2 */ } +| 'g' { semi++; no_semi++ /* TEST:Y:2 */ } +| 'h' { {no_semi} no_semi /* TEST:Y:2 */ } +| 'i' { {semi;} no_semi /* TEST:Y:2 */ } +; +test1 + : 'a' { semi; // TEST:N:1 ; +} | 'b' { if (0) {no_semi} // TEST:N:1 ; +} | 'c' { if (0) {semi;} // TEST:N:1 ; +} | 'd' { semi; no_semi // TEST:Y:1 ; +} | 'e' { semi(); no_semi() // TEST:Y:1 ; +} | 'f' { semi[]; no_semi[] // TEST:Y:1 ; +} | 'g' { semi++; no_semi++ // TEST:Y:1 ; +} | 'h' { {no_semi} no_semi // TEST:Y:1 ; +} | 'i' { {semi;} no_semi // TEST:Y:1 ; +} ; +test0 + : 'a' { semi; // TEST:N:1 {} +} | 'b' { if (0) {no_semi} // TEST:N:1 {} +} | 'c' { if (0) {semi;} // TEST:N:1 {} +} | 'd' { semi; no_semi // TEST:Y:1 {} +} | 'e' { semi(); no_semi() // TEST:Y:1 {} +} | 'f' { semi[]; no_semi[] // TEST:Y:1 {} +} | 'g' { semi++; no_semi++ // TEST:Y:1 {} +} | 'h' { {no_semi} no_semi // TEST:Y:1 {} +} | 'i' { {semi;} no_semi // TEST:Y:1 {} +} ; + +testc +: 'a' { +#define TEST_MACRO_N \ +[]"broken\" $ @ $$ @$ [];\ +string;"} +| 'b' { +no_semi +#define TEST_MACRO_N \ +[]"broken\" $ @ $$ @$ [];\ +string;"} +]]) + +AT_BISON_CHECK([[-o input.c input.y]], [0], [], +[[input.y:8.48: warning: a `;' might be needed at the end of action code +input.y:8.48: warning: future versions of Bison will not add the `;' +input.y:9.48: warning: a `;' might be needed at the end of action code +input.y:9.48: warning: future versions of Bison will not add the `;' +input.y:10.48: warning: a `;' might be needed at the end of action code +input.y:10.48: warning: future versions of Bison will not add the `;' +input.y:11.48: warning: a `;' might be needed at the end of action code +input.y:11.48: warning: future versions of Bison will not add the `;' +input.y:12.48: warning: a `;' might be needed at the end of action code +input.y:12.48: warning: future versions of Bison will not add the `;' +input.y:13.48: warning: a `;' might be needed at the end of action code +input.y:13.48: warning: future versions of Bison will not add the `;' +input.y:20.1: warning: a `;' might be needed at the end of action code +input.y:20.1: warning: future versions of Bison will not add the `;' +input.y:21.1: warning: a `;' might be needed at the end of action code +input.y:21.1: warning: future versions of Bison will not add the `;' +input.y:22.1: warning: a `;' might be needed at the end of action code +input.y:22.1: warning: future versions of Bison will not add the `;' +input.y:23.1: warning: a `;' might be needed at the end of action code +input.y:23.1: warning: future versions of Bison will not add the `;' +input.y:24.1: warning: a `;' might be needed at the end of action code +input.y:24.1: warning: future versions of Bison will not add the `;' +input.y:25.1: warning: a `;' might be needed at the end of action code +input.y:25.1: warning: future versions of Bison will not add the `;' +input.y:31.1: warning: a `;' might be needed at the end of action code +input.y:31.1: warning: future versions of Bison will not add the `;' +input.y:32.1: warning: a `;' might be needed at the end of action code +input.y:32.1: warning: future versions of Bison will not add the `;' +input.y:33.1: warning: a `;' might be needed at the end of action code +input.y:33.1: warning: future versions of Bison will not add the `;' +input.y:34.1: warning: a `;' might be needed at the end of action code +input.y:34.1: warning: future versions of Bison will not add the `;' +input.y:35.1: warning: a `;' might be needed at the end of action code +input.y:35.1: warning: future versions of Bison will not add the `;' +input.y:36.1: warning: a `;' might be needed at the end of action code +input.y:36.1: warning: future versions of Bison will not add the `;' +]]) + +AT_MATCHES_CHECK([input.c], [[/\* TEST:N:2 \*/ \}$]], [[3]]) +AT_MATCHES_CHECK([input.c], [[/\* TEST:Y:2 \*/ ;\}$]], [[6]]) +AT_MATCHES_CHECK([input.c], [[// TEST:N:1 [;{}]*\n\}$]], [[6]]) +AT_MATCHES_CHECK([input.c], [[// TEST:Y:1 [;{}]*\n;\}$]], [[12]]) +AT_MATCHES_CHECK([input.c], [[#define TEST_MACRO_N \\\n\[\]"broken\\" \$ \@ \$\$ \@\$ \[\];\\\nstring;"\}]], [[2]]) + +AT_CLEANUP