* data/yacc.c, data/glr.c, data/lal1.cc: Use similar code to

generate verbose error messages.
Use the number of tokens as an upper bound in yytname, as it
cannot be a non terminal.

ChangeLog

@@ -1,3 +1,10 @@
+2003-03-02  Akim Demaille  <akim@epita.fr>
+
+	* data/yacc.c, data/glr.c, data/lal1.cc: Use similar code to
+	generate verbose error messages.
+	Use the number of tokens as an upper bound in yytname, as it
+	cannot be a non terminal.
+
 2003-03-02  Akim Demaille  <akim@epita.fr>
 
 	* tests/regression.at (_AT_DATA_DANCER_Y): Fix the expected error

data/glr.c

@@ -1597,29 +1597,28 @@ yyreportSyntaxError (yyGLRStack* yystack,
 #if YYERROR_VERBOSE
       yySymbol* const yytokenp = yystack->yytokenp;
       int yyn;
-      const char* yyprefix;
       yyn = yypact[yystack->yytops.yystates[0]->yylrState];
       if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
 	  size_t yysize = 0;
+	  const char* yyprefix;
 	  char* yymsg;
 	  int yyx;
 
 	  /* Start YYX at -YYN if negative to avoid negative indexes in
 	     YYCHECK.  */
-	  int yyxbase = yyn < 0 ? -yyn : 0;
+	  int yyxbegin = yyn < 0 ? -yyn : 0;
 
 	  /* Stay within bounds of both yycheck and yytname.  */
 	  int yychecklim = YYLAST - yyn;
-	  int yynsyms = sizeof (yytname) / sizeof (yytname[0]);
+	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yyxlim = yychecklim < yynsyms ? yychecklim : yynsyms;
 	  int yycount = 0;
 
 	  yyprefix = ", expecting ";
-	  for (yyx = yyxbase; yyx < yyxlim && yycount < 5; yyx += 1)
+	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
 	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 	      {
-		yysize += strlen (yytokenName (yyx)) + strlen (yyprefix);
+		yysize += strlen (yyprefix) + strlen (yytokenName (yyx));
 		yycount += 1;
 		if (yycount == 5)
 		  {
@@ -1640,7 +1639,7 @@ yyreportSyntaxError (yyGLRStack* yystack,
 	      if (yycount < 5)
 		{
 		  yyprefix = ", expecting ";
-		  for (yyx = yyxbase; yyx < yyxlim; yyx += 1)
+		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
 		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 		      {
 			sprintf (yyp, "%s%s", yyprefix, yytokenName (yyx));

data/lalr1.cc

@@ -498,13 +498,19 @@ b4_syncline([@oline@], [@ofile@])[
 	  message += name_[ilooka_];
 	  {
 	    int count = 0;
-	    for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)
+            /* 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 x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)
+		for (int x = xbegin; x < xend; ++x)
 		  if (check_[x + n_] == x && x != terror_)
 		    {
 		      message += (!count++) ? ", expecting " : " or ";

data/yacc.c

@@ -1038,27 +1038,25 @@ yyerrlab:
 	{
 	  YYSIZE_T yysize = 0;
 	  int yytype = YYTRANSLATE (yychar);
+	  const char* yyprefix;
 	  char *yymsg;
 	  int yyx;
 
 	  /* Start YYX at -YYN if negative to avoid negative indexes in
 	     YYCHECK.  */
-	  int yyxbase = yyn < 0 ? -yyn : 0;
+	  int yyxbegin = yyn < 0 ? -yyn : 0;
 
 	  /* Stay within bounds of both yycheck and yytname.  */
 	  int yychecklim = YYLAST - yyn;
-	  int yynsyms = sizeof (yytname) / sizeof (yytname[0]);
+	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yyxlim = yychecklim < yynsyms ? yychecklim : yynsyms;
 	  int yycount = 0;
 
-	  for (yyx = yyxbase; yyx < yyxlim; yyx++)
+	  yyprefix = ", expecting ";
+	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
 	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 	      {
-	        yysize += (! yycount
+		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
-			   ? sizeof (", expecting ") - 1
+		yycount += 1;
-			   : sizeof (" or ") - 1);
-		yysize += yystrlen (yytname[yyx]);
-		yycount++;
 		if (yycount == 5)
 		  {
 		    yysize = 0;
@@ -1075,14 +1073,13 @@ yyerrlab:
 
 	      if (yycount < 5)
 		{
-		  yycount = 0;
+		  yyprefix = ", expecting ";
-		  for (yyx = yyxbase; yyx < yyxlim; yyx++)
+		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
 		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
+			yyp = yystpcpy (yyp, yyprefix);
-			yyp = yystpcpy (yyp, yyq);
 			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
+			yyprefix = " or ";
 		      }
 		}
 	      yyerror (]b4_yyerror_args[yymsg);