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

regen

Browse Source
This commit is contained in:
Akim Demaille
2020-03-17 19:06:24 +01:00
parent cbb967dbad
commit 466fb66578
2 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/parse-gram.c
View File

@@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 3.5.2.140-15e57-dirty. */ /* A Bison parser, made by GNU Bison 3.5.3. */
/* Bison implementation for Yacc-like parsers in C /* Bison implementation for Yacc-like parsers in C
@@ -48,7 +48,7 @@
#define YYBISON 1 #define YYBISON 1
/* Bison version. */ /* Bison version. */
#define YYBISON_VERSION "3.5.2.140-15e57-dirty" #define YYBISON_VERSION "3.5.3"
/* Skeleton name. */ /* Skeleton name. */
#define YYSKELETON_NAME "yacc.c" #define YYSKELETON_NAME "yacc.c"
@@ -922,7 +922,8 @@ do { \
`-----------------------------------*/ `-----------------------------------*/
static void static void
yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) yy_symbol_value_print (FILE *yyo,
int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
{ {
FILE *yyoutput = yyo; FILE *yyoutput = yyo;
YYUSE (yyoutput); YYUSE (yyoutput);
@@ -1132,7 +1133,8 @@ troff (yyo);
`---------------------------*/ `---------------------------*/
static void static void
yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) yy_symbol_print (FILE *yyo,
int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
{ {
YYFPRINTF (yyo, "%s %s (", YYFPRINTF (yyo, "%s %s (",
yytype < YYNTOKENS ? "token" : "nterm", yysymbol_name (yytype)); yytype < YYNTOKENS ? "token" : "nterm", yysymbol_name (yytype));
@@ -1172,7 +1174,8 @@ do { \
`------------------------------------------------*/ `------------------------------------------------*/
static void static void
yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule) yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp,
int yyrule)
{ {
int yylno = yyrline[yyrule]; int yylno = yyrline[yyrule];
int yynrhs = yyr2[yyrule]; int yynrhs = yyr2[yyrule];
@@ -1224,6 +1227,7 @@ int yydebug;
# define YYMAXDEPTH 10000 # define YYMAXDEPTH 10000
#endif #endif
/* Given a state stack such that *YYBOTTOM is its bottom, such that /* Given a state stack such that *YYBOTTOM is its bottom, such that
*YYTOP is either its top or is YYTOP_EMPTY to indicate an empty *YYTOP is either its top or is YYTOP_EMPTY to indicate an empty
stack, and such that *YYCAPACITY is the maximum number of elements it stack, and such that *YYCAPACITY is the maximum number of elements it
@@ -1311,23 +1315,22 @@ yy_lac_stack_realloc (YYPTRDIFF_T *yycapacity, YYPTRDIFF_T yyadd,
current lookahead, then check if that lookahead can eventually be current lookahead, then check if that lookahead can eventually be
shifted if syntactic actions continue from the current context. shifted if syntactic actions continue from the current context.
Report a syntax error if it cannot. */ Report a syntax error if it cannot. */
#define YY_LAC_ESTABLISH \ #define YY_LAC_ESTABLISH \
do { \ do { \
if (!yy_lac_established) \ if (!yy_lac_established) \
{ \ { \
YYDPRINTF ((stderr, \ YYDPRINTF ((stderr, \
"LAC: initial context established for %s\n", \ "LAC: initial context established for %s\n", \
yysymbol_name (yytoken))); \ yysymbol_name (yytoken))); \
yy_lac_established = 1; \ yy_lac_established = 1; \
{ \ switch (yy_lac (yyesa, &yyes, &yyes_capacity, yyssp, yytoken)) \
int yy_lac_status = \ { \
yy_lac (yyesa, &yyes, &yyes_capacity, yyssp, yytoken); \ case 2: \
if (yy_lac_status == 2) \ goto yyexhaustedlab; \
goto yyexhaustedlab; \ case 1: \
if (yy_lac_status == 1) \ goto yyerrlab; \
goto yyerrlab; \ } \
} \ } \
} \
} while (0) } while (0)
/* Discard any previous initial lookahead context because of Event, /* Discard any previous initial lookahead context because of Event,
@@ -1468,14 +1471,15 @@ yy_lac (yy_state_t *yyesa, yy_state_t **yyes,
} }
} }
/* Context of a parse error. */
typedef struct typedef struct
{ {
yy_state_t *yyssp; yy_state_t *yyssp;
yy_state_t *yyesa;
yy_state_t **yyes;
YYPTRDIFF_T *yyes_capacity;
int yytoken; int yytoken;
YYLTYPE *yylloc; YYLTYPE *yylloc;
yy_state_t *yyesa;
yy_state_t **yyes_p;
YYPTRDIFF_T *yyes_capacity_p;
} yyparse_context_t; } yyparse_context_t;
/* Put in YYARG at most YYARGN of the expected tokens given the /* Put in YYARG at most YYARGN of the expected tokens given the
@@ -1492,25 +1496,25 @@ yyexpected_tokens (const yyparse_context_t *yyctx,
int yyx; int yyx;
for (yyx = 0; yyx < YYNTOKENS; ++yyx) for (yyx = 0; yyx < YYNTOKENS; ++yyx)
if (yyx != YYTERROR && yyx != YYUNDEFTOK) if (yyx != YYTERROR && yyx != YYUNDEFTOK)
{ switch (yy_lac (yyctx->yyesa, yyctx->yyes, yyctx->yyes_capacity, yyctx->yyssp, yyx))
{ {
int yy_lac_status = yy_lac (yyctx->yyesa, yyctx->yyes_p, yyctx->yyes_capacity_p, case 2:
yyctx->yyssp, yyx); return -2;
if (yy_lac_status == 2) case 1:
return -2; continue;
if (yy_lac_status == 1) default:
continue; if (!yyarg)
++yycount;
else if (yycount == yyargn)
return 0;
else
yyarg[yycount++] = yyx;
} }
if (!yyarg)
++yycount;
else if (yycount == yyargn)
return 0;
else
yyarg[yycount++] = yyx;
}
return yycount; return yycount;
} }
static int static int
yysyntax_error_arguments (const yyparse_context_t *yyctx, yysyntax_error_arguments (const yyparse_context_t *yyctx,
int yyarg[], int yyargn) int yyarg[], int yyargn)
@@ -1565,14 +1569,16 @@ yyparse_context_location (const yyparse_context_t *yyctx)
} }
/* User defined function to report a syntax error. */ /* User defined function to report a syntax error. */
static int yyreport_syntax_error (const yyparse_context_t *yyctx); static int
yyreport_syntax_error (const yyparse_context_t *yyctx);
/*-----------------------------------------------. /*-----------------------------------------------.
| Release the memory associated to this symbol. | | Release the memory associated to this symbol. |
`-----------------------------------------------*/ `-----------------------------------------------*/
static void static void
yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) yydestruct (const char *yymsg,
int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
{ {
YYUSE (yyvaluep); YYUSE (yyvaluep);
YYUSE (yylocationp); YYUSE (yylocationp);
@@ -1628,6 +1634,8 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
/*----------. /*----------.
| yyparse. | | yyparse. |
`----------*/ `----------*/
@@ -1668,6 +1676,9 @@ YYLTYPE yylloc = yyloc_default;
Refer to the stacks through separate pointers, to allow yyoverflow Refer to the stacks through separate pointers, to allow yyoverflow
to reallocate them elsewhere. */ to reallocate them elsewhere. */
/* Their size. */
YYPTRDIFF_T yystacksize;
/* The state stack. */ /* The state stack. */
yy_state_t yyssa[YYINITDEPTH]; yy_state_t yyssa[YYINITDEPTH];
yy_state_t *yyss; yy_state_t *yyss;
@@ -1683,11 +1694,6 @@ YYLTYPE yylloc = yyloc_default;
YYLTYPE *yyls; YYLTYPE *yyls;
YYLTYPE *yylsp; YYLTYPE *yylsp;
/* The locations where the error started and ended. */
YYLTYPE yyerror_range[3];
YYPTRDIFF_T yystacksize;
yy_state_t yyesa[20]; yy_state_t yyesa[20];
yy_state_t *yyes; yy_state_t *yyes;
YYPTRDIFF_T yyes_capacity; YYPTRDIFF_T yyes_capacity;
@@ -1704,6 +1710,9 @@ YYLTYPE yylloc = yyloc_default;
YYSTYPE yyval; YYSTYPE yyval;
YYLTYPE yyloc; YYLTYPE yyloc;
/* The locations where the error started and ended. */
YYLTYPE yyerror_range[3];
#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
@@ -1712,21 +1721,23 @@ YYLTYPE yylloc = yyloc_default;
Keep to zero when no symbol should be popped. */ Keep to zero when no symbol should be popped. */
int yylen = 0; int yylen = 0;
yynerrs = 0;
yystate = 0;
yyerrstatus = 0;
yystacksize = YYINITDEPTH;
yyssp = yyss = yyssa; yyssp = yyss = yyssa;
yyvsp = yyvs = yyvsa; yyvsp = yyvs = yyvsa;
yylsp = yyls = yylsa; yylsp = yyls = yylsa;
yystacksize = YYINITDEPTH;
yyes = yyesa; yyes = yyesa;
yyes_capacity = 20; yyes_capacity = 20;
if (YYMAXDEPTH < yyes_capacity) if (YYMAXDEPTH < yyes_capacity)
yyes_capacity = YYMAXDEPTH; yyes_capacity = YYMAXDEPTH;
YYDPRINTF ((stderr, "Starting parse\n")); YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
yychar = YYEMPTY; /* Cause a token to be read. */ yychar = YYEMPTY; /* Cause a token to be read. */
/* User initialization code. */ /* User initialization code. */
@@ -2534,7 +2545,7 @@ yyerrlab:
++yynerrs; ++yynerrs;
{ {
yyparse_context_t yyctx yyparse_context_t yyctx
= {yyssp, yytoken, &yylloc, yyesa, &yyes, &yyes_capacity}; = {yyssp, yyesa, &yyes, &yyes_capacity, yytoken, &yylloc};
if (yychar != YYEMPTY) if (yychar != YYEMPTY)
YY_LAC_ESTABLISH; YY_LAC_ESTABLISH;
if (yyreport_syntax_error (&yyctx) == 2) if (yyreport_syntax_error (&yyctx) == 2)
@@ -2699,6 +2710,7 @@ yyreturn:
} }
int int
yyreport_syntax_error (const yyparse_context_t *ctx) yyreport_syntax_error (const yyparse_context_t *ctx)
{ {

2
src/parse-gram.h
View File

@@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 3.5.2.140-15e57-dirty. */ /* A Bison parser, made by GNU Bison 3.5.3. */
/* Bison interface for Yacc-like parsers in C /* Bison interface for Yacc-like parsers in C