Merge branch 'branch-2.6' into maint

[bison.git] / tests / cxx-type.at

diff --git a/tests/cxx-type.at b/tests/cxx-type.at
index e6fd8a85d0dca779f24f777fd42280e30efcf5f8..f5e7c559a5014c69b3e23692fc026bae56e73481 100644 (file)
--- a/tests/cxx-type.at
+++ b/tests/cxx-type.at
@@ -122,12 +122,12 @@ declarator : ID
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <assert.h>
 
 int
 main (int argc, char **argv)
 {
-  if (argc != 2)
-    abort ();
+  assert (argc == 2);
   if (!freopen (argv[1], "r", stdin))
     return 3;
   return yyparse ();
@@ -135,8 +135,7 @@ main (int argc, char **argv)
 
 ]AT_YYERROR_DEFINE[
 
-int
-yylex (]AT_LEX_FORMALS[)
+]AT_YYLEX_PROTOTYPE[
 {
   char buffer[256];
   int c;
@@ -153,8 +152,7 @@ yylex (]AT_LEX_FORMALS[)
 
   while (1)
     {
-      if (feof (stdin))
-        abort ();
+      assert (!feof (stdin));
       c = getchar ();
       switch (c)
         {
@@ -183,8 +181,7 @@ yylex (]AT_LEX_FORMALS[)
                   {
                     buffer[i++] = c;
                     colNum += 1;
-                    if (i == sizeof buffer - 1)
-                      abort ();
+                    assert (i != sizeof buffer - 1);
                     c = getchar ();
                   }
                 while (isalnum (c) || c == '_');