* src/bison.simple: Fix debug.

[YYERROR_VERBOSE]: Re-integrate as an internal macro.
This commit is contained in:
Marc Autret
2001-11-28 19:54:36 +00:00
parent 9113b58f6f
commit 8850be4b1c
2 changed files with 14 additions and 3 deletions

View File

@@ -1,3 +1,8 @@
2001-11-28 Marc Autret <autret_m@epita.fr>
* src/bison.simple: Fix debug.
[YYERROR_VERBOSE]: Re-integrate as an internal macro.
2001-11-28 Akim Demaille <akim@epita.fr> 2001-11-28 Akim Demaille <akim@epita.fr>
* src/LR0.c (shifts_new): New. * src/LR0.c (shifts_new): New.

View File

@@ -149,6 +149,12 @@ typedef struct yyltype
# define YYLTYPE %%ltype # define YYLTYPE %%ltype
#endif #endif
#ifdef YYERROR_VERBOSE
# undef YYERROR_VERBOSE
#endif
#define YYERROR_VERBOSE %%error_verbose
/* Tokens. */ /* Tokens. */
%%tokendef %%tokendef
@@ -190,7 +196,7 @@ static const short yyrline[] =
}; };
#endif #endif
#if %%error_verbose #if YYDEBUG || YYERROR_VERBOSE
/* YYTNME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */ /* YYTNME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
static const char *const yytname[] = static const char *const yytname[] =
{ {
@@ -819,7 +825,7 @@ yyerrlab:
{ {
++yynerrs; ++yynerrs;
#if %%error_verbose #if YYERROR_VERBOSE
yyn = yypact[yystate]; yyn = yypact[yystate];
if (yyn > YYFLAG && yyn < YYLAST) if (yyn > YYFLAG && yyn < YYLAST)
@@ -862,7 +868,7 @@ yyerrlab:
yyerror ("parse error; also virtual memory exhausted"); yyerror ("parse error; also virtual memory exhausted");
} }
else else
#endif /* %%ERROR_VERBOSE */ #endif /* YYERROR_VERBOSE */
yyerror ("parse error"); yyerror ("parse error");
} }
goto yyerrlab1; goto yyerrlab1;