Check for unrecognized %define variables similar to checking for

[bison.git] / tests / torture.at

diff --git a/tests/torture.at b/tests/torture.at
index b9032d0cb7da6ec945e8cee212cf7d316c470139..fabab2dfae010e40e64a84f50579bd38f75bfaed 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,20 +13,21 @@
 
 # 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_INCREASE_DATA_SIZE(SIZE)
 
 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
 # 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])
     ulimit -S -d $1
   fi
 esac])


@@ -48,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);


@@ -76,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:


@@ -164,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
 


@@ -198,10 +199,11 @@ static int
 yylex (void)
 {
   static int counter = 1;
 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
 }
 
 static void


@@ -256,11 +258,11 @@ AT_CLEANUP
 
 
 
 
 
 

-# AT_DATA_LOOKAHEADS_GRAMMAR(FILE-NAME, SIZE)
-# -------------------------------------------
+# AT_DATA_LOOKAHEAD_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 lookahead tokens.
+m4_define([AT_DATA_LOOKAHEAD_TOKENS_GRAMMAR],

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


@@ -269,13 +271,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);


@@ -295,9 +296,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;


@@ -308,12 +310,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";
 


@@ -330,7 +332,11 @@ yylex (void)
   static int return_token = 1;
   static int counter = 1;
   if (counter > $max)
   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;
   if (return_token)
     {
       return_token = 0;


@@ -360,13 +366,13 @@ mv stdout $1
 ])
 
 
 ])
 
 

-## ----------------- ##
-## Many lookaheads.  ##
-## ----------------- ##
+## ------------------------ ##
+## Many lookahead tokens.   ##
+## ------------------------ ##

 
 

-AT_SETUP([Many lookaheads])
+AT_SETUP([Many lookahead tokens])

 
 

-AT_DATA_LOOKAHEADS_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.
 
 # 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.


@@ -380,21 +386,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],
 [[%{
 # 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 <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);
 %}

+]$2[

 %error-verbose
 %debug
 %token WAIT_FOR_EOF
 %error-verbose
 %debug
 %token WAIT_FOR_EOF


@@ -405,15 +413,13 @@ 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)
 {

+  if (yylval < 0)
+    abort ();

   if (yylval--)
     return WAIT_FOR_EOF;
   else
   if (yylval--)
     return WAIT_FOR_EOF;
   else


@@ -423,10 +429,37 @@ 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;
+  YYSTYPE yylval_init;
+  if (argc != 2)
+    abort ();
+  yylval_init = strtol (argv[1], &endp, 10);
+  if (! (argv[1] != endp
+        && 0 <= yylval_init && yylval_init <= INT_MAX
+        && errno != ERANGE))
+    abort ();

   yydebug = 1;
   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])
 }
 ]])
 AT_CHECK([bison -o input.c input.y])


@@ -440,7 +473,14 @@ AT_COMPILE([input])
 
 AT_SETUP([Exploding the Stack Size with Alloca])
 
 
 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])
 
 # Below the limit of 200.
 AT_PARSER_CHECK([./input 20], 0, [], [ignore])


@@ -448,7 +488,16 @@ 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_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
 
 
 AT_CLEANUP
 


@@ -461,7 +510,9 @@ AT_CLEANUP
 
 AT_SETUP([Exploding the Stack Size with Malloc])
 
 
 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])
 
 # Below the limit of 200.
 AT_PARSER_CHECK([./input 20], 0, [], [ignore])


@@ -469,6 +520,15 @@ 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_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
 
 AT_CLEANUP