Don't pipe output of ./types through sed to

[bison.git] / tests / calc.at

diff --git a/tests/calc.at b/tests/calc.at
index 81af81c3cd742aeace20d265dff260901faf96cc..69b919643ae393657c672ab7f04c484bbf0af104 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,5 +1,7 @@
-# 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, 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.  ##


@@ -41,35 +43,37 @@ AT_DATA_GRAMMAR([calc.y],
 %{
 #include <stdio.h>
 
 %{
 #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>
 
 #endif
 #include <ctype.h>
 

-extern void perror (const char *s);
-

 /* Exercise pre-prologue dependency to %union.  */
 /* Exercise pre-prologue dependency to %union.  */

-typedef int value;
+typedef int semantic_value;

 
 

-static value global_result = 0;
+static semantic_value global_result = 0;

 static int global_count = 0;
 %}
 
 /* Exercise %union. */
 %union
 {
 static int global_count = 0;
 %}
 
 /* Exercise %union. */
 %union
 {

-  value ival;
+  semantic_value ival;

 };
 
 %{
 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. */
 static void yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])
 [/* yyerror receives the location if:
    - %location & %pure & %glr
    - %location & %pure & %yacc & %parse-param. */
 static void yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])

-                     AT_PARAM_IF([value *result, int *count, ])
+                     AT_PARAM_IF([semantic_value *result, int *count, ])

                      const char *s
                      );])[
 static int yylex (]AT_LEX_FORMALS[);
                      const char *s
                      );])[
 static int yylex (]AT_LEX_FORMALS[);


@@ -117,37 +121,32 @@ exp:
 | '(' exp ')'        { $$ = $2;             }
 | '(' error ')'      { $$ = 1111;           }
 | '!'                { YYERROR;             }
 | '(' exp ')'        { $$ = $2;             }
 | '(' error ')'      { $$ = 1111;           }
 | '!'                { YYERROR;             }

+| '-' error          { YYERROR;             }

 ;
 %%
 /* The input. */
 static FILE *yyin;
 
 ]AT_LALR1_CC_IF(
 ;
 %%
 /* 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
 void

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

 {
 {

-  std::cerr << AT_LOCATION_IF([location << ": " << ])message << std::endl;
+  (void) l;
+  std::cerr << AT_LOCATION_IF([l << ": " << ])m << std::endl;

 }
 
 int
 }
 
 int

-yyparse (void)
+yyparse (AT_PARAM_IF([semantic_value *result, int *count]))

 {
 {

-  yy::Parser parser (!!YYDEBUG[]AT_LOCATION_IF([, yy::Location::Location ()]));
+  yy::parser parser[]AT_PARAM_IF([ (result, count)]);
+  parser.set_debug_level (!!YYDEBUG);

   return parser.parse ();
 }
 ],
 [static void
 yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])
   return parser.parse ();
 }
 ],
 [static void
 yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])

-         AT_PARAM_IF([value *result, int *count, ])
+         AT_PARAM_IF([semantic_value *result, int *count, ])

          const char *s)
 {
 AT_PARAM_IF([(void) result; (void) count;])
          const char *s)
 {
 AT_PARAM_IF([(void) result; (void) count;])


@@ -289,7 +288,7 @@ power (int base, int exponent)
 {
   int res = 1;
   if (exponent < 0)
 {
   int res = 1;
   if (exponent < 0)

-    exit (1);
+    exit (3);

   for (/* Niente */; exponent; --exponent)
     res *= base;
   return res;
   for (/* Niente */; exponent; --exponent)
     res *= base;
   return res;


@@ -299,10 +298,15 @@ power (int base, int exponent)
 int
 main (int argc, const char **argv)
 {
 int
 main (int argc, const char **argv)
 {

-  value result = 0;
+  semantic_value result = 0;

   int count = 0;
   int status;
 
   int count = 0;
   int status;
 

+  /* 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


@@ -311,7 +315,7 @@ main (int argc, const char **argv)
   if (!yyin)
     {
       perror (argv[1]);
   if (!yyin)
     {
       perror (argv[1]);

-      exit (1);
+      return 3;

     }
 
 ]AT_LALR1_CC_IF([], [m4_bmatch([$4], [%debug],
     }
 
 ]AT_LALR1_CC_IF([], [m4_bmatch([$4], [%debug],


@@ -423,23 +427,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.
 # ------------------------------
 # 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_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])
 
 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],
 
 # Test the priorities.
 _AT_CHECK_CALC([$1],


@@ -456,25 +463,25 @@ _AT_CHECK_CALC([$1],
 
 2^2^3 = 256
 (2^2)^3 = 64],
 
 2^2^3 = 256
 (2^2)^3 = 64],

-               [486])
+               [571])

 
 # Some syntax errors.
 
 # Some syntax errors.

-_AT_CHECK_CALC_ERROR([$1], [1], [0 0], [11],
-                     [1.2: syntax error, unexpected "number"])
-_AT_CHECK_CALC_ERROR([$1], [1], [1//2], [15],
-                     [1.2: syntax error, unexpected '/', expecting "number" or '-' or '(' or '!'])
-_AT_CHECK_CALC_ERROR([$1], [1], [error], [4],
+_AT_CHECK_CALC_ERROR([$1], [1], [0 0], [13],
+                     [1.2: syntax error, unexpected number])
+_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], [5],

                      [1.0: syntax error, unexpected $undefined])
                      [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],
                      [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],
                      [2.0: syntax error, unexpected '+'])
 # Exercise error messages with EOF: work on an empty file.
 _AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4],

-                     [1.0: syntax error, unexpected "end of input"])
+                     [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


@@ -487,24 +494,28 @@ _AT_CHECK_CALC_ERROR([$1], [1], [/dev/null], [4],
 #
 # - test the action associated to `error'
 #
 #
 # - 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],
 #   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],
-[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 '!'
+                     [189],
+[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.
 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],
-[1.9: syntax error, unexpected "number"
+# POSIX says the look-ahead causing the error should not be discarded.
+_AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [76],
+[1.9: syntax error, unexpected number
+calc: error: 2222 != 1])
+_AT_CHECK_CALC_ERROR([$1], [0], [(- *) + (0 0) = 1], [86],
+[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
 


@@ -546,7 +557,7 @@ AT_CHECK_CALC_LALR([%error-verbose %debug %locations %defines %name-prefix="calc
 
 AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
 
 
 AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
 

-AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value *result} %parse-param {int *count}])
+AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}])

 
 
 # ----------------------- #
 
 
 # ----------------------- #


@@ -582,7 +593,7 @@ AT_CHECK_CALC_GLR([%error-verbose %debug %locations %defines %name-prefix="calc"
 
 AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
 
 
 AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
 

-AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value *result} %parse-param {int *count}])
+AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}])

 
 
 # ----------------------------- #
 
 
 # ----------------------------- #


@@ -594,7 +605,7 @@ AT_BANNER([[Simple LALR1 C++ Calculator.]])
 # AT_CHECK_CALC_LALR1_CC([BISON-OPTIONS])
 # ---------------------------------------
 # Start a testing chunk which compiles `calc' grammar with
 # AT_CHECK_CALC_LALR1_CC([BISON-OPTIONS])
 # ---------------------------------------
 # Start a testing chunk which compiles `calc' grammar with

-# BISON-OPTIONS and %glr-parser, and performs several tests over the parser.
+# the C++ skeleton, and performs several tests over the parser.

 m4_define([AT_CHECK_CALC_LALR1_CC],
 [AT_CHECK_CALC([%skeleton "lalr1.cc"] $@)])
 
 m4_define([AT_CHECK_CALC_LALR1_CC],
 [AT_CHECK_CALC([%skeleton "lalr1.cc"] $@)])
 


@@ -619,4 +630,4 @@ AT_CHECK_CALC_LALR1_CC([%error-verbose %debug %locations %defines %name-prefix="
 
 AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
 
 
 AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
 

-# AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value *result} %parse-param {int *count}])
+AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}])