Fix yyerror / yylex test glitches noted by twlevo@xs4all.nl.

* tests/cxx-type.at (_AT_TEST_GLR_CXXTYPES): Have yyerror return
void, not int.
* tests/glr-regression.at (Badly Collapsed GLR States):
Likewise.
(Improper handling of embedded actions and dollar(-N) in GLR parsers):
yylex should return 0 at EOF rather than aborting.

diff --git a/ChangeLog b/ChangeLog
index a93c813cebbbab14c11705e1d813781b016e456c..82929e9ab1b31c158418ecdc48262f7562f8e1e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2005-07-18  Paul Eggert  <eggert@cs.ucla.edu>
 
 2005-07-18  Paul Eggert  <eggert@cs.ucla.edu>
 

+       Fix yyerror / yylex test glitches noted by twlevo@xs4all.nl.
+       * tests/cxx-type.at (_AT_TEST_GLR_CXXTYPES): Have yyerror return
+       void, not int.
+       * tests/glr-regression.at (Badly Collapsed GLR States):
+       Likewise.
+       (Improper handling of embedded actions and dollar(-N) in GLR parsers):
+       yylex should return 0 at EOF rather than aborting.
+

        Improve tests for stack overflow in GLR parser.
        Problem reported by twlevo@xs4all.nl.
        * data/glr.c (struct yyGLRStack): Remove yyerrflag member.
        Improve tests for stack overflow in GLR parser.
        Problem reported by twlevo@xs4all.nl.
        * data/glr.c (struct yyGLRStack): Remove yyerrflag member.

diff --git a/tests/cxx-type.at b/tests/cxx-type.at
index 0fcdfdb691c77b4bff33ec258e9e2d46676a5a00..012b57e4524448b1e2c689df7976c2ded846e03e 100644 (file)
--- a/tests/cxx-type.at
+++ b/tests/cxx-type.at
@@ -56,7 +56,7 @@ $1
 # define ERROR_PARAMETERS char const *s
 #endif
   int yylex (LEX_PARAMETERS);
 # define ERROR_PARAMETERS char const *s
 #endif
   int yylex (LEX_PARAMETERS);

-  int yyerror (ERROR_PARAMETERS);
+  void yyerror (ERROR_PARAMETERS);

 %}
 
 %token TYPENAME ID
 %}
 
 %token TYPENAME ID


@@ -191,7 +191,7 @@ yylex (LEX_PARAMETERS)
     }
 }
 
     }
 }
 

-int
+void

 yyerror (ERROR_PARAMETERS)
 {
 #if YYPURE && YYLSP_NEEDED
 yyerror (ERROR_PARAMETERS)
 {
 #if YYPURE && YYLSP_NEEDED

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index e65346247f2b083abd5f09023c610de676550485..4ac981c0f82f8d103b4c3099191b508b4780a42b 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -34,7 +34,7 @@ AT_DATA_GRAMMAR([glr-regr1.y],
 #define YYSTYPE int
 static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1);
 int yylex (void);
 #define YYSTYPE int
 static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1);
 int yylex (void);

-int yyerror (char const *msg);
+void yyerror (char const *msg);

 %}
 
 
 %}
 
 


@@ -70,7 +70,7 @@ main (void)
   return yyparse ();
 }
 
   return yyparse ();
 }
 

-int
+void

 yyerror (char const *msg)
 {
   fprintf (stderr, "%s\n", msg);
 yyerror (char const *msg)
 {
   fprintf (stderr, "%s\n", msg);


@@ -184,7 +184,7 @@ yylex (void)
     break;
   }
   if (fscanf (yyin, "%49s", buf) != 1)
     break;
   }
   if (fscanf (yyin, "%49s", buf) != 1)

-    abort ();
+    return 0;

   if (sizeof buf - 1 <= strlen (buf))
     abort ();
   s = (char *) malloc (strlen (buf) + 1);
   if (sizeof buf - 1 <= strlen (buf))
     abort ();
   s = (char *) malloc (strlen (buf) + 1);