X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/67fd79c42743952d58ca53e3a97a8b66ee31bcc6..9350499cfce9122ebb065a582ab17e321b2e8ff3:/tests/torture.at

diff --git a/tests/torture.at b/tests/torture.at
index af5019bc..629bf976 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -50,13 +50,12 @@ my $max = $ARGV[0] || 10;
 
 print <<EOF;
 ]AT_DATA_GRAMMAR_PROLOGUE[
+%error-verbose
+%debug
 %{
 #include <stdio.h>
 #include <stdlib.h>
 
-#define YYERROR_VERBOSE 1
-#define YYDEBUG 1
-
 static int yylex (void);
 static void yyerror (const char *msg);
 %}
@@ -166,24 +165,25 @@ my $max = $ARGV[0] || 10;
 
 print <<EOF;
 ]AT_DATA_GRAMMAR_PROLOGUE[
+%error-verbose
+%debug
 %{
 #include <stdio.h>
 #include <stdlib.h>
 
-#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 <<EOF;
+
 %%
 EOF
 
@@ -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 <<EOF;
+%error-verbose
+%debug
 %{
-#include <stdio.h>
-#include <stdlib.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);
@@ -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 <<EOF;
 %%
 input:
-  exp        { if (\@S|@1 != 1) abort (); \$\$ = \@S|@1; }
-| input exp  { if (\@S|@2 != \@S|@1 + 1) abort (); \$\$ = \@S|@2; }
+  exp        { assert (\@S|@1 == 1); \$\$ = \@S|@1; }
+| input exp  { assert (\@S|@2 == \@S|@1 + 1); \$\$ = \@S|@2; }
 ;
 
 exp:
-  n1 "1" { if (\@S|@1 != 1) abort (); }
+  n1 "1" { assert (\@S|@1 == 1); \@S|@\@S|@ = \@S|@1; }
 EOF
 
 for my $count (2 .. $max)
   {
-    print "| n$count \"$count\" { if (\@S|@1 != $count) abort (); }\n";
+    print "| n$count \"$count\" { assert (\@S|@1 == $count); \@S|@\@S|@ = \@S|@1; }\n";
   };
 print ";\n";
 
@@ -361,12 +362,12 @@ 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.
@@ -388,6 +389,8 @@ m4_define([AT_DATA_STACK_TORTURE],
 # exp:
 AT_DATA([input.y],
 [[%{
+#include <errno.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 ]$1[
@@ -406,9 +409,6 @@ yyerror (const char *msg)
   fprintf (stderr, "%s\n", msg);
 }
 
-/* There are YYLVAL_MAX of WAIT_FOR_EOFs. */
-unsigned int yylval_max;
-
 static int
 yylex (void)
 {
@@ -421,9 +421,14 @@ yylex (void)
 int
 main (int argc, const char **argv)
 {
+  char *endp;
   if (argc != 2)
     abort ();
-  yylval = atoi (argv[1]);
+  yylval = strtol (argv[1], &endp, 10);
+  if (! (argv[1] != endp
+	 && 0 <= yylval && yylval <= INT_MAX
+	 && errno != ERANGE))
+    abort ();
   yydebug = 1;
   return yyparse ();
 }
@@ -440,7 +445,8 @@ AT_COMPILE([input])
 AT_SETUP([Exploding the Stack Size with Alloca])
 
 AT_DATA_STACK_TORTURE([[
-#if defined __GNUC__ || defined alloca
+#if (defined __GNUC__ || defined __BUILTIN_VA_ARG_INCR \
+     || defined _AIX || defined _MSC_VER || defined _ALLOCA_H)
 # define YYSTACK_USE_ALLOCA 1
 #endif
 ]])