tests: AT_YYERROR_DEFINE: prepare for list of ints.

[bison.git] / tests / regression.at

diff --git a/tests/regression.at b/tests/regression.at
index fa77fff4f86a7a1c90c10b04c0ab6b296df3d4a2..a5e0c14d82d91947c1fbbb5781360148b5667cf6 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -1,6 +1,6 @@
 # Bison Regressions.                               -*- Autotest -*-
 
 # Bison Regressions.                               -*- Autotest -*-
 

-# Copyright (C) 2001-2011 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


@@ -24,10 +24,11 @@ AT_BANNER([[Regression tests.]])
 
 AT_SETUP([Trivial grammars])
 
 
 AT_SETUP([Trivial grammars])
 

+AT_BISON_OPTION_PUSHDEFS

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

-void yyerror (char const *);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[

 #define YYSTYPE int *
 %}
 
 #define YYSTYPE int *
 %}
 


@@ -37,9 +38,10 @@ int yylex (void);
 
 program: 'x';
 ]])
 
 program: 'x';
 ]])

+AT_BISON_OPTION_POPDEFS

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

-AT_COMPILE([input.o], [-c input.c])
+AT_COMPILE([input.o])

 AT_COMPILE([input.o], [-DYYDEBUG -c input.c])
 
 AT_CLEANUP
 AT_COMPILE([input.o], [-DYYDEBUG -c input.c])
 
 AT_CLEANUP


@@ -52,10 +54,11 @@ AT_CLEANUP
 
 AT_SETUP([YYSTYPE typedef])
 
 
 AT_SETUP([YYSTYPE typedef])
 

+AT_BISON_OPTION_PUSHDEFS

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

-void yyerror (char const *);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[

 typedef union { char const *val; } YYSTYPE;
 %}
 
 typedef union { char const *val; } YYSTYPE;
 %}
 


@@ -65,9 +68,10 @@ typedef union { char const *val; } YYSTYPE;
 
 program: { $$ = ""; };
 ]])
 
 program: { $$ = ""; };
 ]])

+AT_BISON_OPTION_POPDEFS

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

-AT_COMPILE([input.o], [-c input.c])
+AT_COMPILE([input.o])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -83,10 +87,11 @@ AT_SETUP([Early token definitions with --yacc])
 # Found in GCJ: they expect the tokens to be defined before the user
 # prologue, so that they can use the token definitions in it.
 
 # Found in GCJ: they expect the tokens to be defined before the user
 # prologue, so that they can use the token definitions in it.
 

+AT_BISON_OPTION_PUSHDEFS

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

-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[

 %}
 
 %union
 %}
 
 %union


@@ -103,9 +108,10 @@ int yylex (void);
 exp: MY_TOKEN;
 %%
 ]])
 exp: MY_TOKEN;
 %%
 ]])

+AT_BISON_OPTION_POPDEFS

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

-AT_COMPILE([input.o], [-c input.c])
+AT_COMPILE([input.o])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -121,11 +127,12 @@ AT_SETUP([Early token definitions without --yacc])
 # Found in GCJ: they expect the tokens to be defined before the user
 # prologue, so that they can use the token definitions in it.
 
 # Found in GCJ: they expect the tokens to be defined before the user
 # prologue, so that they can use the token definitions in it.
 

+AT_BISON_OPTION_PUSHDEFS

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

-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[

 void print_my_token (void);
 %}
 
 void print_my_token (void);
 %}
 


@@ -146,9 +153,10 @@ print_my_token (void)
 exp: MY_TOKEN;
 %%
 ]])
 exp: MY_TOKEN;
 %%
 ]])

+AT_BISON_OPTION_POPDEFS

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

-AT_COMPILE([input.o], [-c input.c])
+AT_COMPILE([input.o])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -161,13 +169,15 @@ AT_CLEANUP
 
 AT_SETUP([Braces parsing])
 
 
 AT_SETUP([Braces parsing])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA([input.y],
 AT_DATA([input.y],

-[[/* Bison used to swallow the character after `}'. */
+[[/* Bison used to swallow the character after '}'. */

 
 %%
 exp: { tests = {{{{{{{{{{}}}}}}}}}}; };
 %%
 ]])
 
 %%
 exp: { tests = {{{{{{{{{{}}}}}}}}}}; };
 %%
 ]])

+AT_BISON_OPTION_POPDEFS

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


@@ -183,8 +193,9 @@ AT_CLEANUP
 
 AT_SETUP([Duplicate string])
 
 
 AT_SETUP([Duplicate string])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA([input.y],
 AT_DATA([input.y],

-[[/* `Bison -v' used to dump core when two tokens are defined with the same
+[[/* 'Bison -v' used to dump core when two tokens are defined with the same

    string, as LE and GE below. */
 
 %token NUM
    string, as LE and GE below. */
 
 %token NUM


@@ -195,9 +206,10 @@ AT_DATA([input.y],
 exp: '(' exp ')' | NUM ;
 %%
 ]])
 exp: '(' exp ')' | NUM ;
 %%
 ]])

+AT_BISON_OPTION_POPDEFS

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

-[[input.y:6.8-14: warning: symbol `"<="' used more than once as a literal string
+[[input.y:6.8-14: warning: symbol "<=" used more than once as a literal string

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -211,6 +223,7 @@ AT_SETUP([Rule Line Numbers])
 
 AT_KEYWORDS([report])
 
 
 AT_KEYWORDS([report])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA([input.y],
 [[%%
 expr:
 AT_DATA([input.y],
 [[%%
 expr:


@@ -240,6 +253,7 @@ expr:
 
 };
 ]])
 
 };
 ]])

+AT_BISON_OPTION_POPDEFS

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


@@ -387,13 +401,14 @@ default: 'a' }
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],

-[[input.y:2.1: invalid character: `?'
-input.y:3.14: invalid character: `}'
-input.y:4.1: invalid character: `%'
-input.y:4.2: invalid character: `&'
-input.y:5.1-17: invalid directive: `%a-does-not-exist'
-input.y:6.1-2: invalid directive: `%-'
-input.y:7.1-8.0: missing `%}' at end of file
+[[input.y:2.1: invalid character: '?'
+input.y:3.14: invalid character: '}'
+input.y:4.1: invalid character: '%'
+input.y:4.2: invalid character: '&'
+input.y:5.1-17: invalid directive: '%a-does-not-exist'
+input.y:6.1: invalid character: '%'
+input.y:6.2: invalid character: '-'
+input.y:7.1-8.0: missing '%}' at end of file

 input.y:7.1-8.0: syntax error, unexpected %{...%}
 ]])
 
 input.y:7.1-8.0: syntax error, unexpected %{...%}
 ]])
 


@@ -427,13 +442,14 @@ AT_CLEANUP
 
 AT_SETUP([Token definitions])
 
 
 AT_SETUP([Token definitions])
 

-# Bison managed, when fed with `%token 'f' "f"' to #define 'f'!
+AT_BISON_OPTION_PUSHDEFS
+# Bison managed, when fed with '%token 'f' "f"' to #define 'f'!

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

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

 %}
 [%error-verbose
 %token MYEOF 0 "end of file"
 %}
 [%error-verbose
 %token MYEOF 0 "end of file"


@@ -446,11 +462,7 @@ int yylex (void);
 %%
 exp: "a" "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!";
 %%
 %%
 exp: "a" "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!";
 %%

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

 
 int
 yylex (void)
 
 int
 yylex (void)


@@ -467,6 +479,7 @@ main (void)
   return yyparse ();
 }
 ]])
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 # Checking the warning message guarantees that the trigraph "??!" isn't
 # unnecessarily escaped here even though it would need to be if encoded in a
 
 # Checking the warning message guarantees that the trigraph "??!" isn't
 # unnecessarily escaped here even though it would need to be if encoded in a


@@ -474,7 +487,7 @@ main (void)
 # the user specification is eliminated.
 AT_BISON_CHECK([-o input.c input.y], [[0]], [[]],
 [[input.y:22.8-14: warning: symbol SPECIAL redeclared
 # the user specification is eliminated.
 AT_BISON_CHECK([-o input.c input.y], [[0]], [[]],
 [[input.y:22.8-14: warning: symbol SPECIAL redeclared

-input.y:22.8-63: warning: symbol `"\\'?\"\a\b\f\n\r\t\v\001\201\001\201??!"' used more than once as a literal string
+input.y:22.8-63: warning: symbol "\\'?\"\a\b\f\n\r\t\v\001\201\001\201??!" used more than once as a literal string

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


@@ -497,22 +510,24 @@ AT_CLEANUP
 
 AT_SETUP([Characters Escapes])
 
 
 AT_SETUP([Characters Escapes])
 

+AT_BISON_OPTION_PUSHDEFS

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

-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[

 %}
 [%%
 exp:
   '\'' "\'"
 | '\"' "\""
 %}
 [%%
 exp:
   '\'' "\'"
 | '\"' "\""

-| '"'  "'"
+| '"'  "'" /* Pacify font-lock-mode: ". */

 ;
 ]])
 ;
 ]])

-# Pacify font-lock-mode: "
+
+AT_BISON_OPTION_POPDEFS

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

-AT_COMPILE([input.o], [-c input.c])
+AT_COMPILE([input.o])

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -523,7 +538,7 @@ AT_CLEANUP
 
 # The generation of the reduction was once wrong in Bison, and made it
 # miss some reductions.  In the following test case, the reduction on
 
 # The generation of the reduction was once wrong in Bison, and made it
 # miss some reductions.  In the following test case, the reduction on

-# `undef_id_tok' in state 1 was missing.  This is stripped down from
+# 'undef_id_tok' in state 1 was missing.  This is stripped down from

 # the actual web2c.y.
 
 AT_SETUP([Web2c Report])
 # the actual web2c.y.
 
 AT_SETUP([Web2c Report])


@@ -685,7 +700,7 @@ AT_CLEANUP
 ## Web2c Actions.  ##
 ## --------------- ##
 
 ## Web2c Actions.  ##
 ## --------------- ##
 

-# The generation of the mapping `state -> action' was once wrong in
+# The generation of the mapping 'state -> action' was once wrong in

 # extremely specific situations.  web2c.y exhibits this situation.
 # Below is a stripped version of the grammar.  It looks like one can
 # simplify it further, but just don't: it is tuned to exhibit a bug,
 # extremely specific situations.  web2c.y exhibits this situation.
 # Below is a stripped version of the grammar.  It looks like one can
 # simplify it further, but just don't: it is tuned to exhibit a bug,


@@ -768,7 +783,7 @@ static const yytype_uint8 yyrline[] =
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"",
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"",

-  "\"else\"", "$accept", "statement", "struct_stat", "if", "else", 0
+  "\"else\"", "$accept", "statement", "struct_stat", "if", "else", YY_NULL

 };
 static const yytype_uint16 yytoknum[] =
 {
 };
 static const yytype_uint16 yytoknum[] =
 {


@@ -836,7 +851,7 @@ static int yylex (AT_LALR1_CC_IF([int *], [void]));
 AT_LALR1_CC_IF([],
 [#include <stdlib.h>
 #include <stdio.h>
 AT_LALR1_CC_IF([],
 [#include <stdlib.h>
 #include <stdio.h>

-static void yyerror (const char *);])
+]AT_YYERROR_DECLARE[])

 %}
 $1
 %token ARROW INVALID NUMBER STRING DATA
 %}
 $1
 %token ARROW INVALID NUMBER STRING DATA


@@ -882,15 +897,9 @@ member: STRING
    | INVALID
    ;
 %%
    | INVALID
    ;
 %%

-AT_LALR1_CC_IF(
-[/* A C++ error reporting function. */
-void
-yy::parser::error (const location&, const std::string& m)
-{
-  std::cerr << m << std::endl;
-}
-
-int
+AT_YYERROR_DEFINE[
+]AT_LALR1_CC_IF(
+[int

 yyparse ()
 {
   yy::parser parser;
 yyparse ()
 {
   yy::parser parser;


@@ -899,13 +908,9 @@ yyparse ()
 #endif
   return parser.parse ();
 }
 #endif
   return parser.parse ();
 }

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

 
 

+#include <assert.h>

 static int
 yylex (AT_LALR1_CC_IF([int *lval], [void]))
 [{
 static int
 yylex (AT_LALR1_CC_IF([int *lval], [void]))
 [{


@@ -915,8 +920,7 @@ yylex (AT_LALR1_CC_IF([int *lval], [void]))
     };
   static size_t toknum;
   ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC.  */])[
     };
   static size_t toknum;
   ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC.  */])[

-  if (! (toknum < sizeof tokens / sizeof *tokens))
-    abort ();
+  assert (toknum < sizeof tokens / sizeof *tokens);

   return tokens[toknum++];
 }]
 
   return tokens[toknum++];
 }]
 


@@ -959,12 +963,12 @@ AT_CHECK_DANCER([%skeleton "lalr1.cc"])
 # --------------------------------
 m4_define([_AT_DATA_EXPECT2_Y],
 [AT_DATA_GRAMMAR([expect2.y],
 # --------------------------------
 m4_define([_AT_DATA_EXPECT2_Y],
 [AT_DATA_GRAMMAR([expect2.y],

-[%{
-static int yylex (AT_LALR1_CC_IF([int *], [void]));
+[[%{
+static int yylex (]AT_LALR1_CC_IF([int *], [void]));

 AT_LALR1_CC_IF([],
 AT_LALR1_CC_IF([],

-[#include <stdio.h>
+[[#include <stdio.h>

 #include <stdlib.h>
 #include <stdlib.h>

-static void yyerror (const char *);])
+]AT_YYERROR_DECLARE])[

 %}
 $1
 %defines
 %}
 $1
 %defines


@@ -981,52 +985,41 @@ e: e '+' t | t;
 t: A | B;
 
 %%
 t: A | B;
 
 %%

-AT_LALR1_CC_IF(
-[/* A C++ error reporting function. */
-void
-yy::parser::error (const location&, const std::string& m)
-{
-  std::cerr << m << std::endl;
-}
-
-int
+]AT_YYERROR_DEFINE[
+]AT_LALR1_CC_IF(
+[int

 yyparse ()
 {
   yy::parser parser;
   return parser.parse ();
 }
 yyparse ()
 {
   yy::parser parser;
   return parser.parse ();
 }

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

 
 

+#include <assert.h>

 static int
 static int

-yylex (AT_LALR1_CC_IF([int *lval], [void]))
-[{
+yylex (]AT_LALR1_CC_IF([int *lval], [void])[)
+{

   static int const tokens[] =
     {
       1000, '+', '+', -1
     };
   static size_t toknum;
   ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC.  */])[
   static int const tokens[] =
     {
       1000, '+', '+', -1
     };
   static size_t toknum;
   ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC.  */])[

-  if (! (toknum < sizeof tokens / sizeof *tokens))
-    abort ();
+  assert (toknum < sizeof tokens / sizeof *tokens);

   return tokens[toknum++];
   return tokens[toknum++];

-}]
+}

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

-])
+]])

 ])# _AT_DATA_EXPECT2_Y
 
 
 # AT_CHECK_EXPECT2(BISON-OPTIONS)
 ])# _AT_DATA_EXPECT2_Y
 
 
 # AT_CHECK_EXPECT2(BISON-OPTIONS)

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

 # Generate the grammar, compile it, run it.
 m4_define([AT_CHECK_EXPECT2],
 [AT_SETUP([Expecting two tokens $1])
 # Generate the grammar, compile it, run it.
 m4_define([AT_CHECK_EXPECT2],
 [AT_SETUP([Expecting two tokens $1])


@@ -1055,12 +1048,12 @@ AT_SETUP([Braced code in declaration in rules section])
 
 # Bison once mistook braced code in a declaration in the rules section to be a
 # rule action.
 
 # Bison once mistook braced code in a declaration in the rules section to be a
 # rule action.

-
+AT_BISON_OPTION_PUSHDEFS

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

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

 %}
 
 %error-verbose
 %}
 
 %error-verbose


@@ -1079,12 +1072,7 @@ start:
 
 %%
 
 
 %%
 

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

 static int
 yylex (void)
 {
 static int
 yylex (void)
 {


@@ -1098,6 +1086,7 @@ main (void)
   return !yyparse ();
 }
 ]])
   return !yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

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


@@ -1156,7 +1145,7 @@ AT_SETUP([[Extra lookahead sets in report]])
 # state's one item that (1) is associated with the same rule as the reduction
 # and (2) has its dot at the end of its RHS.  Previously, Bison also
 # erroneously printed the lookahead set next to all of the state's other items
 # state's one item that (1) is associated with the same rule as the reduction
 # and (2) has its dot at the end of its RHS.  Previously, Bison also
 # erroneously printed the lookahead set next to all of the state's other items

-# associated with the same rule.  This bug affected only the `.output' file and
+# associated with the same rule.  This bug affected only the '.output' file and

 # not the generated parser source code.
 
 AT_DATA([[input.y]],
 # not the generated parser source code.
 
 AT_DATA([[input.y]],


@@ -1195,21 +1184,24 @@ AT_SETUP([[Token number in precedence declaration]])
 
 # POSIX says token numbers can be declared in %left, %right, and %nonassoc, but
 # we lost this in Bison 1.50.
 
 # POSIX says token numbers can be declared in %left, %right, and %nonassoc, but
 # we lost this in Bison 1.50.

-
+AT_BISON_OPTION_PUSHDEFS

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

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

 %}
 
 %error-verbose
 %}
 
 %error-verbose

+%right END 0

 %left TK1 1 TK2 2 "tok alias" 3
 
 %%
 
 %left TK1 1 TK2 2 "tok alias" 3
 
 %%
 

-start: TK1 sr_conflict "tok alias" ;
-
+start:
+    TK1 sr_conflict "tok alias"
+  | start %prec END
+  ;

 sr_conflict:
   TK2
   | TK2 "tok alias"
 sr_conflict:
   TK2
   | TK2 "tok alias"


@@ -1217,12 +1209,7 @@ sr_conflict:
 
 %%
 
 
 %%
 

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

 int
 yylex (void)
 {
 int
 yylex (void)
 {


@@ -1237,9 +1224,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:24.5-19: warning: rule useless in parser due to conflicts: sr_conflict: TK2 "tok alias"
+[[input.y:23.5-19: warning: rule useless in parser due to conflicts: start: start
+input.y:27.5-19: warning: rule useless in parser due to conflicts: sr_conflict: TK2 "tok alias"

 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input]])
 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input]])


@@ -1262,9 +1251,11 @@ AT_SETUP([[parse-gram.y: LALR = IELR]])
 [cp $abs_top_srcdir/src/parse-gram.y input.y]
 AT_BISON_CHECK([[-o input.c -Dlr.type=lalr input.y]])
 [mv input.c lalr.c]
 [cp $abs_top_srcdir/src/parse-gram.y input.y]
 AT_BISON_CHECK([[-o input.c -Dlr.type=lalr input.y]])
 [mv input.c lalr.c]

+AT_CAPTURE_FILE([lalr.c])

 AT_BISON_CHECK([[-o input.c -Dlr.type=ielr input.y]])
 [mv input.c ielr.c]
 AT_BISON_CHECK([[-o input.c -Dlr.type=ielr input.y]])
 [mv input.c ielr.c]

-AT_CHECK([[diff -u lalr.c ielr.c]])
+AT_CAPTURE_FILE([ielr.c])
+AT_CHECK([[diff lalr.c ielr.c]], [[0]])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -1276,11 +1267,12 @@ AT_CLEANUP
 
 AT_SETUP([[%error-verbose and YYSTACK_USE_ALLOCA]])
 
 
 AT_SETUP([[%error-verbose and YYSTACK_USE_ALLOCA]])
 

+AT_BISON_OPTION_PUSHDEFS

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

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

   #define YYSTACK_USE_ALLOCA 1
 }
 
   #define YYSTACK_USE_ALLOCA 1
 }
 


@@ -1316,28 +1308,18 @@ syntax_error:
 
 %%
 
 
 %%
 

-void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
-int
-yylex (void)
-{
-  /* Induce two syntax error messages (which requires full error
-     recovery by shifting 3 tokens) in order to detect any loss of the
-     reallocated buffer.  */
-  static char const *input = "abc";
-  return *input++;
-}
-
+]AT_YYERROR_DEFINE[
+/* Induce two syntax error messages (which requires full error
+   recovery by shifting 3 tokens) in order to detect any loss of the
+   reallocated buffer.  */
+]AT_YYLEX_DEFINE(["abc"])[

 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]])


@@ -1363,12 +1345,12 @@ AT_CLEANUP
 # yyparse would invoke yyerror using the old contents of yymsg.
 
 AT_SETUP([[%error-verbose overflow]])
 # yyparse would invoke yyerror using the old contents of yymsg.
 
 AT_SETUP([[%error-verbose overflow]])

-
+AT_BISON_OPTION_PUSHDEFS

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

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

 
   /* This prevents this test case from having to induce error messages
      large enough to overflow size_t.  */
 
   /* This prevents this test case from having to induce error messages
      large enough to overflow size_t.  */


@@ -1434,21 +1416,10 @@ syntax_error2:
 
 %%
 
 
 %%
 

-void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
-int
-yylex (void)
-{
-  /* Induce two syntax error messages (which requires full error
-     recovery by shifting 3 tokens).  */
-  static char const *input = "abc";
-  return *input++;
-}
-
+]AT_YYERROR_DEFINE[
+/* Induce two syntax error messages (which requires full error
+   recovery by shifting 3 tokens).  */
+]AT_YYLEX_DEFINE(["abc"])[

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


@@ -1474,7 +1445,7 @@ AT_PARSER_CHECK([[./input]], [[2]], [],
 syntax error
 memory exhausted
 ]])
 syntax error
 memory exhausted
 ]])

-
+AT_BISON_OPTION_POPDEFS

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -1492,7 +1463,7 @@ AT_BISON_OPTION_PUSHDEFS([$1])
 AT_DATA_GRAMMAR([input.y],
 [[%code {
   #include <stdio.h>
 AT_DATA_GRAMMAR([input.y],
 [[%code {
   #include <stdio.h>

-  void yyerror (char const *);
+  ]AT_YYERROR_DECLARE[

   int yylex (]AT_PURE_IF([[YYSTYPE *]], [[void]])[);
 }
 
   int yylex (]AT_PURE_IF([[YYSTYPE *]], [[void]])[);
 }
 


@@ -1513,13 +1484,7 @@ B: 'b' ;
 C: /*empty*/ { printf ("consistent default reduction\n"); } ;
 
 %%
 C: /*empty*/ { printf ("consistent default reduction\n"); } ;
 
 %%

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

 int
 yylex (]AT_PURE_IF([[YYSTYPE *v]], [[void]])[)
 {
 int
 yylex (]AT_PURE_IF([[YYSTYPE *v]], [[void]])[)
 {


@@ -1585,13 +1550,13 @@ AT_CLEANUP
 
 AT_SETUP([[LAC: Memory exhaustion]])
 
 
 AT_SETUP([[LAC: Memory exhaustion]])
 

-m4_pushdef([AT_LAC_CHECK], [
-
+m4_pushdef([AT_LAC_CHECK],
+[AT_BISON_OPTION_PUSHDEFS

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

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

   #define YYMAXDEPTH 8
 }
 
   #define YYMAXDEPTH 8
 }
 


@@ -1603,20 +1568,8 @@ S: A A A A A A A A A ;
 A: /*empty*/ | 'a' ;
 
 %%
 A: /*empty*/ | 'a' ;
 
 %%

-
-void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
-int
-yylex (void)
-{
-  static char const *input = "]$1[";
-  return *input++;
-}
-
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE(["$1"])[

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


@@ -1630,12 +1583,12 @@ AT_BISON_CHECK([[-Dparse.lac=full -Dparse.lac.es-capacity-initial=1 \
 [[input.y: conflicts: 8 shift/reduce
 ]])
 AT_COMPILE([[input]])
 [[input.y: conflicts: 8 shift/reduce
 ]])
 AT_COMPILE([[input]])

-
+AT_BISON_OPTION_POPDEFS

 ])
 
 # Check for memory exhaustion during parsing.
 ])
 
 # Check for memory exhaustion during parsing.

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

 [[Starting parse
 Entering state 0
 Reading a token: Now at end of input.
 [[Starting parse
 Entering state 0
 Reading a token: Now at end of input.


@@ -1648,8 +1601,8 @@ Stack now 0
 
 # Induce an immediate syntax error with an undefined token, and check
 # for memory exhaustion while building syntax error message.
 
 # Induce an immediate syntax error with an undefined token, and check
 # for memory exhaustion while building syntax error message.

-AT_LAC_CHECK([[z]], [[0]])
-AT_PARSER_CHECK([[./input]], [[2]], [[]],
+AT_LAC_CHECK([z], [[0]])
+AT_PARSER_CHECK([[./input]], [[2]], [],

 [[Starting parse
 Entering state 0
 Reading a token: Next token is token $undefined ()
 [[Starting parse
 Entering state 0
 Reading a token: Next token is token $undefined ()