* doc/bison.texinfo (C++ Parser Interface): Use defcv to define

[bison.git] / tests / calc.at

diff --git a/tests/calc.at b/tests/calc.at
index c921590ff6a66f43fb9fc4c8de9d033d9831dbe3..db92f70019ec79b2c68e33087010e51d58be2cf8 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,5 +1,7 @@
 # Simple calculator.                         -*- Autotest -*-
 # Simple calculator.                         -*- Autotest -*-

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


@@ -13,8 +15,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.

 
 ## ---------------------------------------------------- ##
 ## Compile the grammar described in the documentation.  ##
 
 ## ---------------------------------------------------- ##
 ## Compile the grammar described in the documentation.  ##


@@ -66,7 +68,7 @@ static int global_count = 0;
 
 %{
 static int power (int base, int exponent);
 
 %{
 static int power (int base, int exponent);

-]AT_LALR1_CC_IF([typedef yy::Location YYLTYPE;],
+]AT_LALR1_CC_IF([typedef yy::location YYLTYPE;],

 [/* yyerror receives the location if:
    - %location & %pure & %glr
    - %location & %pure & %yacc & %parse-param. */
 [/* yyerror receives the location if:
    - %location & %pure & %glr
    - %location & %pure & %yacc & %parse-param. */


@@ -128,7 +130,7 @@ static FILE *yyin;
 ]AT_LALR1_CC_IF(
 [/* A C++ error reporting function. */
 void
 ]AT_LALR1_CC_IF(
 [/* A C++ error reporting function. */
 void

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

 {
   (void) l;
   std::cerr << AT_LOCATION_IF([l << ": " << ])m << std::endl;
 {
   (void) l;
   std::cerr << AT_LOCATION_IF([l << ": " << ])m << std::endl;


@@ -137,7 +139,7 @@ yy::Parser::error (const Location& l, const std::string& m)
 int
 yyparse (AT_PARAM_IF([semantic_value *result, int *count]))
 {
 int
 yyparse (AT_PARAM_IF([semantic_value *result, int *count]))
 {

-  yy::Parser parser[]AT_PARAM_IF([ (result, count)]);
+  yy::parser parser[]AT_PARAM_IF([ (result, count)]);

   parser.set_debug_level (!!YYDEBUG);
   return parser.parse ();
 }
   parser.set_debug_level (!!YYDEBUG);
   return parser.parse ();
 }


@@ -300,7 +302,11 @@ main (int argc, const char **argv)
   int count = 0;
   int status;
 
   int count = 0;
   int status;
 

-  alarm (10);
+  /* This used to be alarm (10), but that isn't enough time for
+     a July 1995 vintage DEC Alphastation 200 4/100 system,
+     according to Nelson H. F. Beebe.  100 seconds is enough.  */
+  alarm (100);
+

   if (argc == 2)
     yyin = fopen (argv[1], "r");
   else
   if (argc == 2)
     yyin = fopen (argv[1], "r");
   else


@@ -461,9 +467,9 @@ _AT_CHECK_CALC([$1],
 
 # Some syntax errors.
 _AT_CHECK_CALC_ERROR([$1], [1], [0 0], [13],
 
 # Some syntax errors.
 _AT_CHECK_CALC_ERROR([$1], [1], [0 0], [13],

-                     [1.2: syntax error, unexpected "number"])
+                     [1.2: syntax error, unexpected number])

 _AT_CHECK_CALC_ERROR([$1], [1], [1//2], [18],
 _AT_CHECK_CALC_ERROR([$1], [1], [1//2], [18],

-                     [1.2: syntax error, unexpected '/', expecting "number" or '-' or '(' or '!'])
+                     [1.2: syntax error, unexpected '/', expecting number or '-' or '(' or '!'])

 _AT_CHECK_CALC_ERROR([$1], [1], [error], [5],
                      [1.0: syntax error, unexpected $undefined])
 _AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3], [26],
 _AT_CHECK_CALC_ERROR([$1], [1], [error], [5],
                      [1.0: syntax error, unexpected $undefined])
 _AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3], [26],


@@ -474,8 +480,8 @@ _AT_CHECK_CALC_ERROR([$1], [1],
                      [16],
                      [2.0: syntax error, unexpected '+'])
 # Exercise error messages with EOF: work on an empty file.
                      [16],
                      [2.0: syntax error, unexpected '+'])
 # Exercise error messages with EOF: work on an empty file.

-_AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [5],
-                     [1.0: syntax error, unexpected "end of input"])
+_AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4],
+                     [1.0: syntax error, unexpected end of input])

 
 # Exercise the error token: without it, we die at the first error,
 # hence be sure to
 
 # Exercise the error token: without it, we die at the first error,
 # hence be sure to


@@ -496,20 +502,20 @@ _AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [5],
 _AT_CHECK_CALC_ERROR([$1], [0],
                      [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
                      [188],
 _AT_CHECK_CALC_ERROR([$1], [0],
                      [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
                      [188],

-[1.1: syntax error, unexpected ')', expecting "number" or '-' or '(' or '!'
-1.17: syntax error, unexpected ')', expecting "number" or '-' or '(' or '!'
-1.22: syntax error, unexpected '*', expecting "number" or '-' or '(' or '!'
-1.40: syntax error, unexpected '*', expecting "number" or '-' or '(' or '!'
+[1.1: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
+1.17: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
+1.22: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
+1.40: syntax error, unexpected '*', expecting number or '-' or '(' or '!'

 calc: error: 4444 != 1])
 
 # The same, but this time exercising explicitly triggered syntax errors.
 # POSIX says the look-ahead causing the error should not be discarded.
 _AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [75],
 calc: error: 4444 != 1])
 
 # The same, but this time exercising explicitly triggered syntax errors.
 # POSIX says the look-ahead causing the error should not be discarded.
 _AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [75],

-[1.9: syntax error, unexpected "number"
+[1.9: syntax error, unexpected number

 calc: error: 2222 != 1])
 _AT_CHECK_CALC_ERROR([$1], [0], [(- *) + (0 0) = 1], [85],
 calc: error: 2222 != 1])
 _AT_CHECK_CALC_ERROR([$1], [0], [(- *) + (0 0) = 1], [85],

-[1.3: syntax error, unexpected '*', expecting "number" or '-' or '(' or '!'
-1.11: syntax error, unexpected "number"
+[1.3: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
+1.11: syntax error, unexpected number

 calc: error: 2222 != 1])
 AT_BISON_OPTION_POPDEFS
 
 calc: error: 2222 != 1])
 AT_BISON_OPTION_POPDEFS