Merge remote-tracking branch 'origin/maint'

[bison.git] / tests / regression.at

diff --git a/tests/regression.at b/tests/regression.at
index e93b901eedb962bacb3347337483e14298ef1d16..bc129b7ce83046df2f7120e20a7325140078fd01 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -24,6 +24,7 @@ AT_BANNER([[Regression tests.]])
 
 AT_SETUP([Trivial grammars])
 
 
 AT_SETUP([Trivial grammars])
 

+AT_BISON_OPTION_PUSHDEFS

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


@@ -37,6 +38,7 @@ AT_DATA_GRAMMAR([input.y],
 
 program: 'x';
 ]])
 
 program: 'x';
 ]])

+AT_BISON_OPTION_POPDEFS

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


@@ -52,6 +54,7 @@ AT_CLEANUP
 
 AT_SETUP([YYSTYPE typedef])
 
 
 AT_SETUP([YYSTYPE typedef])
 

+AT_BISON_OPTION_PUSHDEFS

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


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

+AT_BISON_OPTION_POPDEFS

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


@@ -83,6 +87,7 @@ 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_YYERROR_DECLARE_EXTERN[
 AT_DATA_GRAMMAR([input.y],
 [[%{
 ]AT_YYERROR_DECLARE_EXTERN[


@@ -103,6 +108,7 @@ AT_DATA_GRAMMAR([input.y],
 exp: MY_TOKEN;
 %%
 ]])
 exp: MY_TOKEN;
 %%
 ]])

+AT_BISON_OPTION_POPDEFS

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


@@ -121,6 +127,7 @@ 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>


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

+AT_BISON_OPTION_POPDEFS

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


@@ -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,6 +206,7 @@ AT_DATA([input.y],
 exp: '(' exp ')' | NUM ;
 %%
 ]])
 exp: '(' exp ')' | NUM ;
 %%
 ]])

+AT_BISON_OPTION_POPDEFS

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


@@ -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,6 +442,7 @@ 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],
 [%{
 # Bison managed, when fed with '%token 'f' "f"' to #define 'f'!
 AT_DATA_GRAMMAR([input.y],
 [%{


@@ -447,11 +462,7 @@ AT_DATA_GRAMMAR([input.y],
 %%
 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)


@@ -468,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


@@ -534,7 +546,7 @@ AT_SETUP([Web2c Report])
 AT_KEYWORDS([report])
 
 AT_DATA([input.y],
 AT_KEYWORDS([report])
 
 AT_DATA([input.y],

-[[%token       undef_id_tok const_id_tok
+[[%token        undef_id_tok const_id_tok

 
 %start CONST_DEC_PART
 \f
 
 %start CONST_DEC_PART
 \f


@@ -544,12 +556,12 @@ CONST_DEC_PART:
         ;
 
 CONST_DEC_LIST:
         ;
 
 CONST_DEC_LIST:

-         CONST_DEC
+          CONST_DEC

         | CONST_DEC_LIST CONST_DEC
         ;
 
 CONST_DEC:
         | CONST_DEC_LIST CONST_DEC
         ;
 
 CONST_DEC:

-         { } undef_id_tok '=' const_id_tok ';'
+          { } undef_id_tok '=' const_id_tok ';'

         ;
 %%
 ]])
         ;
 %%
 ]])


@@ -755,15 +767,6 @@ AT_CHECK([[cat tables.c]], 0,
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
        5,     6
 };
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
        5,     6
 };

-static const yytype_uint8 yyprhs[] =
-{
-       0,     0,     3,     5,     6,     9,    14
-};
-static const yytype_int8 yyrhs[] =
-{
-       8,     0,    -1,     9,    -1,    -1,    10,    11,    -1,     3,
-       4,     5,     8,    -1,     6,     8,    -1
-};

 static const yytype_uint8 yyrline[] =
 {
        0,     2,     2,     3,     3,     4,     5
 static const yytype_uint8 yyrline[] =
 {
        0,     2,     2,     3,     3,     4,     5


@@ -777,32 +780,24 @@ static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261
 };
 {
        0,   256,   257,   258,   259,   260,   261
 };

-static const yytype_uint8 yyr1[] =
-{
-       0,     7,     8,     9,     9,    10,    11
-};
-static const yytype_uint8 yyr2[] =
+static const yytype_int8 yypact[] =

 {
 {

-       0,     2,     1,     0,     2,     4,     2
+      -2,    -1,     4,    -8,     0,     2,    -8,    -2,    -8,    -2,
+      -8,    -8

 };
 static const yytype_uint8 yydefact[] =
 {
        3,     0,     0,     2,     0,     0,     1,     3,     4,     3,
        6,     5
 };
 };
 static const yytype_uint8 yydefact[] =
 {
        3,     0,     0,     2,     0,     0,     1,     3,     4,     3,
        6,     5
 };

-static const yytype_int8 yydefgoto[] =
-{
-      -1,     2,     3,     4,     8
-};
-static const yytype_int8 yypact[] =
-{
-      -2,    -1,     4,    -8,     0,     2,    -8,    -2,    -8,    -2,
-      -8,    -8
-};

 static const yytype_int8 yypgoto[] =
 {
       -8,    -7,    -8,    -8,    -8
 };
 static const yytype_int8 yypgoto[] =
 {
       -8,    -7,    -8,    -8,    -8
 };

+static const yytype_int8 yydefgoto[] =
+{
+      -1,     2,     3,     4,     8
+};

 static const yytype_uint8 yytable[] =
 {
       10,     1,    11,     5,     6,     0,     7,     9
 static const yytype_uint8 yytable[] =
 {
       10,     1,    11,     5,     6,     0,     7,     9


@@ -816,6 +811,14 @@ static const yytype_uint8 yystos[] =
        0,     3,     8,     9,    10,     4,     0,     6,    11,     5,
        8,     8
 };
        0,     3,     8,     9,    10,     4,     0,     6,    11,     5,
        8,     8
 };

+static const yytype_uint8 yyr1[] =
+{
+       0,     7,     8,     9,     9,    10,    11
+};
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     0,     2,     4,     2
+};

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -836,7 +839,7 @@ m4_define([_AT_DATA_DANCER_Y],
 [AT_DATA_GRAMMAR([dancer.y],
 [%{
 static int yylex (AT_LALR1_CC_IF([int *], [void]));
 [AT_DATA_GRAMMAR([dancer.y],
 [%{
 static int yylex (AT_LALR1_CC_IF([int *], [void]));

-AT_LALR1_CC_IF([],
+AT_LALR1_CC_IF([#include <cstdlib>],

 [#include <stdlib.h>
 #include <stdio.h>
 ]AT_YYERROR_DECLARE[])
 [#include <stdlib.h>
 #include <stdio.h>
 ]AT_YYERROR_DECLARE[])


@@ -885,15 +888,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;


@@ -902,12 +899,7 @@ 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
 yylex (AT_LALR1_CC_IF([int *lval], [void]))


@@ -964,10 +956,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 <stdio.h>
-#include <stdlib.h>
-]AT_YYERROR_DECLARE[])
+AT_LALR1_CC_IF([[#include <cstdlib>]],
+[[#include <stdlib.h>
+#include <stdio.h>
+]AT_YYERROR_DECLARE])[

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


@@ -984,30 +976,19 @@ 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);
-}])
+])[

 
 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 int const tokens[] =
     {
       1000, '+', '+', -1


@@ -1017,19 +998,19 @@ yylex (AT_LALR1_CC_IF([int *lval], [void]))
   if (! (toknum < sizeof tokens / sizeof *tokens))
     abort ();
   return tokens[toknum++];
   if (! (toknum < sizeof tokens / sizeof *tokens))
     abort ();
   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])


@@ -1073,7 +1054,7 @@ AT_DATA_GRAMMAR([input.y],
 start:
   {
     printf ("Bison would once convert this action to a midrule because of the"
 start:
   {
     printf ("Bison would once convert this action to a midrule because of the"

-           " subsequent braced code.\n");
+            " subsequent braced code.\n");

   }
   ;
 
   }
   ;
 


@@ -1256,8 +1237,9 @@ AT_CLEANUP
 
 AT_SETUP([[parse-gram.y: LALR = IELR]])
 
 
 AT_SETUP([[parse-gram.y: LALR = IELR]])
 

-# Avoid differences in synclines by telling bison that the output files
-# have the same name.
+# Avoid tests/bison's dark magic by processing a local copy of the
+# grammar.  Avoid differences in synclines by telling bison that the
+# 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 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]


@@ -1271,11 +1253,11 @@ AT_CLEANUP
 
 
 
 
 
 

-## --------------------------------------- ##
-## %error-verbose and YYSTACK_USE_ALLOCA.  ##
-## --------------------------------------- ##
+## -------------------------------------------- ##
+## parse.error=verbose and YYSTACK_USE_ALLOCA.  ##
+## -------------------------------------------- ##

 
 

-AT_SETUP([[%error-verbose and YYSTACK_USE_ALLOCA]])
+AT_SETUP([[parse.error=verbose and YYSTACK_USE_ALLOCA]])

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


@@ -1286,7 +1268,7 @@ AT_DATA_GRAMMAR([input.y],
   #define YYSTACK_USE_ALLOCA 1
 }
 
   #define YYSTACK_USE_ALLOCA 1
 }
 

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

 
 %%
 
 
 %%
 


@@ -1319,9 +1301,9 @@ syntax_error:
 %%
 
 ]AT_YYERROR_DEFINE[
 %%
 
 ]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.  */

 ]AT_YYLEX_DEFINE([abc])[
 int
 main (void)
 ]AT_YYLEX_DEFINE([abc])[
 int
 main (void)


@@ -1342,9 +1324,9 @@ AT_CLEANUP
 
 
 
 
 
 

-## ------------------------- ##
-## %error-verbose overflow.  ##
-## ------------------------- ##
+## ------------------------------ ##
+## parse.error=verbose overflow.  ##
+## ------------------------------ ##

 
 # Imagine the case where YYSTACK_ALLOC_MAXIMUM = YYSIZE_MAXIMUM and an
 # invocation of yysyntax_error has caused yymsg_alloc to grow to exactly
 
 # Imagine the case where YYSTACK_ALLOC_MAXIMUM = YYSIZE_MAXIMUM and an
 # invocation of yysyntax_error has caused yymsg_alloc to grow to exactly


@@ -1354,7 +1336,8 @@ AT_CLEANUP
 # size calculation would return YYSIZE_MAXIMUM to yyparse.  Then,
 # yyparse would invoke yyerror using the old contents of yymsg.
 
 # size calculation would return YYSIZE_MAXIMUM to yyparse.  Then,
 # yyparse would invoke yyerror using the old contents of yymsg.
 

-AT_SETUP([[%error-verbose overflow]])
+AT_SETUP([[parse.error=verbose overflow]])
+

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


@@ -1379,7 +1362,7 @@ AT_DATA_GRAMMAR([input.y],
   #define YYMAXDEPTH 100
 }
 
   #define YYMAXDEPTH 100
 }
 

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

 
 %%
 
 
 %%
 


@@ -1427,8 +1410,8 @@ syntax_error2:
 %%
 
 ]AT_YYERROR_DEFINE[
 %%
 
 ]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).  */

 ]AT_YYLEX_DEFINE([abc])[
 int
 main (void)
 ]AT_YYLEX_DEFINE([abc])[
 int
 main (void)


@@ -1478,7 +1461,7 @@ AT_DATA_GRAMMAR([input.y],
 }
 
 ]$1[
 }
 
 ]$1[

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

 %token 'c'
 
 %%
 %token 'c'
 
 %%