tests: address g++-4.8 warnings.

[bison.git] / tests / regression.at

diff --git a/tests/regression.at b/tests/regression.at
index 5affe4d9c62ab2c1a1c2f438cdee69ad060e2a1f..58988c81f5876ca8de902ca4444d3a37c2e04d7f 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -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,6 +169,7 @@ AT_CLEANUP
 
 AT_SETUP([Braces parsing])
 
 
 AT_SETUP([Braces parsing])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA([input.y],
 [[/* Bison used to swallow the character after '}'. */
 
 AT_DATA([input.y],
 [[/* Bison used to swallow the character after '}'. */
 


@@ -168,6 +177,7 @@ AT_DATA([input.y],
 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,6 +193,7 @@ AT_CLEANUP
 
 AT_SETUP([Duplicate string])
 
 
 AT_SETUP([Duplicate string])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA([input.y],
 [[/* 'Bison -v' used to dump core when two tokens are defined with the same
    string, as LE and GE below. */
 AT_DATA([input.y],
 [[/* 'Bison -v' used to dump core when two tokens are defined with the same
    string, as LE and GE below. */


@@ -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 [-Wother]

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


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

+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>
 # Bison managed, when fed with '%token 'f' "f"' to #define 'f'!
 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"


@@ -447,20 +462,8 @@ 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);
-}
-
-int
-yylex (void)
-{
-  static int called;
-  if (called++)
-    abort ();
-  return SPECIAL;
-}
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE([{ SPECIAL }])[

 
 int
 main (void)
 
 int
 main (void)


@@ -468,14 +471,15 @@ 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
 # C-string literal.  Also notice that unnecessary escaping, such as "\?", from
 # the user specification is eliminated.
 AT_BISON_CHECK([-o input.c input.y], [[0]], [[]],
 
 # Checking the warning message guarantees that the trigraph "??!" isn't
 # unnecessarily escaped here even though it would need to be if encoded in a
 # C-string literal.  Also notice that unnecessary escaping, such as "\?", from
 # 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-14: warning: symbol SPECIAL redeclared [-Wother]
+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 [-Wother]

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


@@ -498,22 +502,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
 
 


@@ -760,7 +766,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[] =
 {


@@ -823,13 +829,11 @@ AT_CLEANUP
 # so that possible bound checking compilers could check all the skeletons.
 m4_define([_AT_DATA_DANCER_Y],
 [AT_DATA_GRAMMAR([dancer.y],
 # so that possible bound checking compilers could check all the skeletons.
 m4_define([_AT_DATA_DANCER_Y],
 [AT_DATA_GRAMMAR([dancer.y],

-[%{
-static int yylex (AT_LALR1_CC_IF([int *], [void]));
-AT_LALR1_CC_IF([#include <cstdlib>],
-[#include <stdlib.h>
-#include <stdio.h>
-static void yyerror (const char *);])
-%}
+[[%code provides
+{
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[
+}

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


@@ -874,15 +878,10 @@ member: STRING
    | INVALID
    ;
 %%
    | INVALID
    ;
 %%

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

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


@@ -891,33 +890,14 @@ yyparse ()
 #endif
   return parser.parse ();
 }
 #endif
   return parser.parse ();
 }

-],
-[static void
-yyerror (const char *s)
-{
-  fprintf (stderr, "%s\n", s);
-}])
-
-static int
-yylex (AT_LALR1_CC_IF([int *lval], [void]))
-[{
-  static int const tokens[] =
-    {
-      ':', -1
-    };
-  static size_t toknum;
-  ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC.  */])[
-  if (! (toknum < sizeof tokens / sizeof *tokens))
-    abort ();
-  return tokens[toknum++];
-}]
+])[

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

-])
+]])

 ])# _AT_DATA_DANCER_Y
 
 
 ])# _AT_DATA_DANCER_Y
 
 


@@ -953,10 +933,10 @@ m4_define([_AT_DATA_EXPECT2_Y],
 [AT_DATA_GRAMMAR([expect2.y],
 [%{
 static int yylex (AT_LALR1_CC_IF([int *], [void]));
 [AT_DATA_GRAMMAR([expect2.y],
 [%{
 static int yylex (AT_LALR1_CC_IF([int *], [void]));

-AT_LALR1_CC_IF([#include <cstdlib>],
-[#include <stdio.h>
-#include <stdlib.h>
-static void yyerror (const char *);])
+AT_LALR1_CC_IF([[#include <cstdlib>]],
+[[#include <stdlib.h>
+#include <stdio.h>
+]AT_YYERROR_DECLARE])[

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


@@ -973,52 +953,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 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])


@@ -1047,12 +1016,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


@@ -1070,18 +1039,8 @@ start:
 %printer { fprintf (yyoutput, "PRINTER"); } 'a';
 
 %%
 %printer { fprintf (yyoutput, "PRINTER"); } 'a';
 
 %%

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

 
 int
 main (void)
 
 int
 main (void)


@@ -1090,6 +1049,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])


@@ -1187,12 +1147,12 @@ 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


@@ -1212,19 +1172,8 @@ sr_conflict:
 
 %%
 
 
 %%
 

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

 
 int
 main (void)
 
 int
 main (void)


@@ -1232,10 +1181,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: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"
+[[input.y:23.5-19: warning: rule useless in parser due to conflicts: start: start [-Wother]
+input.y:27.5-19: warning: rule useless in parser due to conflicts: sr_conflict: TK2 "tok alias" [-Wother]

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


@@ -1258,10 +1208,12 @@ AT_SETUP([[parse-gram.y: LALR = IELR]])
 # output files have the same name.
 [cp $abs_top_srcdir/src/parse-gram.y input.y]
 AT_BISON_CHECK([[-o input.c -Dlr.type=lalr input.y]])
 # output files have the same name.
 [cp $abs_top_srcdir/src/parse-gram.y input.y]
 AT_BISON_CHECK([[-o input.c -Dlr.type=lalr input.y]])

-[mv input.c expout]
+[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([[cat ielr.c]], [[0]], [[expout]])
+AT_CAPTURE_FILE([ielr.c])
+AT_CHECK([[diff lalr.c ielr.c]], [[0]])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -1273,11 +1225,12 @@ AT_CLEANUP
 
 AT_SETUP([[parse.error=verbose and YYSTACK_USE_ALLOCA]])
 
 
 AT_SETUP([[parse.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
 }
 


@@ -1313,28 +1266,18 @@ syntax_error:
 
 %%
 
 
 %%
 

-void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
-int
-yylex (void)
-{
+]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.  */
   /* 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_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]])


@@ -1361,11 +1304,12 @@ AT_CLEANUP
 
 AT_SETUP([[parse.error=verbose overflow]])
 
 
 AT_SETUP([[parse.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.  */


@@ -1431,21 +1375,10 @@ syntax_error2:
 
 %%
 
 
 %%
 

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

   /* Induce two syntax error messages (which requires full error
      recovery by shifting 3 tokens).  */
   /* Induce two syntax error messages (which requires full error
      recovery by shifting 3 tokens).  */

-  static char const *input = "abc";
-  return *input++;
-}
-
+]AT_YYLEX_DEFINE(["abc"])[

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


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

-
+AT_BISON_OPTION_POPDEFS

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -1489,7 +1422,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]])[);
 }
 


@@ -1510,13 +1443,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]])[)
 {


@@ -1582,13 +1509,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
 }
 


@@ -1600,20 +1527,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)
 {


@@ -1627,12 +1542,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.


@@ -1645,8 +1560,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 ()