tests: style changes

* tests/torture.at (AT_DATA_STACK_TORTURE): M4 style changes to
improve readability.
Fix an assertion which, because of a <= instead of ==, did not check
new_status as visibly meant.
(get_args): New.

tests/torture.at

@@ -412,38 +412,44 @@ yylex (void)
     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)
 {
-  char *endp;
+  YYSTYPE yylval_init = get_args (argc, argv);
-  YYSTYPE yylval_init;
-  assert (argc == 2);
-  yylval_init = strtol (argv[1], &endp, 10);
-  assert (argv[1] != endp);
-  assert (0 <= yylval_init);
-  assert (yylval_init <= INT_MAX);
-  assert (errno != ERANGE);
-  yydebug = 1;
-  {
-    int count;
   int status;
+  int count;
 ]m4_bmatch([$2], [api.push-pull both],
 [[  yypstate *ps = yypstate_new ();
-]])[    for (count = 0; count < 2; ++count)
+]])[  yydebug = 1;
+  for (count = 0; count < 2; ++count)
     {
       int new_status;
       yylval = yylval_init;
-]m4_bmatch([$2], [api.push-pull both],
+      new_status = ]m4_bmatch([$2], [api.push-pull both],
-[[        new_status = yypull_parse (ps);
+                              [[yypull_parse (ps)]],
-]],
+                              [[yyparse ()]])[;
-[[        new_status = yyparse ();
+      if (count == 0)
-]])[        assert (0 <= count || new_status == status);
         status = new_status;
-      }
+      else
-]m4_bmatch([$2], [api.push-pull both],
+        assert (new_status == status);
-[[    yypstate_delete (ps);
+    }]m4_bmatch([$2], [api.push-pull both],[[
-]])[    return status;
+  yypstate_delete (ps);]])[
-  }
+  return status;
 }
 ]])
 AT_BISON_OPTION_POPDEFS([$2])