Stop storing rules from 1 to nrules + 1.

[bison.git] / tests / torture.at

diff --git a/tests/torture.at b/tests/torture.at
index 2e0cfc926e18021b35543da101deaecbd5e81ec0..47016622d09f868a7004933d3f72c18c6084900e 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -57,7 +57,7 @@ EOF
 
 for my $size (1 .. $max)
   {
-    print "%token \"$size\" ", $size, "\n";
+    print "%token t$size $size \"$size\"\n";
   };
 
 print <<EOF;
@@ -128,10 +128,12 @@ AT_SETUP([Big triangle])
 
 # I have been able to go up to 2000 on my machine.
 # I tried 3000, a 29Mb grammar file, but then my system killed bison.
-AT_DATA_TRIANGULAR_GRAMMAR([input.y], [500])
+# 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([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input])
 
 AT_CLEANUP
 
@@ -164,7 +166,7 @@ EOF
 
 for my $size (1 .. $max)
   {
-    print "%token \"$size\" ", $size, "\n";
+    print "%token t$size $size \"$size\"\n";
   };
 
 print <<EOF;
@@ -229,8 +231,8 @@ AT_SETUP([Big horizontal])
 #
 AT_DATA_HORIZONTAL_GRAMMAR([input.y], [1000])
 AT_CHECK([bison input.y -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input])
 
 AT_CLEANUP
 
@@ -272,12 +274,12 @@ EOF
 print
   wrap ("%type <val> ",
        "            ",
-       map { "token$_" } (1 .. $max)),
+       map { "n$_" } (1 .. $max)),
   "\n";
 
 for my $count (1 .. $max)
   {
-    print "%token \"$count\" $count\n";
+    print "%token t$count $count \"$count\"\n";
   };
 
 print <<EOF;
@@ -288,18 +290,18 @@ input:
 ;
 
 exp:
-  token1 "1" { assert (\@S|@1 == 1); }
+  n1 "1" { assert (\@S|@1 == 1); }
 EOF
 
 for my $count (2 .. $max)
   {
-    print "| token$count \"$count\" { assert (\@S|@1 == $count); }\n";
+    print "| n$count \"$count\" { assert (\@S|@1 == $count); }\n";
   };
 print ";\n";
 
 for my $count (1 .. $max)
   {
-    print "token$count: token { \$\$ = $count; };\n";
+    print "n$count: token { \$\$ = $count; };\n";
   };
 
 print <<EOF;
@@ -348,8 +350,8 @@ AT_SETUP([Many lookaheads])
 
 AT_DATA_LOOKAHEADS_GRAMMAR([input.y], [1000])
 AT_CHECK([bison input.y -v -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CHECK([./input])
+AT_COMPILE([input])
+AT_PARSER_CHECK([./input])
 
 AT_CLEANUP
 
@@ -369,9 +371,6 @@ AT_DATA([input.y],
 ]$1[
   static int yylex (void);
   static void yyerror (const char *msg);
-#define YYPRINT(File, Type, Value)                   \
-  fprintf (File, " (%d, stack size = %d, max = %d)", \
-           Value, yyssp - yyss + 1, yystacksize);
 %}
 %error-verbose
 %debug
@@ -408,7 +407,7 @@ main (int argc, const char **argv)
 }
 ]])
 AT_CHECK([bison input.y -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
+AT_COMPILE([input])
 ])
 
 
@@ -421,12 +420,12 @@ AT_SETUP([Exploding the Stack Size with Alloca])
 AT_DATA_STACK_TORTURE
 
 # Below the limit of 200.
-AT_CHECK([./input 20], 0, [], [ignore])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore])
 # Two enlargements: 2 * 2 * 200.
-AT_CHECK([./input 900], 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_CHECK([./input 10000], 1, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 1, [], [ignore])
 
 AT_CLEANUP
 
@@ -442,11 +441,11 @@ AT_SETUP([Exploding the Stack Size with Malloc])
 AT_DATA_STACK_TORTURE([[#define YYSTACK_USE_ALLOCA 0]])
 
 # Below the limit of 200.
-AT_CHECK([./input 20], 0, [], [ignore])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore])
 # Two enlargements: 2 * 2 * 200.
-AT_CHECK([./input 900], 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_CHECK([./input 10000], 1, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 1, [], [ignore])
 
 AT_CLEANUP