Add Makevars.template, stamp-po.

[bison.git] / data / lalr1.cc

diff --git a/data/lalr1.cc b/data/lalr1.cc
index d92bfd1249a3c9dfc50d027c379c3a092582a8cc..4fe3c2ada7b6b68982f528fc03cf3032b5c27e35 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -234,6 +234,7 @@ namespace yy
     virtual void lex_ ();
     virtual void error_ ();
     virtual void print_ ();
+    virtual void report_syntax_error_ ();
 
     /* Stacks.  */
     StateStack    state_stack_;
@@ -288,6 +289,10 @@ namespace yy
     int len_;
     int state_;
 
+    /* Error handling. */
+    int nerrs_;
+    int errstatus_;
+
     /* Debugging.  */
     int debug_;
     std::ostream &cdebug_;
@@ -348,8 +353,8 @@ do {                                        \
 int
 yy::]b4_parser_class_name[::parse ()
 {
-  int nerrs = 0;
-  int errstatus = 0;
+  nerrs_ = 0;
+  errstatus_ = 0;
 
   /* Initialize the stacks.  The initial state will be pushed in
      yynewstate, since the latter expects the semantical and the
@@ -449,8 +454,8 @@ yy::]b4_parser_class_name[::parse ()
 
   /* Count tokens shifted since error; after three, turn off error
      status.  */
-  if (errstatus)
-    --errstatus;
+  if (errstatus_)
+    --errstatus_;
 
   state_ = n_;
   goto yynewstate;
@@ -523,46 +528,9 @@ b4_syncline([@oline@], [@ofile@])[
 `------------------------------------*/
  yyerrlab:
   /* If not already recovering from an error, report this error.  */
-  if (!errstatus)
-    {
-      ++nerrs;
-
-#if YYERROR_VERBOSE
-      n_ = pact_[state_];
-      if (pact_ninf_ < n_ && n_ < last_)
-       {
-         message = "syntax error, unexpected ";
-         message += name_[ilooka_];
-         {
-           int count = 0;
-            /* Start YYX at -YYN if negative to avoid negative indexes in
-               YYCHECK.  */
-           int xbegin = n_ < 0 ? -n_ : 0;
-           /* Stay within bounds of both yycheck and yytname.  */
-           int checklim = last_ - n_;
-           int xend = checklim < ntokens_ ? checklim : ntokens_;
-           for (int x = xbegin; x < xend; ++x)
-             if (check_[x + n_] == x && x != terror_)
-               ++count;
-           if (count < 5)
-             {
-               count = 0;
-               for (int x1 = xbegin; x1 < xend; ++x1)
-                 if (check_[x1 + n_] == x1 && x1 != terror_)
-                   {
-                     message += (!count++) ? ", expecting " : " or ";
-                     message += name_[x1];
-                   }
-             }
-         }
-       }
-      else
-#endif
-       message = "syntax error";
-      error_ ();
-    }
+  report_syntax_error_ ();
 
-  if (errstatus == 3)
+  if (errstatus_ == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
         error, discard it.  */
@@ -605,6 +573,13 @@ b4_syncline([@oline@], [@ofile@])[
 `---------------------------------------------------*/
 yyerrorlab:
 
+#ifdef __GNUC__
+  /* Pacify GCC when the user code never invokes YYERROR and the label
+     yyerrorlab therefore never appears in user code.  */
+  if (0)
+     goto yyerrorlab;
+#endif
+
   state_stack_.pop (len_);
   semantic_stack_.pop (len_);
   location_stack_.pop (len_);
@@ -615,7 +590,7 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
-  errstatus = 3;       /* Each real token shifted decrements this.  */
+  errstatus_ = 3;      /* Each real token shifted decrements this.  */
 
   for (;;)
     {
@@ -694,6 +669,45 @@ yy::]b4_parser_class_name[::lex_ ()
 #endif
 }
 
+/** Generate an error message, and invoke yyerror. */
+void
+yy::]b4_parser_class_name[::report_syntax_error_ ()
+{
+  /* If not already recovering from an error, report this error.  */
+  if (!errstatus_)
+    {
+      ++nerrs_;
+
+#if YYERROR_VERBOSE
+      n_ = pact_[state_];
+      if (pact_ninf_ < n_ && n_ < last_)
+       {
+         message = "syntax error, unexpected ";
+         message += name_[ilooka_];
+         {
+           int count = 0;
+           for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)
+             if (check_[x + n_] == x && x != terror_)
+               ++count;
+           if (count < 5)
+             {
+               count = 0;
+               for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)
+                 if (check_[x + n_] == x && x != terror_)
+                   {
+                     message += (!count++) ? ", expecting " : " or ";
+                     message += name_[x];
+                   }
+             }
+         }
+       }
+      else
+#endif
+       message = "syntax error";
+      error_ ();
+    }
+}
+
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
@@ -826,7 +840,6 @@ yy::]b4_parser_class_name[::stack_print_ ()
 void
 yy::]b4_parser_class_name[::reduce_print_ (int yyrule)
 {
-  int yyi;
   unsigned int yylno = rline_[yyrule];
   /* Print the symbols being reduced, and their result.  */
   cdebug_ << "Reducing via rule " << n_ - 1 << " (line " << yylno << "), ";