Merge remote-tracking branch 'origin/maint'

[bison.git] / tests / actions.at

diff --git a/tests/actions.at b/tests/actions.at
index 32bfc34e4c4a2d59cb4957a09e06fb6dc4cb1c61..a14f522dc639f6555ad36e633c5e0e3db13b821b 100644 (file)
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1,6 +1,6 @@
 # Executing Actions.                               -*- Autotest -*-
 # Executing Actions.                               -*- Autotest -*-

-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-# Foundation, Inc.
+
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -28,14 +28,13 @@ AT_SETUP([Mid-rule actions])
 # instead of being attached to the empty rule dedicated to this
 # action.
 
 # instead of being attached to the empty rule dedicated to this
 # action.
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([[input.y]],
 AT_DATA_GRAMMAR([[input.y]],

-[[%error-verbose
+[[%define parse.error verbose

 %debug
 %{
 %debug
 %{

-# include <stdio.h>
-# include <stdlib.h>
-  static void yyerror (const char *msg);
-  static int yylex (void);
+]AT_YYERROR_DECLARE[
+]AT_YYLEX_DECLARE[

 %}
 %%
 exp:     { putchar ('0'); }
 %}
 %%
 exp:     { putchar ('0'); }


@@ -51,28 +50,15 @@ exp:     { putchar ('0'); }
          { putchar ('\n'); }
    ;
 %%
          { putchar ('\n'); }
    ;
 %%

-static int
-yylex (void)
-{
-  static char const input[] = "123456789";
-  static size_t toknum;
-  if (! (toknum < sizeof input))
-    abort ();
-  return input[toknum++];
-}
-
-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE(["123456789"])[

 int
 main (void)
 {
   return yyparse ();
 }
 ]])
 int
 main (void)
 {
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

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


@@ -92,14 +78,13 @@ AT_CLEANUP
 
 AT_SETUP([Exotic Dollars])
 
 
 AT_SETUP([Exotic Dollars])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([[input.y]],
 AT_DATA_GRAMMAR([[input.y]],

-[[%error-verbose
+[[%define parse.error verbose

 %debug
 %{
 %debug
 %{

-# include <stdio.h>
-# include <stdlib.h>
-  static void yyerror (const char *msg);
-  static int yylex (void);
+]AT_YYERROR_DECLARE[
+]AT_YYLEX_DECLARE[

 # define USE(Var)
 %}
 
 # define USE(Var)
 %}
 


@@ -130,21 +115,8 @@ sum_of_the_five_previous_values:
 ;
 
 %%
 ;
 
 %%

-static int
-yylex (void)
-{
-  static int called;
-  if (called++)
-    abort ();
-  return EOF;
-}
-
-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE[

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


@@ -158,6 +130,42 @@ AT_PARSER_CHECK([./input], 0,
 [[15
 ]])
 
 [[15
 ]])
 

+# Make sure that fields after $n or $-n are parsed correctly.  At one
+# point while implementing dashes in symbol names, we were dropping
+# fields after $-n.
+AT_DATA_GRAMMAR([[input.y]],
+[[
+%{
+# include <stdio.h>
+]AT_YYERROR_DECLARE[
+]AT_YYLEX_DECLARE[
+  typedef struct { int val; } stype;
+# define YYSTYPE stype
+%}
+
+%%
+start: one two { $$.val = $1.val + $2.val; } sum ;
+one: { $$.val = 1; } ;
+two: { $$.val = 2; } ;
+sum: { printf ("%d\n", $0.val + $-1.val + $-2.val); } ;
+
+%%
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE[
+int
+main (void)
+{
+  return yyparse ();
+}
+]])
+
+AT_BISON_CHECK([[-o input.c input.y]])
+AT_COMPILE([[input]])
+AT_PARSER_CHECK([[./input]], [[0]],
+[[6
+]])
+
+AT_BISON_OPTION_POPDEFS

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -166,11 +174,12 @@ AT_CLEANUP
 ## Printers and Destructors.  ##
 ## -------------------------- ##
 
 ## Printers and Destructors.  ##
 ## -------------------------- ##
 

-# _AT_CHECK_PRINTER_AND_DESTRUCTOR($1, $2, $3, $4, BISON-DIRECTIVE, UNION-FLAG)
-# -----------------------------------------------------------------------------
+# _AT_CHECK_PRINTER_AND_DESTRUCTOR($1, $2, $3, $4,
+#                                  BISON-DIRECTIVE, UNION-FLAG)
+# -------------------------------------------------------------

 m4_define([_AT_CHECK_PRINTER_AND_DESTRUCTOR],
 [# Make sure complex $n work.
 m4_define([_AT_CHECK_PRINTER_AND_DESTRUCTOR],
 [# Make sure complex $n work.

-m4_if([$1$2$3], $[1]$[2]$[3], [],
+m4_if([$1$2$3$4], $[1]$[2]$[3]$[4], [],

        [m4_fatal([$0: Invalid arguments: $@])])dnl
 
 # Be sure to pass all the %directives to this macro to have correct
        [m4_fatal([$0: Invalid arguments: $@])])dnl
 
 # Be sure to pass all the %directives to this macro to have correct


@@ -185,21 +194,24 @@ AT_DATA_GRAMMAR([[input.y]],
 
 #define YYINITDEPTH 10
 #define YYMAXDEPTH 10
 
 #define YYINITDEPTH 10
 #define YYMAXDEPTH 10

-]AT_LALR1_CC_IF(
-  [#define RANGE(Location) (Location).begin.line, (Location).end.line],
-  [#define RANGE(Location) (Location).first_line, (Location).last_line])
-[}
+#define RANGE(Location) ]AT_LALR1_CC_IF([(Location).begin.line, (Location).end.line],
+      [(Location).first_line, (Location).last_line])[
+
+/* Display the symbol type Symbol.  */
+#define V(Symbol, Value, Location, Sep) \
+   fprintf (stderr, #Symbol " (%d@%d-%d)" Sep, Value, RANGE(Location))
+}

 
 

-$5]
-m4_ifval([$6], [%union
+$5
+]m4_ifval([$6], [%union

 {
   int ival;
 }])
 AT_LALR1_CC_IF([%define global_tokens_and_yystype])
 m4_ifval([$6], [[%code provides {]], [[%code {]])
 {
   int ival;
 }])
 AT_LALR1_CC_IF([%define global_tokens_and_yystype])
 m4_ifval([$6], [[%code provides {]], [[%code {]])

-AT_LALR1_CC_IF([typedef yy::location YYLTYPE;])
-[static int yylex (]AT_LEX_FORMALS[);
-]AT_LALR1_CC_IF([], [static void yyerror (const char *msg);])
+AT_LALR1_CC_IF([typedef yy::location YYLTYPE;])[
+]AT_YYLEX_DECLARE[
+]AT_LALR1_CC_IF([], [AT_YYERROR_DECLARE])

 [}
 
 ]m4_ifval([$6], [%type <ival> '(' 'x' 'y' ')' ';' thing line input END])[
 [}
 
 ]m4_ifval([$6], [%type <ival> '(' 'x' 'y' ')' ';' thing line input END])[


@@ -213,28 +225,28 @@ AT_LALR1_CC_IF([typedef yy::location YYLTYPE;])
   input line thing 'x' 'y'
 
 %destructor
   input line thing 'x' 'y'
 
 %destructor

-  { printf ("Freeing nterm input (%d@%d-%d)\n", $$, RANGE (@$)); }
+  { fprintf (stderr, "Freeing nterm input (%d@%d-%d)\n", $$, RANGE (@$)); }

   input
 
 %destructor
   input
 
 %destructor

-  { printf ("Freeing nterm line (%d@%d-%d)\n", $$, RANGE (@$)); }
+  { fprintf (stderr, "Freeing nterm line (%d@%d-%d)\n", $$, RANGE (@$)); }

   line
 
 %destructor
   line
 
 %destructor

-  { printf ("Freeing nterm thing (%d@%d-%d)\n", $$, RANGE (@$)); }
+  { fprintf (stderr, "Freeing nterm thing (%d@%d-%d)\n", $$, RANGE (@$)); }

   thing
 
 %destructor
   thing
 
 %destructor

-  { printf ("Freeing token 'x' (%d@%d-%d)\n", $$, RANGE (@$)); }
+  { fprintf (stderr, "Freeing token 'x' (%d@%d-%d)\n", $$, RANGE (@$)); }

   'x'
 
 %destructor
   'x'
 
 %destructor

-  { printf ("Freeing token 'y' (%d@%d-%d)\n", $$, RANGE (@$)); }
+  { fprintf (stderr, "Freeing token 'y' (%d@%d-%d)\n", $$, RANGE (@$)); }

   'y'
 
 %token END 0
 %destructor
   'y'
 
 %token END 0
 %destructor

-  { printf ("Freeing token END (%d@%d-%d)\n", $$, RANGE (@$)); }
+  { fprintf (stderr, "Freeing token END (%d@%d-%d)\n", $$, RANGE (@$)); }

   END
 
 %%
   END
 
 %%


@@ -249,14 +261,15 @@ input:
   /* Nothing. */
     {
       $$ = 0;
   /* Nothing. */
     {
       $$ = 0;

-      printf ("input (%d@%d-%d): /* Nothing */\n", $$, RANGE (@$));
+      V(input, $$, @$, ": /* Nothing */\n");

     }
 | line input /* Right recursive to load the stack so that popping at
     }
 | line input /* Right recursive to load the stack so that popping at

-               END can be exercised.  */
+                END can be exercised.  */

     {
       $$ = 2;
     {
       $$ = 2;

-      printf ("input (%d@%d-%d): line (%d@%d-%d) input (%d@%d-%d)\n",
-             $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2));
+      V(input, $$, @$, ": ");
+      V(line,  $1, @1, " ");
+      V(input, $2, @2, "\n");

     }
 ;
 
     }
 ;
 


@@ -264,28 +277,36 @@ line:
   thing thing thing ';'
     {
       $$ = $1;
   thing thing thing ';'
     {
       $$ = $1;

-      printf ("line (%d@%d-%d): thing (%d@%d-%d) thing (%d@%d-%d) thing (%d@%d-%d) ';' (%d@%d-%d)\n",
-              $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2),
-              $3, RANGE (@3), $4, RANGE (@4));
+      V(line,  $$, @$, ": ");
+      V(thing, $1, @1, " ");
+      V(thing, $2, @2, " ");
+      V(thing, $3, @3, " ");
+      V(;,     $4, @4, "\n");

     }
 | '(' thing thing ')'
     {
       $$ = $1;
     }
 | '(' thing thing ')'
     {
       $$ = $1;

-      printf ("line (%d@%d-%d): '(' (%d@%d-%d) thing (%d@%d-%d) thing (%d@%d-%d) ')' (%d@%d-%d)\n",
-              $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2),
-              $3, RANGE (@3), $4, RANGE (@4));
+      V(line,  $$, @$, ": ");
+      V('(',   $1, @1, " ");
+      V(thing, $2, @2, " ");
+      V(thing, $3, @3, " ");
+      V(')',   $4, @4, "\n");

     }
 | '(' thing ')'
     {
       $$ = $1;
     }
 | '(' thing ')'
     {
       $$ = $1;

-      printf ("line (%d@%d-%d): '(' (%d@%d-%d) thing (%d@%d-%d) ')' (%d@%d-%d)\n",
-              $$, RANGE (@$), $1, RANGE (@1), $2, RANGE (@2), $3, RANGE (@3));
+      V(line,  $$, @$, ": ");
+      V('(',   $1, @1, " ");
+      V(thing, $2, @2, " ");
+      V(')',   $3, @3, "\n");

     }
 | '(' error ')'
     {
       $$ = -1;
     }
 | '(' error ')'
     {
       $$ = -1;

-      printf ("line (%d@%d-%d): '(' (%d@%d-%d) error (@%d-%d) ')' (%d@%d-%d)\n",
-              $$, RANGE (@$), $1, RANGE (@1), RANGE (@2), $3, RANGE (@3));
+      V(line,  $$, @$, ": ");
+      V('(',   $1, @1, " ");
+      fprintf (stderr, "error (@%d-%d) ", RANGE(@2));
+      V(')',   $3, @3, "\n");

     }
 ;
 
     }
 ;
 


@@ -293,48 +314,35 @@ thing:
   'x'
     {
       $$ = $1;
   'x'
     {
       $$ = $1;

-      printf ("thing (%d@%d-%d): 'x' (%d@%d-%d)\n",
-              $$, RANGE (@$), $1, RANGE (@1));
+      V(thing, $$, @$, ": ");
+      V('x',   $1, @1, "\n");

     }
 ;
 %%
 /* Alias to ARGV[1]. */
     }
 ;
 %%
 /* Alias to ARGV[1]. */

-const char *source = 0;
+const char *source = YY_NULL;

 
 

-static int
-yylex (]AT_LEX_FORMALS[)
+]AT_YYERROR_DEFINE[
+
+static
+]AT_YYLEX_PROTOTYPE[

 {
   static unsigned int counter = 0;
 
   int c = ]AT_VAL[]m4_ifval([$6], [.ival])[ = counter++;
   /* As in BASIC, line numbers go from 10 to 10.  */
 {
   static unsigned int counter = 0;
 
   int c = ]AT_VAL[]m4_ifval([$6], [.ival])[ = counter++;
   /* As in BASIC, line numbers go from 10 to 10.  */

-]AT_LALR1_CC_IF(
-[ AT_LOC.begin.line = AT_LOC.begin.column = 10 * c;
-  AT_LOC.end.line = AT_LOC.end.column = AT_LOC.begin.line + 9;
-],
-[ AT_LOC.first_line = AT_LOC.first_column = 10 * c;
-  AT_LOC.last_line = AT_LOC.last_column = AT_LOC.first_line + 9;
-])[
-
-  if (! (0 <= c && c <= strlen (source)))
-    abort ();
+  ]AT_LOC_FIRST_LINE[ = ]AT_LOC_FIRST_COLUMN[ = 10 * c;
+  ]AT_LOC_LAST_LINE[ = ]AT_LOC_LAST_COLUMN[ = ]AT_LOC_FIRST_LINE[ + 9;
+  assert (0 <= c && c <= strlen (source));

   if (source[c])
   if (source[c])

-    printf ("sending: '%c'", source[c]);
+    fprintf (stderr, "sending: '%c'", source[c]);

   else
   else

-    printf ("sending: END");
-  printf (" (%d@%d-%d)\n", c, RANGE (]AT_LOC[));
+    fprintf (stderr, "sending: END");
+  fprintf (stderr, " (%d@%d-%d)\n", c, RANGE (]AT_LOC[));

   return source[c];
 }
   return source[c];
 }

-

 ]AT_LALR1_CC_IF(
 ]AT_LALR1_CC_IF(

-[/* A C++ error reporting function. */
-void
-yy::parser::error (const location& l, const std::string& m)
-{
-  printf ("%d-%d: %s\n", RANGE (l), m.c_str());
-}
-
-static bool yydebug;
+[static bool yydebug;

 int
 yyparse ()
 {
 int
 yyparse ()
 {


@@ -342,12 +350,7 @@ yyparse ()
   parser.set_debug_level (yydebug);
   return parser.parse ();
 }
   parser.set_debug_level (yydebug);
   return parser.parse ();
 }

-],
-[static void
-yyerror (const char *msg)
-{
-  printf ("%d-%d: %s\n", RANGE (yylloc), msg);
-}])[
+])[

 
 int
 main (int argc, const char *argv[])
 
 int
 main (int argc, const char *argv[])


@@ -359,9 +362,9 @@ main (int argc, const char *argv[])
   status = yyparse ();
   switch (status)
     {
   status = yyparse ();
   switch (status)
     {

-      case 0: printf ("Successful parse.\n"); break;
-      case 1: printf ("Parsing FAILED.\n"); break;
-      default: printf ("Parsing FAILED (status %d).\n", status); break;
+      case 0: fprintf (stderr, "Successful parse.\n"); break;
+      case 1: fprintf (stderr, "Parsing FAILED.\n"); break;
+      default: fprintf (stderr, "Parsing FAILED (status %d).\n", status); break;

     }
   return status;
 }
     }
   return status;
 }


@@ -375,7 +378,7 @@ AT_FULL_COMPILE([input])
 # I.e., epsilon-reductions, as in "(x)" which ends by reducing
 # an empty "line" nterm.
 # FIXME: This location is not satisfying.  Depend on the lookahead?
 # I.e., epsilon-reductions, as in "(x)" which ends by reducing
 # an empty "line" nterm.
 # FIXME: This location is not satisfying.  Depend on the lookahead?

-AT_PARSER_CHECK([./input '(x)'], 0,
+AT_PARSER_CHECK([./input '(x)'], 0, [],

 [[sending: '(' (0@0-9)
 sending: 'x' (1@10-19)
 thing (1@10-19): 'x' (1@10-19)
 [[sending: '(' (0@0-9)
 sending: 'x' (1@10-19)
 thing (1@10-19): 'x' (1@10-19)


@@ -394,10 +397,10 @@ Successful parse.
 # ---------------------------------
 # '(y)' is an error, but can be recovered from.  But what's the location
 # of the error itself ('y'), and of the resulting reduction ('(error)').
 # ---------------------------------
 # '(y)' is an error, but can be recovered from.  But what's the location
 # of the error itself ('y'), and of the resulting reduction ('(error)').

-AT_PARSER_CHECK([./input '(y)'], 0,
+AT_PARSER_CHECK([./input '(y)'], 0, [],

 [[sending: '(' (0@0-9)
 sending: 'y' (1@10-19)
 [[sending: '(' (0@0-9)
 sending: 'y' (1@10-19)

-10-19: syntax error, unexpected 'y', expecting 'x'
+10.10-19.18: syntax error, unexpected 'y', expecting 'x'

 Freeing token 'y' (1@10-19)
 sending: ')' (2@20-29)
 line (-1@0-29): '(' (0@0-9) error (@10-19) ')' (2@20-29)
 Freeing token 'y' (1@10-19)
 sending: ')' (2@20-29)
 line (-1@0-29): '(' (0@0-9) error (@10-19) ')' (2@20-29)


@@ -424,14 +427,14 @@ Successful parse.
 #     '(', 'x', ')',
 #     '(', 'x', ')',
 #     'y'
 #     '(', 'x', ')',
 #     '(', 'x', ')',
 #     'y'

-AT_PARSER_CHECK([./input '(xxxxx)(x)(x)y'], 1,
+AT_PARSER_CHECK([./input '(xxxxx)(x)(x)y'], 1, [],

 [[sending: '(' (0@0-9)
 sending: 'x' (1@10-19)
 thing (1@10-19): 'x' (1@10-19)
 sending: 'x' (2@20-29)
 thing (2@20-29): 'x' (2@20-29)
 sending: 'x' (3@30-39)
 [[sending: '(' (0@0-9)
 sending: 'x' (1@10-19)
 thing (1@10-19): 'x' (1@10-19)
 sending: 'x' (2@20-29)
 thing (2@20-29): 'x' (2@20-29)
 sending: 'x' (3@30-39)

-30-39: syntax error, unexpected 'x', expecting ')'
+30.30-39.38: syntax error, unexpected 'x', expecting ')'

 Freeing nterm thing (2@20-29)
 Freeing nterm thing (1@10-19)
 Freeing token 'x' (3@30-39)
 Freeing nterm thing (2@20-29)
 Freeing nterm thing (1@10-19)
 Freeing token 'x' (3@30-39)


@@ -456,7 +459,7 @@ input (0@129-129): /* Nothing */
 input (2@100-129): line (10@100-129) input (0@129-129)
 input (2@70-129): line (7@70-99) input (2@100-129)
 input (2@0-129): line (-1@0-69) input (2@70-129)
 input (2@100-129): line (10@100-129) input (0@129-129)
 input (2@70-129): line (7@70-99) input (2@100-129)
 input (2@0-129): line (-1@0-69) input (2@70-129)

-130-139: syntax error, unexpected 'y', expecting END
+130.130-139.138: syntax error, unexpected 'y', expecting END

 Freeing nterm input (2@0-129)
 Freeing token 'y' (13@130-139)
 Parsing FAILED.
 Freeing nterm input (2@0-129)
 Freeing token 'y' (13@130-139)
 Parsing FAILED.


@@ -472,7 +475,7 @@ Parsing FAILED.
 #     '(', 'x', ')',
 #     '(', 'x', ')',
 #     'x'
 #     '(', 'x', ')',
 #     '(', 'x', ')',
 #     'x'

-AT_PARSER_CHECK([./input '(x)(x)x'], 1,
+AT_PARSER_CHECK([./input '(x)(x)x'], 1, [],

 [[sending: '(' (0@0-9)
 sending: 'x' (1@10-19)
 thing (1@10-19): 'x' (1@10-19)
 [[sending: '(' (0@0-9)
 sending: 'x' (1@10-19)
 thing (1@10-19): 'x' (1@10-19)


@@ -486,7 +489,7 @@ line (3@30-59): '(' (3@30-39) thing (4@40-49) ')' (5@50-59)
 sending: 'x' (6@60-69)
 thing (6@60-69): 'x' (6@60-69)
 sending: END (7@70-79)
 sending: 'x' (6@60-69)
 thing (6@60-69): 'x' (6@60-69)
 sending: END (7@70-79)

-70-79: syntax error, unexpected END, expecting 'x'
+70.70-79.78: syntax error, unexpected END, expecting 'x'

 Freeing nterm thing (6@60-69)
 Freeing nterm line (3@30-59)
 Freeing nterm line (0@0-29)
 Freeing nterm thing (6@60-69)
 Freeing nterm line (3@30-59)
 Freeing nterm line (0@0-29)


@@ -500,7 +503,7 @@ Parsing FAILED.
 # Upon stack overflow, all symbols on the stack should be destroyed.
 # Only check for yacc.c.
 AT_YACC_IF([
 # Upon stack overflow, all symbols on the stack should be destroyed.
 # Only check for yacc.c.
 AT_YACC_IF([

-AT_PARSER_CHECK([./input '(x)(x)(x)(x)(x)(x)(x)'], 2,
+AT_PARSER_CHECK([./input '(x)(x)(x)(x)(x)(x)(x)'], 2, [],

 [[sending: '(' (0@0-9)
 sending: 'x' (1@10-19)
 thing (1@10-19): 'x' (1@10-19)
 [[sending: '(' (0@0-9)
 sending: 'x' (1@10-19)
 thing (1@10-19): 'x' (1@10-19)


@@ -535,7 +538,7 @@ sending: '(' (18@180-189)
 sending: 'x' (19@190-199)
 thing (19@190-199): 'x' (19@190-199)
 sending: ')' (20@200-209)
 sending: 'x' (19@190-199)
 thing (19@190-199): 'x' (19@190-199)
 sending: ')' (20@200-209)

-200-209: memory exhausted
+200.200-209.208: memory exhausted

 Freeing nterm thing (19@190-199)
 Freeing nterm line (15@150-179)
 Freeing nterm line (12@120-149)
 Freeing nterm thing (19@190-199)
 Freeing nterm line (15@150-179)
 Freeing nterm line (12@120-149)


@@ -547,7 +550,8 @@ Parsing FAILED (status 2).
 ]])
 ])
 
 ]])
 ])
 

-])
+AT_BISON_OPTION_POPDEFS
+])# _AT_CHECK_PRINTER_AND_DESTRUCTOR

 
 
 # AT_CHECK_PRINTER_AND_DESTRUCTOR([BISON-OPTIONS], [UNION-FLAG], [SKIP_FLAG])
 
 
 # AT_CHECK_PRINTER_AND_DESTRUCTOR([BISON-OPTIONS], [UNION-FLAG], [SKIP_FLAG])


@@ -557,7 +561,7 @@ m4_define([AT_CHECK_PRINTER_AND_DESTRUCTOR],
 
 $3
 _AT_CHECK_PRINTER_AND_DESTRUCTOR($[1], $[2], $[3], $[4],
 
 $3
 _AT_CHECK_PRINTER_AND_DESTRUCTOR($[1], $[2], $[3], $[4],

-[%error-verbose
+[%define parse.error verbose

 %debug
 %verbose
 %locations
 %debug
 %verbose
 %locations


@@ -586,9 +590,9 @@ AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser], [with union])
 # called for $end, and that $$ and @$ work correctly.
 
 AT_SETUP([Default tagless %printer and %destructor])
 # called for $end, and that $$ and @$ work correctly.
 
 AT_SETUP([Default tagless %printer and %destructor])

-
+AT_BISON_OPTION_PUSHDEFS([%locations])

 AT_DATA_GRAMMAR([[input.y]],
 AT_DATA_GRAMMAR([[input.y]],

-[[%error-verbose
+[[%define parse.error verbose

 %debug
 %locations
 %initial-action {
 %debug
 %locations
 %initial-action {


@@ -599,8 +603,8 @@ AT_DATA_GRAMMAR([[input.y]],
 %{
 # include <stdio.h>
 # include <stdlib.h>
 %{
 # include <stdio.h>
 # include <stdlib.h>

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

 # define USE(SYM)
 %}
 
 # define USE(SYM)
 %}
 


@@ -631,25 +635,8 @@ AT_DATA_GRAMMAR([[input.y]],
 start: 'a' 'b' 'c' 'd' 'e' { $$ = 'S'; USE(($1, $2, $3, $4, $5)); } ;
 
 %%
 start: 'a' 'b' 'c' 'd' 'e' { $$ = 'S'; USE(($1, $2, $3, $4, $5)); } ;
 
 %%

-
-static int
-yylex (void)
-{
-  static char const input[] = "abcd";
-  static size_t toknum;
-  if (! (toknum < sizeof input))
-    abort ();
-  yylval = input[toknum++];
-  yylloc.first_line = yylloc.last_line = 1;
-  yylloc.first_column = yylloc.last_column = toknum;
-  return yylval;
-}
-
-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE(["abcd"], [[yylval = res]])[

 
 int
 main (void)
 
 int
 main (void)


@@ -682,7 +669,7 @@ Reading a token: Next token is token 'd' (1.4-1.4: <> printer for 'd' @ 4)
 Shifting token 'd' (1.4-1.4: <> printer for 'd' @ 4)
 Entering state 6
 Reading a token: Now at end of input.
 Shifting token 'd' (1.4-1.4: <> printer for 'd' @ 4)
 Entering state 6
 Reading a token: Now at end of input.

-syntax error, unexpected $end, expecting 'e'
+1.5-4: syntax error, unexpected $end, expecting 'e'

 Error: popping token 'd' (1.4-1.4: <> printer for 'd' @ 4)
 Stack now 0 1 3 5
 Error: popping token 'c' (1.3-1.3: 'b'/'c' printer for 'c' @ 3)
 Error: popping token 'd' (1.4-1.4: <> printer for 'd' @ 4)
 Stack now 0 1 3 5
 Error: popping token 'c' (1.3-1.3: 'b'/'c' printer for 'c' @ 3)


@@ -695,6 +682,7 @@ Cleanup: discarding lookahead token $end (1.5-1.5: )
 Stack now 0
 ]])
 
 Stack now 0
 ]])
 

+AT_BISON_OPTION_POPDEFS

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -704,16 +692,16 @@ AT_CLEANUP
 ## ------------------------------------------------------ ##
 
 AT_SETUP([Default tagged and per-type %printer and %destructor])
 ## ------------------------------------------------------ ##
 
 AT_SETUP([Default tagged and per-type %printer and %destructor])

-
+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([[input.y]],
 AT_DATA_GRAMMAR([[input.y]],

-[[%error-verbose
+[[%define parse.error verbose

 %debug
 
 %{
 # include <stdio.h>
 # include <stdlib.h>
 %debug
 
 %{
 # include <stdio.h>
 # include <stdlib.h>

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

 # define USE(SYM)
 %}
 
 # define USE(SYM)
 %}
 


@@ -759,22 +747,8 @@ start:
   ;
 
 %%
   ;
 
 %%

-
-static int
-yylex (void)
-{
-  static char const input[] = "abcdef";
-  static size_t toknum;
-  if (! (toknum < sizeof input))
-    abort ();
-  return input[toknum++];
-}
-
-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE(["abcdef"])[

 
 int
 main (void)
 
 int
 main (void)


@@ -832,6 +806,7 @@ Cleanup: discarding lookahead token $end ()
 Stack now 0
 ]])
 
 Stack now 0
 ]])
 

+AT_BISON_OPTION_POPDEFS

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -843,14 +818,15 @@ AT_CLEANUP
 AT_SETUP([Default %printer and %destructor for user-defined end token])
 
 # _AT_CHECK_DEFAULT_PRINTER_AND_DESTRUCTOR_FOR_END_TOKEN(TYPED)
 AT_SETUP([Default %printer and %destructor for user-defined end token])
 
 # _AT_CHECK_DEFAULT_PRINTER_AND_DESTRUCTOR_FOR_END_TOKEN(TYPED)

-# -----------------------------------------------------------------------------
+# -------------------------------------------------------------

 m4_define([_AT_CHECK_DEFAULT_PRINTER_AND_DESTRUCTOR_FOR_END_TOKEN],
 [m4_if($1, 0,
   [m4_pushdef([kind], []) m4_pushdef([not_kind], [*])],
   [m4_pushdef([kind], [*]) m4_pushdef([not_kind], [])])
 
 m4_define([_AT_CHECK_DEFAULT_PRINTER_AND_DESTRUCTOR_FOR_END_TOKEN],
 [m4_if($1, 0,
   [m4_pushdef([kind], []) m4_pushdef([not_kind], [*])],
   [m4_pushdef([kind], [*]) m4_pushdef([not_kind], [])])
 

+AT_BISON_OPTION_PUSHDEFS([%locations])

 AT_DATA_GRAMMAR([[input]]$1[[.y]],
 AT_DATA_GRAMMAR([[input]]$1[[.y]],

-[[%error-verbose
+[[%define parse.error verbose

 %debug
 %locations
 %initial-action {
 %debug
 %locations
 %initial-action {


@@ -861,8 +837,8 @@ AT_DATA_GRAMMAR([[input]]$1[[.y]],
 %{
 # include <stdio.h>
 # include <stdlib.h>
 %{
 # include <stdio.h>
 # include <stdlib.h>

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

 # define USE(SYM)
 %}
 
 # define USE(SYM)
 %}
 


@@ -904,12 +880,7 @@ yylex (void)
   yylloc.first_column = yylloc.last_column = 1;
   return 0;
 }
   yylloc.first_column = yylloc.last_column = 1;
   return 0;
 }

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

 
 int
 main (void)
 
 int
 main (void)


@@ -918,6 +889,7 @@ main (void)
   return yyparse ();
 }
 ]])
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

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


@@ -964,15 +936,15 @@ AT_SETUP([Default %printer and %destructor are not for error or $undefined])
 #       semantic value, which would be initialized from the lookahead, which
 #       would be destroyed separately.
 #   - For $undefined, who knows what the semantic value would be.
 #       semantic value, which would be initialized from the lookahead, which
 #       would be destroyed separately.
 #   - For $undefined, who knows what the semantic value would be.

-
+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([[input.y]],
 [[%debug
 
 %{
 # include <stdio.h>
 # include <stdlib.h>
 AT_DATA_GRAMMAR([[input.y]],
 [[%debug
 
 %{
 # include <stdio.h>
 # include <stdlib.h>

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

 # define USE(SYM)
 %}
 
 # define USE(SYM)
 %}
 


@@ -993,24 +965,8 @@ start:
   ;
 
 %%
   ;
 
 %%

-
-static int
-yylex (void)
-{
-  static char const input[] = "abd";
-  static size_t toknum;
-  if (! (toknum < sizeof input))
-    abort ();
-  yylval = input[toknum++];
-  return yylval;
-}
-
-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE(["abd"], [yylval = res])[

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


@@ -1018,6 +974,7 @@ main (void)
   return yyparse ();
 }
 ]])
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

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


@@ -1079,14 +1036,15 @@ AT_SETUP([Default %printer and %destructor are not for $accept])
 #     true for $undefined and the error token, so there are three warnings for
 #     %printer and three for %destructor.)
 
 #     true for $undefined and the error token, so there are three warnings for
 #     %printer and three for %destructor.)
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([[input.y]],
 [[%debug /* So that %printer is actually compiled.  */
 
 %{
 # include <stdio.h>
 # include <stdlib.h>
 AT_DATA_GRAMMAR([[input.y]],
 [[%debug /* So that %printer is actually compiled.  */
 
 %{
 # include <stdio.h>
 # include <stdlib.h>

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

 # define USE(SYM)
 %}
 
 # define USE(SYM)
 %}
 


@@ -1107,28 +1065,15 @@ AT_DATA_GRAMMAR([[input.y]],
 start: { USE($$); } ;
 
 %%
 start: { USE($$); } ;
 
 %%

-
-static int
-yylex (void)
-{
-  static int called;
-  if (called++)
-    abort ();
-  return 0;
-}
-
-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE[

 int
 main (void)
 {
   return yyparse ();
 }
 ]])
 int
 main (void)
 {
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

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


@@ -1143,17 +1088,18 @@ AT_CLEANUP
 
 AT_SETUP([Default %printer and %destructor for mid-rule values])
 
 
 AT_SETUP([Default %printer and %destructor for mid-rule values])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([[input.y]],
 [[%debug /* So that %printer is actually compiled.  */
 
 %{
 # include <stdio.h>
 # include <stdlib.h>
 AT_DATA_GRAMMAR([[input.y]],
 [[%debug /* So that %printer is actually compiled.  */
 
 %{
 # include <stdio.h>
 # include <stdlib.h>

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

 # define USE(SYM)
 # define YYLTYPE int
 # define USE(SYM)
 # define YYLTYPE int

-# define YYLLOC_DEFAULT(Current, Rhs, N)
+# define YYLLOC_DEFAULT(Current, Rhs, N) (void)(Rhs)

 # define YY_LOCATION_PRINT(File, Loc)
 %}
 
 # define YY_LOCATION_PRINT(File, Loc)
 %}
 


@@ -1174,22 +1120,8 @@ start:
   ;
 
 %%
   ;
 
 %%

-
-static int
-yylex (void)
-{
-  static int called;
-  if (called++)
-    abort ();
-  return 0;
-}
-
-static void
-yyerror (const char *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE[

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


@@ -1197,10 +1129,11 @@ main (void)
   return yyparse ();
 }
 ]])
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([-o input.c input.y], 0,,
 
 AT_BISON_CHECK([-o input.c input.y], 0,,

-[[input.y:33.3-23: warning: unset value: $$
-input.y:30.3-35.37: warning: unused value: $3
+[[input.y:33.3-23: warning: unset value: $$ [-Wother]
+input.y:30.3-35.37: warning: unused value: $3 [-Wother]

 ]])
 
 AT_COMPILE([input])
 ]])
 
 AT_COMPILE([input])


@@ -1250,21 +1183,21 @@ AT_CLEANUP
 # Bison once forgot to check for @$ in actions other than semantic actions.
 
 # AT_CHECK_ACTION_LOCATIONS(ACTION-DIRECTIVE)
 # Bison once forgot to check for @$ in actions other than semantic actions.
 
 # AT_CHECK_ACTION_LOCATIONS(ACTION-DIRECTIVE)

-# -------------------------------------------------------
+# -------------------------------------------

 m4_define([AT_CHECK_ACTION_LOCATIONS],
 [AT_SETUP([[@$ in ]$1[ implies %locations]])
 m4_define([AT_CHECK_ACTION_LOCATIONS],
 [AT_SETUP([[@$ in ]$1[ implies %locations]])

-
+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([[input.y]],
 [[%code {
   #include <stdio.h>
 AT_DATA_GRAMMAR([[input.y]],
 [[%code {
   #include <stdio.h>

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

 }
 
 %debug
 
 ]$1[ {
 }
 
 %debug
 
 ]$1[ {

-  printf ("%d\n", @$.first_line);
+  fprintf (stderr, "%d\n", @$.first_line);

 } ]m4_if($1, [%initial-action], [], [[start]])[
 
 %%
 } ]m4_if($1, [%initial-action], [], [[start]])[
 
 %%


@@ -1279,12 +1212,7 @@ yylex (void)
   return 0;
 }
 
   return 0;
 }
 

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

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


@@ -1294,7 +1222,7 @@ main (void)
 
 AT_BISON_CHECK([[-o input.c input.y]])
 AT_COMPILE([[input]])
 
 AT_BISON_CHECK([[-o input.c input.y]])
 AT_COMPILE([[input]])

-
+AT_BISON_OPTION_POPDEFS

 AT_CLEANUP])
 
 AT_CHECK_ACTION_LOCATIONS([[%initial-action]])
 AT_CLEANUP])
 
 AT_CHECK_ACTION_LOCATIONS([[%initial-action]])


@@ -1311,43 +1239,43 @@ AT_SETUP([[Fix user actions without a trailing semicolon]])
 # This feature is undocumented, but we accidentally broke it in 2.3a,
 # and there was a complaint at:
 # <http://lists.gnu.org/archive/html/bug-bison/2008-11/msg00001.html>.
 # This feature is undocumented, but we accidentally broke it in 2.3a,
 # and there was a complaint at:
 # <http://lists.gnu.org/archive/html/bug-bison/2008-11/msg00001.html>.

-
+AT_BISON_OPTION_PUSHDEFS

 AT_DATA([input.y],
 [[%%
 start: test2 test1 test0 testc;
 
 test2
 AT_DATA([input.y],
 [[%%
 start: test2 test1 test0 testc;
 
 test2

-: 'a' { semi;                  /* TEST:N:2 */ }
-| 'b' { if (0) {no_semi}       /* TEST:N:2 */ }
-| 'c' { if (0) {semi;}         /* TEST:N:2 */ }
-| 'd' { semi;   no_semi                /* TEST:Y:2 */ }
-| 'e' { semi(); no_semi()      /* TEST:Y:2 */ }
-| 'f' { semi[]; no_semi[]      /* TEST:Y:2 */ }
-| 'g' { semi++; no_semi++      /* TEST:Y:2 */ }
-| 'h' { {no_semi} no_semi      /* TEST:Y:2 */ }
-| 'i' { {semi;}   no_semi      /* TEST:Y:2 */ }
+: 'a' { semi;                   /* TEST:N:2 */ }
+| 'b' { if (0) {no_semi}        /* TEST:N:2 */ }
+| 'c' { if (0) {semi;}          /* TEST:N:2 */ }
+| 'd' { semi;   no_semi         /* TEST:Y:2 */ }
+| 'e' { semi(); no_semi()       /* TEST:Y:2 */ }
+| 'f' { semi[]; no_semi[]       /* TEST:Y:2 */ }
+| 'g' { semi++; no_semi++       /* TEST:Y:2 */ }
+| 'h' { {no_semi} no_semi       /* TEST:Y:2 */ }
+| 'i' { {semi;}   no_semi       /* TEST:Y:2 */ }

 ;
 test1
 ;
 test1

-  : 'a' { semi;                        // TEST:N:1 ;
-} | 'b' { if (0) {no_semi}     // TEST:N:1 ;
-} | 'c' { if (0) {semi;}       // TEST:N:1 ;
-} | 'd' { semi;   no_semi      // TEST:Y:1 ;
-} | 'e' { semi(); no_semi()    // TEST:Y:1 ;
-} | 'f' { semi[]; no_semi[]    // TEST:Y:1 ;
-} | 'g' { semi++; no_semi++    // TEST:Y:1 ;
-} | 'h' { {no_semi} no_semi    // TEST:Y:1 ;
-} | 'i' { {semi;}   no_semi    // TEST:Y:1 ;
+  : 'a' { semi;                 // TEST:N:1 ;
+} | 'b' { if (0) {no_semi}      // TEST:N:1 ;
+} | 'c' { if (0) {semi;}        // TEST:N:1 ;
+} | 'd' { semi;   no_semi       // TEST:Y:1 ;
+} | 'e' { semi(); no_semi()     // TEST:Y:1 ;
+} | 'f' { semi[]; no_semi[]     // TEST:Y:1 ;
+} | 'g' { semi++; no_semi++     // TEST:Y:1 ;
+} | 'h' { {no_semi} no_semi     // TEST:Y:1 ;
+} | 'i' { {semi;}   no_semi     // TEST:Y:1 ;

 } ;
 test0
 } ;
 test0

-  : 'a' { semi;                        // TEST:N:1 {}
-} | 'b' { if (0) {no_semi}     // TEST:N:1 {}
-} | 'c' { if (0) {semi;}       // TEST:N:1 {}
-} | 'd' { semi;   no_semi      // TEST:Y:1 {}
-} | 'e' { semi(); no_semi()    // TEST:Y:1 {}
-} | 'f' { semi[]; no_semi[]    // TEST:Y:1 {}
-} | 'g' { semi++; no_semi++    // TEST:Y:1 {}
-} | 'h' { {no_semi} no_semi    // TEST:Y:1 {}
-} | 'i' { {semi;}   no_semi    // TEST:Y:1 {}
+  : 'a' { semi;                 // TEST:N:1 {}
+} | 'b' { if (0) {no_semi}      // TEST:N:1 {}
+} | 'c' { if (0) {semi;}        // TEST:N:1 {}
+} | 'd' { semi;   no_semi       // TEST:Y:1 {}
+} | 'e' { semi(); no_semi()     // TEST:Y:1 {}
+} | 'f' { semi[]; no_semi[]     // TEST:Y:1 {}
+} | 'g' { semi++; no_semi++     // TEST:Y:1 {}
+} | 'h' { {no_semi} no_semi     // TEST:Y:1 {}
+} | 'i' { {semi;}   no_semi     // TEST:Y:1 {}

 } ;
 
 testc
 } ;
 
 testc


@@ -1361,59 +1289,165 @@ no_semi
 []"broken\" $ @ $$ @$ [];\
 string;"}
 ]])
 []"broken\" $ @ $$ @$ [];\
 string;"}
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o input.c input.y]], [0], [],
 
 AT_BISON_CHECK([[-o input.c input.y]], [0], [],

-[[input.y:8.48: warning: a `;' might be needed at the end of action code
-input.y:8.48: warning: future versions of Bison will not add the `;'
-input.y:9.48: warning: a `;' might be needed at the end of action code
-input.y:9.48: warning: future versions of Bison will not add the `;'
-input.y:10.48: warning: a `;' might be needed at the end of action code
-input.y:10.48: warning: future versions of Bison will not add the `;'
-input.y:11.48: warning: a `;' might be needed at the end of action code
-input.y:11.48: warning: future versions of Bison will not add the `;'
-input.y:12.48: warning: a `;' might be needed at the end of action code
-input.y:12.48: warning: future versions of Bison will not add the `;'
-input.y:13.48: warning: a `;' might be needed at the end of action code
-input.y:13.48: warning: future versions of Bison will not add the `;'
-input.y:20.1: warning: a `;' might be needed at the end of action code
-input.y:20.1: warning: future versions of Bison will not add the `;'
-input.y:21.1: warning: a `;' might be needed at the end of action code
-input.y:21.1: warning: future versions of Bison will not add the `;'
-input.y:22.1: warning: a `;' might be needed at the end of action code
-input.y:22.1: warning: future versions of Bison will not add the `;'
-input.y:23.1: warning: a `;' might be needed at the end of action code
-input.y:23.1: warning: future versions of Bison will not add the `;'
-input.y:24.1: warning: a `;' might be needed at the end of action code
-input.y:24.1: warning: future versions of Bison will not add the `;'
-input.y:25.1: warning: a `;' might be needed at the end of action code
-input.y:25.1: warning: future versions of Bison will not add the `;'
-input.y:31.1: warning: a `;' might be needed at the end of action code
-input.y:31.1: warning: future versions of Bison will not add the `;'
-input.y:32.1: warning: a `;' might be needed at the end of action code
-input.y:32.1: warning: future versions of Bison will not add the `;'
-input.y:33.1: warning: a `;' might be needed at the end of action code
-input.y:33.1: warning: future versions of Bison will not add the `;'
-input.y:34.1: warning: a `;' might be needed at the end of action code
-input.y:34.1: warning: future versions of Bison will not add the `;'
-input.y:35.1: warning: a `;' might be needed at the end of action code
-input.y:35.1: warning: future versions of Bison will not add the `;'
-input.y:36.1: warning: a `;' might be needed at the end of action code
-input.y:36.1: warning: future versions of Bison will not add the `;'
-]])
-AT_CHECK([[grep -c '/\* TEST:N:2 \*/ }$' input.c]], [0], [[3
+[[input.y:8.48: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:8.48: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:9.48: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:9.48: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:10.48: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:10.48: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:11.48: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:11.48: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:12.48: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:12.48: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:13.48: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:13.48: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:20.1: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:20.1: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:21.1: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:21.1: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:22.1: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:22.1: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:23.1: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:23.1: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:24.1: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:24.1: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:25.1: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:25.1: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:31.1: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:31.1: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:32.1: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:32.1: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:33.1: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:33.1: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:34.1: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:34.1: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:35.1: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:35.1: warning: future versions of Bison will not add the ';' [-Wother]
+input.y:36.1: warning: a ';' might be needed at the end of action code [-Wother]
+input.y:36.1: warning: future versions of Bison will not add the ';' [-Wother]

 ]])
 ]])

-AT_CHECK([[grep -c '/\* TEST:Y:2 \*/ ;}$' input.c]], [0], [[6
+
+AT_MATCHES_CHECK([input.c], [[/\* TEST:N:2 \*/ \}$]],       [[3]])
+AT_MATCHES_CHECK([input.c], [[/\* TEST:Y:2 \*/ ;\}$]],      [[6]])
+AT_MATCHES_CHECK([input.c], [[// TEST:N:1 [;{}]*\n\}$]],    [[6]])
+AT_MATCHES_CHECK([input.c], [[// TEST:Y:1 [;{}]*\n;\}$]],  [[12]])
+AT_MATCHES_CHECK([input.c], [[#define TEST_MACRO_N \\\n\[\]"broken\\" \$ \@ \$\$ \@\$ \[\];\\\nstring;"\}]], [[2]])
+
+AT_CLEANUP
+
+
+## -------------------------------------------------- ##
+## Destroying lookahead assigned by semantic action.  ##
+## -------------------------------------------------- ##
+
+AT_SETUP([[Destroying lookahead assigned by semantic action]])
+
+AT_BISON_OPTION_PUSHDEFS
+AT_DATA_GRAMMAR([input.y],
+[[
+%code {
+  #include <assert.h>
+  #include <stdio.h>
+]AT_YYERROR_DECLARE[
+]AT_YYLEX_DECLARE[
+  #define USE(Var)
+}
+
+%destructor { fprintf (stderr, "'a' destructor\n"); } 'a'
+%destructor { fprintf (stderr, "'b' destructor\n"); } 'b'
+
+%%
+
+// In a previous version of Bison, yychar assigned by the semantic
+// action below was not translated into yytoken before the lookahead was
+// discarded and thus before its destructor (selected according to
+// yytoken) was called in order to return from yyparse.  This would
+// happen even if YYACCEPT was performed in a later semantic action as
+// long as only consistent states with default reductions were visited
+// in between.  However, we leave YYACCEPT in the same semantic action
+// for this test in order to show that skeletons cannot simply translate
+// immediately after every semantic action because a semantic action
+// that has set yychar might not always return normally.  Instead,
+// skeletons must translate before every use of yytoken.
+start: 'a' accept { USE($1); } ;
+accept: /*empty*/ {
+  assert (yychar == YYEMPTY);
+  yychar = 'b';
+  YYACCEPT;
+} ;
+
+%%
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE(["a"])[
+int
+main (void)
+{
+  return yyparse ();
+}

 ]])
 ]])

-AT_CHECK([[sed -n '/TEST:N:1/{N
-s/\n/<NL>/gp}' input.c | grep -c '// TEST:N:1 [;{}]*<NL>}$']], [0], [[6
+AT_BISON_OPTION_POPDEFS
+AT_BISON_CHECK([[-o input.c input.y]])
+AT_COMPILE([[input]])
+AT_PARSER_CHECK([[./input]], [[0]], [],
+[['b' destructor
+'a' destructor

 ]])
 ]])

-AT_CHECK([[sed -n '/TEST:Y:1/{N
-s/\n/<NL>/gp}' input.c | grep -c '// TEST:Y:1 [;{}]*<NL>;}$']], [0], [[12
+
+AT_CLEANUP
+
+## ---------- ##
+## YYBACKUP.  ##
+## ---------- ##
+
+AT_SETUP([[YYBACKUP]])
+
+AT_BISON_OPTION_PUSHDEFS([%pure-parser])
+
+AT_DATA_GRAMMAR([input.y],
+[[
+%error-verbose
+%debug
+%pure-parser
+%code {
+# include <stdio.h>
+# include <stdlib.h>
+# include <assert.h>
+
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[
+}
+%%
+input:
+  exp exp {}
+;
+
+exp:
+  'a'     { printf ("a: %d\n", $1); }
+| 'b'     { YYBACKUP('a', 123); }
+| 'c' 'd' { YYBACKUP('a', 456); }
+;
+
+%%
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE(["bcd"], [*lvalp = (toknum + 1) * 10])[
+
+int
+main (void)
+{
+  yydebug = !!getenv("YYDEBUG");
+  return yyparse ();
+}

 ]])
 ]])

-AT_CHECK([[sed -n '/^#define TEST_MACRO_N/{N
-N
-s/\n/<NL>/gp}' input.c | grep -F -xc '#define TEST_MACRO_N \<NL>[]"broken\" $ @ $$ @$ [];\<NL>string;"}']],
-       [0], [[2
+AT_BISON_OPTION_POPDEFS
+
+AT_BISON_CHECK([[-o input.c input.y]])
+AT_COMPILE([[input]])
+AT_PARSER_CHECK([[./input]], [[0]],
+[[a: 123
+a: 456

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP