Clean up yesterday's patch.

[bison.git] / src / parse-gram.c

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 905ae1604223d6653145092ae7109a816d5af4ce..76abad682b20880635f5bcc2b961b858b486368c 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -654,8 +654,8 @@ static const yytype_uint16 yyrline[] =
      305,   309,   323,   324,   328,   350,   350,   355,   355,   360,
      370,   385,   386,   387,   391,   392,   397,   398,   403,   407,
      412,   418,   424,   435,   436,   445,   446,   452,   453,   454,
-     461,   461,   465,   466,   467,   472,   473,   475,   481,   483,
-     485,   498,   500,   509,   514,   515,   520,   529,   534,   536
+     461,   461,   465,   466,   467,   472,   473,   475,   477,   479,
+     481,   494,   496,   505,   510,   511,   516,   525,   530,   532
 };
 #endif
 
@@ -2173,35 +2173,31 @@ yyreduce:
 
   case 77:
 #line 476 "parse-gram.y"
-    {
-      if (current_rule && current_rule->action)
-       grammar_midrule_action ();
-      grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
-    }
+    { grammar_current_rule_action_append ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])); }
     break;
 
   case 78:
-#line 482 "parse-gram.y"
+#line 478 "parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
   case 79:
-#line 484 "parse-gram.y"
+#line 480 "parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
   case 80:
-#line 486 "parse-gram.y"
+#line 482 "parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 
   case 81:
-#line 499 "parse-gram.y"
+#line 495 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 82:
-#line 501 "parse-gram.y"
+#line 497 "parse-gram.y"
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
@@ -2210,12 +2206,12 @@ yyreduce:
     break;
 
   case 83:
-#line 509 "parse-gram.y"
+#line 505 "parse-gram.y"
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 86:
-#line 521 "parse-gram.y"
+#line 517 "parse-gram.y"
     {
       (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);
@@ -2223,12 +2219,12 @@ yyreduce:
     break;
 
   case 87:
-#line 530 "parse-gram.y"
+#line 526 "parse-gram.y"
     { (yyval.chars) = (yyvsp[(1) - (1)].chars); }
     break;
 
   case 89:
-#line 537 "parse-gram.y"
+#line 533 "parse-gram.y"
     {
       muscle_code_grow ("epilogue", translate_code ((yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)])), (yylsp[(2) - (2)]));
       gram_scanner_last_string_free ();
@@ -2237,7 +2233,7 @@ yyreduce:
 
 
 /* Line 1274 of yacc.c.  */
-#line 2241 "parse-gram.c"
+#line 2237 "parse-gram.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2457,7 +2453,7 @@ yyreturn:
 }
 
 
-#line 543 "parse-gram.y"
+#line 539 "parse-gram.y"