Merge branch 'branch-2.6' into maint

[bison.git] / tests / regression.at

diff --git a/tests/regression.at b/tests/regression.at
index fa93833cd0d08b3bf4378e8b54c4a5bfe79243cc..b6bff17cb0743128f82bc74360e74f54b48baba4 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -41,7 +41,7 @@ program: 'x';
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([-o input.c input.y])
 AT_BISON_OPTION_POPDEFS
 
 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


@@ -71,7 +71,7 @@ program: { $$ = ""; };
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([-o input.c input.y])
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([-o input.c input.y])

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

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -111,7 +111,7 @@ exp: MY_TOKEN;
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([-y -o input.c input.y])
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([-y -o input.c input.y])

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

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -156,7 +156,7 @@ exp: MY_TOKEN;
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([-o input.c input.y])
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([-o input.c input.y])

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

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -401,15 +401,15 @@ 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: 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:2.1: error: invalid character: '?'
+input.y:3.14: error: invalid character: '}'
+input.y:4.1: error: invalid character: '%'
+input.y:4.2: error: invalid character: '&'
+input.y:5.1-17: error: invalid directive: '%a-does-not-exist'
+input.y:6.1: error: invalid character: '%'
+input.y:6.2: error: invalid character: '-'
+input.y:7.1-8.0: error: missing '%}' at end of file
+input.y:7.1-8.0: error: syntax error, unexpected %{...%}

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -428,7 +428,7 @@ AT_DATA([input.y],
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],

-[[input.y:3.1-15: syntax error, unexpected %initial-action, expecting {...}
+[[input.y:3.1-15: error: syntax error, unexpected %initial-action, expecting {...}

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


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

 
 int
 main (void)
 
 int
 main (void)


@@ -531,7 +519,7 @@ exp:
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([-o input.c input.y])
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([-o input.c input.y])

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

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -850,13 +838,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 <stdlib.h>
-#include <stdio.h>
-]AT_YYERROR_DECLARE[])
-%}
+[[%code provides
+{
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[
+}

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


@@ -901,15 +887,10 @@ 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_YYLEX_DEFINE([":"])[
+]AT_LALR1_CC_IF(
+[int

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


@@ -918,33 +899,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
 
 


@@ -955,7 +917,6 @@ m4_define([AT_CHECK_DANCER],
 [AT_SETUP([Dancer $1])
 AT_BISON_OPTION_PUSHDEFS([$1])
 _AT_DATA_DANCER_Y([$1])
 [AT_SETUP([Dancer $1])
 AT_BISON_OPTION_PUSHDEFS([$1])
 _AT_DATA_DANCER_Y([$1])

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

 AT_FULL_COMPILE([dancer])
 AT_PARSER_CHECK([./dancer], 1, [],
 [syntax error, unexpected ':'
 AT_FULL_COMPILE([dancer])
 AT_PARSER_CHECK([./dancer], 1, [],
 [syntax error, unexpected ':'


@@ -1010,6 +971,7 @@ yyparse ()
 }
 ])[
 
 }
 ])[
 

+#include <assert.h>

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


@@ -1019,8 +981,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++];
 }
 


@@ -1040,7 +1001,6 @@ m4_define([AT_CHECK_EXPECT2],
 [AT_SETUP([Expecting two tokens $1])
 AT_BISON_OPTION_PUSHDEFS([$1])
 _AT_DATA_EXPECT2_Y([$1])
 [AT_SETUP([Expecting two tokens $1])
 AT_BISON_OPTION_PUSHDEFS([$1])
 _AT_DATA_EXPECT2_Y([$1])

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

 AT_FULL_COMPILE([expect2])
 AT_PARSER_CHECK([./expect2], 1, [],
 [syntax error, unexpected '+', expecting A or B
 AT_FULL_COMPILE([expect2])
 AT_PARSER_CHECK([./expect2], 1, [],
 [syntax error, unexpected '+', expecting A or B


@@ -1086,13 +1046,8 @@ start:
 %printer { fprintf (yyoutput, "PRINTER"); } 'a';
 
 %%
 %printer { fprintf (yyoutput, "PRINTER"); } 'a';
 
 %%

-

 ]AT_YYERROR_DEFINE[
 ]AT_YYERROR_DEFINE[

-static int
-yylex (void)
-{
-  return 'a';
-}
+]AT_YYLEX_DEFINE(["a"])[

 
 int
 main (void)
 
 int
 main (void)


@@ -1225,13 +1180,7 @@ sr_conflict:
 %%
 
 ]AT_YYERROR_DEFINE[
 %%
 
 ]AT_YYERROR_DEFINE[

-int
-yylex (void)
-{
-  static int const input[] = { 1, 2, 3, 0 };
-  static int const *inputp = input;
-  return *inputp++;
-}
+]AT_YYLEX_DEFINE([{ 1, 2, 3, 0 }])[

 
 int
 main (void)
 
 int
 main (void)


@@ -1327,7 +1276,7 @@ syntax_error:
 /* 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])[
+]AT_YYLEX_DEFINE(["abc"])[

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


@@ -1434,7 +1383,7 @@ syntax_error2:
 ]AT_YYERROR_DEFINE[
 /* Induce two syntax error messages (which requires full error
    recovery by shifting 3 tokens).  */
 ]AT_YYERROR_DEFINE[
 /* Induce two syntax error messages (which requires full error
    recovery by shifting 3 tokens).  */

-]AT_YYLEX_DEFINE([abc])[
+]AT_YYLEX_DEFINE(["abc"])[

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


@@ -1532,17 +1481,17 @@ AT_CHECK([[grep 'syntax error,' stderr.txt]], [[0]],
 
 # Check number of default reductions in inconsistent states to be sure
 # syntax error is detected before unnecessary reductions are performed.
 
 # Check number of default reductions in inconsistent states to be sure
 # syntax error is detected before unnecessary reductions are performed.

-AT_CHECK([[perl -0777 -ne 'print s/inconsistent default reduction//g;' \
+AT_CHECK([[$PERL -0777 -ne 'print s/inconsistent default reduction//g;' \

            < stdout.txt || exit 77]], [[0]], [[14]])
 
 # Check number of default reductions in consistent states to be sure
 # it is performed before the syntax error is detected.
            < stdout.txt || exit 77]], [[0]], [[14]])
 
 # Check number of default reductions in consistent states to be sure
 # it is performed before the syntax error is detected.

-AT_CHECK([[perl -0777 -ne 'print s/\bconsistent default reduction//g;' \
+AT_CHECK([[$PERL -0777 -ne 'print s/\bconsistent default reduction//g;' \

            < stdout.txt || exit 77]], [[0]], [[2]])
 
 # Check number of reallocs to be sure reallocated memory isn't somehow
 # lost between LAC invocations.
            < stdout.txt || exit 77]], [[0]], [[2]])
 
 # Check number of reallocs to be sure reallocated memory isn't somehow
 # lost between LAC invocations.

-AT_CHECK([[perl -0777 -ne 'print s/\(realloc//g;' < stderr.txt \
+AT_CHECK([[$PERL -0777 -ne 'print s/\(realloc//g;' < stderr.txt \

            || exit 77]], [[0]], [[3]])
 
 AT_BISON_OPTION_POPDEFS
            || exit 77]], [[0]], [[3]])
 
 AT_BISON_OPTION_POPDEFS


@@ -1584,7 +1533,7 @@ A: /*empty*/ | 'a' ;
 
 %%
 ]AT_YYERROR_DEFINE[
 
 %%
 ]AT_YYERROR_DEFINE[

-]AT_YYLEX_DEFINE([$1])[
+]AT_YYLEX_DEFINE(["$1"])[

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


@@ -1634,3 +1583,79 @@ Stack now 0
 m4_popdef([AT_LAC_CHECK])
 
 AT_CLEANUP
 m4_popdef([AT_LAC_CHECK])
 
 AT_CLEANUP

+
+
+## ---------------------- ##
+## Lex and parse params.  ##
+## ---------------------- ##
+
+# AT_TEST(SKELETON)
+# -----------------
+# Check that the identifier of the params is properly fetched
+# even when there are trailing blanks.
+
+m4_pushdef([AT_TEST],
+[AT_SETUP([[Lex and parse params: $1]])
+
+AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" %parse-param { int x } %parse-param { int y }])
+
+## FIXME: Improve parsing of parse-param and use the generated
+## yyerror.
+AT_DATA_GRAMMAR([input.y],
+[[%defines
+%locations
+%skeleton "$1"
+%union { int ival; }
+%parse-param { int x }
+// Spaces, tabs, and new lines.
+%parse-param { @&t@
+        int y   @&t@
+         @&t@
+ @&t@
+}
+
+%{
+#include <stdio.h>
+#include <stdlib.h>
+
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[
+%}
+
+%%
+exp: 'a' { fprintf (stdout, "x: %d, y: %d\n", x, y); };
+%%
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE(["a"])[
+
+]AT_SKEL_CC_IF(
+[int
+yyparse (int x, int y)
+{
+  yy::parser parser(x, y);
+  return parser.parse ();
+}
+])[
+
+int
+main (void)
+{
+  return !!yyparse(1, 2);
+}
+]])
+
+AT_FULL_COMPILE([input])
+AT_CHECK([./input], 0, [[x: 1, y: 2
+]])
+AT_BISON_OPTION_POPDEFS
+
+AT_CLEANUP
+])
+
+## FIXME: test Java, and iterate over skeletons.
+AT_TEST([yacc.c])
+AT_TEST([glr.c])
+AT_TEST([lalr1.cc])
+AT_TEST([glr.cc])
+
+m4_popdef([AT_TEST])