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

(yytokenName): Bullet-proof against YYEMPTY token.

Browse Source 
(yyreportSyntaxError): Handle case where lookahead token is
YYEMPTY.
This commit is contained in:
Paul Eggert
2004-02-02 22:35:53 +00:00
parent be16239bf7
commit d0d5aa6425
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/glr.c
View File

@@ -1,7 +1,7 @@
m4_divert(-1) -*- C -*- m4_divert(-1) -*- C -*-
# GLR skeleton for Bison # GLR skeleton for Bison
# Copyright (C) 2002, 2003 Free Software Foundation, Inc. # Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -636,6 +636,9 @@ yyFail (yyGLRStack* yystack]b4_pure_formals[, const char* yyformat, ...)
static inline const char* static inline const char*
yytokenName (yySymbol yytoken) yytokenName (yySymbol yytoken)
{ {
if (yytoken == YYEMPTY)
return "";
return yytname[yytoken]; return yytname[yytoken];
} }
#endif #endif
@@ -1653,7 +1656,8 @@ yyreportSyntaxError (yyGLRStack* yystack,
if (yymsg != 0) if (yymsg != 0)
{ {
char* yyp = yymsg; char* yyp = yymsg;
sprintf (yyp, "syntax error, unexpected %s", sprintf (yyp, "syntax error%s%s",
(*yytokenp == YYEMPTY ? "" : ", unexpected "),
yytokenName (*yytokenp)); yytokenName (*yytokenp));
yyp += strlen (yyp); yyp += strlen (yyp);
if (yycount < 5) if (yycount < 5)