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

bison: avoid using yysyntax_error_arguments

Browse Source 
* src/parse-gram.y (yyreport_syntax_error): Use yyparse_context_token
and yyexpected_tokens.
This commit is contained in:
Akim Demaille
2020-03-21 10:22:56 +01:00
parent 00b0d02955
commit 4192de1f41
2 changed files with 60 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/parse-gram.y
View File

@@ -801,18 +801,26 @@ epilogue.opt:
int
yyreport_syntax_error (const yyparse_context_t *ctx)
{
enum { ARGS_MAX = 5 };
int res = 0;
/* Arguments of format: reported tokens (one for the "unexpected",
one per "expected"). */
int arg[ARGS_MAX];
int n = yysyntax_error_arguments (ctx, arg, ARGS_MAX);
if (n < 0)
return n;
enum { ARGS_MAX = 5 };
const char *argv[ARGS_MAX];
for (int i = 0; i < n; ++i)
argv[i] = yysymbol_name (arg[i]);
syntax_error (*yyparse_context_location (ctx), n, argv);
return 0;
int argc = 0;
int unexpected = yyparse_context_token (ctx);
if (unexpected != YYEMPTY)
{
argv[argc++] = yysymbol_name (unexpected);
int expected[ARGS_MAX - 1];
int nexpected = yyexpected_tokens (ctx, expected, ARGS_MAX - 1);
if (nexpected < 0)
res = nexpected;
else
for (int i = 0; i < nexpected; ++i)
argv[argc++] = yysymbol_name (expected[i]);
}
syntax_error (*yyparse_context_location (ctx), argc, argv);
return res;
}