* src/bison.simple: Remove YYERROR_VERBOSE using.

Use %%error_verbose.
(yyparse): Likewise.
* src/output.c (prepare): Give its final value.
* src/muscle_tab.c (muscle_init): Init new muscle 'error_verbose'.
* src/getargs.h: Add its extern declaration.
* src/getargs.c (error_verbose_flag): New int.
(getargs): Update to catch new case.
* src/options.c (option_table): 'error-verbose' is a new option.
(shortopts): Update.
This commit is contained in:
Marc Autret
2001-11-27 20:30:13 +00:00
parent e0327bc8b4
commit eeeb962b2f
8 changed files with 36 additions and 13 deletions

View File

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