maint: update copyright years

[bison.git] / tests / torture.at

diff --git a/tests/torture.at b/tests/torture.at
index 3fff08e6c66a3939dba58c8ea7a624fcc37c62fe..338c33c554f687fc60020b40a8bd46014bb339f9 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1,6 +1,6 @@
 # Torturing Bison.                                    -*- Autotest -*-
 
 # Torturing Bison.                                    -*- Autotest -*-
 

-# Copyright (C) 2001-2002, 2004-2007, 2009-2012 Free Software
+# Copyright (C) 2001-2002, 2004-2007, 2009-2013 Free Software

 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify


@@ -42,7 +42,8 @@ esac])
 # Create FILE-NAME, containing a self checking parser for a huge
 # triangular grammar.
 m4_define([AT_DATA_TRIANGULAR_GRAMMAR],
 # Create FILE-NAME, containing a self checking parser for a huge
 # triangular grammar.
 m4_define([AT_DATA_TRIANGULAR_GRAMMAR],

-[AT_DATA([[gengram.pl]],
+[AT_BISON_OPTION_PUSHDEFS
+AT_DATA([[gengram.pl]],

 [[#! /usr/bin/perl -w
 
 use strict;
 [[#! /usr/bin/perl -w
 
 use strict;


@@ -55,7 +56,8 @@ print <<EOF;
 %{
 #include <stdio.h>
 #include <stdlib.h>
 %{
 #include <stdio.h>
 #include <stdlib.h>

-
+#include <assert.h>
+#define MAX $max

 ]AT_YYLEX_DECLARE[
 ]AT_YYERROR_DECLARE[
 %}
 ]AT_YYLEX_DECLARE[
 ]AT_YYERROR_DECLARE[
 %}


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

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

 ;
 
 exp:
 ;
 
 exp:


@@ -89,20 +91,21 @@ for my $size (1 .. $max)
   {
     use Text::Wrap;
     print wrap ("| ", "   ",
   {
     use Text::Wrap;
     print wrap ("| ", "   ",

-               (map { "\"$_\"" } (1 .. $size)),
-               " END \n"),
-                 "    { \$\$ = $size; }\n";
+                (map { "\"$_\"" } (1 .. $size)),
+                " END \n"),
+                  "    { \$\$ = $size; }\n";

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

-print <<EOF;
+print <<\EOF;

 %%
 %%

+]AT_YYERROR_DEFINE[

 static int
 yylex (void)
 {
   static int inner = 1;
   static int outer = 0;
 static int
 yylex (void)
 {
   static int inner = 1;
   static int outer = 0;

-  if (outer > $max)
+  if (outer > MAX)

     return 0;
   else if (inner > outer)
     {
     return 0;
   else if (inner > outer)
     {


@@ -112,13 +115,6 @@ yylex (void)
     }
   return inner++;
 }
     }
   return inner++;
 }

-
-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\\n", msg);
-}
-

 int
 main (void)
 {
 int
 main (void)
 {


@@ -127,8 +123,9 @@ main (void)
 }
 EOF
 ]])
 }
 EOF
 ]])

+AT_BISON_OPTION_POPDEFS

 
 

-AT_CHECK([perl -w ./gengram.pl $2 || exit 77], 0, [stdout])
+AT_CHECK([$PERL -w ./gengram.pl $2 || exit 77], 0, [stdout])

 mv stdout $1
 ])
 
 mv stdout $1
 ])
 


@@ -157,7 +154,8 @@ AT_CLEANUP
 # Create FILE-NAME, containing a self checking parser for a huge
 # horizontal grammar.
 m4_define([AT_DATA_HORIZONTAL_GRAMMAR],
 # Create FILE-NAME, containing a self checking parser for a huge
 # horizontal grammar.
 m4_define([AT_DATA_HORIZONTAL_GRAMMAR],

-[AT_DATA([[gengram.pl]],
+[AT_BISON_OPTION_PUSHDEFS
+AT_DATA([[gengram.pl]],

 [[#! /usr/bin/perl -w
 
 use strict;
 [[#! /usr/bin/perl -w
 
 use strict;


@@ -170,7 +168,7 @@ print <<EOF;
 %{
 #include <stdio.h>
 #include <stdlib.h>
 %{
 #include <stdio.h>
 #include <stdlib.h>

-
+#define MAX $max

 ]AT_YYLEX_DECLARE[
 ]AT_YYERROR_DECLARE[
 %}
 ]AT_YYLEX_DECLARE[
 ]AT_YYERROR_DECLARE[
 %}


@@ -190,28 +188,23 @@ EOF
 use Text::Wrap;
 print
   wrap ("exp: ", "  ",
 use Text::Wrap;
 print
   wrap ("exp: ", "  ",

-       (map { "\"$_\"" } (1 .. $max)), ";"),
+        (map { "\"$_\"" } (1 .. $max)), ";"),

   "\n";
 
   "\n";
 

-print <<EOF;
+print <<\EOF;

 %%
 %%

+#include <assert.h>
+]AT_YYERROR_DEFINE[

 static int
 yylex (void)
 {
   static int counter = 1;
 static int
 yylex (void)
 {
   static int counter = 1;

-  if (counter <= $max)
+  if (counter <= MAX)

     return counter++;
     return counter++;

-  if (counter++ != $max + 1)
-    abort ();
+  assert (counter++ == MAX + 1);

   return 0;
 }
 
   return 0;
 }
 

-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\\n", msg);
-}
-

 int
 main (void)
 {
 int
 main (void)
 {


@@ -221,8 +214,9 @@ main (void)
 EOF
 ]])
 
 EOF
 ]])
 

-AT_CHECK([perl -w ./gengram.pl $2 || exit 77], 0, [stdout])
+AT_CHECK([$PERL -w ./gengram.pl $2 || exit 77], 0, [stdout])

 mv stdout $1
 mv stdout $1

+AT_BISON_OPTION_POPDEFS

 ])
 
 
 ])
 
 


@@ -263,7 +257,8 @@ AT_CLEANUP
 # Create FILE-NAME, containing a self checking parser for a grammar
 # requiring SIZE lookahead tokens.
 m4_define([AT_DATA_LOOKAHEAD_TOKENS_GRAMMAR],
 # Create FILE-NAME, containing a self checking parser for a grammar
 # requiring SIZE lookahead tokens.
 m4_define([AT_DATA_LOOKAHEAD_TOKENS_GRAMMAR],

-[AT_DATA([[gengram.pl]],
+[AT_BISON_OPTION_PUSHDEFS
+AT_DATA([[gengram.pl]],

 [[#! /usr/bin/perl -w
 
 use strict;
 [[#! /usr/bin/perl -w
 
 use strict;


@@ -274,10 +269,11 @@ print <<EOF;
 %error-verbose
 %debug
 %{
 %error-verbose
 %debug
 %{

+]AT_DATA_SOURCE_PROLOGUE[

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

-
+# define MAX $max

 ]AT_YYLEX_DECLARE[
 ]AT_YYERROR_DECLARE[
 %}
 ]AT_YYLEX_DECLARE[
 ]AT_YYERROR_DECLARE[
 %}


@@ -292,8 +288,8 @@ EOF
 
 print
   wrap ("%type <val> ",
 
 print
   wrap ("%type <val> ",

-       "            ",
-       map { "n$_" } (1 .. $max)),
+        "            ",
+        map { "n$_" } (1 .. $max)),

   "\n";
 
 print "%token\n";
   "\n";
 
 print "%token\n";


@@ -324,17 +320,17 @@ for my $count (1 .. $max)
     print "n$count: token { \$\$ = $count; };\n";
   };
 
     print "n$count: token { \$\$ = $count; };\n";
   };
 

-print <<EOF;
+print <<\EOF;

 %%
 %%

+]AT_YYERROR_DEFINE[

 static int
 yylex (void)
 {
   static int return_token = 1;
   static int counter = 1;
 static int
 yylex (void)
 {
   static int return_token = 1;
   static int counter = 1;

-  if (counter > $max)
+  if (counter > MAX)

     {
     {

-      if (counter++ != $max + 1)
-       abort ();
+      assert (counter++ == MAX + 1);

       return 0;
     }
   if (return_token)
       return 0;
     }
   if (return_token)


@@ -346,12 +342,6 @@ yylex (void)
   return counter++;
 }
 
   return counter++;
 }
 

-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\\n", msg);
-}
-

 int
 main (void)
 {
 int
 main (void)
 {


@@ -361,8 +351,9 @@ main (void)
 EOF
 ]])
 
 EOF
 ]])
 

-AT_CHECK([perl -w ./gengram.pl $2 || exit 77], 0, [stdout])
+AT_CHECK([$PERL -w ./gengram.pl $2 || exit 77], 0, [stdout])

 mv stdout $1
 mv stdout $1

+AT_BISON_OPTION_POPDEFS

 ])
 
 
 ])
 
 


@@ -393,7 +384,7 @@ m4_define([AT_DATA_STACK_TORTURE],
 [AT_BISON_OPTION_PUSHDEFS([$2])
 # A grammar of parens growing the stack thanks to right recursion.
 # exp:
 [AT_BISON_OPTION_PUSHDEFS([$2])
 # A grammar of parens growing the stack thanks to right recursion.
 # exp:

-AT_DATA([input.y],
+AT_DATA_GRAMMAR([input.y],

 [[%{
 #include <errno.h>
 #include <limits.h>
 [[%{
 #include <errno.h>
 #include <limits.h>


@@ -411,51 +402,55 @@ AT_DATA([input.y],
 exp: WAIT_FOR_EOF exp | ;
 %%
 ]AT_YYERROR_DEFINE[
 exp: WAIT_FOR_EOF exp | ;
 %%
 ]AT_YYERROR_DEFINE[

+#include <assert.h>

 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

-  if (yylval < 0)
-    abort ();
+  assert (0 <= yylval);

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

+/* Return argv[1] as an int. */
+static int
+get_args (int argc, const char **argv)
+{
+  int res;
+  char *endp;
+  assert (argc == 2);
+  res = strtol (argv[1], &endp, 10);
+  assert (argv[1] != endp);
+  assert (0 <= res);
+  assert (res <= INT_MAX);
+  assert (errno != ERANGE);
+  return res;
+}
+

 int
 main (int argc, const char **argv)
 {
 int
 main (int argc, const char **argv)
 {

-  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;
-  {
-    int count;
-    int status;
-]m4_bmatch([$2], [%push-],
-[[    yypstate *ps = yypstate_new ();
-]])[    for (count = 0; count < 2; ++count)
-      {
-        int new_status;
-        yylval = yylval_init;
-]m4_bmatch([$2], [%push-],
-[[        new_status = yypull_parse (ps);
-]],
-[[        new_status = yyparse ();
-]])[        if (count > 0 && new_status != status)
-          abort ();
+  YYSTYPE yylval_init = get_args (argc, argv);
+  int status = 0;
+  int count;
+]m4_bmatch([$2], [api.push-pull both],
+[[  yypstate *ps = yypstate_new ();
+]])[  yydebug = 1;
+  for (count = 0; count < 2; ++count)
+    {
+      int new_status;
+      yylval = yylval_init;
+      new_status = ]m4_bmatch([$2], [api.push-pull both],
+                              [[yypull_parse (ps)]],
+                              [[yyparse ()]])[;
+      if (count == 0)

         status = new_status;
         status = new_status;

-      }
-]m4_bmatch([$2], [%push-],
-[[    yypstate_delete (ps);
-]])[    return status;
-  }
+      else
+        assert (new_status == status);
+    }]m4_bmatch([$2], [api.push-pull both],[[
+  yypstate_delete (ps);]])[
+  return status;

 }
 ]])
 AT_BISON_OPTION_POPDEFS([$2])
 }
 ]])
 AT_BISON_OPTION_POPDEFS([$2])