* data/lalr1.cc (Parser:print_): Remove, use %printer instead.

[bison.git] / tests / calc.at

diff --git a/tests/calc.at b/tests/calc.at
index 2eb594eb4c4bcdc1ac0966ef031b27eb85c587bd..83ce28314b32363aa3a79f5e2c09a78d33770b4d 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,5 +1,5 @@
-# Checking the output filenames.                         -*- Autotest -*-
-# Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Simple calculator.                         -*- Autotest -*-
+# Copyright (C) 2000, 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
@@ -41,14 +41,16 @@ AT_DATA_GRAMMAR([calc.y],
 %{
 #include <stdio.h>
 
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
+#include <stdlib.h>
+#include <string.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#else
+# undef alarm
+# define alarm(seconds) /* empty */
 #endif
 #include <ctype.h>
 
-extern void perror (const char *s);
-
 /* Exercise pre-prologue dependency to %union.  */
 typedef int semantic_value;
 
@@ -117,21 +119,14 @@ exp:
 | '(' exp ')'        { $$ = $2;             }
 | '(' error ')'      { $$ = 1111;           }
 | '!'                { YYERROR;             }
+| '-' error          { YYERROR;             }
 ;
 %%
 /* The input. */
 static FILE *yyin;
 
 ]AT_LALR1_CC_IF(
-[/* Currently, print_ is required in C++. */
-void
-yy::Parser::print_ ()
-{
-AT_LOCATION_IF([
-  std::cerr << location;])
-}
-
-/* A C++ error reporting function. */
+[/* A C++ error reporting function. */
 void
 yy::Parser::error_ ()
 {
@@ -141,7 +136,7 @@ yy::Parser::error_ ()
 int
 yyparse (AT_PARAM_IF([semantic_value *result, int *count]))
 {
-  yy::Parser parser (!!YYDEBUG[]AT_LOCATION_IF([, yy::Location::Location ()])AT_PARAM_IF([, result, count]));
+  yy::Parser parser (!!YYDEBUG[]AT_PARAM_IF([, result, count]));
   return parser.parse ();
 }
 ],
@@ -303,6 +298,7 @@ main (int argc, const char **argv)
   int count = 0;
   int status;
 
+  alarm (10);
   if (argc == 2)
     yyin = fopen (argv[1], "r");
   else
@@ -423,23 +419,26 @@ AT_CHECK([cat stderr], 0, [expout])
 ])
 
 
-# AT_CHECK_CALC([BISON-OPTIONS])
+# AT_CHECK_CALC([BISON-OPTIONS [, EXPECTED-TO-FAIL]])
 # ------------------------------
 # Start a testing chunk which compiles `calc' grammar with
 # BISON-OPTIONS, and performs several tests over the parser.
+# However, if EXPECTED-TO-FAIL is nonempty, this test is expected to fail.
 m4_define([AT_CHECK_CALC],
 [# We use integers to avoid dependencies upon the precision of doubles.
 AT_SETUP([Calculator $1])
 
+m4_ifval([$2], [AT_CHECK([exit 77])])
+
 AT_BISON_OPTION_PUSHDEFS([$1])
 
 AT_DATA_CALC_Y([$1])
 
-# Specify the output files to avoid problems on different file systems.
-AT_CHECK([bison -o calc.c calc.y])
-
-AT_LALR1_CC_IF([AT_COMPILE_CXX([calc])],
-               [AT_COMPILE([calc])])
+AT_LALR1_CC_IF(
+  [AT_CHECK([bison -o calc.cc calc.y])
+   AT_COMPILE_CXX([calc])],
+  [AT_CHECK([bison -o calc.c calc.y])
+   AT_COMPILE([calc])])
 
 # Test the priorities.
 _AT_CHECK_CALC([$1],
@@ -456,24 +455,24 @@ _AT_CHECK_CALC([$1],
 
 2^2^3 = 256
 (2^2)^3 = 64],
-               [486])
+               [570])
 
 # Some syntax errors.
-_AT_CHECK_CALC_ERROR([$1], [1], [0 0], [11],
+_AT_CHECK_CALC_ERROR([$1], [1], [0 0], [13],
                      [1.2: syntax error, unexpected "number"])
-_AT_CHECK_CALC_ERROR([$1], [1], [1//2], [15],
+_AT_CHECK_CALC_ERROR([$1], [1], [1//2], [18],
                      [1.2: syntax error, unexpected '/', expecting "number" or '-' or '(' or '!'])
-_AT_CHECK_CALC_ERROR([$1], [1], [error], [4],
+_AT_CHECK_CALC_ERROR([$1], [1], [error], [5],
                      [1.0: syntax error, unexpected $undefined])
-_AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3], [22],
+_AT_CHECK_CALC_ERROR([$1], [1], [1 = 2 = 3], [26],
                      [1.6: syntax error, unexpected '='])
 _AT_CHECK_CALC_ERROR([$1], [1],
                      [
 +1],
-                     [14],
+                     [16],
                      [2.0: syntax error, unexpected '+'])
 # Exercise error messages with EOF: work on an empty file.
-_AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4],
+_AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [5],
                      [1.0: syntax error, unexpected "end of input"])
 
 # Exercise the error token: without it, we die at the first error,
@@ -487,14 +486,14 @@ _AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4],
 #
 # - test the action associated to `error'
 #
-# - check the lookahead that triggers an error is not discarded
-#   when we enter error recovery.  Below, the lookahead causing the
+# - check the look-ahead that triggers an error is not discarded
+#   when we enter error recovery.  Below, the look-ahead causing the
 #   first error is ")", which is needed to recover from the error and
 #   produce the "0" that triggers the "0 != 1" error.
 #
 _AT_CHECK_CALC_ERROR([$1], [0],
                      [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
-                     [156],
+                     [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 '!'
@@ -502,10 +501,14 @@ _AT_CHECK_CALC_ERROR([$1], [0],
 calc: error: 4444 != 1])
 
 # The same, but this time exercising explicitly triggered syntax errors.
-# POSIX says the lookahead causing the error should not be discarded.
-_AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [64],
+# 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"
 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"
+calc: error: 2222 != 1])
 AT_BISON_OPTION_POPDEFS
 
 AT_CLEANUP