X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0fb669f9d648dfdd7a39478a6b658511455ae966..326e5cf81eada2ebd9007fa5fe9903a27a8bd067:/tests/torture.at?ds=sidebyside
diff --git a/tests/torture.at b/tests/torture.at
index df20a346..33532377 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,20 +1,19 @@
# Torturing Bison. -*- Autotest -*-
-# Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001-2002, 2004-2007, 2009-2010 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([[Torture Tests.]])
@@ -50,13 +49,12 @@ my $max = $ARGV[0] || 10;
print <
#include
-#define YYERROR_VERBOSE 1
-#define YYDEBUG 1
-
static int yylex (void);
static void yyerror (const char *msg);
%}
@@ -145,7 +143,7 @@ AT_SETUP([Big triangle])
# With 500 and the new parser, which consume far too much memory,
# it gets killed too. Of course the parser is to be cleaned.
AT_DATA_TRIANGULAR_GRAMMAR([input.y], [200])
-AT_CHECK([bison -v -o input.c input.y])
+AT_BISON_CHECK_NO_XML([-v -o input.c input.y])
AT_COMPILE([input])
AT_PARSER_CHECK([./input])
@@ -166,24 +164,25 @@ my $max = $ARGV[0] || 10;
print <
#include
-#define YYERROR_VERBOSE 1
-#define YYDEBUG 1
-
static int yylex (void);
static void yyerror (const char *msg);
%}
-EOF
+%token
+EOF
for my $size (1 .. $max)
{
- print "%token t$size $size \"$size\"\n";
+ print " t$size $size \"$size\"\n";
};
print < $max)
- return 0;
- else
- return counter++;
+ if (counter <= $max)
+ return counter++;
+ if (counter++ != $max + 1)
+ abort ();
+ return 0;
}
static void
@@ -249,7 +249,7 @@ AT_DATA_HORIZONTAL_GRAMMAR([input.y], [1000])
# Ask for 200 MiB, which should be plenty even on a 64-bit host.
AT_INCREASE_DATA_SIZE(204000)
-AT_CHECK([bison -v -o input.c input.y])
+AT_BISON_CHECK_NO_XML([-v -o input.c input.y])
AT_COMPILE([input])
AT_PARSER_CHECK([./input])
@@ -257,11 +257,11 @@ AT_CLEANUP
-# AT_DATA_LOOK_AHEAD_TOKENS_GRAMMAR(FILE-NAME, SIZE)
-# -------------------------------------------
+# AT_DATA_LOOKAHEAD_TOKENS_GRAMMAR(FILE-NAME, SIZE)
+# --------------------------------------------------
# Create FILE-NAME, containing a self checking parser for a grammar
-# requiring SIZE look-ahead tokens.
-m4_define([AT_DATA_LOOK_AHEAD_TOKENS_GRAMMAR],
+# requiring SIZE lookahead tokens.
+m4_define([AT_DATA_LOOKAHEAD_TOKENS_GRAMMAR],
[AT_DATA([[gengram.pl]],
[[#! /usr/bin/perl -w
@@ -270,12 +270,12 @@ use Text::Wrap;
my $max = $ARGV[0] || 10;
print <
-#include
-
-#define YYERROR_VERBOSE 1
-#define YYDEBUG 1
+# include
+# include
+# include
static int yylex (void);
static void yyerror (const char *msg);
@@ -295,25 +295,26 @@ print
map { "n$_" } (1 .. $max)),
"\n";
+print "%token\n";
for my $count (1 .. $max)
{
- print "%token t$count $count \"$count\"\n";
+ print " t$count $count \"$count\"\n";
};
print < $max)
- return 0;
+ {
+ if (counter++ != $max + 1)
+ abort ();
+ return 0;
+ }
if (return_token)
{
return_token = 0;
@@ -361,18 +366,18 @@ mv stdout $1
## ------------------------ ##
-## Many look-ahead tokens. ##
+## Many lookahead tokens. ##
## ------------------------ ##
-AT_SETUP([Many look-ahead tokens])
+AT_SETUP([Many lookahead tokens])
-AT_DATA_LOOK_AHEAD_TOKENS_GRAMMAR([input.y], [1000])
+AT_DATA_LOOKAHEAD_TOKENS_GRAMMAR([input.y], [1000])
# GNU m4 requires about 70 MiB for this test on a 32-bit host.
# Ask for 200 MiB, which should be plenty even on a 64-bit host.
AT_INCREASE_DATA_SIZE(204000)
-AT_CHECK([bison -v -o input.c input.y])
+AT_BISON_CHECK([-v -o input.c input.y])
AT_COMPILE([input])
AT_PARSER_CHECK([./input])
@@ -380,20 +385,23 @@ AT_CLEANUP
-# AT_DATA_STACK_TORTURE(C-PROLOGUE)
-# ---------------------------------
+# AT_DATA_STACK_TORTURE(C-PROLOGUE, [BISON-DECLS])
+# ------------------------------------------------
# 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.
# exp:
AT_DATA([input.y],
[[%{
+#include
+#include
#include
#include
]$1[
static int yylex (void);
static void yyerror (const char *msg);
%}
+]$2[
%error-verbose
%debug
%token WAIT_FOR_EOF
@@ -404,15 +412,13 @@ static void
yyerror (const char *msg)
{
fprintf (stderr, "%s\n", msg);
- exit (1);
}
-/* There are YYLVAL_MAX of WAIT_FOR_EOFs. */
-unsigned int yylval_max;
-
static int
yylex (void)
{
+ if (yylval < 0)
+ abort ();
if (yylval--)
return WAIT_FOR_EOF;
else
@@ -422,14 +428,40 @@ yylex (void)
int
main (int argc, const char **argv)
{
+ char *endp;
+ YYSTYPE yylval_init;
if (argc != 2)
abort ();
- yylval = atoi (argv[1]);
+ yylval_init = strtol (argv[1], &endp, 10);
+ if (! (argv[1] != endp
+ && 0 <= yylval_init && yylval_init <= INT_MAX
+ && errno != ERANGE))
+ abort ();
yydebug = 1;
- return yyparse ();
+ {
+ 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 ();
+ status = new_status;
+ }
+]m4_bmatch([$2], [%push-],
+[[ yypstate_delete (ps);
+]])[ return status;
+ }
}
]])
-AT_CHECK([bison -o input.c input.y])
+AT_BISON_CHECK([-o input.c input.y])
AT_COMPILE([input])
])
@@ -440,19 +472,40 @@ AT_COMPILE([input])
AT_SETUP([Exploding the Stack Size with Alloca])
-AT_DATA_STACK_TORTURE([[
-#if defined __GNUC__ || defined alloca
+m4_pushdef([AT_USE_ALLOCA], [[
+#if (defined __GNUC__ || defined __BUILTIN_VA_ARG_INCR \
+ || defined _AIX || defined _MSC_VER || defined _ALLOCA_H)
# define YYSTACK_USE_ALLOCA 1
#endif
]])
+AT_DATA_STACK_TORTURE([AT_USE_ALLOCA])
+
# Below the limit of 200.
-AT_PARSER_CHECK([./input 20], 0, [], [ignore])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore],
+ [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
# Two enlargements: 2 * 2 * 200.
-AT_PARSER_CHECK([./input 900], 0, [], [ignore])
+AT_PARSER_CHECK([./input 900], 0, [], [ignore],
+ [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
# Fails: beyond the limit of 10,000 (which we don't reach anyway since we
# multiply by two starting at 200 => 5120 is the last possible).
-AT_PARSER_CHECK([./input 10000], 1, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 2, [], [ignore],
+ [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+
+# The push parser can't use alloca since the stacks can't be locals. This test
+# 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
+]])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore],
+ [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+AT_PARSER_CHECK([./input 900], 0, [], [ignore],
+ [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+AT_PARSER_CHECK([./input 10000], 2, [], [ignore],
+ [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+
+m4_popdef([AT_USE_ALLOCA])
AT_CLEANUP
@@ -465,14 +518,31 @@ AT_CLEANUP
AT_SETUP([Exploding the Stack Size with Malloc])
-AT_DATA_STACK_TORTURE([[#define YYSTACK_USE_ALLOCA 0]])
+m4_pushdef([AT_USE_ALLOCA], [[#define YYSTACK_USE_ALLOCA 0]])
+
+AT_DATA_STACK_TORTURE([AT_USE_ALLOCA])
# Below the limit of 200.
-AT_PARSER_CHECK([./input 20], 0, [], [ignore])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore],
+ [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
# Two enlargements: 2 * 2 * 200.
-AT_PARSER_CHECK([./input 900], 0, [], [ignore])
+AT_PARSER_CHECK([./input 900], 0, [], [ignore],
+ [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
# Fails: beyond the limit of 10,000 (which we don't reach anyway since we
# multiply by two starting at 200 => 5120 is the possible).
-AT_PARSER_CHECK([./input 10000], 1, [], [ignore])
+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
+]])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore],
+ [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+AT_PARSER_CHECK([./input 900], 0, [], [ignore],
+ [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+AT_PARSER_CHECK([./input 10000], 2, [], [ignore],
+ [[VALGRIND_OPTS="$VALGRIND_OPTS --log-fd=1"]])
+
+m4_popdef([AT_USE_ALLOCA])
AT_CLEANUP