Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-11 05:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/bison.simple (yyparse): When reporting verbosely an error,

Browse Source 
no longer issue additional quotes around token names.
* tests/calc.at: Adjust.
This commit is contained in:
Akim Demaille
2001-11-19 10:27:52 +00:00
parent e41dc70020
commit f047348491
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/bison.simple
View File

@@ -833,30 +833,29 @@ yyerrlab:
int x, count;
count = 0;
/* Start X at -yyn if nec to avoid negative indexes in yycheck. */
for (x = (yyn < 0 ? -yyn : 0);
/* Start X at -YYN if negative to avoid negative indexes in
YYCHECK. */
for (x = yyn < 0 ? -yyn : 0;
x < (int) (sizeof (yytname) / sizeof (char *)); x++)
if (yycheck[x + yyn] == x)
size += strlen (yytname[x]) + 15, count++;
size += strlen ("parse error, unexpected `") + 1;
size += strlen ("parse error, unexpected ") + 1;
size += strlen (yytname[YYTRANSLATE (yychar)]);
msg = (char *) malloc (size);
if (msg != 0)
{
strcpy (msg, "parse error, unexpected `");
strcpy (msg, "parse error, unexpected ");
strcat (msg, yytname[YYTRANSLATE (yychar)]);
strcat (msg, "'");
if (count < 5)
{
count = 0;
for (x = (yyn < 0 ? -yyn : 0);
for (x = yyn < 0 ? -yyn : 0;
x < (int) (sizeof (yytname) / sizeof (char *)); x++)
if (yycheck[x + yyn] == x)
{
strcat (msg, count == 0 ? ", expecting `" : " or `");
strcat (msg, count == 0 ? ", expecting " : " or ");
strcat (msg, yytname[x]);
strcat (msg, "'");
count++;
}
}
@@ -864,7 +863,7 @@ yyerrlab:
free (msg);
}
else
yyerror ("parse error; also virtual memory exceeded");
yyerror ("parse error; also virtual memory exhausted");
}
else
#endif /* YYERROR_VERBOSE */