maint: minor fixes

[bison.git] / tests / torture.at

diff --git a/tests/torture.at b/tests/torture.at
index 253041e6d50ea5bb0593e0efa763c7e5d39aa447..338c1648e9453e5549a89f1917ba8532e3667dc6 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -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,9 +56,10 @@ print <<EOF;
 %{
 #include <stdio.h>
 #include <stdlib.h>
 %{
 #include <stdio.h>
 #include <stdlib.h>

-
-static int yylex (void);
-static void yyerror (const char *msg);
+#include <assert.h>
+#define MAX $max
+]AT_YYLEX_DECLARE[
+]AT_YYERROR_DECLARE[

 %}
 %union
 {
 %}
 %union
 {


@@ -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,6 +123,7 @@ main (void)
 }
 EOF
 ]])
 }
 EOF
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_CHECK([perl -w ./gengram.pl $2 || exit 77], 0, [stdout])
 mv stdout $1
 
 AT_CHECK([perl -w ./gengram.pl $2 || exit 77], 0, [stdout])
 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,9 +168,9 @@ print <<EOF;
 %{
 #include <stdio.h>
 #include <stdlib.h>
 %{
 #include <stdio.h>
 #include <stdlib.h>

-
-static int yylex (void);
-static void yyerror (const char *msg);
+#define MAX $max
+]AT_YYLEX_DECLARE[
+]AT_YYERROR_DECLARE[

 %}
 
 %token
 %}
 
 %token


@@ -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)
 {


@@ -223,6 +216,7 @@ EOF
 
 AT_CHECK([perl -w ./gengram.pl $2 || exit 77], 0, [stdout])
 mv stdout $1
 
 AT_CHECK([perl -w ./gengram.pl $2 || exit 77], 0, [stdout])
 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;


@@ -277,9 +272,9 @@ print <<EOF;
 # include <stdio.h>
 # include <stdlib.h>
 # include <assert.h>
 # include <stdio.h>
 # include <stdlib.h>
 # include <assert.h>

-
-static int yylex (void);
-static void yyerror (const char *msg);
+# define MAX $max
+]AT_YYLEX_DECLARE[
+]AT_YYERROR_DECLARE[

 %}
 %union
 {
 %}
 %union
 {


@@ -292,8 +287,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 +319,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 +341,6 @@ yylex (void)
   return counter++;
 }
 
   return counter++;
 }
 

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

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


@@ -363,6 +352,7 @@ EOF
 
 AT_CHECK([perl -w ./gengram.pl $2 || exit 77], 0, [stdout])
 mv stdout $1
 
 AT_CHECK([perl -w ./gengram.pl $2 || exit 77], 0, [stdout])
 mv stdout $1

+AT_BISON_OPTION_POPDEFS

 ])
 
 
 ])
 
 


@@ -390,7 +380,8 @@ AT_CLEANUP
 # ------------------------------------------------
 # A parser specialized in torturing the stack size.
 m4_define([AT_DATA_STACK_TORTURE],
 # ------------------------------------------------
 # 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.
+[AT_BISON_OPTION_PUSHDEFS([$2])
+# A grammar of parens growing the stack thanks to right recursion.

 # exp:
 AT_DATA([input.y],
 [[%{
 # exp:
 AT_DATA([input.y],
 [[%{


@@ -399,8 +390,8 @@ AT_DATA([input.y],
 #include <stdio.h>
 #include <stdlib.h>
 ]$1[
 #include <stdio.h>
 #include <stdlib.h>
 ]$1[

-  static int yylex (void);
-  static void yyerror (const char *msg);
+  ]AT_YYLEX_DECLARE[
+  ]AT_YYERROR_DECLARE[

 %}
 ]$2[
 %error-verbose
 %}
 ]$2[
 %error-verbose


@@ -409,17 +400,12 @@ AT_DATA([input.y],
 %%
 exp: WAIT_FOR_EOF exp | ;
 %%
 %%
 exp: WAIT_FOR_EOF exp | ;
 %%

-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]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
   if (yylval--)
     return WAIT_FOR_EOF;
   else


@@ -431,13 +417,12 @@ main (int argc, const char **argv)
 {
   char *endp;
   YYSTYPE yylval_init;
 {
   char *endp;
   YYSTYPE yylval_init;

-  if (argc != 2)
-    abort ();
+  assert (argc == 2);

   yylval_init = strtol (argv[1], &endp, 10);
   yylval_init = strtol (argv[1], &endp, 10);

-  if (! (argv[1] != endp
-         && 0 <= yylval_init && yylval_init <= INT_MAX
-         && errno != ERANGE))
-    abort ();
+  assert (argv[1] != endp);
+  assert (0 <= yylval_init);
+  assert (yylval_init <= INT_MAX);
+  assert (errno != ERANGE);

   yydebug = 1;
   {
     int count;
   yydebug = 1;
   {
     int count;


@@ -452,8 +437,7 @@ main (int argc, const char **argv)
 [[        new_status = yypull_parse (ps);
 ]],
 [[        new_status = yyparse ();
 [[        new_status = yypull_parse (ps);
 ]],
 [[        new_status = yyparse ();

-]])[        if (count > 0 && new_status != status)
-          abort ();
+]])[        assert (0 <= count || new_status == status);

         status = new_status;
       }
 ]m4_bmatch([$2], [%push-],
         status = new_status;
       }
 ]m4_bmatch([$2], [%push-],


@@ -462,6 +446,7 @@ main (int argc, const char **argv)
   }
 }
 ]])
   }
 }
 ]])

+AT_BISON_OPTION_POPDEFS([$2])

 AT_BISON_CHECK([-o input.c input.y])
 AT_COMPILE([input])
 ])
 AT_BISON_CHECK([-o input.c input.y])
 AT_COMPILE([input])
 ])