(getargs) [MSDOS]: Don't assume optarg != NULL

[bison.git] / tests / calc.at

diff --git a/tests/calc.at b/tests/calc.at
index d566c1dbd34168779fa6f2674c22111e353edbc1..7cf12d39e9c064537dfed544a22f8912168217d7 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -46,14 +46,13 @@ AT_DATA_GRAMMAR([calc.y],
 # include <string.h>
 #endif
 #include <ctype.h>
-#include <assert.h>
 
 extern void perror (const char *s);
 
 /* Exercise pre-prologue dependency to %union.  */
-typedef int value_t;
+typedef int value;
 
-static value_t global_result = 0;
+static value global_result = 0;
 static int global_count = 0;
 
 %}
@@ -61,7 +60,7 @@ static int global_count = 0;
 /* Exercise %union. */
 %union
 {
-  value_t ival;
+  value ival;
 };
 
 %{
@@ -96,7 +95,7 @@ static int power (int base, int exponent);
    - %location & %pure & %glr
    - %location & %pure & %yacc & %parse-param. */
 static void yyerror (]AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])[
-                     ]AT_PARAM_IF([value_t *result, int *count, ])[
+                     ]AT_PARAM_IF([value *result, int *count, ])[
                      const char *s
                      );
 static int yylex (LEX_FORMALS);
@@ -150,7 +149,7 @@ static FILE *yyin;
 
 static void
 yyerror (]AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])[
-         ]AT_PARAM_IF([value_t *result, int *count, ])[
+         ]AT_PARAM_IF([value *result, int *count, ])[
          const char *s
          )
 {
@@ -289,7 +288,7 @@ power (int base, int exponent)
 int
 main (int argc, const char **argv)
 {
-  value_t result = 0;
+  value result = 0;
   int count = 0;
   int status;
 
@@ -308,8 +307,10 @@ main (int argc, const char **argv)
   yydebug = 1;
 #endif
   status = yyparse (]AT_PARAM_IF([&result, &count])[);
-  assert (global_result == result);
-  assert (global_count  == count);
+  if (global_result != result)
+    abort ();
+  if (global_count != count)
+    abort ();
   return status;
 }
 ]])
@@ -561,7 +562,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 %parse-param {value_t *result}, {result} %parse-param {int *count}, {count}])
+AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value *result} %parse-param {int *count}])
 
 
 # ----------------------- #
@@ -596,4 +597,4 @@ 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 %parse-param {value_t *result}, {result} %parse-param {int *count}, {count}])
+AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value *result} %parse-param {int *count}])