* doc/bison.texinfo (Location Default Action): Mention that n must be zero when k is.

[bison.git] / tests / actions.at

diff --git a/tests/actions.at b/tests/actions.at
index 15f25c03489fe93e78e227538e487c8e27887be1..d79a33ec917d899d1ce072a1668f3c85781f1cc0 100644 (file)
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -186,7 +186,7 @@ m4_ifval([$6], [%union
 }])
 [
 %{
-]AT_LALR1_CC_IF([typedef yy::Location YYLTYPE;
+]AT_LALR1_CC_IF([typedef yy::location YYLTYPE;
                 m4_ifval([$6], , [#define YYSTYPE int])])
 [static int yylex (]AT_LEX_FORMALS[);
 ]AT_LALR1_CC_IF([], [static void yyerror (const char *msg);])
@@ -311,16 +311,17 @@ yylex (]AT_LEX_FORMALS[)
 ]AT_LALR1_CC_IF(
 [/* A C++ error reporting function. */
 void
-yy::Parser::error_ ()
+yy::parser::error (const location& l, const std::string& m)
 {
-  printf ("%d-%d: %s\n", RANGE (location), message.c_str());
+  printf ("%d-%d: %s\n", RANGE (l), m.c_str());
 }
 
 static bool yydebug;
 int
 yyparse ()
 {
-  yy::Parser parser (yydebug);
+  yy::parser parser;
+  parser.set_debug_level (yydebug);
   return parser.parse ();
 }
 ],
@@ -467,10 +468,8 @@ AT_CHECK_PRINTER_AND_DESTRUCTOR([], [with union])
 # These tests currently fail on a Debian GNU/Linux 3.0r2 x86 host,
 # but the 2nd test succeeds on a Solaris 9 sparc hosts (Forte 7 cc).
 # Skip them until we figure out what the problem is.
-AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"], ,
-  [AT_CHECK([exit 77])])
-AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"], [with union],
-  [AT_CHECK([exit 77])])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"], [with union])
 
 AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser])
 AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser], [with union])