[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] regen
|
From: |
Valentin Tolmer |
|
Subject: |
[PATCH 2/2] regen |
|
Date: |
Tue, 30 Jul 2013 17:37:34 +0200 |
From: nitnelave <address@hidden>
---
src/parse-gram.c | 245 +++++++++++++++++++++++++++---------------------------
src/parse-gram.h | 6 +-
2 files changed, 126 insertions(+), 125 deletions(-)
diff --git a/src/parse-gram.c b/src/parse-gram.c
index 17d0418..220c696 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.7.90. */
+/* A Bison parser, made by GNU Bison 2.7.90.8-9816b-dirty. */
/* Bison implementation for Yacc-like parsers in C
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.7.90"
+#define YYBISON_VERSION "2.7.90.8-9816b-dirty"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -129,7 +129,7 @@ extern int gram_debug;
param_parse = 1 << 1,
param_both = param_lex | param_parse
} param_type;
-#line 645 "src/parse-gram.y" /* yacc.c:372 */
+#line 646 "src/parse-gram.y" /* yacc.c:372 */
#include "muscle-tab.h"
#line 136 "src/parse-gram.c" /* yacc.c:372 */
@@ -223,7 +223,7 @@ named_ref *named_ref;
param_type param;
#line 409 "src/parse-gram.y" /* yacc.c:372 */
code_props_type code_type;
-#line 647 "src/parse-gram.y" /* yacc.c:372 */
+#line 648 "src/parse-gram.y" /* yacc.c:372 */
struct
{
@@ -584,13 +584,13 @@ static const yytype_uint16 yyrline[] =
322, 323, 324, 324, 325, 326, 350, 351, 352, 353,
357, 358, 367, 368, 369, 373, 385, 389, 393, 401,
412, 413, 423, 424, 428, 440, 440, 445, 445, 450,
- 461, 476, 477, 478, 479, 483, 484, 489, 491, 496,
- 501, 511, 513, 518, 519, 523, 524, 528, 529, 530,
- 535, 540, 545, 551, 557, 568, 569, 578, 579, 585,
- 586, 587, 594, 594, 602, 603, 604, 609, 612, 614,
- 616, 618, 620, 622, 624, 629, 630, 640, 641, 666,
- 667, 668, 669, 681, 683, 692, 697, 698, 703, 711,
- 712
+ 461, 477, 478, 479, 480, 484, 485, 490, 492, 497,
+ 502, 512, 514, 519, 520, 524, 525, 529, 530, 531,
+ 536, 541, 546, 552, 558, 569, 570, 579, 580, 586,
+ 587, 588, 595, 595, 603, 604, 605, 610, 613, 615,
+ 617, 619, 621, 623, 625, 630, 631, 641, 642, 667,
+ 668, 669, 670, 682, 684, 693, 698, 699, 704, 712,
+ 713
};
#endif
@@ -1075,7 +1075,7 @@ yy_symbol_value_print (FILE *yyoutput, int yytype,
YYSTYPE const * const yyvalue
break;
case 89: /* value */
-#line 656 "src/parse-gram.y" /* yacc.c:701 */
+#line 657 "src/parse-gram.y" /* yacc.c:701 */
{
switch (((*yyvaluep).value).kind)
{
@@ -2346,7 +2346,7 @@ yyreduce:
symbol_list *list;
tag_seen = true;
for (list = (yyvsp[0].list); list; list = list->next)
- symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
+ symbol_type_set (list->content.sym->content, (yyvsp[-1].uniqstr),
(yylsp[-1]));
symbol_list_free ((yyvsp[0].list));
}
#line 2353 "src/parse-gram.c" /* yacc.c:1663 */
@@ -2359,347 +2359,348 @@ yyreduce:
++current_prec;
for (list = (yyvsp[0].list); list; list = list->next)
{
- symbol_type_set (list->content.sym, current_type, (yylsp[-1]));
- symbol_precedence_set (list->content.sym, current_prec,
(yyvsp[-2].assoc), (yylsp[-2]));
+ symbol_type_set (list->content.sym->content, current_type,
(yylsp[-1]));
+ symbol_precedence_set (list->content.sym, current_prec,
+ (yyvsp[-2].assoc), (yylsp[-2]));
}
symbol_list_free ((yyvsp[0].list));
current_type = NULL;
}
-#line 2369 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2370 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 51:
-#line 476 "src/parse-gram.y" /* yacc.c:1663 */
+#line 477 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.assoc) = left_assoc; }
-#line 2375 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2376 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 52:
-#line 477 "src/parse-gram.y" /* yacc.c:1663 */
+#line 478 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.assoc) = right_assoc; }
-#line 2381 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2382 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 53:
-#line 478 "src/parse-gram.y" /* yacc.c:1663 */
+#line 479 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.assoc) = non_assoc; }
-#line 2387 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2388 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 54:
-#line 479 "src/parse-gram.y" /* yacc.c:1663 */
+#line 480 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.assoc) = precedence_assoc; }
-#line 2393 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2394 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 55:
-#line 483 "src/parse-gram.y" /* yacc.c:1663 */
+#line 484 "src/parse-gram.y" /* yacc.c:1663 */
{ current_type = NULL; }
-#line 2399 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2400 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 56:
-#line 484 "src/parse-gram.y" /* yacc.c:1663 */
+#line 485 "src/parse-gram.y" /* yacc.c:1663 */
{ current_type = (yyvsp[0].uniqstr); tag_seen = true; }
-#line 2405 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2406 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 57:
-#line 490 "src/parse-gram.y" /* yacc.c:1663 */
+#line 491 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2411 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2412 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 58:
-#line 492 "src/parse-gram.y" /* yacc.c:1663 */
+#line 493 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new
((yyvsp[0].symbol), (yylsp[0]))); }
-#line 2417 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2418 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 59:
-#line 497 "src/parse-gram.y" /* yacc.c:1663 */
+#line 498 "src/parse-gram.y" /* yacc.c:1663 */
{
(yyval.symbol) = (yyvsp[0].symbol);
symbol_class_set ((yyvsp[0].symbol), token_sym, (yylsp[0]), false);
}
-#line 2426 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2427 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 60:
-#line 502 "src/parse-gram.y" /* yacc.c:1663 */
+#line 503 "src/parse-gram.y" /* yacc.c:1663 */
{
(yyval.symbol) = (yyvsp[-1].symbol);
- symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer),
(yylsp[0]));
+ symbol_user_token_number_set ((yyvsp[-1].symbol)->content,
(yyvsp[0].integer), (yylsp[0]));
symbol_class_set ((yyvsp[-1].symbol), token_sym, (yylsp[-1]), false);
}
-#line 2436 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2437 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 61:
-#line 512 "src/parse-gram.y" /* yacc.c:1663 */
+#line 513 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2442 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2443 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 62:
-#line 514 "src/parse-gram.y" /* yacc.c:1663 */
+#line 515 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new
((yyvsp[0].symbol), (yylsp[0]))); }
-#line 2448 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2449 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 63:
-#line 518 "src/parse-gram.y" /* yacc.c:1663 */
+#line 519 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = (yyvsp[0].list); }
-#line 2454 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2455 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 64:
-#line 519 "src/parse-gram.y" /* yacc.c:1663 */
+#line 520 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); }
-#line 2460 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2461 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 65:
-#line 523 "src/parse-gram.y" /* yacc.c:1663 */
+#line 524 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2466 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2467 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 66:
-#line 524 "src/parse-gram.y" /* yacc.c:1663 */
+#line 525 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2472 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2473 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 68:
-#line 529 "src/parse-gram.y" /* yacc.c:1663 */
+#line 530 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.uniqstr) = uniqstr_new ("*"); }
-#line 2478 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2479 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 69:
-#line 530 "src/parse-gram.y" /* yacc.c:1663 */
+#line 531 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.uniqstr) = uniqstr_new (""); }
-#line 2484 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2485 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 70:
-#line 536 "src/parse-gram.y" /* yacc.c:1663 */
+#line 537 "src/parse-gram.y" /* yacc.c:1663 */
{
current_type = (yyvsp[0].uniqstr);
tag_seen = true;
}
-#line 2493 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2494 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 71:
-#line 541 "src/parse-gram.y" /* yacc.c:1663 */
+#line 542 "src/parse-gram.y" /* yacc.c:1663 */
{
symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
- symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
+ symbol_type_set ((yyvsp[0].symbol)->content, current_type, (yylsp[0]));
}
-#line 2502 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2503 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 72:
-#line 546 "src/parse-gram.y" /* yacc.c:1663 */
+#line 547 "src/parse-gram.y" /* yacc.c:1663 */
{
symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
- symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
- symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer),
(yylsp[0]));
+ symbol_type_set ((yyvsp[-1].symbol)->content, current_type, (yylsp[-1]));
+ symbol_user_token_number_set ((yyvsp[-1].symbol)->content,
(yyvsp[0].integer), (yylsp[0]));
}
-#line 2512 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2513 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 73:
-#line 552 "src/parse-gram.y" /* yacc.c:1663 */
+#line 553 "src/parse-gram.y" /* yacc.c:1663 */
{
symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
- symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
+ symbol_type_set ((yyvsp[-1].symbol)->content, current_type, (yylsp[-1]));
symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));
}
-#line 2522 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2523 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 74:
-#line 558 "src/parse-gram.y" /* yacc.c:1663 */
+#line 559 "src/parse-gram.y" /* yacc.c:1663 */
{
symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
- symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
- symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer),
(yylsp[-1]));
+ symbol_type_set ((yyvsp[-2].symbol)->content, current_type, (yylsp[-2]));
+ symbol_user_token_number_set ((yyvsp[-2].symbol)->content,
(yyvsp[-1].integer), (yylsp[-1]));
symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));
}
-#line 2533 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2534 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 81:
-#line 588 "src/parse-gram.y" /* yacc.c:1663 */
+#line 589 "src/parse-gram.y" /* yacc.c:1663 */
{
yyerrok;
}
-#line 2541 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2542 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 82:
-#line 594 "src/parse-gram.y" /* yacc.c:1663 */
+#line 595 "src/parse-gram.y" /* yacc.c:1663 */
{ current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
-#line 2547 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2548 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 83:
-#line 595 "src/parse-gram.y" /* yacc.c:1663 */
+#line 596 "src/parse-gram.y" /* yacc.c:1663 */
{
/* Free the current lhs. */
current_lhs (0, (yylsp[-3]), 0);
}
-#line 2556 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2557 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 84:
-#line 602 "src/parse-gram.y" /* yacc.c:1663 */
+#line 603 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_end ((yylsp[0])); }
-#line 2562 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2563 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 85:
-#line 603 "src/parse-gram.y" /* yacc.c:1663 */
+#line 604 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_end ((yylsp[0])); }
-#line 2568 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2569 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 87:
-#line 610 "src/parse-gram.y" /* yacc.c:1663 */
+#line 611 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
current_lhs_named_ref); }
-#line 2575 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2576 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 88:
-#line 613 "src/parse-gram.y" /* yacc.c:1663 */
+#line 614 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]),
(yyvsp[0].named_ref)); }
-#line 2581 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2582 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 89:
-#line 615 "src/parse-gram.y" /* yacc.c:1663 */
+#line 616 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]),
(yyvsp[0].named_ref), false); }
-#line 2587 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2588 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 90:
-#line 617 "src/parse-gram.y" /* yacc.c:1663 */
+#line 618 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL,
true); }
-#line 2593 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2594 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 91:
-#line 619 "src/parse-gram.y" /* yacc.c:1663 */
+#line 620 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_empty_set ((yylsp[0])); }
-#line 2599 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2600 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 92:
-#line 621 "src/parse-gram.y" /* yacc.c:1663 */
+#line 622 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2605 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2606 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 93:
-#line 623 "src/parse-gram.y" /* yacc.c:1663 */
+#line 624 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
-#line 2611 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2612 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 94:
-#line 625 "src/parse-gram.y" /* yacc.c:1663 */
+#line 626 "src/parse-gram.y" /* yacc.c:1663 */
{ grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2617 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2618 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 95:
-#line 629 "src/parse-gram.y" /* yacc.c:1663 */
+#line 630 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.named_ref) = 0; }
-#line 2623 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2624 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 96:
-#line 630 "src/parse-gram.y" /* yacc.c:1663 */
+#line 631 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.named_ref) = named_ref_new ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2629 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2630 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 98:
-#line 641 "src/parse-gram.y" /* yacc.c:1663 */
+#line 642 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.uniqstr) = uniqstr_new ((yyvsp[0].code)); }
-#line 2635 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2636 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 99:
-#line 666 "src/parse-gram.y" /* yacc.c:1663 */
+#line 667 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; }
-#line 2641 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2642 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 100:
-#line 667 "src/parse-gram.y" /* yacc.c:1663 */
+#line 668 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.value).kind = muscle_keyword; (yyval.value).chars =
(yyvsp[0].uniqstr); }
-#line 2647 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2648 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 101:
-#line 668 "src/parse-gram.y" /* yacc.c:1663 */
+#line 669 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.value).kind = muscle_string; (yyval.value).chars =
(yyvsp[0].code); }
-#line 2653 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2654 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 102:
-#line 669 "src/parse-gram.y" /* yacc.c:1663 */
+#line 670 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.value).kind = muscle_code; (yyval.value).chars = strip_braces
((yyvsp[0].code)); }
-#line 2659 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2660 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 103:
-#line 682 "src/parse-gram.y" /* yacc.c:1663 */
+#line 683 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2665 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2666 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 104:
-#line 684 "src/parse-gram.y" /* yacc.c:1663 */
+#line 685 "src/parse-gram.y" /* yacc.c:1663 */
{
(yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)),
(yylsp[0]));
symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
- symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character),
(yylsp[0]));
+ symbol_user_token_number_set ((yyval.symbol)->content,
(yyvsp[0].character), (yylsp[0]));
}
-#line 2675 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2676 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 105:
-#line 692 "src/parse-gram.y" /* yacc.c:1663 */
+#line 693 "src/parse-gram.y" /* yacc.c:1663 */
{ (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-#line 2681 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2682 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 108:
-#line 704 "src/parse-gram.y" /* yacc.c:1663 */
+#line 705 "src/parse-gram.y" /* yacc.c:1663 */
{
(yyval.symbol) = symbol_get (quotearg_style (c_quoting_style,
(yyvsp[0].code)), (yylsp[0]));
symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
}
-#line 2690 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2691 "src/parse-gram.c" /* yacc.c:1663 */
break;
case 110:
-#line 713 "src/parse-gram.y" /* yacc.c:1663 */
+#line 714 "src/parse-gram.y" /* yacc.c:1663 */
{
muscle_code_grow ("epilogue", translate_code ((yyvsp[0].code),
(yylsp[0]), true), (yylsp[0]));
code_scanner_last_string_free ();
}
-#line 2699 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2700 "src/parse-gram.c" /* yacc.c:1663 */
break;
-#line 2703 "src/parse-gram.c" /* yacc.c:1663 */
+#line 2704 "src/parse-gram.c" /* yacc.c:1663 */
default: break;
}
if (yychar_backup != yychar)
@@ -2946,7 +2947,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 719 "src/parse-gram.y" /* yacc.c:1923 */
+#line 720 "src/parse-gram.y" /* yacc.c:1923 */
/* Return the location of the left-hand side of a rule whose
diff --git a/src/parse-gram.h b/src/parse-gram.h
index 5ebd58d..3bc7638 100644
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.7.90. */
+/* A Bison parser, made by GNU Bison 2.7.90.8-9816b-dirty. */
/* Bison interface for Yacc-like parsers in C
@@ -61,7 +61,7 @@ extern int gram_debug;
param_parse = 1 << 1,
param_both = param_lex | param_parse
} param_type;
-#line 645 "src/parse-gram.y" /* yacc.c:1926 */
+#line 646 "src/parse-gram.y" /* yacc.c:1926 */
#include "muscle-tab.h"
#line 68 "src/parse-gram.h" /* yacc.c:1926 */
@@ -155,7 +155,7 @@ named_ref *named_ref;
param_type param;
#line 409 "src/parse-gram.y" /* yacc.c:1926 */
code_props_type code_type;
-#line 647 "src/parse-gram.y" /* yacc.c:1926 */
+#line 648 "src/parse-gram.y" /* yacc.c:1926 */
struct
{
--
1.7.9.5