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

Clean up b4_check_percent_code_qualifiers a little.

Browse Source 
* data/bison.m4 (b4_check_percent_code_qualifiers): Expect qualifiers
in b4_used_percent_code_qualifiers to be double-M4-quoted.  Rewrite
documentation and add examples.
* src/parse-gram.y (grammar_declaration): Double-M4-quote those
qualifiers here.
This commit is contained in:
Joel E. Denny
2007-01-06 23:12:25 +00:00
parent 08af01c2fc
commit 1c7b7e1d87
5 changed files with 121 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2007-01-06 Joel E. Denny <jdenny@ces.clemson.edu>
Clean up b4_check_percent_code_qualifiers a little.
* data/bison.m4 (b4_check_percent_code_qualifiers): Expect qualifiers
in b4_used_percent_code_qualifiers to be double-M4-quoted. Rewrite
documentation and add examples.
* src/parse-gram.y (grammar_declaration): Double-M4-quote those
qualifiers here.
2007-01-05 Joel E. Denny <jdenny@ces.clemson.edu> 2007-01-05 Joel E. Denny <jdenny@ces.clemson.edu>
Don't use m4_divert since it makes m4_divert_push and m4_divert_pop Don't use m4_divert since it makes m4_divert_push and m4_divert_pop

51
data/bison.m4
View File

@@ -71,7 +71,7 @@ version 2.2 of Bison.])])
m4_define([b4_error], m4_define([b4_error],
[m4_divert_push(0)[@]$1[(]$2[]m4_if([$#], [2], [], [m4_divert_push(0)[@]$1[(]$2[]m4_if([$#], [2], [],
[m4_foreach([b4_arg], [m4_foreach([b4_arg],
m4_dquote(m4_shift(m4_shift($@))), m4_dquote(m4_shift(m4_shift($@))),
[[@,]b4_arg])])[@)]m4_divert_pop(0)]) [[@,]b4_arg])])[@)]m4_divert_pop(0)])
# b4_warn(FORMAT, [ARG1], [ARG2], ...) # b4_warn(FORMAT, [ARG1], [ARG2], ...)
@@ -258,38 +258,47 @@ b4_define_user_code([post_prologue])
b4_define_user_code([pre_prologue]) b4_define_user_code([pre_prologue])
b4_define_user_code([stype]) b4_define_user_code([stype])
# b4_check_percent_code_qualifiers([VAILD_QUALIFIER], [VALID_QUALIFIER], ...) # b4_check_percent_code_qualifiers([VAILD_QUALIFIER], [VALID_QUALIFIER], ...)
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Complain if any %code qualifier used in the grammar is not a valid qualifier. # Complain if any %code qualifier used in the grammar is not a valid qualifier.
# #
# b4_used_percent_code_qualifiers must expand to a comma-delimited list of the # If no %code qualifiers are used in the grammar,
# %code qualifiers used in the grammar. The list as a whole must be quoted, # b4_used_percent_code_qualifiers must be undefined or expand to the empty
# but individual qualifiers in it must not be. Qualifiers will not be # string. Otherwise, it must expand to a comma-delimited list specifying all
# M4-expanded. Whitespace will not be stripped from the qualifiers. Any # %code qualifiers used in the grammar. Each item in the list must expand to
# qualifier that is the empty string will be correctly parsed as such. If # text that expands to one of those qualifiers. For example, to define
# b4_used_percent_code_qualifiers expands to the empty string, then the list # b4_used_percent_code_qualifiers with two qualifiers with correct quoting:
# contains one qualifier that is the empty string. If
# b4_used_percent_code_qualifiers is undefined, then the list contains no
# qualifiers. Multiple occurrences of the same qualifier are fine.
# #
# Each VALID_QUALIFIER will be M4-expanded once to define a valid qualifier. A # m4_define([b4_used_percent_code_qualifiers],
# VALID_QUALIFIER that expands to the empty string will correctly define the # [[[[requires]], [[provides]]]])
# empty string as a valid qualifier. If b4_used_percent_code_qualifiers is
# invoked with empty parens, then there is one valid qualifier and it is the
# empty string. To specify that there are no valid qualifiers, invoke
# b4_check_percent_code_qualifiers without parens. Multiple occurrences of the
# same valid qualifier are fine.
# #
# Qualifiers and valid qualifiers must not contain the characters `,' or `&'. # Multiple occurrences of the same qualifier are fine. Empty string qualifiers
# are fine.
#
# Each VALID_QUALIFIER must expand to a valid qualifier. For example,
# b4_check_percent_code_qualifiers might be invoked with:
#
# b4_check_percent_code_qualifiers([[requires]], [[provides]])
#
# Multiple occurrences of the same valid qualifier are fine. A VALID_QUALIFIER
# that expands to the empty string will correctly define the empty string as a
# valid qualifier, but it would be ugly for a Bison skeleton to actually use
# that. If b4_used_percent_code_qualifiers is invoked with empty parens, then
# there is one valid qualifier and it is the empty string. To specify that
# there are no valid qualifiers, invoke b4_check_percent_code_qualifiers
# without parens.
#
# Qualifiers and valid qualifiers must not contain the character `,'.
m4_define([b4_check_percent_code_qualifiers], m4_define([b4_check_percent_code_qualifiers],
[m4_ifdef([b4_used_percent_code_qualifiers], [ [m4_ifdef([b4_used_percent_code_qualifiers], [
m4_foreach([b4_qualifier], m4_foreach([b4_qualifier],
m4_dquote(m4_substr(m4_split(m4_translit(m4_dquote([,]b4_used_percent_code_qualifiers), [,], [&]), [[&]]), 4)), b4_used_percent_code_qualifiers,
[m4_if(m4_index(m4_if($#, 0, [], [[,]m4_quote($*)[,]]), [m4_if(m4_index(m4_if($#, 0, [], [[,]m4_quote($*)[,]]),
[,]m4_defn([b4_qualifier])[,]), [,]b4_qualifier[,]),
[-1], [-1],
[b4_complain([[`%s' is not a recognized %%code qualifier]], [b4_complain([[`%s' is not a recognized %%code qualifier]],
[m4_defn([b4_qualifier])]) [b4_qualifier])
]) ])
]) ])
])]) ])])

151
src/parse-gram.c
View File

@@ -1,3 +1,4 @@
/* A Bison parser, made by GNU Bison 2.3a+. */ /* A Bison parser, made by GNU Bison 2.3a+. */
/* Skeleton implementation for Bison's Yacc-like parsers in C /* Skeleton implementation for Bison's Yacc-like parsers in C
@@ -157,7 +158,7 @@ static int current_prec = 0;
/* Line 171 of yacc.c */ /* Line 171 of yacc.c */
#line 161 "parse-gram.c" #line 162 "parse-gram.c"
/* Enabling traces. */ /* Enabling traces. */
#ifndef YYDEBUG #ifndef YYDEBUG
@@ -322,7 +323,7 @@ typedef union YYSTYPE
} }
/* Line 205 of yacc.c */ /* Line 205 of yacc.c */
#line 326 "parse-gram.c" #line 327 "parse-gram.c"
YYSTYPE; YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -347,7 +348,7 @@ typedef struct YYLTYPE
/* Line 228 of yacc.c */ /* Line 228 of yacc.c */
#line 351 "parse-gram.c" #line 352 "parse-gram.c"
#ifdef short #ifdef short
# undef short # undef short
@@ -676,13 +677,13 @@ static const yytype_uint16 yyrline[] =
238, 243, 244, 245, 246, 247, 248, 253, 262, 263, 238, 243, 244, 245, 246, 247, 248, 253, 262, 263,
264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
274, 275, 276, 277, 278, 279, 280, 284, 285, 286, 274, 275, 276, 277, 278, 279, 280, 284, 285, 286,
290, 297, 304, 308, 312, 317, 338, 339, 343, 372, 290, 297, 304, 308, 312, 317, 340, 341, 345, 374,
372, 377, 377, 382, 393, 408, 409, 410, 414, 415, 374, 379, 379, 384, 395, 410, 411, 412, 416, 417,
420, 422, 427, 428, 432, 433, 434, 435, 440, 445, 422, 424, 429, 430, 434, 435, 436, 437, 442, 447,
450, 456, 462, 473, 474, 483, 484, 490, 491, 492, 452, 458, 464, 475, 476, 485, 486, 492, 493, 494,
499, 499, 503, 504, 505, 510, 511, 513, 515, 517, 501, 501, 505, 506, 507, 512, 513, 515, 517, 519,
519, 529, 530, 536, 540, 545, 565, 567, 576, 581, 521, 531, 532, 538, 542, 547, 567, 569, 578, 583,
582, 587, 594, 596 584, 589, 596, 598
}; };
#endif #endif
@@ -1048,7 +1049,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); }; { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1052 "parse-gram.c" #line 1053 "parse-gram.c"
break; break;
case 4: /* "\"integer\"" */ case 4: /* "\"integer\"" */
@@ -1057,7 +1058,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "%d", (yyvaluep->integer)); }; { fprintf (stderr, "%d", (yyvaluep->integer)); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1061 "parse-gram.c" #line 1062 "parse-gram.c"
break; break;
case 45: /* "\"{...}\"" */ case 45: /* "\"{...}\"" */
@@ -1066,7 +1067,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); }; { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1070 "parse-gram.c" #line 1071 "parse-gram.c"
break; break;
case 46: /* "\"char\"" */ case 46: /* "\"char\"" */
@@ -1075,7 +1076,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fputs (char_name ((yyvaluep->character)), stderr); }; { fputs (char_name ((yyvaluep->character)), stderr); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1079 "parse-gram.c" #line 1080 "parse-gram.c"
break; break;
case 47: /* "\"epilogue\"" */ case 47: /* "\"epilogue\"" */
@@ -1084,7 +1085,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1088 "parse-gram.c" #line 1089 "parse-gram.c"
break; break;
case 49: /* "\"identifier\"" */ case 49: /* "\"identifier\"" */
@@ -1093,7 +1094,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fputs ((yyvaluep->uniqstr), stderr); }; { fputs ((yyvaluep->uniqstr), stderr); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1097 "parse-gram.c" #line 1098 "parse-gram.c"
break; break;
case 50: /* "\"identifier:\"" */ case 50: /* "\"identifier:\"" */
@@ -1102,7 +1103,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "%s:", (yyvaluep->uniqstr)); }; { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1106 "parse-gram.c" #line 1107 "parse-gram.c"
break; break;
case 53: /* "\"%{...%}\"" */ case 53: /* "\"%{...%}\"" */
@@ -1111,7 +1112,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1115 "parse-gram.c" #line 1116 "parse-gram.c"
break; break;
case 55: /* "\"type\"" */ case 55: /* "\"type\"" */
@@ -1120,7 +1121,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); }; { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1124 "parse-gram.c" #line 1125 "parse-gram.c"
break; break;
case 82: /* "content" */ case 82: /* "content" */
@@ -1129,7 +1130,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1133 "parse-gram.c" #line 1134 "parse-gram.c"
break; break;
case 83: /* "content.opt" */ case 83: /* "content.opt" */
@@ -1138,7 +1139,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1142 "parse-gram.c" #line 1143 "parse-gram.c"
break; break;
case 84: /* "braceless" */ case 84: /* "braceless" */
@@ -1147,7 +1148,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); }; { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1151 "parse-gram.c" #line 1152 "parse-gram.c"
break; break;
case 85: /* "id" */ case 85: /* "id" */
@@ -1156,7 +1157,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1160 "parse-gram.c" #line 1161 "parse-gram.c"
break; break;
case 86: /* "id_colon" */ case 86: /* "id_colon" */
@@ -1165,7 +1166,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); }; { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1169 "parse-gram.c" #line 1170 "parse-gram.c"
break; break;
case 87: /* "symbol" */ case 87: /* "symbol" */
@@ -1174,7 +1175,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1178 "parse-gram.c" #line 1179 "parse-gram.c"
break; break;
case 88: /* "string_as_id" */ case 88: /* "string_as_id" */
@@ -1183,7 +1184,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); }; { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
/* Line 681 of yacc.c */ /* Line 681 of yacc.c */
#line 1187 "parse-gram.c" #line 1188 "parse-gram.c"
break; break;
default: default:
break; break;
@@ -1707,7 +1708,7 @@ YYLTYPE yylloc;
} }
/* Line 1093 of yacc.c */ /* Line 1093 of yacc.c */
#line 1711 "parse-gram.c" #line 1712 "parse-gram.c"
yylsp[0] = yylloc; yylsp[0] = yylloc;
goto yysetstate; goto yysetstate;
@@ -2193,28 +2194,30 @@ yyreduce:
muscle_code_grow (uniqstr_new (name), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)])); muscle_code_grow (uniqstr_new (name), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
free (name); free (name);
code_scanner_last_string_free (); code_scanner_last_string_free ();
muscle_grow ("used_percent_code_qualifiers", (yyvsp[(2) - (3)].chars), ","); muscle_grow ("used_percent_code_qualifiers", "[[", ",");
muscle_grow ("used_percent_code_qualifiers", (yyvsp[(2) - (3)].chars), "");
muscle_grow ("used_percent_code_qualifiers", "]]", "");
} }
break; break;
case 46: case 46:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 338 "parse-gram.y" #line 340 "parse-gram.y"
{} {}
break; break;
case 47: case 47:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 339 "parse-gram.y" #line 341 "parse-gram.y"
{ muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 48: case 48:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 344 "parse-gram.y" #line 346 "parse-gram.y"
{ {
char const *body = (yyvsp[(3) - (3)].code); char const *body = (yyvsp[(3) - (3)].code);
@@ -2242,14 +2245,14 @@ yyreduce:
case 49: case 49:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 372 "parse-gram.y" #line 374 "parse-gram.y"
{ current_class = nterm_sym; } { current_class = nterm_sym; }
break; break;
case 50: case 50:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 373 "parse-gram.y" #line 375 "parse-gram.y"
{ {
current_class = unknown_sym; current_class = unknown_sym;
current_type = NULL; current_type = NULL;
@@ -2259,14 +2262,14 @@ yyreduce:
case 51: case 51:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 377 "parse-gram.y" #line 379 "parse-gram.y"
{ current_class = token_sym; } { current_class = token_sym; }
break; break;
case 52: case 52:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 378 "parse-gram.y" #line 380 "parse-gram.y"
{ {
current_class = unknown_sym; current_class = unknown_sym;
current_type = NULL; current_type = NULL;
@@ -2276,7 +2279,7 @@ yyreduce:
case 53: case 53:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 383 "parse-gram.y" #line 385 "parse-gram.y"
{ {
symbol_list *list; symbol_list *list;
tag_seen = true; tag_seen = true;
@@ -2289,7 +2292,7 @@ yyreduce:
case 54: case 54:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 394 "parse-gram.y" #line 396 "parse-gram.y"
{ {
symbol_list *list; symbol_list *list;
++current_prec; ++current_prec;
@@ -2306,98 +2309,98 @@ yyreduce:
case 55: case 55:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 408 "parse-gram.y" #line 410 "parse-gram.y"
{ (yyval.assoc) = left_assoc; } { (yyval.assoc) = left_assoc; }
break; break;
case 56: case 56:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 409 "parse-gram.y" #line 411 "parse-gram.y"
{ (yyval.assoc) = right_assoc; } { (yyval.assoc) = right_assoc; }
break; break;
case 57: case 57:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 410 "parse-gram.y" #line 412 "parse-gram.y"
{ (yyval.assoc) = non_assoc; } { (yyval.assoc) = non_assoc; }
break; break;
case 58: case 58:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 414 "parse-gram.y" #line 416 "parse-gram.y"
{ current_type = NULL; } { current_type = NULL; }
break; break;
case 59: case 59:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 415 "parse-gram.y" #line 417 "parse-gram.y"
{ current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; } { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
break; break;
case 60: case 60:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 421 "parse-gram.y" #line 423 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break; break;
case 61: case 61:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 423 "parse-gram.y" #line 425 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); } { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
break; break;
case 62: case 62:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 427 "parse-gram.y" #line 429 "parse-gram.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); } { (yyval.list) = (yyvsp[(1) - (1)].list); }
break; break;
case 63: case 63:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 428 "parse-gram.y" #line 430 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); } { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break; break;
case 64: case 64:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 432 "parse-gram.y" #line 434 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break; break;
case 65: case 65:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 433 "parse-gram.y" #line 435 "parse-gram.y"
{ (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 66: case 66:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 434 "parse-gram.y" #line 436 "parse-gram.y"
{ (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
break; break;
case 67: case 67:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 435 "parse-gram.y" #line 437 "parse-gram.y"
{ (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); } { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
break; break;
case 68: case 68:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 441 "parse-gram.y" #line 443 "parse-gram.y"
{ {
current_type = (yyvsp[(1) - (1)].uniqstr); current_type = (yyvsp[(1) - (1)].uniqstr);
tag_seen = true; tag_seen = true;
@@ -2407,7 +2410,7 @@ yyreduce:
case 69: case 69:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 446 "parse-gram.y" #line 448 "parse-gram.y"
{ {
symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true); symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)])); symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)]));
@@ -2417,7 +2420,7 @@ yyreduce:
case 70: case 70:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 451 "parse-gram.y" #line 453 "parse-gram.y"
{ {
symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
@@ -2428,7 +2431,7 @@ yyreduce:
case 71: case 71:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 457 "parse-gram.y" #line 459 "parse-gram.y"
{ {
symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true); symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)])); symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
@@ -2439,7 +2442,7 @@ yyreduce:
case 72: case 72:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 463 "parse-gram.y" #line 465 "parse-gram.y"
{ {
symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true); symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)])); symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));
@@ -2451,7 +2454,7 @@ yyreduce:
case 79: case 79:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 493 "parse-gram.y" #line 495 "parse-gram.y"
{ {
yyerrok; yyerrok;
} }
@@ -2460,70 +2463,70 @@ yyreduce:
case 80: case 80:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 499 "parse-gram.y" #line 501 "parse-gram.y"
{ current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); } { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
break; break;
case 82: case 82:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 503 "parse-gram.y" #line 505 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(1) - (1)])); } { grammar_current_rule_end ((yylsp[(1) - (1)])); }
break; break;
case 83: case 83:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 504 "parse-gram.y" #line 506 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(3) - (3)])); } { grammar_current_rule_end ((yylsp[(3) - (3)])); }
break; break;
case 85: case 85:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 510 "parse-gram.y" #line 512 "parse-gram.y"
{ grammar_current_rule_begin (current_lhs, current_lhs_location); } { grammar_current_rule_begin (current_lhs, current_lhs_location); }
break; break;
case 86: case 86:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 512 "parse-gram.y" #line 514 "parse-gram.y"
{ grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); } { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
break; break;
case 87: case 87:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 514 "parse-gram.y" #line 516 "parse-gram.y"
{ grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); } { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break; break;
case 88: case 88:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 516 "parse-gram.y" #line 518 "parse-gram.y"
{ grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); } { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
break; break;
case 89: case 89:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 518 "parse-gram.y" #line 520 "parse-gram.y"
{ grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); } { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
break; break;
case 90: case 90:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 520 "parse-gram.y" #line 522 "parse-gram.y"
{ grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); } { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
break; break;
case 93: case 93:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 536 "parse-gram.y" #line 538 "parse-gram.y"
{ {
static char one[] = "1"; static char one[] = "1";
(yyval.chars) = one; (yyval.chars) = one;
@@ -2533,7 +2536,7 @@ yyreduce:
case 95: case 95:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 546 "parse-gram.y" #line 548 "parse-gram.y"
{ {
code_props plain_code; code_props plain_code;
(yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n'; (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
@@ -2547,14 +2550,14 @@ yyreduce:
case 96: case 96:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 566 "parse-gram.y" #line 568 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 97: case 97:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 568 "parse-gram.y" #line 570 "parse-gram.y"
{ {
(yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)])); (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
@@ -2565,14 +2568,14 @@ yyreduce:
case 98: case 98:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 576 "parse-gram.y" #line 578 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); } { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break; break;
case 101: case 101:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 588 "parse-gram.y" #line 590 "parse-gram.y"
{ {
(yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)])); (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false); symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
@@ -2582,7 +2585,7 @@ yyreduce:
case 103: case 103:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 597 "parse-gram.y" #line 599 "parse-gram.y"
{ {
code_props plain_code; code_props plain_code;
code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
@@ -2596,7 +2599,7 @@ yyreduce:
/* Line 1280 of yacc.c */ /* Line 1280 of yacc.c */
#line 2600 "parse-gram.c" #line 2603 "parse-gram.c"
default: break; default: break;
} }
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2815,7 +2818,7 @@ yyreturn:
/* Line 1497 of yacc.c */ /* Line 1497 of yacc.c */
#line 607 "parse-gram.y" #line 609 "parse-gram.y"

4
src/parse-gram.h
View File

@@ -1,3 +1,4 @@
/* A Bison parser, made by GNU Bison 2.3a+. */ /* A Bison parser, made by GNU Bison 2.3a+. */
/* Skeleton interface for Bison's Yacc-like parsers in C /* Skeleton interface for Bison's Yacc-like parsers in C
@@ -178,7 +179,7 @@ typedef union YYSTYPE
} }
/* Line 1546 of yacc.c */ /* Line 1546 of yacc.c */
#line 182 "parse-gram.h" #line 183 "parse-gram.h"
YYSTYPE; YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -203,4 +204,3 @@ typedef struct YYLTYPE

4
src/parse-gram.y
View File

@@ -323,7 +323,9 @@ grammar_declaration:
muscle_code_grow (uniqstr_new (name), $3, @3); muscle_code_grow (uniqstr_new (name), $3, @3);
free (name); free (name);
code_scanner_last_string_free (); code_scanner_last_string_free ();
muscle_grow ("used_percent_code_qualifiers", $2, ","); muscle_grow ("used_percent_code_qualifiers", "[[", ",");
muscle_grow ("used_percent_code_qualifiers", $2, "");
muscle_grow ("used_percent_code_qualifiers", "]]", "");
} }
; ;