Merge branch 'maint'

[bison.git] / tests / torture.at

diff --git a/tests/torture.at b/tests/torture.at
index 414abacaa238e75e7d1e4fbc4a6e4e75101d3923..a5e244b65086990b0e6884ff54005d2c95bc71ac 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -125,7 +125,7 @@ EOF
 ]])
 AT_BISON_OPTION_POPDEFS
 
 ]])
 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
 ])
 


@@ -214,7 +214,7 @@ 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
 AT_BISON_OPTION_POPDEFS
 ])
 mv stdout $1
 AT_BISON_OPTION_POPDEFS
 ])


@@ -350,7 +350,7 @@ 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
 AT_BISON_OPTION_POPDEFS
 ])
 mv stdout $1
 AT_BISON_OPTION_POPDEFS
 ])


@@ -412,38 +412,44 @@ yylex (void)
     return EOF;
 }
 
     return EOF;
 }
 

-int
-main (int argc, const char **argv)
+/* Return argv[1] as an int. */
+static int
+get_args (int argc, const char **argv)

 {
 {

+  int res;

   char *endp;
   char *endp;

-  YYSTYPE yylval_init;

   assert (argc == 2);
   assert (argc == 2);

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

   assert (argv[1] != endp);
   assert (argv[1] != endp);

-  assert (0 <= yylval_init);
-  assert (yylval_init <= INT_MAX);
+  assert (0 <= res);
+  assert (res <= INT_MAX);

   assert (errno != ERANGE);
   assert (errno != ERANGE);

-  yydebug = 1;
-  {
-    int count;
-    int status;
-]m4_bmatch([$2], [api.push-pull both],
-[[    yypstate *ps = yypstate_new ();
-]])[    for (count = 0; count < 2; ++count)
-      {
-        int new_status;
-        yylval = yylval_init;
+  return res;
+}
+
+int
+main (int argc, const char **argv)
+{
+  YYSTYPE yylval_init = get_args (argc, argv);
+  int status;
+  int count;

 ]m4_bmatch([$2], [api.push-pull both],
 ]m4_bmatch([$2], [api.push-pull both],

-[[        new_status = yypull_parse (ps);
-]],
-[[        new_status = yyparse ();
-]])[        assert (0 <= count || new_status == status);
+[[  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], [api.push-pull both],
-[[    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])