From: Akim Demaille <akim@epita.fr>
Date: Thu, 16 Dec 2004 14:39:42 +0000 (+0000)
Subject: * data/lalr1.cc (yyreport_syntax_error_): Catch up with glr.c and
X-Git-Tag: BISON-2_0~22
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/fd19f2714f56e972cc03dba474399a89af630699

* data/lalr1.cc (yyreport_syntax_error_): Catch up with glr.c and
yacc.c: be sure to stay within yycheck_.
* tests/actions.at: Re-enable C++ tests.
---

diff --git a/ChangeLog b/ChangeLog
index 2b2847d4..e256cc54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-16  Akim Demaille  <akim@epita.fr>
+
+	* data/lalr1.cc (yyreport_syntax_error_): Catch up with glr.c and
+	yacc.c: be sure to stay within yycheck_.
+	* tests/actions.at: Re-enable C++ tests.
+
 2004-12-16  Akim Demaille  <akim@epita.fr>
 
 	* src/print_graph.c (print_graph): Remove layoutalgorithm uses for
diff --git a/data/lalr1.cc b/data/lalr1.cc
index b921b818..8e82cb51 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -810,24 +810,30 @@ yy::]b4_parser_class_name[::yyreport_syntax_error_ ()
       yyn_ = yypact_[yystate_];
       if (yypact_ninf_ < yyn_ && yyn_ < yylast_)
 	{
+	  /* Start YYX at -YYN if negative to avoid negative indexes in
+	     YYCHECK.  */
+	  int yyxbegin = yyn_ < 0 ? -yyn_ : 0;
+
+	  /* Stay within bounds of both yycheck and yytname.  */
+	  int yychecklim = yylast_ - yyn_;
+	  int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
+          int count = 0;
+          for (int x = yyxbegin; x < yyxend; ++x)
+            if (yycheck_[x + yyn_] == x && x != yyterror_)
+              ++count;
+
 	  message = "syntax error, unexpected ";
 	  message += yyname_[yyilooka_];
-	  {
-	    int count = 0;
-	    for (int x = (yyn_ < 0 ? -yyn_ : 0); x < yyntokens_ + yynnts_; ++x)
-	      if (yycheck_[x + yyn_] == x && x != yyterror_)
-		++count;
-	    if (count < 5)
-	      {
-		count = 0;
-		for (int x = (yyn_ < 0 ? -yyn_ : 0); x < yyntokens_ + yynnts_; ++x)
-		  if (yycheck_[x + yyn_] == x && x != yyterror_)
-		    {
-		      message += (!count++) ? ", expecting " : " or ";
-		      message += yyname_[x];
-		    }
-	      }
-	  }
+          if (count < 5)
+            {
+              count = 0;
+              for (int x = yyxbegin; x < yyxend; ++x)
+                if (yycheck_[x + yyn_] == x && x != yyterror_)
+                  {
+                    message += (!count++) ? ", expecting " : " or ";
+                    message += yyname_[x];
+ 	          }
+            }
 	}
       else
 #endif
diff --git a/tests/actions.at b/tests/actions.at
index fa779b39..05432aee 100644
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -468,10 +468,8 @@ AT_CHECK_PRINTER_AND_DESTRUCTOR([], [with union])
 # These tests currently fail on a Debian GNU/Linux 3.0r2 x86 host,
 # but the 2nd test succeeds on a Solaris 9 sparc hosts (Forte 7 cc).
 # Skip them until we figure out what the problem is.
-AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"], ,
-  [AT_CHECK([exit 77])])
-AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"], [with union],
-  [AT_CHECK([exit 77])])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"])
+AT_CHECK_PRINTER_AND_DESTRUCTOR([%defines %skeleton "lalr1.cc"], [with union])
 
 AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser])
 AT_CHECK_PRINTER_AND_DESTRUCTOR([%glr-parser], [with union])