Actually handle the yytable zero value correctly this time.

* data/glr.c, data/lalr1.cc, data/lalr1.java, data/yacc.c: Don't
mention zero values in the YYTABLE comments.
* data/glr.c (yytable_value_is_error): Don't check for zero
value.
* data/lalr1.cc (yy_table_value_is_error_): Likewise.
* data/yacc.c (yytable_value_is_error): Likewise.
* data/lalr1.java (yy_table_value_is_error_): Likewise.
(yysyntax_error): Fix typo in code: use yytable_ not yycheck_.
* src/tables.h: In header comments, explain why it's useless to
check for a zero value in yytable.
(cherry picked from commit aa0cb40d61)

Conflicts:

	data/bison.m4
	data/lalr1.java
This commit is contained in:
Joel E. Denny
2009-08-26 02:40:38 -04:00
parent d5eb0826af
commit e4bcae3c5a
9 changed files with 184 additions and 164 deletions

View File

@@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 2.4.1.122-1fa3-dirty. */
/* A Bison parser, made by GNU Bison 2.4.1.124-faff. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
@@ -45,7 +45,7 @@
#define YYBISON 1
/* Bison version. */
#define YYBISON_VERSION "2.4.1.122-1fa3-dirty"
#define YYBISON_VERSION "2.4.1.124-faff"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -823,7 +823,7 @@ static const yytype_int16 yypgoto[] =
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero or YYTABLE_NINF, syntax error. */
number is the opposite. If YYTABLE_NINF, syntax error. */
#define YYTABLE_NINF -107
static const yytype_int16 yytable[] =
{
@@ -849,8 +849,7 @@ static const yytype_int16 yytable[] =
((yystate) == (-60))
#define yytable_value_is_error(yytable_value) \
(YYID (0) \
|| ((yytable_value) == (0)))
YYID (0)
static const yytype_uint8 yycheck[] =
{
@@ -1040,147 +1039,147 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
{
case 3: /* "\"string\"" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 184 "parse-gram.y"
{ fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
/* Line 722 of yacc.c */
#line 1049 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1048 "parse-gram.c"
break;
case 4: /* "\"integer\"" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 196 "parse-gram.y"
{ fprintf (stderr, "%d", (yyvaluep->integer)); };
/* Line 722 of yacc.c */
#line 1058 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1057 "parse-gram.c"
break;
case 43: /* "\"{...}\"" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
/* Line 722 of yacc.c */
#line 1067 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1066 "parse-gram.c"
break;
case 44: /* "\"char\"" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 178 "parse-gram.y"
{ fputs (char_name ((yyvaluep->character)), stderr); };
/* Line 722 of yacc.c */
#line 1076 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1075 "parse-gram.c"
break;
case 45: /* "\"epilogue\"" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 722 of yacc.c */
#line 1085 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1084 "parse-gram.c"
break;
case 47: /* "\"identifier\"" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 192 "parse-gram.y"
{ fputs ((yyvaluep->uniqstr), stderr); };
/* Line 722 of yacc.c */
#line 1094 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1093 "parse-gram.c"
break;
case 48: /* "\"identifier:\"" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 193 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
/* Line 722 of yacc.c */
#line 1103 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1102 "parse-gram.c"
break;
case 51: /* "\"%{...%}\"" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 722 of yacc.c */
#line 1112 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1111 "parse-gram.c"
break;
case 53: /* "\"type\"" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 191 "parse-gram.y"
{ fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
/* Line 722 of yacc.c */
#line 1121 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1120 "parse-gram.c"
break;
case 84: /* "variable" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 192 "parse-gram.y"
{ fputs ((yyvaluep->uniqstr), stderr); };
/* Line 722 of yacc.c */
#line 1130 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1129 "parse-gram.c"
break;
case 85: /* "content.opt" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 722 of yacc.c */
#line 1139 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1138 "parse-gram.c"
break;
case 86: /* "braceless" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 186 "parse-gram.y"
{ fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
/* Line 722 of yacc.c */
#line 1148 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1147 "parse-gram.c"
break;
case 87: /* "id" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
/* Line 722 of yacc.c */
#line 1157 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1156 "parse-gram.c"
break;
case 88: /* "id_colon" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 200 "parse-gram.y"
{ fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
/* Line 722 of yacc.c */
#line 1166 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1165 "parse-gram.c"
break;
case 89: /* "symbol" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
/* Line 722 of yacc.c */
#line 1175 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1174 "parse-gram.c"
break;
case 90: /* "string_as_id" */
/* Line 722 of yacc.c */
/* Line 721 of yacc.c */
#line 199 "parse-gram.y"
{ fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
/* Line 722 of yacc.c */
#line 1184 "parse-gram.c"
/* Line 721 of yacc.c */
#line 1183 "parse-gram.c"
break;
default:
break;
@@ -1701,7 +1700,7 @@ YYLTYPE yylloc;
/* User initialization code. */
/* Line 1251 of yacc.c */
/* Line 1250 of yacc.c */
#line 86 "parse-gram.y"
{
/* Bison's grammar can initial empty locations, hence a default
@@ -1710,8 +1709,8 @@ YYLTYPE yylloc;
boundary_set (&yylloc.end, current_file, 1, 1);
}
/* Line 1251 of yacc.c */
#line 1715 "parse-gram.c"
/* Line 1250 of yacc.c */
#line 1714 "parse-gram.c"
yylsp[0] = yylloc;
goto yysetstate;
@@ -1898,7 +1897,7 @@ yyreduce:
{
case 6:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 223 "parse-gram.y"
{
code_props plain_code;
@@ -1913,14 +1912,14 @@ yyreduce:
case 7:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 232 "parse-gram.y"
{ debug_flag = true; }
break;
case 8:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 234 "parse-gram.y"
{
muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars),
@@ -1930,14 +1929,14 @@ yyreduce:
case 9:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 238 "parse-gram.y"
{ defines_flag = true; }
break;
case 10:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 240 "parse-gram.y"
{
defines_flag = true;
@@ -1947,42 +1946,42 @@ yyreduce:
case 11:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 244 "parse-gram.y"
{ error_verbose = true; }
break;
case 12:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 245 "parse-gram.y"
{ expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
break;
case 13:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 246 "parse-gram.y"
{ expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
break;
case 14:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 247 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(2) - (2)].chars); }
break;
case 15:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 248 "parse-gram.y"
{ spec_file_prefix = (yyvsp[(3) - (3)].chars); }
break;
case 16:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 250 "parse-gram.y"
{
nondeterministic_parser = true;
@@ -1992,7 +1991,7 @@ yyreduce:
case 17:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 255 "parse-gram.y"
{
code_props action;
@@ -2006,77 +2005,77 @@ yyreduce:
case 18:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 263 "parse-gram.y"
{ language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
break;
case 19:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 264 "parse-gram.y"
{ add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
case 20:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 265 "parse-gram.y"
{ locations_flag = true; }
break;
case 21:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 266 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(2) - (2)].chars); }
break;
case 22:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 267 "parse-gram.y"
{ spec_name_prefix = (yyvsp[(3) - (3)].chars); }
break;
case 23:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 268 "parse-gram.y"
{ no_lines_flag = true; }
break;
case 24:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 269 "parse-gram.y"
{ nondeterministic_parser = true; }
break;
case 25:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 270 "parse-gram.y"
{ spec_outfile = (yyvsp[(2) - (2)].chars); }
break;
case 26:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 271 "parse-gram.y"
{ spec_outfile = (yyvsp[(3) - (3)].chars); }
break;
case 27:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 272 "parse-gram.y"
{ add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
break;
case 28:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 274 "parse-gram.y"
{
/* %pure-parser is deprecated in favor of `%define api.pure', so use
@@ -2096,14 +2095,14 @@ yyreduce:
case 29:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 288 "parse-gram.y"
{ version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
break;
case 30:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 290 "parse-gram.y"
{
char const *skeleton_user = (yyvsp[(2) - (2)].chars);
@@ -2132,28 +2131,28 @@ yyreduce:
case 31:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 313 "parse-gram.y"
{ token_table_flag = true; }
break;
case 32:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 314 "parse-gram.y"
{ report_flag |= report_states; }
break;
case 33:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 315 "parse-gram.y"
{ yacc_flag = true; }
break;
case 37:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 323 "parse-gram.y"
{
grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
@@ -2162,7 +2161,7 @@ yyreduce:
case 38:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 327 "parse-gram.y"
{
symbol_list *list;
@@ -2174,7 +2173,7 @@ yyreduce:
case 39:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 334 "parse-gram.y"
{
symbol_list *list;
@@ -2186,7 +2185,7 @@ yyreduce:
case 40:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 341 "parse-gram.y"
{
default_prec = true;
@@ -2195,7 +2194,7 @@ yyreduce:
case 41:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 345 "parse-gram.y"
{
default_prec = false;
@@ -2204,7 +2203,7 @@ yyreduce:
case 42:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 349 "parse-gram.y"
{
/* Do not invoke muscle_percent_code_grow here since it invokes
@@ -2216,7 +2215,7 @@ yyreduce:
case 43:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 356 "parse-gram.y"
{
muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
@@ -2226,21 +2225,21 @@ yyreduce:
case 44:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 370 "parse-gram.y"
{}
break;
case 45:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 371 "parse-gram.y"
{ muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
case 46:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 376 "parse-gram.y"
{
union_seen = true;
@@ -2251,14 +2250,14 @@ yyreduce:
case 47:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 387 "parse-gram.y"
{ current_class = nterm_sym; }
break;
case 48:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 388 "parse-gram.y"
{
current_class = unknown_sym;
@@ -2268,14 +2267,14 @@ yyreduce:
case 49:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 392 "parse-gram.y"
{ current_class = token_sym; }
break;
case 50:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 393 "parse-gram.y"
{
current_class = unknown_sym;
@@ -2285,7 +2284,7 @@ yyreduce:
case 51:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 398 "parse-gram.y"
{
symbol_list *list;
@@ -2298,7 +2297,7 @@ yyreduce:
case 52:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 409 "parse-gram.y"
{
symbol_list *list;
@@ -2315,126 +2314,126 @@ yyreduce:
case 53:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 423 "parse-gram.y"
{ (yyval.assoc) = left_assoc; }
break;
case 54:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 424 "parse-gram.y"
{ (yyval.assoc) = right_assoc; }
break;
case 55:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 425 "parse-gram.y"
{ (yyval.assoc) = non_assoc; }
break;
case 56:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 429 "parse-gram.y"
{ current_type = NULL; }
break;
case 57:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 430 "parse-gram.y"
{ current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
break;
case 58:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 436 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
case 59:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 438 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
break;
case 60:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 442 "parse-gram.y"
{ (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
break;
case 61:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 443 "parse-gram.y"
{ (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
break;
case 62:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 449 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
case 63:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 451 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
break;
case 64:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 455 "parse-gram.y"
{ (yyval.list) = (yyvsp[(1) - (1)].list); }
break;
case 65:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 456 "parse-gram.y"
{ (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
break;
case 66:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 460 "parse-gram.y"
{ (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
break;
case 67:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 461 "parse-gram.y"
{ (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
case 68:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 462 "parse-gram.y"
{ (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
break;
case 69:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 463 "parse-gram.y"
{ (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
break;
case 70:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 469 "parse-gram.y"
{
current_type = (yyvsp[(1) - (1)].uniqstr);
@@ -2444,7 +2443,7 @@ yyreduce:
case 71:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 474 "parse-gram.y"
{
symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
@@ -2454,7 +2453,7 @@ yyreduce:
case 72:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 479 "parse-gram.y"
{
symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
@@ -2465,7 +2464,7 @@ yyreduce:
case 73:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 485 "parse-gram.y"
{
symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
@@ -2476,7 +2475,7 @@ yyreduce:
case 74:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 491 "parse-gram.y"
{
symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
@@ -2488,7 +2487,7 @@ yyreduce:
case 81:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 521 "parse-gram.y"
{
yyerrok;
@@ -2497,7 +2496,7 @@ yyreduce:
case 82:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 527 "parse-gram.y"
{ current_lhs = (yyvsp[(1) - (2)].symbol); current_lhs_location = (yylsp[(1) - (2)]);
current_lhs_named_ref = (yyvsp[(2) - (2)].named_ref); }
@@ -2505,21 +2504,21 @@ yyreduce:
case 84:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 532 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(1) - (1)])); }
break;
case 85:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 533 "parse-gram.y"
{ grammar_current_rule_end ((yylsp[(3) - (3)])); }
break;
case 87:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 539 "parse-gram.y"
{ grammar_current_rule_begin (current_lhs, current_lhs_location,
current_lhs_named_ref); }
@@ -2527,70 +2526,70 @@ yyreduce:
case 88:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 542 "parse-gram.y"
{ grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
break;
case 89:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 544 "parse-gram.y"
{ grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
break;
case 90:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 546 "parse-gram.y"
{ grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
break;
case 91:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 548 "parse-gram.y"
{ grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
break;
case 92:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 550 "parse-gram.y"
{ grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
break;
case 93:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 554 "parse-gram.y"
{ (yyval.named_ref) = 0; }
break;
case 94:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 556 "parse-gram.y"
{ (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
case 96:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 568 "parse-gram.y"
{ (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
break;
case 97:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 573 "parse-gram.y"
{ (yyval.chars) = ""; }
break;
case 99:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 584 "parse-gram.y"
{
code_props plain_code;
@@ -2604,14 +2603,14 @@ yyreduce:
case 100:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 604 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
case 101:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 606 "parse-gram.y"
{
(yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
@@ -2622,14 +2621,14 @@ yyreduce:
case 102:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 614 "parse-gram.y"
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
break;
case 105:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 626 "parse-gram.y"
{
(yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
@@ -2639,7 +2638,7 @@ yyreduce:
case 107:
/* Line 1464 of yacc.c */
/* Line 1463 of yacc.c */
#line 635 "parse-gram.y"
{
code_props plain_code;
@@ -2653,8 +2652,8 @@ yyreduce:
/* Line 1464 of yacc.c */
#line 2658 "parse-gram.c"
/* Line 1463 of yacc.c */
#line 2657 "parse-gram.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2872,7 +2871,7 @@ yyreturn:
/* Line 1684 of yacc.c */
/* Line 1683 of yacc.c */
#line 645 "parse-gram.y"

View File

@@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 2.4.1.122-1fa3-dirty. */
/* A Bison parser, made by GNU Bison 2.4.1.124-faff. */
/* Skeleton interface for Bison's Yacc-like parsers in C
@@ -161,7 +161,7 @@
typedef union YYSTYPE
{
/* Line 1685 of yacc.c */
/* Line 1684 of yacc.c */
#line 94 "parse-gram.y"
symbol *symbol;
@@ -176,7 +176,7 @@ typedef union YYSTYPE
/* Line 1685 of yacc.c */
/* Line 1684 of yacc.c */
#line 181 "parse-gram.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1

View File

@@ -126,7 +126,7 @@ static int table_size = 32768;
base_number *table;
base_number *check;
/* The value used in TABLE to denote explicit syntax errors
(%nonassoc), a negative infinite. First defaults to ACTION_NUMBER_MININUM,
(%nonassoc), a negative infinite. First defaults to ACTION_NUMBER_MINIMUM,
but in order to keep small tables, renumbered as TABLE_ERROR, which
is the smallest (non error) value minus 1. */
base_number table_ninf = 0;

View File

@@ -48,7 +48,7 @@
YYFINAL = the state number of the termination state.
YYTABLE = a vector filled with portions for different uses, found
via YYPACT and YYPGOTO.
via YYPACT and YYPGOTO, described below.
YYLAST ( = high) the number of the last element of YYTABLE, i.e.,
sizeof (YYTABLE) - 1.
@@ -87,7 +87,7 @@
If the value is negative, it is minus a rule number to reduce by.
If the value is zero or YYTABLE_NINF, it's a syntax error.
If the value is YYTABLE_NINF, it's a syntax error.
YYPGOTO[I] = the index in YYTABLE of the portion describing what to
do after reducing a rule that derives variable I + NTOKENS. This
@@ -99,6 +99,16 @@
YYCHECK[YYPGOTO[I] + S] != S), then the default state (that is,
YYDEFGOTO[I]) should be used instead of YYTABLE. Otherwise,
YYTABLE[YYPGOTO[I] + S] is the state to go to even if YYPGOTO[I] < 0.
When the above YYPACT, YYPGOTO, and YYCHECK tests determine that a
value from YYTABLE should be used, that value is never zero, so it is
useless to check for zero. When those tests indicate that the value
from YYDEFACT or YYDEFGOTO should be used instead, the value from
YYTABLE *might* be zero, which, as a consequence of the way in which
the tables are constructed, also happens to indicate that YYDEFACT or
YYDEFGOTO should be used. However, the YYTABLE value cannot be
trusted when the YYDEFACT or YYDEFGOTO value should be used. In
summary, forget about zero values in YYTABLE.
*/
extern int nvectors;