Ignore YYSTACK_USE_ALLOCA for push parsers since the stacks can't be

[bison.git] / tests / torture.at

diff --git a/tests/torture.at b/tests/torture.at
index ff373c21486115c6f668525a097ca65ae01bea25..6e1a1a48ace6a345d0e1bba8b6fa594f8affb935 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -199,10 +199,11 @@ static int
 yylex (void)
 {
   static int counter = 1;
-  if (counter > $max)
-    return 0;
-  else
-  return counter++;
+  if (counter <= $max)
+    return counter++;
+  if (counter++ != $max + 1)
+    abort ();
+  return 0;
 }
 
 static void
@@ -257,11 +258,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
 
@@ -331,7 +332,11 @@ yylex (void)
   static int return_token = 1;
   static int counter = 1;
   if (counter > $max)
-    return 0;
+    {
+      if (counter++ != $max + 1)
+       abort ();
+      return 0;
+    }
   if (return_token)
     {
       return_token = 0;
@@ -362,12 +367,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.
@@ -381,8 +386,8 @@ 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.
@@ -397,6 +402,7 @@ AT_DATA([input.y],
   static int yylex (void);
   static void yyerror (const char *msg);
 %}
+]$2[
 %error-verbose
 %debug
 %token WAIT_FOR_EOF
@@ -412,6 +418,8 @@ yyerror (const char *msg)
 static int
 yylex (void)
 {
+  if (yylval < 0)
+    abort ();
   if (yylval--)
     return WAIT_FOR_EOF;
   else
@@ -422,15 +430,36 @@ int
 main (int argc, const char **argv)
 {
   char *endp;
+  YYSTYPE yylval_init;
   if (argc != 2)
     abort ();
-  yylval = strtol (argv[1], &endp, 10);
+  yylval_init = strtol (argv[1], &endp, 10);
   if (! (argv[1] != endp
-        && 0 <= yylval && yylval <= INT_MAX
+        && 0 <= yylval_init && yylval_init <= INT_MAX
         && errno != ERANGE))
     abort ();
   yydebug = 1;
-  return yyparse ();
+  {
+    int count;
+    int status;
+]m4_bmatch([$2], [%push-],
+[[    yypstate *yyps = yypstate_new ();
+]])[    for (count = 0; count < 2; ++count)
+      {
+        int new_status;
+        yylval = yylval_init;
+]m4_bmatch([$2], [%push-],
+[[        new_status = yypull_parse (yyps);
+]],
+[[        new_status = yyparse ();
+]])[        if (count > 0 && new_status != status)
+          abort ();
+        status = new_status;
+      }
+]m4_bmatch([$2], [%push-],
+[[    yypstate_delete (yyps);
+]])[    return status;
+  }
 }
 ]])
 AT_CHECK([bison -o input.c input.y])
@@ -444,13 +473,15 @@ AT_COMPILE([input])
 
 AT_SETUP([Exploding the Stack Size with Alloca])
 
-AT_DATA_STACK_TORTURE([[
+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])
 # Two enlargements: 2 * 2 * 200.
@@ -459,6 +490,18 @@ AT_PARSER_CHECK([./input 900], 0, [], [ignore])
 # multiply by two starting at 200 => 5120 is the last possible).
 AT_PARSER_CHECK([./input 10000], 2, [], [ignore])
 
+# 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],
+[[%push-pull-parser
+]])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore])
+AT_PARSER_CHECK([./input 900], 0, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 2, [], [ignore])
+
+m4_popdef([AT_USE_ALLOCA])
+
 AT_CLEANUP
 
 
@@ -470,7 +513,9 @@ 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])
@@ -480,4 +525,13 @@ AT_PARSER_CHECK([./input 900], 0, [], [ignore])
 # multiply by two starting at 200 => 5120 is the possible).
 AT_PARSER_CHECK([./input 10000], 2, [], [ignore])
 
+AT_DATA_STACK_TORTURE([AT_USE_ALLOCA],
+[[%push-pull-parser
+]])
+AT_PARSER_CHECK([./input 20], 0, [], [ignore])
+AT_PARSER_CHECK([./input 900], 0, [], [ignore])
+AT_PARSER_CHECK([./input 10000], 2, [], [ignore])
+
+m4_popdef([AT_USE_ALLOCA])
+
 AT_CLEANUP