X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/caf37a366683f5a2dabbda4ba13535c168d6b167..88ab880d90020666c39614a01e388eee5c6505e8:/tests/calc.at

diff --git a/tests/calc.at b/tests/calc.at
index 2eb594eb..8c68dfd7 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,4 +1,4 @@
-# Checking the output filenames.                         -*- Autotest -*-
+# Simple calculator.                         -*- Autotest -*-
 # Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -45,6 +45,12 @@ AT_DATA_GRAMMAR([calc.y],
 # include <stdlib.h>
 # include <string.h>
 #endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#else
+# undef alarm
+# define alarm(seconds) /* empty */
+#endif
 #include <ctype.h>
 
 extern void perror (const char *s);
@@ -117,6 +123,7 @@ exp:
 | '(' exp ')'        { $$ = $2;             }
 | '(' error ')'      { $$ = 1111;           }
 | '!'                { YYERROR;             }
+| '-' error          { YYERROR;             }
 ;
 %%
 /* The input. */
@@ -303,6 +310,7 @@ main (int argc, const char **argv)
   int count = 0;
   int status;
 
+  alarm (10);
   if (argc == 2)
     yyin = fopen (argv[1], "r");
   else
@@ -423,14 +431,17 @@ 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])
@@ -503,9 +514,13 @@ 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],
+_AT_CHECK_CALC_ERROR([$1], [0], [(!) + (0 0) = 1], [62],
 [1.9: syntax error, unexpected "number"
 calc: error: 2222 != 1])
+_AT_CHECK_CALC_ERROR([$1], [0], [(- *) + (0 0) = 1], [70],
+[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
@@ -596,7 +611,7 @@ AT_BANNER([[Simple LALR1 C++ Calculator.]])
 # Start a testing chunk which compiles `calc' grammar with
 # the C++ skeleton, and performs several tests over the parser.
 m4_define([AT_CHECK_CALC_LALR1_CC],
-[AT_CHECK_CALC([%skeleton "lalr1.cc"] $@)])
+[AT_CHECK_CALC([%skeleton "lalr1.cc"] $@, [expected to fail])])
 
 # AT_CHECK_CALC_LALR1_CC()