* data/bison.c++: Correct error recovery. Make the user able to

initialize the starting location.

diff --git a/ChangeLog b/ChangeLog
index 15e7cc1068b11485295d9b65921bc1e1d26e960e..a7126def6143c2684135157d20b31257f22c4f59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-08  Robert Anisko  <robert@lrde.epita.fr>
+
+       * data/bison.c++: Correct error recovery.  Make the user able to
+       initialize the starting location.
+

 2002-02-07  Akim Demaille  <akim@epita.fr>
 
        * tests/input.at: New.
 2002-02-07  Akim Demaille  <akim@epita.fr>
 
        * tests/input.at: New.

diff --git a/data/bison.c++ b/data/bison.c++
index 84f3dfac854f48792615f3b253132768e1979002..2e82826d69cff1368410a9ebf1c42ec725855704 100644 (file)
--- a/data/bison.c++
+++ b/data/bison.c++
@@ -30,7 +30,7 @@
 #include "stack.hh"
 #include "location.hh"
 
 #include "stack.hh"
 #include "location.hh"
 

-b4_prologue
+#include <string>

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG


@@ -45,6 +45,8 @@ b4_prologue
 /* Using locations.  */
 #define YYLSP_NEEDED b4_locations_flag
 
 /* Using locations.  */
 #define YYLSP_NEEDED b4_locations_flag
 

+b4_prologue
+

 // FIXME: This should be defined in traits, not here.
 typedef b4_stype yystype;
 
 // FIXME: This should be defined in traits, not here.
 typedef b4_stype yystype;
 


@@ -80,7 +82,13 @@ namespace yy
     typedef Stack< SemanticType > SemanticStack;
     typedef Stack< LocationType > LocationStack;
 
     typedef Stack< SemanticType > SemanticStack;
     typedef Stack< LocationType > LocationStack;
 

+#if YYLSP_NEEDED
+    b4_name (bool debug,
+            LocationType initlocation) : debug_ (debug),
+                                         initlocation_ (initlocation)
+#else

     b4_name (bool debug) : debug_ (debug)
     b4_name (bool debug) : debug_ (debug)

+#endif

     {
     }
 
     {
     }
 


@@ -155,6 +163,9 @@ namespace yy
     /* @$ and $$.  */
     SemanticType value;
     LocationType location;
     /* @$ and $$.  */
     SemanticType value;
     LocationType location;

+
+    /* Initial location.  */
+    LocationType initlocation_;

   };
 }
 
   };
 }
 


@@ -197,6 +208,9 @@ yy::b4_name::parse ()
   /* Start.  */
   state_ = 0;
   looka_ = empty_;
   /* Start.  */
   state_ = 0;
   looka_ = empty_;

+#if YYLSP_NEEDED
+  location = initlocation_;
+#endif

   YYDPRINTF ((stderr, "Starting parse\n"));
 
   /* New state.  */
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   /* New state.  */


@@ -272,6 +286,12 @@ yy::b4_name::parse ()
 
   semantic_stack_.push (value);
   location_stack_.push (location);
 
   semantic_stack_.push (value);
   location_stack_.push (location);

+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (errstatus)
+    --errstatus;
+

   state_ = n_;
   goto yynewstate;
 
   state_ = n_;
   goto yynewstate;
 


@@ -379,8 +399,8 @@ yy::b4_name::parse ()
       else
 #endif
        message = "parse error";
       else
 #endif
        message = "parse error";

+      error_ ();

     }
     }

-  error_ ();

   goto yyerrlab1;
   
   /* Error raised explicitly by an action.  */
   goto yyerrlab1;
   
   /* Error raised explicitly by an action.  */