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-04-05 15:26:08 +02:00
parent cc68bbf799
commit e9fddab715
2 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/parse-gram.c
View File

@@ -1035,7 +1035,7 @@ do { \
static void static void
yy_symbol_value_print (FILE *yyo, yy_symbol_value_print (FILE *yyo,
yysymbol_kind_t yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
{ {
FILE *yyoutput = yyo; FILE *yyoutput = yyo;
YYUSE (yyoutput); YYUSE (yyoutput);
@@ -1043,14 +1043,14 @@ yy_symbol_value_print (FILE *yyo,
if (!yyvaluep) if (!yyvaluep)
return; return;
# ifdef YYPRINT # ifdef YYPRINT
if (yytype < YYNTOKENS) if (yykind < YYNTOKENS)
YYPRINT (yyo, yytoknum[yytype], *yyvaluep); YYPRINT (yyo, yytoknum[yykind], *yyvaluep);
# endif # endif
/* "%code pre-printer" blocks. */ /* "%code pre-printer" blocks. */
tron (yyo); tron (yyo);
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
switch (yytype) switch (yykind)
{ {
case 3: /* "string" */ case 3: /* "string" */
{ fputs (((*yyvaluep).STRING), yyo); } { fputs (((*yyvaluep).STRING), yyo); }
@@ -1140,7 +1140,7 @@ tron (yyo);
break; break;
case 74: /* tag.opt */ case 74: /* tag.opt */
{ fputs (((*yyvaluep).yytype_74), yyo); } { fputs (((*yyvaluep).yykind_74), yyo); }
break; break;
case 75: /* generic_symlist */ case 75: /* generic_symlist */
@@ -1164,7 +1164,7 @@ tron (yyo);
break; break;
case 80: /* token_decl.1 */ case 80: /* token_decl.1 */
{ symbol_list_syms_print (((*yyvaluep).yytype_80), yyo); } { symbol_list_syms_print (((*yyvaluep).yykind_80), yyo); }
break; break;
case 81: /* token_decl */ case 81: /* token_decl */
@@ -1172,7 +1172,7 @@ tron (yyo);
break; break;
case 82: /* int.opt */ case 82: /* int.opt */
{ fprintf (yyo, "%d", ((*yyvaluep).yytype_82)); } { fprintf (yyo, "%d", ((*yyvaluep).yykind_82)); }
break; break;
case 83: /* alias */ case 83: /* alias */
@@ -1184,7 +1184,7 @@ tron (yyo);
break; break;
case 85: /* token_decl_for_prec.1 */ case 85: /* token_decl_for_prec.1 */
{ symbol_list_syms_print (((*yyvaluep).yytype_85), yyo); } { symbol_list_syms_print (((*yyvaluep).yykind_85), yyo); }
break; break;
case 86: /* token_decl_for_prec */ case 86: /* token_decl_for_prec */
@@ -1196,7 +1196,7 @@ tron (yyo);
break; break;
case 88: /* symbol_decl.1 */ case 88: /* symbol_decl.1 */
{ symbol_list_syms_print (((*yyvaluep).yytype_88), yyo); } { symbol_list_syms_print (((*yyvaluep).yykind_88), yyo); }
break; break;
case 96: /* variable */ case 96: /* variable */
@@ -1246,14 +1246,14 @@ troff (yyo);
static void static void
yy_symbol_print (FILE *yyo, yy_symbol_print (FILE *yyo,
yysymbol_kind_t yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
{ {
YYFPRINTF (yyo, "%s %s (", YYFPRINTF (yyo, "%s %s (",
yytype < YYNTOKENS ? "token" : "nterm", yysymbol_name (yytype)); yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind));
YY_LOCATION_PRINT (yyo, *yylocationp); YY_LOCATION_PRINT (yyo, *yylocationp);
YYFPRINTF (yyo, ": "); YYFPRINTF (yyo, ": ");
yy_symbol_value_print (yyo, yytype, yyvaluep, yylocationp); yy_symbol_value_print (yyo, yykind, yyvaluep, yylocationp);
YYFPRINTF (yyo, ")"); YYFPRINTF (yyo, ")");
} }
@@ -1633,7 +1633,7 @@ yyexpected_tokens (const yypcontext_t *yyctx,
/* The token type of the lookahead of this context. */ /* The kind of the lookahead of this context. */
static yysymbol_kind_t static yysymbol_kind_t
yypcontext_token (const yypcontext_t *yyctx) YY_ATTRIBUTE_UNUSED; yypcontext_token (const yypcontext_t *yyctx) YY_ATTRIBUTE_UNUSED;
@@ -1663,16 +1663,16 @@ yyreport_syntax_error (const yypcontext_t *yyctx);
static void static void
yydestruct (const char *yymsg, yydestruct (const char *yymsg,
yysymbol_kind_t yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) yysymbol_kind_t yykind, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
{ {
YYUSE (yyvaluep); YYUSE (yyvaluep);
YYUSE (yylocationp); YYUSE (yylocationp);
if (!yymsg) if (!yymsg)
yymsg = "Deleting"; yymsg = "Deleting";
YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp);
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
switch (yytype) switch (yykind)
{ {
case 75: /* generic_symlist */ case 75: /* generic_symlist */
{ symbol_list_free (((*yyvaluep).generic_symlist)); } { symbol_list_free (((*yyvaluep).generic_symlist)); }
@@ -1691,7 +1691,7 @@ yydestruct (const char *yymsg,
break; break;
case 80: /* token_decl.1 */ case 80: /* token_decl.1 */
{ symbol_list_free (((*yyvaluep).yytype_80)); } { symbol_list_free (((*yyvaluep).yykind_80)); }
break; break;
case 84: /* token_decls_for_prec */ case 84: /* token_decls_for_prec */
@@ -1699,7 +1699,7 @@ yydestruct (const char *yymsg,
break; break;
case 85: /* token_decl_for_prec.1 */ case 85: /* token_decl_for_prec.1 */
{ symbol_list_free (((*yyvaluep).yytype_85)); } { symbol_list_free (((*yyvaluep).yykind_85)); }
break; break;
case 87: /* symbol_decls */ case 87: /* symbol_decls */
@@ -1707,7 +1707,7 @@ yydestruct (const char *yymsg,
break; break;
case 88: /* symbol_decl.1 */ case 88: /* symbol_decl.1 */
{ symbol_list_free (((*yyvaluep).yytype_88)); } { symbol_list_free (((*yyvaluep).yykind_88)); }
break; break;
default: default:
@@ -2291,11 +2291,11 @@ yyreduce:
break; break;
case 56: case 56:
{ (yyval.yytype_74) = NULL; } { (yyval.yykind_74) = NULL; }
break; break;
case 57: case 57:
{ (yyval.yytype_74) = (yyvsp[0].TAG); } { (yyval.yykind_74) = (yyvsp[0].TAG); }
break; break;
case 59: case 59:
@@ -2320,43 +2320,43 @@ yyreduce:
case 66: case 66:
{ {
(yyval.token_decls) = (yyvsp[0].yytype_80); (yyval.token_decls) = (yyvsp[0].yykind_80);
} }
break; break;
case 67: case 67:
{ {
(yyval.token_decls) = symbol_list_type_set ((yyvsp[0].yytype_80), (yyvsp[-1].TAG), (yylsp[-1])); (yyval.token_decls) = symbol_list_type_set ((yyvsp[0].yykind_80), (yyvsp[-1].TAG), (yylsp[-1]));
} }
break; break;
case 68: case 68:
{ {
(yyval.token_decls) = symbol_list_append ((yyvsp[-2].token_decls), symbol_list_type_set ((yyvsp[0].yytype_80), (yyvsp[-1].TAG), (yylsp[-1]))); (yyval.token_decls) = symbol_list_append ((yyvsp[-2].token_decls), symbol_list_type_set ((yyvsp[0].yykind_80), (yyvsp[-1].TAG), (yylsp[-1])));
} }
break; break;
case 69: case 69:
{ (yyval.yytype_80) = symbol_list_sym_new ((yyvsp[0].token_decl), (yylsp[0])); } { (yyval.yykind_80) = symbol_list_sym_new ((yyvsp[0].token_decl), (yylsp[0])); }
break; break;
case 70: case 70:
{ (yyval.yytype_80) = symbol_list_append ((yyvsp[-1].yytype_80), symbol_list_sym_new ((yyvsp[0].token_decl), (yylsp[0]))); } { (yyval.yykind_80) = symbol_list_append ((yyvsp[-1].yykind_80), symbol_list_sym_new ((yyvsp[0].token_decl), (yylsp[0]))); }
break; break;
case 71: case 71:
{ {
(yyval.token_decl) = (yyvsp[-2].id); (yyval.token_decl) = (yyvsp[-2].id);
symbol_class_set ((yyvsp[-2].id), current_class, (yylsp[-2]), true); symbol_class_set ((yyvsp[-2].id), current_class, (yylsp[-2]), true);
if (0 <= (yyvsp[-1].yytype_82)) if (0 <= (yyvsp[-1].yykind_82))
symbol_user_token_number_set ((yyvsp[-2].id), (yyvsp[-1].yytype_82), (yylsp[-1])); symbol_user_token_number_set ((yyvsp[-2].id), (yyvsp[-1].yykind_82), (yylsp[-1]));
if ((yyvsp[0].alias)) if ((yyvsp[0].alias))
symbol_make_alias ((yyvsp[-2].id), (yyvsp[0].alias), (yylsp[0])); symbol_make_alias ((yyvsp[-2].id), (yyvsp[0].alias), (yylsp[0]));
} }
break; break;
case 72: case 72:
{ (yyval.yytype_82) = -1; } { (yyval.yykind_82) = -1; }
break; break;
case 74: case 74:
@@ -2377,68 +2377,68 @@ yyreduce:
case 77: case 77:
{ {
(yyval.token_decls_for_prec) = (yyvsp[0].yytype_85); (yyval.token_decls_for_prec) = (yyvsp[0].yykind_85);
} }
break; break;
case 78: case 78:
{ {
(yyval.token_decls_for_prec) = symbol_list_type_set ((yyvsp[0].yytype_85), (yyvsp[-1].TAG), (yylsp[-1])); (yyval.token_decls_for_prec) = symbol_list_type_set ((yyvsp[0].yykind_85), (yyvsp[-1].TAG), (yylsp[-1]));
} }
break; break;
case 79: case 79:
{ {
(yyval.token_decls_for_prec) = symbol_list_append ((yyvsp[-2].token_decls_for_prec), symbol_list_type_set ((yyvsp[0].yytype_85), (yyvsp[-1].TAG), (yylsp[-1]))); (yyval.token_decls_for_prec) = symbol_list_append ((yyvsp[-2].token_decls_for_prec), symbol_list_type_set ((yyvsp[0].yykind_85), (yyvsp[-1].TAG), (yylsp[-1])));
} }
break; break;
case 80: case 80:
{ (yyval.yytype_85) = symbol_list_sym_new ((yyvsp[0].token_decl_for_prec), (yylsp[0])); } { (yyval.yykind_85) = symbol_list_sym_new ((yyvsp[0].token_decl_for_prec), (yylsp[0])); }
break; break;
case 81: case 81:
{ (yyval.yytype_85) = symbol_list_append ((yyvsp[-1].yytype_85), symbol_list_sym_new ((yyvsp[0].token_decl_for_prec), (yylsp[0]))); } { (yyval.yykind_85) = symbol_list_append ((yyvsp[-1].yykind_85), symbol_list_sym_new ((yyvsp[0].token_decl_for_prec), (yylsp[0]))); }
break; break;
case 82: case 82:
{ {
(yyval.token_decl_for_prec) = (yyvsp[-1].id); (yyval.token_decl_for_prec) = (yyvsp[-1].id);
symbol_class_set ((yyvsp[-1].id), token_sym, (yylsp[-1]), false); symbol_class_set ((yyvsp[-1].id), token_sym, (yylsp[-1]), false);
if (0 <= (yyvsp[0].yytype_82)) if (0 <= (yyvsp[0].yykind_82))
symbol_user_token_number_set ((yyvsp[-1].id), (yyvsp[0].yytype_82), (yylsp[0])); symbol_user_token_number_set ((yyvsp[-1].id), (yyvsp[0].yykind_82), (yylsp[0]));
} }
break; break;
case 84: case 84:
{ {
(yyval.symbol_decls) = (yyvsp[0].yytype_88); (yyval.symbol_decls) = (yyvsp[0].yykind_88);
} }
break; break;
case 85: case 85:
{ {
(yyval.symbol_decls) = symbol_list_type_set ((yyvsp[0].yytype_88), (yyvsp[-1].TAG), (yylsp[-1])); (yyval.symbol_decls) = symbol_list_type_set ((yyvsp[0].yykind_88), (yyvsp[-1].TAG), (yylsp[-1]));
} }
break; break;
case 86: case 86:
{ {
(yyval.symbol_decls) = symbol_list_append ((yyvsp[-2].symbol_decls), symbol_list_type_set ((yyvsp[0].yytype_88), (yyvsp[-1].TAG), (yylsp[-1]))); (yyval.symbol_decls) = symbol_list_append ((yyvsp[-2].symbol_decls), symbol_list_type_set ((yyvsp[0].yykind_88), (yyvsp[-1].TAG), (yylsp[-1])));
} }
break; break;
case 87: case 87:
{ {
symbol_class_set ((yyvsp[0].symbol), pct_type_sym, (yylsp[0]), false); symbol_class_set ((yyvsp[0].symbol), pct_type_sym, (yylsp[0]), false);
(yyval.yytype_88) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); (yyval.yykind_88) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]));
} }
break; break;
case 88: case 88:
{ {
symbol_class_set ((yyvsp[0].symbol), pct_type_sym, (yylsp[0]), false); symbol_class_set ((yyvsp[0].symbol), pct_type_sym, (yylsp[0]), false);
(yyval.yytype_88) = symbol_list_append ((yyvsp[-1].yytype_88), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); (yyval.yykind_88) = symbol_list_append ((yyvsp[-1].yykind_88), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])));
} }
break; break;
@@ -2449,7 +2449,7 @@ yyreduce:
break; break;
case 94: case 94:
{ current_lhs ((yyvsp[-1].id_colon), (yylsp[-1]), (yyvsp[0].yytype_95)); } { current_lhs ((yyvsp[-1].id_colon), (yylsp[-1]), (yyvsp[0].yykind_95)); }
break; break;
case 95: case 95:
@@ -2473,11 +2473,11 @@ yyreduce:
break; break;
case 100: case 100:
{ grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].yytype_95)); } { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].yykind_95)); }
break; break;
case 101: case 101:
{ grammar_current_rule_action_append ((yyvsp[-1].BRACED_CODE), (yylsp[-1]), (yyvsp[0].yytype_95), (yyvsp[-2].yytype_74)); } { grammar_current_rule_action_append ((yyvsp[-1].BRACED_CODE), (yylsp[-1]), (yyvsp[0].yykind_95), (yyvsp[-2].yykind_74)); }
break; break;
case 102: case 102:
@@ -2509,11 +2509,11 @@ yyreduce:
break; break;
case 109: case 109:
{ (yyval.yytype_95) = NULL; } { (yyval.yykind_95) = NULL; }
break; break;
case 110: case 110:
{ (yyval.yytype_95) = named_ref_new ((yyvsp[0].BRACKETED_ID), (yylsp[0])); } { (yyval.yykind_95) = named_ref_new ((yyvsp[0].BRACKETED_ID), (yylsp[0])); }
break; break;
case 112: case 112:

12
src/parse-gram.h
View File

@@ -163,9 +163,9 @@ union GRAM_STYPE
/* "integer literal" */ /* "integer literal" */
int INT; int INT;
/* int.opt */ /* int.opt */
int yytype_82; int yykind_82;
/* named_ref.opt */ /* named_ref.opt */
named_ref* yytype_95; named_ref* yykind_95;
/* "%param" */ /* "%param" */
param_type PERCENT_PARAM; param_type PERCENT_PARAM;
/* token_decl */ /* token_decl */
@@ -191,15 +191,15 @@ union GRAM_STYPE
/* token_decls */ /* token_decls */
symbol_list* token_decls; symbol_list* token_decls;
/* token_decl.1 */ /* token_decl.1 */
symbol_list* yytype_80; symbol_list* yykind_80;
/* token_decls_for_prec */ /* token_decls_for_prec */
symbol_list* token_decls_for_prec; symbol_list* token_decls_for_prec;
/* token_decl_for_prec.1 */ /* token_decl_for_prec.1 */
symbol_list* yytype_85; symbol_list* yykind_85;
/* symbol_decls */ /* symbol_decls */
symbol_list* symbol_decls; symbol_list* symbol_decls;
/* symbol_decl.1 */ /* symbol_decl.1 */
symbol_list* yytype_88; symbol_list* yykind_88;
/* "%error-verbose" */ /* "%error-verbose" */
uniqstr PERCENT_ERROR_VERBOSE; uniqstr PERCENT_ERROR_VERBOSE;
/* "%<flag>" */ /* "%<flag>" */
@@ -219,7 +219,7 @@ union GRAM_STYPE
/* "<tag>" */ /* "<tag>" */
uniqstr TAG; uniqstr TAG;
/* tag.opt */ /* tag.opt */
uniqstr yytype_74; uniqstr yykind_74;
/* tag */ /* tag */
uniqstr tag; uniqstr tag;
/* variable */ /* variable */