Fix some nits reported by twlevo.

[bison.git] / tests / torture.at

diff --git a/tests/torture.at b/tests/torture.at
index 47016622d09f868a7004933d3f72c18c6084900e..ff373c21486115c6f668525a097ca65ae01bea25 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,5 +1,5 @@
 # Torturing Bison.                                    -*- Autotest -*-
 # Torturing Bison.                                    -*- Autotest -*-

-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2005 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
 
 # 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


@@ -13,12 +13,26 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.

 
 AT_BANNER([[Torture Tests.]])
 
 
 
 AT_BANNER([[Torture Tests.]])
 
 

+# AT_INCREASE_DATA_SIZE(SIZE)
+# ---------------------------
+# Try to increase the data size to SIZE KiB if possible.
+m4_define([AT_INCREASE_DATA_SIZE],
+[data_limit=`(ulimit -S -d) 2>/dev/null`
+case $data_limit in
+[[0-9]]*)
+  if test "$data_limit" -lt $1; then
+    AT_CHECK([ulimit -S -d $1 || exit 77])
+    ulimit -S -d $1
+  fi
+esac])
+
+

 ## ------------------------------------- ##
 ## Creating a large artificial grammar.  ##
 ## ------------------------------------- ##
 ## ------------------------------------- ##
 ## Creating a large artificial grammar.  ##
 ## ------------------------------------- ##


@@ -35,13 +49,12 @@ use strict;
 my $max = $ARGV[0] || 10;
 
 print <<EOF;
 my $max = $ARGV[0] || 10;
 
 print <<EOF;

+]AT_DATA_GRAMMAR_PROLOGUE[
+%error-verbose
+%debug

 %{
 #include <stdio.h>
 #include <stdlib.h>
 %{
 #include <stdio.h>
 #include <stdlib.h>

-#include <assert.h>
-
-#define YYERROR_VERBOSE 1
-#define YYDEBUG 1

 
 static int yylex (void);
 static void yyerror (const char *msg);
 
 static int yylex (void);
 static void yyerror (const char *msg);


@@ -63,8 +76,8 @@ for my $size (1 .. $max)
 print <<EOF;
 %%
 input:
 print <<EOF;
 %%
 input:

-  exp        { assert (\@S|@1 == 0); \$\$ = \@S|@1; }
-| input exp  { assert (\@S|@2 == \@S|@1 + 1); \$\$ = \@S|@2; }
+  exp        { if (\@S|@1 != 0) abort (); \$\$ = \@S|@1; }
+| input exp  { if (\@S|@2 != \@S|@1 + 1) abort (); \$\$ = \@S|@2; }

 ;
 
 exp:
 ;
 
 exp:


@@ -131,7 +144,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])
 # 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 input.y -v -o input.c])
+AT_CHECK([bison -v -o input.c input.y])

 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 


@@ -151,25 +164,26 @@ use strict;
 my $max = $ARGV[0] || 10;
 
 print <<EOF;
 my $max = $ARGV[0] || 10;
 
 print <<EOF;

+]AT_DATA_GRAMMAR_PROLOGUE[
+%error-verbose
+%debug

 %{
 #include <stdio.h>
 #include <stdlib.h>
 %{
 #include <stdio.h>
 #include <stdlib.h>

-#include <assert.h>
-
-#define YYERROR_VERBOSE 1
-#define YYDEBUG 1

 
 static int yylex (void);
 static void yyerror (const char *msg);
 %}
 
 static int yylex (void);
 static void yyerror (const char *msg);
 %}

-EOF

 
 

+%token
+EOF

 for my $size (1 .. $max)
   {
 for my $size (1 .. $max)
   {

-    print "%token t$size $size \"$size\"\n";
+    print "    t$size $size \"$size\"\n";

   };
 
 print <<EOF;
   };
 
 print <<EOF;

+

 %%
 EOF
 
 %%
 EOF
 


@@ -230,7 +244,12 @@ AT_SETUP([Big horizontal])
 # ./input                          0.00s user 0.01s sys 108% cpu     0.01 total
 #
 AT_DATA_HORIZONTAL_GRAMMAR([input.y], [1000])
 # ./input                          0.00s user 0.01s sys 108% cpu     0.01 total
 #
 AT_DATA_HORIZONTAL_GRAMMAR([input.y], [1000])

-AT_CHECK([bison input.y -v -o input.c])
+
+# 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_COMPILE([input])
 AT_PARSER_CHECK([./input])
 
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 


@@ -238,11 +257,11 @@ AT_CLEANUP
 
 
 
 
 
 

-# AT_DATA_LOOKAHEADS_GRAMMAR(FILE-NAME, SIZE)
-# -------------------------------------------
+# AT_DATA_LOOK_AHEAD_TOKENS_GRAMMAR(FILE-NAME, SIZE)
+# --------------------------------------------------

 # Create FILE-NAME, containing a self checking parser for a grammar
 # Create FILE-NAME, containing a self checking parser for a grammar

-# requiring SIZE lookaheads.
-m4_define([AT_DATA_LOOKAHEADS_GRAMMAR],
+# requiring SIZE look-ahead tokens.
+m4_define([AT_DATA_LOOK_AHEAD_TOKENS_GRAMMAR],

 [AT_DATA([[gengram.pl]],
 [[#! /usr/bin/perl -w
 
 [AT_DATA([[gengram.pl]],
 [[#! /usr/bin/perl -w
 


@@ -251,13 +270,12 @@ use Text::Wrap;
 my $max = $ARGV[0] || 10;
 
 print <<EOF;
 my $max = $ARGV[0] || 10;
 
 print <<EOF;

+%error-verbose
+%debug

 %{
 %{

-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#define YYERROR_VERBOSE 1
-#define YYDEBUG 1
+# include <stdio.h>
+# include <stdlib.h>
+# include <assert.h>

 
 static int yylex (void);
 static void yyerror (const char *msg);
 
 static int yylex (void);
 static void yyerror (const char *msg);


@@ -277,9 +295,10 @@ print
        map { "n$_" } (1 .. $max)),
   "\n";
 
        map { "n$_" } (1 .. $max)),
   "\n";
 

+print "%token\n";

 for my $count (1 .. $max)
   {
 for my $count (1 .. $max)
   {

-    print "%token t$count $count \"$count\"\n";
+    print "    t$count $count \"$count\"\n";

   };
 
 print <<EOF;
   };
 
 print <<EOF;


@@ -290,12 +309,12 @@ input:
 ;
 
 exp:
 ;
 
 exp:

-  n1 "1" { assert (\@S|@1 == 1); }
+  n1 "1" { assert (\@S|@1 == 1); \@S|@\@S|@ = \@S|@1; }

 EOF
 
 for my $count (2 .. $max)
   {
 EOF
 
 for my $count (2 .. $max)
   {

-    print "| n$count \"$count\" { assert (\@S|@1 == $count); }\n";
+    print "| n$count \"$count\" { assert (\@S|@1 == $count); \@S|@\@S|@ = \@S|@1; }\n";

   };
 print ";\n";
 
   };
 print ";\n";
 


@@ -342,14 +361,19 @@ mv stdout $1
 ])
 
 
 ])
 
 

-## ----------------- ##
-## Many lookaheads.  ##
-## ----------------- ##
+## ------------------------ ##
+## Many look-ahead tokens.  ##
+## ------------------------ ##
+
+AT_SETUP([Many look-ahead tokens])

 
 

-AT_SETUP([Many lookaheads])
+AT_DATA_LOOK_AHEAD_TOKENS_GRAMMAR([input.y], [1000])

 
 

-AT_DATA_LOOKAHEADS_GRAMMAR([input.y], [1000])
-AT_CHECK([bison input.y -v -o input.c])
+# 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_COMPILE([input])
 AT_PARSER_CHECK([./input])
 
 AT_COMPILE([input])
 AT_PARSER_CHECK([./input])
 


@@ -365,9 +389,10 @@ m4_define([AT_DATA_STACK_TORTURE],
 # exp:
 AT_DATA([input.y],
 [[%{
 # exp:
 AT_DATA([input.y],
 [[%{

+#include <errno.h>
+#include <limits.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <assert.h>

 ]$1[
   static int yylex (void);
   static void yyerror (const char *msg);
 ]$1[
   static int yylex (void);
   static void yyerror (const char *msg);


@@ -382,12 +407,8 @@ static void
 yyerror (const char *msg)
 {
   fprintf (stderr, "%s\n", msg);
 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)
 {
 static int
 yylex (void)
 {


@@ -400,13 +421,19 @@ yylex (void)
 int
 main (int argc, const char **argv)
 {
 int
 main (int argc, const char **argv)
 {

-  assert (argc == 2);
-  yylval = atoi (argv[1]);
+  char *endp;
+  if (argc != 2)
+    abort ();
+  yylval = strtol (argv[1], &endp, 10);
+  if (! (argv[1] != endp
+        && 0 <= yylval && yylval <= INT_MAX
+        && errno != ERANGE))
+    abort ();

   yydebug = 1;
   return yyparse ();
 }
 ]])
   yydebug = 1;
   return yyparse ();
 }
 ]])

-AT_CHECK([bison input.y -o input.c])
+AT_CHECK([bison -o input.c input.y])

 AT_COMPILE([input])
 ])
 
 AT_COMPILE([input])
 ])
 


@@ -417,7 +444,12 @@ AT_COMPILE([input])
 
 AT_SETUP([Exploding the Stack Size with Alloca])
 
 
 AT_SETUP([Exploding the Stack Size with Alloca])
 

-AT_DATA_STACK_TORTURE
+AT_DATA_STACK_TORTURE([[
+#if (defined __GNUC__ || defined __BUILTIN_VA_ARG_INCR \
+     || defined _AIX || defined _MSC_VER || defined _ALLOCA_H)
+# define YYSTACK_USE_ALLOCA 1
+#endif
+]])

 
 # Below the limit of 200.
 AT_PARSER_CHECK([./input 20], 0, [], [ignore])
 
 # Below the limit of 200.
 AT_PARSER_CHECK([./input 20], 0, [], [ignore])


@@ -425,7 +457,7 @@ AT_PARSER_CHECK([./input 20], 0, [], [ignore])
 AT_PARSER_CHECK([./input 900], 0, [], [ignore])
 # 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 900], 0, [], [ignore])
 # 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])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -446,6 +478,6 @@ AT_PARSER_CHECK([./input 20], 0, [], [ignore])
 AT_PARSER_CHECK([./input 900], 0, [], [ignore])
 # 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 900], 0, [], [ignore])
 # 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])

 
 AT_CLEANUP
 
 AT_CLEANUP