api.namespace: demonstrate and use {...} values instead of "..." values

[bison.git] / tests / torture.at

diff --git a/tests/torture.at b/tests/torture.at
index a5e244b65086990b0e6884ff54005d2c95bc71ac..5489e9199487d87f124f603f4f1898b34f383784 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


@@ -91,9 +91,9 @@ 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";
 


@@ -115,12 +115,7 @@ yylex (void)
     }
   return inner++;
 }
     }
   return inner++;
 }

-int
-main (void)
-{
-  yydebug = !!getenv ("YYDEBUG");
-  return yyparse ();
-}
+]AT_MAIN_DEFINE[

 EOF
 ]])
 AT_BISON_OPTION_POPDEFS
 EOF
 ]])
 AT_BISON_OPTION_POPDEFS


@@ -188,7 +183,7 @@ EOF
 use Text::Wrap;
 print
   wrap ("exp: ", "  ",
 use Text::Wrap;
 print
   wrap ("exp: ", "  ",

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

   "\n";
 
 print <<\EOF;
   "\n";
 
 print <<\EOF;


@@ -204,13 +199,7 @@ yylex (void)
   assert (counter++ == MAX + 1);
   return 0;
 }
   assert (counter++ == MAX + 1);
   return 0;
 }

-
-int
-main (void)
-{
-  yydebug = !!getenv ("YYDEBUG");
-  return yyparse ();
-}
+]AT_MAIN_DEFINE[

 EOF
 ]])
 
 EOF
 ]])
 


@@ -269,6 +258,7 @@ 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>


@@ -287,8 +277,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";


@@ -341,12 +331,7 @@ yylex (void)
   return counter++;
 }
 
   return counter++;
 }
 

-int
-main (void)
-{
-  yydebug = !!getenv ("YYDEBUG");
-  return yyparse ();
-}
+]AT_MAIN_DEFINE[

 EOF
 ]])
 
 EOF
 ]])
 


@@ -383,7 +368,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>


@@ -431,7 +416,7 @@ int
 main (int argc, const char **argv)
 {
   YYSTYPE yylval_init = get_args (argc, argv);
 main (int argc, const char **argv)
 {
   YYSTYPE yylval_init = get_args (argc, argv);

-  int status;
+  int status = 0;

   int count;
 ]m4_bmatch([$2], [api.push-pull both],
 [[  yypstate *ps = yypstate_new ();
   int count;
 ]m4_bmatch([$2], [api.push-pull both],
 [[  yypstate *ps = yypstate_new ();