X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/da730230ce159265f4380daa456e3e3c5f9422f4..a2c525b34c24e790e37d8735c28c708c17cf9f57:/tests/torture.at diff --git a/tests/torture.at b/tests/torture.at index 753fc919..d6b2806a 100644 --- a/tests/torture.at +++ b/tests/torture.at @@ -1,6 +1,7 @@ # Torturing Bison. -*- Autotest -*- -# Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation, -# Inc. + +# Copyright (C) 2001-2002, 2004-2007, 2009-2015 Free Software +# Foundation, Inc. # 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 @@ -41,7 +42,8 @@ esac]) # Create FILE-NAME, containing a self checking parser for a huge # triangular grammar. m4_define([AT_DATA_TRIANGULAR_GRAMMAR], -[AT_DATA([[gengram.pl]], +[AT_BISON_OPTION_PUSHDEFS +AT_DATA([[gengram.pl]], [[#! /usr/bin/perl -w use strict; @@ -54,9 +56,10 @@ print < #include - -static int yylex (void); -static void yyerror (const char *msg); +#include +#define MAX $max +]AT_YYLEX_DECLARE[ +]AT_YYERROR_DECLARE[ %} %union { @@ -75,8 +78,8 @@ for my $size (1 .. $max) print < $max) + if (outer > MAX) return 0; else if (inner > outer) { @@ -111,23 +115,12 @@ yylex (void) } return inner++; } - -static void -yyerror (const char *msg) -{ - fprintf (stderr, "%s\\n", msg); -} - -int -main (void) -{ - yydebug = !!getenv ("YYDEBUG"); - return yyparse (); -} +]AT_MAIN_DEFINE[ EOF ]]) +AT_BISON_OPTION_POPDEFS -AT_CHECK([perl -w ./gengram.pl $2 || exit 77], 0, [stdout]) +AT_CHECK([$PERL -w ./gengram.pl $2 || exit 77], 0, [stdout]) mv stdout $1 ]) @@ -156,7 +149,8 @@ AT_CLEANUP # Create FILE-NAME, containing a self checking parser for a huge # horizontal grammar. m4_define([AT_DATA_HORIZONTAL_GRAMMAR], -[AT_DATA([[gengram.pl]], +[AT_BISON_OPTION_PUSHDEFS +AT_DATA([[gengram.pl]], [[#! /usr/bin/perl -w use strict; @@ -169,9 +163,9 @@ print < #include - -static int yylex (void); -static void yyerror (const char *msg); +#define MAX $max +]AT_YYLEX_DECLARE[ +]AT_YYERROR_DECLARE[ %} %token @@ -189,39 +183,29 @@ EOF use Text::Wrap; print wrap ("exp: ", " ", - (map { "\"$_\"" } (1 .. $max)), ";"), + (map { "\"$_\"" } (1 .. $max)), ";"), "\n"; -print < +]AT_YYERROR_DEFINE[ static int yylex (void) { static int counter = 1; - if (counter <= $max) + if (counter <= MAX) return counter++; - if (counter++ != $max + 1) - abort (); + assert (counter++ == MAX + 1); return 0; } - -static void -yyerror (const char *msg) -{ - fprintf (stderr, "%s\\n", msg); -} - -int -main (void) -{ - yydebug = !!getenv ("YYDEBUG"); - return yyparse (); -} +]AT_MAIN_DEFINE[ EOF ]]) -AT_CHECK([perl -w ./gengram.pl $2 || exit 77], 0, [stdout]) +AT_CHECK([$PERL -w ./gengram.pl $2 || exit 77], 0, [stdout]) mv stdout $1 +AT_BISON_OPTION_POPDEFS ]) @@ -262,7 +246,8 @@ AT_CLEANUP # Create FILE-NAME, containing a self checking parser for a grammar # requiring SIZE lookahead tokens. m4_define([AT_DATA_LOOKAHEAD_TOKENS_GRAMMAR], -[AT_DATA([[gengram.pl]], +[AT_BISON_OPTION_PUSHDEFS +AT_DATA([[gengram.pl]], [[#! /usr/bin/perl -w use strict; @@ -273,12 +258,13 @@ print < # include # include - -static int yylex (void); -static void yyerror (const char *msg); +# define MAX $max +]AT_YYLEX_DECLARE[ +]AT_YYERROR_DECLARE[ %} %union { @@ -291,8 +277,8 @@ EOF print wrap ("%type ", - " ", - map { "n$_" } (1 .. $max)), + " ", + map { "n$_" } (1 .. $max)), "\n"; print "%token\n"; @@ -323,17 +309,17 @@ for my $count (1 .. $max) print "n$count: token { \$\$ = $count; };\n"; }; -print < $max) + if (counter > MAX) { - if (counter++ != $max + 1) - abort (); + assert (counter++ == MAX + 1); return 0; } if (return_token) @@ -345,23 +331,13 @@ yylex (void) return counter++; } -static void -yyerror (const char *msg) -{ - fprintf (stderr, "%s\\n", msg); -} - -int -main (void) -{ - yydebug = !!getenv ("YYDEBUG"); - return yyparse (); -} +]AT_MAIN_DEFINE[ EOF ]]) -AT_CHECK([perl -w ./gengram.pl $2 || exit 77], 0, [stdout]) +AT_CHECK([$PERL -w ./gengram.pl $2 || exit 77], 0, [stdout]) mv stdout $1 +AT_BISON_OPTION_POPDEFS ]) @@ -389,17 +365,18 @@ AT_CLEANUP # ------------------------------------------------ # A parser specialized in torturing the stack size. m4_define([AT_DATA_STACK_TORTURE], -[# A grammar of parens growing the stack thanks to right recursion. +[AT_BISON_OPTION_PUSHDEFS([$2]) +# A grammar of parens growing the stack thanks to right recursion. # exp: -AT_DATA([input.y], +AT_DATA_GRAMMAR([input.y], [[%{ #include #include #include #include ]$1[ - static int yylex (void); - static void yyerror (const char *msg); + ]AT_YYLEX_DECLARE[ + ]AT_YYERROR_DECLARE[ %} ]$2[ %error-verbose @@ -408,59 +385,59 @@ AT_DATA([input.y], %% exp: WAIT_FOR_EOF exp | ; %% -static void -yyerror (const char *msg) -{ - fprintf (stderr, "%s\n", msg); -} - +]AT_YYERROR_DEFINE[ +#include static int yylex (void) { - if (yylval < 0) - abort (); + assert (0 <= yylval); if (yylval--) return WAIT_FOR_EOF; else return EOF; } +/* Return argv[1] as an int. */ +static int +get_args (int argc, const char **argv) +{ + int res; + char *endp; + assert (argc == 2); (void) argc; + res = strtol (argv[1], &endp, 10); + assert (argv[1] != endp); + assert (0 <= res); + assert (res <= INT_MAX); + assert (errno != ERANGE); + return res; +} + int main (int argc, const char **argv) { - char *endp; - YYSTYPE yylval_init; - if (argc != 2) - abort (); - yylval_init = strtol (argv[1], &endp, 10); - if (! (argv[1] != endp - && 0 <= yylval_init && yylval_init <= INT_MAX - && errno != ERANGE)) - abort (); - yydebug = 1; - { - int count; - int status; -]m4_bmatch([$2], [%push-], -[[ yypstate *ps = yypstate_new (); -]])[ for (count = 0; count < 2; ++count) - { - int new_status; - yylval = yylval_init; -]m4_bmatch([$2], [%push-], -[[ new_status = yypull_parse (ps); -]], -[[ new_status = yyparse (); -]])[ if (count > 0 && new_status != status) - abort (); + YYSTYPE yylval_init = get_args (argc, argv); + int status = 0; + int count; +]m4_bmatch([$2], [api.push-pull both], +[[ yypstate *ps = yypstate_new (); +]])[ yydebug = 1; + for (count = 0; count < 2; ++count) + { + int new_status; + yylval = yylval_init; + new_status = ]m4_bmatch([$2], [api.push-pull both], + [[yypull_parse (ps)]], + [[yyparse ()]])[; + if (count == 0) status = new_status; - } -]m4_bmatch([$2], [%push-], -[[ yypstate_delete (ps); -]])[ return status; - } + else + assert (new_status == status); + }]m4_bmatch([$2], [api.push-pull both],[[ + yypstate_delete (ps);]])[ + return status; } ]]) +AT_BISON_OPTION_POPDEFS([$2]) AT_BISON_CHECK([-o input.c input.y]) AT_COMPILE([input]) ]) @@ -496,7 +473,7 @@ AT_PARSER_CHECK([./input 10000], 2, [], [ignore], # just helps guarantee we don't let the YYSTACK_USE_ALLOCA feature affect # push parsers. AT_DATA_STACK_TORTURE([AT_USE_ALLOCA], -[[%define api.push_pull "both" +[[%define api.push-pull both ]]) AT_PARSER_CHECK([./input 20], 0, [], [ignore], [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]]) @@ -534,7 +511,7 @@ AT_PARSER_CHECK([./input 10000], 2, [], [ignore], [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]]) AT_DATA_STACK_TORTURE([AT_USE_ALLOCA], -[[%define api.push_pull "both" +[[%define api.push-pull both ]]) AT_PARSER_CHECK([./input 20], 0, [], [ignore], [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])