(AT_COMPILE, AT_COMPILE_CXX): Don't put options

[bison.git] / tests / regression.at

diff --git a/tests/regression.at b/tests/regression.at
index 51495b897318d1b0069875d5bdfabc13c68402f9..d58c8bdf1a837ed9bf3d674eed5fcdc0cbba0ce5 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -1,5 +1,5 @@
 # Bison Regressions.                               -*- Autotest -*-
 # Bison Regressions.                               -*- Autotest -*-

-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004 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


@@ -535,7 +535,7 @@ AT_CLEANUP
 #
 # It used to be wrong on yydefact only:
 #
 #
 # It used to be wrong on yydefact only:
 #

-# static const short yydefact[] =
+# static const short int yydefact[] =

 #  {
 # -       2,     0,     1,     0,     0,     2,     3,     2,     5,     4,
 # +       2,     0,     1,     0,     0,     0,     3,     2,     5,     4,
 #  {
 # -       2,     0,     1,     0,     0,     2,     3,     2,     5,     4,
 # +       2,     0,     1,     0,     0,     0,     3,     2,     5,     4,


@@ -613,7 +613,7 @@ static const char *const yytname[] =
   "$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"",
   "\"else\"", "$accept", "statement", "struct_stat", "if", "else", 0
 };
   "$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"",
   "\"else\"", "$accept", "statement", "struct_stat", "if", "else", 0
 };

-static const unsigned short yytoknum[] =
+static const unsigned short int yytoknum[] =

 {
        0,   256,   257,   258,   259,   260,   261
 };
 {
        0,   256,   257,   258,   259,   260,   261
 };


@@ -725,23 +725,18 @@ member: STRING
    ;
 %%
 AT_LALR1_CC_IF(
    ;
 %%
 AT_LALR1_CC_IF(

-[/* Currently, print_ is required in C++. */
+[/* A C++ error reporting function. */

 void
 void

-yy::Parser::print_ ()
+yy::parser::error (const location&, const std::string& m)

 {
 {

-}
-
-/* A C++ error reporting function. */
-void
-yy::Parser::error_ ()
-{
-  std::cerr << message << std::endl;
+  std::cerr << m << std::endl;

 }
 
 int
 }
 
 int

-yyparse (void)
+yyparse ()

 {
 {

-  yy::Parser parser (!!YYDEBUG);
+  yy::parser parser;
+  parser.set_debug_level (!!YYDEBUG);

   return parser.parse ();
 }
 ],
   return parser.parse ();
 }
 ],


@@ -780,8 +775,11 @@ m4_define([AT_CHECK_DANCER],
 AT_BISON_OPTION_PUSHDEFS([$1])
 _AT_DATA_DANCER_Y([$1])
 AT_CHECK([bison -o dancer.c dancer.y])
 AT_BISON_OPTION_PUSHDEFS([$1])
 _AT_DATA_DANCER_Y([$1])
 AT_CHECK([bison -o dancer.c dancer.y])

-AT_LALR1_CC_IF([AT_COMPILE_CXX([dancer])],
-               [AT_COMPILE([dancer])])
+AT_LALR1_CC_IF(
+  [AT_CHECK([bison -o dancer.cc dancer.y])
+   AT_COMPILE_CXX([dancer])],
+  [AT_CHECK([bison -o dancer.c dancer.y])
+   AT_COMPILE([dancer])])

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