Support yyerrok in lalr1.cc.

YYBACKUP is still to import back into lalr1.cc.

	* data/lalr1.cc (yyerrork, yyclearin, YYRECOVERING): Define.

diff --git a/ChangeLog b/ChangeLog
index 374b1d373cd02d75275a7ff8df83f9b780ab5be7..c961b7b65e4432d3eeeabc3dde721338837ca146 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Akim Demaille  <demaille@gostai.com>
+
+       Support yyerrok in lalr1.cc.
+       YYBACKUP is still to import back into lalr1.cc.
+        * data/lalr1.cc (yyerrork, yyclearin, YYRECOVERING): Define.
+

 2008-08-26  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        For maintainer-check*, don't recompile for a $(VERSION) update.
 2008-08-26  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        For maintainer-check*, don't recompile for a $(VERSION) update.

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 7ecc525b88c7549162716cc55f606f582657cc01..bc371dcc300a9b56e9c3a16c6b2f29ca5670ffa4 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -367,9 +367,13 @@ do {                                       \
 
 #endif /* !YYDEBUG */
 
 
 #endif /* !YYDEBUG */
 

+#define yyerrok                (yyerrstatus_ = 0)
+#define yyclearin      (yychar = yyempty_)
+

 #define YYACCEPT       goto yyacceptlab
 #define YYABORT                goto yyabortlab
 #define YYERROR                goto yyerrorlab
 #define YYACCEPT       goto yyacceptlab
 #define YYABORT                goto yyabortlab
 #define YYERROR                goto yyerrorlab

+#define YYRECOVERING()  (!!yyerrstatus_)

 
 ]b4_namespace_open[
 #if YYERROR_VERBOSE
 
 ]b4_namespace_open[
 #if YYERROR_VERBOSE