tests: use assert instead of plain abort.

[bison.git] / tests / calc.at

diff --git a/tests/calc.at b/tests/calc.at
index e54a367006d8c4e84da1ad34b95c2e5f6edd0c86..58e7e895c0fe33045dbb2cbf9a52b2afebcea402 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -45,7 +45,8 @@ m4_define([_AT_DATA_CALC_Y],
        [m4_fatal([$0: Invalid arguments: $@])])dnl
 
 m4_pushdef([AT_CALC_MAIN],
        [m4_fatal([$0: Invalid arguments: $@])])dnl
 
 m4_pushdef([AT_CALC_MAIN],

-[#if HAVE_UNISTD_H
+[#include <assert.h>
+#if HAVE_UNISTD_H

 # include <unistd.h>
 #else
 # undef alarm
 # include <unistd.h>
 #else
 # undef alarm


@@ -97,10 +98,8 @@ main (int argc, const char **argv)
   status = ]AT_NAME_PREFIX[parse (]AT_PARAM_IF([[&result, &count]])[);
   if (fclose (input))
     perror ("fclose");
   status = ]AT_NAME_PREFIX[parse (]AT_PARAM_IF([[&result, &count]])[);
   if (fclose (input))
     perror ("fclose");

-  if (global_result != result)
-    abort ();
-  if (global_count != count)
-    abort ();
+  assert (global_result == result);
+  assert (global_count == count);

   return status;
 }
 ]])
   return status;
 }
 ]])


@@ -109,15 +108,15 @@ main (int argc, const char **argv)
 m4_pushdef([AT_CALC_LEX],
 [[#include <ctype.h>
 
 m4_pushdef([AT_CALC_LEX],
 [[#include <ctype.h>
 

-int ]AT_NAME_PREFIX[lex (]AT_LEX_FORMALS[);
-static int get_char (]AT_LEX_FORMALS[);
-static void unget_char (]AT_LEX_PRE_FORMALS[ int c);
+]AT_YYLEX_DECLARE_EXTERN[
+static int get_char (]AT_YYLEX_FORMALS[);
+static void unget_char (]AT_YYLEX_PRE_FORMALS[ int c);

 
 ]AT_LOCATION_IF([
 static YYLTYPE last_yylloc;
 ])[
 static int
 
 ]AT_LOCATION_IF([
 static YYLTYPE last_yylloc;
 ])[
 static int

-get_char (]AT_LEX_FORMALS[)
+get_char (]AT_YYLEX_FORMALS[)

 {
   int res = getc (input);
   ]AT_USE_LEX_ARGS[;
 {
   int res = getc (input);
   ]AT_USE_LEX_ARGS[;


@@ -135,7 +134,7 @@ get_char (]AT_LEX_FORMALS[)
 }
 
 static void
 }
 
 static void

-unget_char (]AT_LEX_PRE_FORMALS[ int c)
+unget_char (]AT_YYLEX_PRE_FORMALS[ int c)

 {
   ]AT_USE_LEX_ARGS[;
 ]AT_LOCATION_IF([
 {
   ]AT_USE_LEX_ARGS[;
 ]AT_LOCATION_IF([


@@ -146,26 +145,26 @@ unget_char (]AT_LEX_PRE_FORMALS[ int c)
 }
 
 static int
 }
 
 static int

-read_signed_integer (]AT_LEX_FORMALS[)
+read_signed_integer (]AT_YYLEX_FORMALS[)

 {
 {

-  int c = get_char (]AT_LEX_ARGS[);
+  int c = get_char (]AT_YYLEX_ARGS[);

   int sign = 1;
   int n = 0;
 
   ]AT_USE_LEX_ARGS[;
   if (c == '-')
     {
   int sign = 1;
   int n = 0;
 
   ]AT_USE_LEX_ARGS[;
   if (c == '-')
     {

-      c = get_char (]AT_LEX_ARGS[);
+      c = get_char (]AT_YYLEX_ARGS[);

       sign = -1;
     }
 
   while (isdigit (c))
     {
       n = 10 * n + (c - '0');
       sign = -1;
     }
 
   while (isdigit (c))
     {
       n = 10 * n + (c - '0');

-      c = get_char (]AT_LEX_ARGS[);
+      c = get_char (]AT_YYLEX_ARGS[);

     }
 
     }
 

-  unget_char (]AT_LEX_PRE_ARGS[ c);
+  unget_char (]AT_YYLEX_PRE_ARGS[ c);

 
   return sign * n;
 }
 
   return sign * n;
 }


@@ -177,8 +176,7 @@ read_signed_integer (]AT_LEX_FORMALS[)
 | blanks and tabs, returns 0 for EOF.                            |
 `---------------------------------------------------------------*/
 
 | blanks and tabs, returns 0 for EOF.                            |
 `---------------------------------------------------------------*/
 

-int
-]AT_NAME_PREFIX[lex (]AT_LEX_FORMALS[)
+]AT_YYLEX_PROTOTYPE[

 {
   static int init = 1;
   int c;
 {
   static int init = 1;
   int c;


@@ -200,13 +198,13 @@ int
       AT_LOC_FIRST_LINE   = AT_LOC_LAST_LINE;
 ])[
     }
       AT_LOC_FIRST_LINE   = AT_LOC_LAST_LINE;
 ])[
     }

-  while ((c = get_char (]AT_LEX_ARGS[)) == ' ' || c == '\t');
+  while ((c = get_char (]AT_YYLEX_ARGS[)) == ' ' || c == '\t');

 
   /* process numbers   */
   if (c == '.' || isdigit (c))
     {
 
   /* process numbers   */
   if (c == '.' || isdigit (c))
     {

-      unget_char (]AT_LEX_PRE_ARGS[ c);
-      ]AT_VAL[.ival = read_signed_integer (]AT_LEX_ARGS[);
+      unget_char (]AT_YYLEX_PRE_ARGS[ c);
+      ]AT_VAL[.ival = read_signed_integer (]AT_YYLEX_ARGS[);

       return NUM;
     }
 
       return NUM;
     }
 


@@ -280,7 +278,6 @@ extern int global_count;]AT_SKEL_CC_IF([[
 %code
 {
 #include <assert.h>
 %code
 {
 #include <assert.h>

-#include <stdlib.h>

 #include <string.h>
 #define USE(Var)
 
 #include <string.h>
 #define USE(Var)
 


@@ -288,14 +285,11 @@ FILE *input;
 static int power (int base, int exponent);
 
 ]AT_SKEL_CC_IF(,
 static int power (int base, int exponent);
 
 ]AT_SKEL_CC_IF(,

-[/* yyerror receives the location if:
-   - %location & %pure & %glr
-   - %location & %pure & %yacc & %parse-param. */
-static void yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *llocp, ])
+[static void yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *llocp, ])

                      AT_PARAM_IF([semantic_value *result, int *count, ])
                      const char *s
                      );])[
                      AT_PARAM_IF([semantic_value *result, int *count, ])
                      const char *s
                      );])[

-int yylex (]AT_LEX_FORMALS[);
+]AT_YYLEX_DECLARE_EXTERN[

 }
 
 ]AT_SKEL_CC_IF([AT_LOCATION_TYPE_IF([], [
 }
 
 ]AT_SKEL_CC_IF([AT_LOCATION_TYPE_IF([], [


@@ -376,15 +370,7 @@ power (int base, int exponent)
     return o;
   }
 ]])
     return o;
   }
 ]])

-
-/* A C++ error reporting function.  */
-void
-AT_NAME_PREFIX::parser::error (const location_type& l, const std::string& m)
-{
-  (void) l;
-  std::cerr << AT_LOCATION_IF([l << ": " << ])m << std::endl;
-}
-],
+AT_YYERROR_DEFINE],

 [/* A C error reporting function.  */
 static void
 yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *llocp, ])
 [/* A C error reporting function.  */
 static void
 yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *llocp, ])


@@ -518,16 +504,15 @@ AT_CHECK([cat stderr], 0, [expout])
 ])
 
 
 ])
 
 

-# AT_CHECK_CALC([BISON-OPTIONS, [EXPECTED-TO-FAIL]])
-# --------------------------------------------------
+# AT_CHECK_CALC([BISON-OPTIONS])
+# ------------------------------

 # 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],
 m4_define([AT_CHECK_CALC],

-[# We use integers to avoid dependencies upon the precision of doubles.
-AT_SETUP([Calculator $1])
+[m4_ifval([$2], [m4_fatal([$0: expected a single argument])])

 
 

-m4_ifval([$2], [AT_CHECK([exit 77])])
+# We use integers to avoid dependencies upon the precision of doubles.
+AT_SETUP([Calculator $1])

 
 AT_BISON_OPTION_PUSHDEFS([$1])
 
 
 AT_BISON_OPTION_PUSHDEFS([$1])