Date: Fri, 16 Feb 2018 03:11:46 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461970 - in head: Mk lang/ruby25/files Message-ID: <201802160311.w1G3BklY084741@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Fri Feb 16 03:11:46 2018 New Revision: 461970 URL: https://svnweb.freebsd.org/changeset/ports/461970 Log: lang/ruby25: apply upstream patch to fix segfault PR: 225470 Submitted by: Charlie Li <ml+freebsd@vishwin.info> Obtained from: https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61523 Differential Revision: https://reviews.freebsd.org/D14073 Added: head/lang/ruby25/files/patch-ext_ripper_ripper.c (contents, props changed) head/lang/ruby25/files/patch-ext_ripper_ripper.y (contents, props changed) head/lang/ruby25/files/patch-parse.c (contents, props changed) head/lang/ruby25/files/patch-parse.y (contents, props changed) head/lang/ruby25/files/patch-test_ruby_test__parse.rb (contents, props changed) Modified: head/Mk/bsd.ruby.mk (contents, props changed) Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Fri Feb 16 03:03:45 2018 (r461969) +++ head/Mk/bsd.ruby.mk Fri Feb 16 03:11:46 2018 (r461970) @@ -175,7 +175,7 @@ RUBY24= "" # PLIST_SUB helpers # Ruby 2.5 # RUBY_RELVERSION= 2.5.0 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY25= "" # PLIST_SUB helpers Added: head/lang/ruby25/files/patch-ext_ripper_ripper.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ruby25/files/patch-ext_ripper_ripper.c Fri Feb 16 03:11:46 2018 (r461970) @@ -0,0 +1,5011 @@ +--- ext/ripper/ripper.c.orig 2017-12-25 07:00:33 UTC ++++ ext/ripper/ripper.c +@@ -1564,61 +1564,61 @@ static const yytype_uint16 yyrline[] = + 1735, 1744, 1753, 1762, 1773, 1774, 1784, 1785, 1795, 1803, + 1811, 1819, 1828, 1836, 1845, 1853, 1862, 1870, 1881, 1882, + 1892, 1900, 1910, 1918, 1928, 1932, 1936, 1944, 1952, 1960, +- 1968, 1972, 1976, 1983, 1991, 1999, 2007, 2015, 2023, 2031, +- 2035, 2039, 2046, 2055, 2058, 2067, 2076, 2087, 2088, 2089, +- 2090, 2095, 2102, 2103, 2106, 2114, 2117, 2125, 2125, 2136, +- 2137, 2138, 2139, 2140, 2141, 2142, 2143, 2144, 2145, 2146, +- 2147, 2148, 2149, 2150, 2151, 2152, 2153, 2154, 2155, 2156, +- 2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2168, +- 2168, 2168, 2169, 2169, 2170, 2170, 2170, 2171, 2171, 2171, +- 2171, 2172, 2172, 2172, 2172, 2173, 2173, 2173, 2174, 2174, +- 2174, 2174, 2175, 2175, 2175, 2175, 2176, 2176, 2176, 2176, +- 2177, 2177, 2177, 2177, 2178, 2178, 2178, 2178, 2179, 2179, +- 2182, 2186, 2190, 2218, 2223, 2228, 2233, 2244, 2249, 2254, +- 2265, 2276, 2280, 2284, 2288, 2292, 2296, 2300, 2304, 2308, +- 2312, 2316, 2320, 2324, 2328, 2329, 2333, 2337, 2341, 2345, +- 2349, 2353, 2357, 2361, 2365, 2369, 2373, 2373, 2378, 2388, +- 2394, 2395, 2396, 2397, 2400, 2404, 2411, 2423, 2424, 2428, +- 2436, 2446, 2454, 2468, 2478, 2479, 2482, 2483, 2484, 2488, +- 2496, 2506, 2515, 2523, 2533, 2542, 2551, 2551, 2563, 2574, +- 2578, 2584, 2592, 2601, 2615, 2631, 2632, 2635, 2649, 2664, +- 2675, 2676, 2677, 2678, 2679, 2680, 2681, 2682, 2683, 2684, +- 2685, 2694, 2693, 2720, 2720, 2729, 2733, 2728, 2742, 2750, +- 2759, 2768, 2776, 2785, 2794, 2802, 2811, 2820, 2820, 2825, +- 2829, 2833, 2844, 2845, 2856, 2860, 2872, 2884, 2884, 2884, +- 2896, 2896, 2896, 2908, 2920, 2931, 2933, 2930, 2984, 2983, +- 3011, 3010, 3035, 3034, 3062, 3067, 3061, 3090, 3091, 3090, +- 3118, 3127, 3136, 3145, 3156, 3168, 3174, 3180, 3186, 3192, +- 3198, 3208, 3214, 3220, 3226, 3236, 3242, 3249, 3254, 3255, +- 3262, 3267, 3270, 3271, 3284, 3285, 3295, 3296, 3299, 3306, +- 3316, 3324, 3334, 3342, 3351, 3361, 3369, 3378, 3387, 3397, +- 3405, 3417, 3421, 3425, 3429, 3435, 3440, 3445, 3449, 3453, +- 3457, 3461, 3465, 3473, 3477, 3481, 3485, 3489, 3493, 3497, +- 3501, 3505, 3511, 3512, 3518, 3528, 3537, 3549, 3553, 3563, +- 3570, 3579, 3587, 3593, 3596, 3601, 3604, 3593, 3625, 3633, +- 3639, 3644, 3651, 3650, 3667, 3684, 3688, 3701, 3716, 3727, +- 3726, 3738, 3737, 3748, 3753, 3752, 3764, 3763, 3774, 3783, +- 3792, 3807, 3806, 3822, 3821, 3838, 3839, 3838, 3848, 3849, +- 3848, 3858, 3871, 3872, 3875, 3897, 3900, 3908, 3916, 3919, +- 3923, 3926, 3934, 3937, 3938, 3946, 3949, 3966, 3973, 3974, +- 3984, 3994, 4000, 4006, 4017, 4024, 4034, 4042, 4052, 4063, +- 4070, 4088, 4098, 4109, 4116, 4128, 4135, 4151, 4158, 4169, +- 4176, 4187, 4194, 4235, 4243, 4242, 4260, 4266, 4271, 4275, +- 4279, 4259, 4301, 4309, 4317, 4326, 4329, 4340, 4341, 4342, +- 4343, 4346, 4357, 4358, 4369, 4376, 4383, 4390, 4399, 4400, +- 4401, 4402, 4403, 4406, 4407, 4408, 4409, 4410, 4411, 4412, +- 4415, 4428, 4438, 4442, 4448, 4455, 4465, 4464, 4474, 4483, +- 4493, 4493, 4507, 4511, 4515, 4519, 4525, 4530, 4535, 4539, +- 4543, 4547, 4551, 4555, 4559, 4563, 4567, 4571, 4575, 4579, +- 4583, 4587, 4592, 4598, 4608, 4618, 4628, 4640, 4641, 4648, +- 4657, 4666, 4691, 4698, 4712, 4721, 4731, 4743, 4752, 4763, +- 4771, 4782, 4790, 4800, 4801, 4804, 4813, 4824, 4837, 4850, +- 4858, 4868, 4876, 4886, 4887, 4890, 4903, 4914, 4915, 4918, +- 4935, 4939, 4949, 4959, 4959, 4989, 4990, 5000, 5007, 5031, +- 5043, 5051, 5062, 5076, 5077, 5078, 5081, 5082, 5083, 5084, +- 5087, 5088, 5089, 5092, 5093, 5096, 5100, 5106, 5107, 5113, +- 5114, 5117, 5118, 5121, 5124, 5127, 5128, 5129, 5132, 5133, +- 5136, 5137, 5141 ++ 1968, 1972, 1976, 1983, 1987, 1991, 1999, 2007, 2015, 2023, ++ 2027, 2031, 2038, 2047, 2050, 2059, 2068, 2079, 2080, 2081, ++ 2082, 2087, 2094, 2095, 2098, 2106, 2109, 2117, 2117, 2128, ++ 2129, 2130, 2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138, ++ 2139, 2140, 2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, ++ 2149, 2150, 2151, 2152, 2153, 2154, 2155, 2156, 2157, 2160, ++ 2160, 2160, 2161, 2161, 2162, 2162, 2162, 2163, 2163, 2163, ++ 2163, 2164, 2164, 2164, 2164, 2165, 2165, 2165, 2166, 2166, ++ 2166, 2166, 2167, 2167, 2167, 2167, 2168, 2168, 2168, 2168, ++ 2169, 2169, 2169, 2169, 2170, 2170, 2170, 2170, 2171, 2171, ++ 2174, 2178, 2182, 2210, 2215, 2220, 2225, 2236, 2241, 2246, ++ 2257, 2268, 2272, 2276, 2280, 2284, 2288, 2292, 2296, 2300, ++ 2304, 2308, 2312, 2316, 2320, 2321, 2325, 2329, 2333, 2337, ++ 2341, 2345, 2349, 2353, 2357, 2361, 2365, 2365, 2370, 2380, ++ 2386, 2387, 2388, 2389, 2392, 2396, 2403, 2415, 2416, 2420, ++ 2428, 2438, 2446, 2460, 2470, 2471, 2474, 2475, 2476, 2480, ++ 2488, 2498, 2507, 2515, 2525, 2534, 2543, 2543, 2555, 2566, ++ 2570, 2576, 2584, 2593, 2607, 2623, 2624, 2627, 2641, 2656, ++ 2667, 2668, 2669, 2670, 2671, 2672, 2673, 2674, 2675, 2676, ++ 2677, 2686, 2685, 2712, 2712, 2721, 2725, 2720, 2734, 2742, ++ 2751, 2760, 2768, 2777, 2786, 2794, 2803, 2812, 2812, 2817, ++ 2821, 2825, 2836, 2837, 2848, 2852, 2864, 2876, 2876, 2876, ++ 2888, 2888, 2888, 2900, 2912, 2923, 2925, 2922, 2976, 2975, ++ 3003, 3002, 3027, 3026, 3054, 3059, 3053, 3082, 3083, 3082, ++ 3110, 3119, 3128, 3137, 3148, 3160, 3166, 3172, 3178, 3184, ++ 3190, 3200, 3206, 3212, 3218, 3228, 3234, 3241, 3246, 3247, ++ 3254, 3259, 3262, 3263, 3276, 3277, 3287, 3288, 3291, 3298, ++ 3308, 3316, 3326, 3334, 3343, 3353, 3361, 3370, 3379, 3389, ++ 3397, 3409, 3413, 3417, 3421, 3427, 3432, 3437, 3441, 3445, ++ 3449, 3453, 3457, 3465, 3469, 3473, 3477, 3481, 3485, 3489, ++ 3493, 3497, 3503, 3504, 3510, 3520, 3529, 3541, 3545, 3555, ++ 3562, 3571, 3579, 3585, 3588, 3593, 3596, 3585, 3617, 3625, ++ 3631, 3636, 3643, 3642, 3659, 3676, 3680, 3693, 3708, 3719, ++ 3718, 3730, 3729, 3740, 3745, 3744, 3756, 3755, 3766, 3775, ++ 3784, 3799, 3798, 3814, 3813, 3830, 3831, 3830, 3840, 3841, ++ 3840, 3850, 3863, 3864, 3867, 3889, 3892, 3900, 3908, 3911, ++ 3915, 3918, 3926, 3929, 3930, 3938, 3941, 3958, 3965, 3966, ++ 3976, 3986, 3992, 3998, 4009, 4016, 4026, 4034, 4044, 4055, ++ 4062, 4080, 4090, 4101, 4108, 4120, 4127, 4143, 4150, 4161, ++ 4168, 4179, 4186, 4227, 4235, 4234, 4252, 4258, 4263, 4267, ++ 4271, 4251, 4293, 4301, 4309, 4318, 4321, 4332, 4333, 4334, ++ 4335, 4338, 4349, 4350, 4361, 4368, 4375, 4382, 4391, 4392, ++ 4393, 4394, 4395, 4398, 4399, 4400, 4401, 4402, 4403, 4404, ++ 4407, 4420, 4430, 4434, 4440, 4447, 4457, 4456, 4466, 4475, ++ 4485, 4485, 4499, 4503, 4507, 4511, 4517, 4522, 4527, 4531, ++ 4535, 4539, 4543, 4547, 4551, 4555, 4559, 4563, 4567, 4571, ++ 4575, 4579, 4584, 4590, 4600, 4610, 4620, 4632, 4633, 4640, ++ 4649, 4658, 4683, 4690, 4704, 4713, 4723, 4735, 4744, 4755, ++ 4763, 4774, 4782, 4792, 4793, 4796, 4805, 4816, 4829, 4842, ++ 4850, 4860, 4868, 4878, 4879, 4882, 4895, 4906, 4907, 4910, ++ 4927, 4931, 4941, 4951, 4951, 4981, 4982, 4992, 4999, 5023, ++ 5035, 5043, 5054, 5068, 5069, 5070, 5073, 5074, 5075, 5076, ++ 5079, 5080, 5081, 5084, 5085, 5088, 5092, 5098, 5099, 5105, ++ 5106, 5109, 5110, 5113, 5116, 5119, 5120, 5121, 5124, 5125, ++ 5128, 5129, 5133 + }; + #endif + +@@ -6590,28 +6590,20 @@ yyreduce: + #line 1984 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = assignable(var_field((yyvsp[0].val)), 0, &(yyloc)); +-#if 0 +- if (!(yyval.val)) (yyval.val) = new_begin(0, &(yyloc)); +-#endif +- + } +-#line 6595 "ripper.c" /* yacc.c:1646 */ ++#line 6591 "ripper.c" /* yacc.c:1646 */ + break; + + case 104: +-#line 1992 "ripper.y" /* yacc.c:1646 */ ++#line 1988 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = assignable(var_field((yyvsp[0].val)), 0, &(yyloc)); +-#if 0 +- if (!(yyval.val)) (yyval.val) = new_begin(0, &(yyloc)); +-#endif +- + } +-#line 6607 "ripper.c" /* yacc.c:1646 */ ++#line 6599 "ripper.c" /* yacc.c:1646 */ + break; + + case 105: +-#line 2000 "ripper.y" /* yacc.c:1646 */ ++#line 1992 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + (yyval.val) = aryset((yyvsp[-3].val), (yyvsp[-1].val), &(yyloc)); +@@ -6619,11 +6611,11 @@ yyreduce: + (yyval.val) = dispatch2(aref_field, (yyvsp[-3].val), escape_Qundef((yyvsp[-1].val))); + + } +-#line 6619 "ripper.c" /* yacc.c:1646 */ ++#line 6611 "ripper.c" /* yacc.c:1646 */ + break; + + case 106: +-#line 2008 "ripper.y" /* yacc.c:1646 */ ++#line 2000 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + (yyval.val) = attrset((yyvsp[-2].val), (yyvsp[-1].val), (yyvsp[0].val), &(yyloc)); +@@ -6631,11 +6623,11 @@ yyreduce: + (yyval.val) = dispatch3(field, (yyvsp[-2].val), (yyvsp[-1].val), (yyvsp[0].val)); + + } +-#line 6631 "ripper.c" /* yacc.c:1646 */ ++#line 6623 "ripper.c" /* yacc.c:1646 */ + break; + + case 107: +-#line 2016 "ripper.y" /* yacc.c:1646 */ ++#line 2008 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + (yyval.val) = attrset((yyvsp[-2].val), idCOLON2, (yyvsp[0].val), &(yyloc)); +@@ -6643,11 +6635,11 @@ yyreduce: + (yyval.val) = dispatch3(field, (yyvsp[-2].val), ID2VAL(idCOLON2), (yyvsp[0].val)); + + } +-#line 6643 "ripper.c" /* yacc.c:1646 */ ++#line 6635 "ripper.c" /* yacc.c:1646 */ + break; + + case 108: +-#line 2024 "ripper.y" /* yacc.c:1646 */ ++#line 2016 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + (yyval.val) = attrset((yyvsp[-2].val), (yyvsp[-1].val), (yyvsp[0].val), &(yyloc)); +@@ -6655,36 +6647,36 @@ yyreduce: + (yyval.val) = dispatch3(field, (yyvsp[-2].val), (yyvsp[-1].val), (yyvsp[0].val)); + + } +-#line 6655 "ripper.c" /* yacc.c:1646 */ ++#line 6647 "ripper.c" /* yacc.c:1646 */ + break; + + case 109: +-#line 2032 "ripper.y" /* yacc.c:1646 */ ++#line 2024 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = const_decl(const_path_field((yyvsp[-2].val), (yyvsp[0].val), &(yyloc)), &(yyloc)); + } +-#line 6663 "ripper.c" /* yacc.c:1646 */ ++#line 6655 "ripper.c" /* yacc.c:1646 */ + break; + + case 110: +-#line 2036 "ripper.y" /* yacc.c:1646 */ ++#line 2028 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = const_decl(top_const_field((yyvsp[0].val)), &(yyloc)); + } +-#line 6671 "ripper.c" /* yacc.c:1646 */ ++#line 6663 "ripper.c" /* yacc.c:1646 */ + break; + + case 111: +-#line 2040 "ripper.y" /* yacc.c:1646 */ ++#line 2032 "ripper.y" /* yacc.c:1646 */ + { + (yyvsp[0].val) = var_field((yyvsp[0].val)); + (yyval.val) = backref_assign_error((yyvsp[0].val), (yyvsp[0].val), &(yyloc)); + } +-#line 6680 "ripper.c" /* yacc.c:1646 */ ++#line 6672 "ripper.c" /* yacc.c:1646 */ + break; + + case 112: +-#line 2047 "ripper.y" /* yacc.c:1646 */ ++#line 2039 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + yyerror0("class/module name must be CONSTANT"); +@@ -6693,11 +6685,11 @@ yyreduce: + ripper_error(); + + } +-#line 6693 "ripper.c" /* yacc.c:1646 */ ++#line 6685 "ripper.c" /* yacc.c:1646 */ + break; + + case 114: +-#line 2059 "ripper.y" /* yacc.c:1646 */ ++#line 2051 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + (yyval.val) = NEW_COLON3((yyvsp[0].val)); +@@ -6706,11 +6698,11 @@ yyreduce: + (yyval.val) = dispatch1(top_const_ref, (yyvsp[0].val)); + + } +-#line 6706 "ripper.c" /* yacc.c:1646 */ ++#line 6698 "ripper.c" /* yacc.c:1646 */ + break; + + case 115: +-#line 2068 "ripper.y" /* yacc.c:1646 */ ++#line 2060 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + (yyval.val) = NEW_COLON2(0, (yyval.val)); +@@ -6719,11 +6711,11 @@ yyreduce: + (yyval.val) = dispatch1(const_ref, (yyvsp[0].val)); + + } +-#line 6719 "ripper.c" /* yacc.c:1646 */ ++#line 6711 "ripper.c" /* yacc.c:1646 */ + break; + + case 116: +-#line 2077 "ripper.y" /* yacc.c:1646 */ ++#line 2069 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + (yyval.val) = NEW_COLON2((yyvsp[-2].val), (yyvsp[0].val)); +@@ -6732,29 +6724,29 @@ yyreduce: + (yyval.val) = dispatch2(const_path_ref, (yyvsp[-2].val), (yyvsp[0].val)); + + } +-#line 6732 "ripper.c" /* yacc.c:1646 */ ++#line 6724 "ripper.c" /* yacc.c:1646 */ + break; + + case 120: +-#line 2091 "ripper.y" /* yacc.c:1646 */ ++#line 2083 "ripper.y" /* yacc.c:1646 */ + { + SET_LEX_STATE(EXPR_ENDFN); + (yyval.val) = (yyvsp[0].val); + } +-#line 6741 "ripper.c" /* yacc.c:1646 */ ++#line 6733 "ripper.c" /* yacc.c:1646 */ + break; + + case 121: +-#line 2096 "ripper.y" /* yacc.c:1646 */ ++#line 2088 "ripper.y" /* yacc.c:1646 */ + { + SET_LEX_STATE(EXPR_ENDFN); + (yyval.val) = (yyvsp[0].val); + } +-#line 6750 "ripper.c" /* yacc.c:1646 */ ++#line 6742 "ripper.c" /* yacc.c:1646 */ + break; + + case 124: +-#line 2107 "ripper.y" /* yacc.c:1646 */ ++#line 2099 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + (yyval.val) = new_lit(ID2SYM((yyvsp[0].val)), &(yyloc)); +@@ -6762,11 +6754,11 @@ yyreduce: + (yyval.val) = dispatch1(symbol_literal, (yyvsp[0].val)); + + } +-#line 6762 "ripper.c" /* yacc.c:1646 */ ++#line 6754 "ripper.c" /* yacc.c:1646 */ + break; + + case 126: +-#line 2118 "ripper.y" /* yacc.c:1646 */ ++#line 2110 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + (yyval.val) = new_undef((yyvsp[0].val), &(yyloc)); +@@ -6774,17 +6766,17 @@ yyreduce: + (yyval.val) = rb_ary_new3(1, get_value((yyvsp[0].val))); + + } +-#line 6774 "ripper.c" /* yacc.c:1646 */ ++#line 6766 "ripper.c" /* yacc.c:1646 */ + break; + + case 127: +-#line 2125 "ripper.y" /* yacc.c:1646 */ ++#line 2117 "ripper.y" /* yacc.c:1646 */ + {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} +-#line 6780 "ripper.c" /* yacc.c:1646 */ ++#line 6772 "ripper.c" /* yacc.c:1646 */ + break; + + case 128: +-#line 2126 "ripper.y" /* yacc.c:1646 */ ++#line 2118 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + NODE *undef = new_undef((yyvsp[0].val), &(yyloc)); +@@ -6793,207 +6785,207 @@ yyreduce: + rb_ary_push((yyvsp[-3].val), get_value((yyvsp[0].val))); + + } +-#line 6793 "ripper.c" /* yacc.c:1646 */ ++#line 6785 "ripper.c" /* yacc.c:1646 */ + break; + + case 129: +-#line 2136 "ripper.y" /* yacc.c:1646 */ ++#line 2128 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '|'); } +-#line 6799 "ripper.c" /* yacc.c:1646 */ ++#line 6791 "ripper.c" /* yacc.c:1646 */ + break; + + case 130: +-#line 2137 "ripper.y" /* yacc.c:1646 */ ++#line 2129 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '^'); } +-#line 6805 "ripper.c" /* yacc.c:1646 */ ++#line 6797 "ripper.c" /* yacc.c:1646 */ + break; + + case 131: +-#line 2138 "ripper.y" /* yacc.c:1646 */ ++#line 2130 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '&'); } +-#line 6811 "ripper.c" /* yacc.c:1646 */ ++#line 6803 "ripper.c" /* yacc.c:1646 */ + break; + + case 132: +-#line 2139 "ripper.y" /* yacc.c:1646 */ ++#line 2131 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tCMP); } +-#line 6817 "ripper.c" /* yacc.c:1646 */ ++#line 6809 "ripper.c" /* yacc.c:1646 */ + break; + + case 133: +-#line 2140 "ripper.y" /* yacc.c:1646 */ ++#line 2132 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tEQ); } +-#line 6823 "ripper.c" /* yacc.c:1646 */ ++#line 6815 "ripper.c" /* yacc.c:1646 */ + break; + + case 134: +-#line 2141 "ripper.y" /* yacc.c:1646 */ ++#line 2133 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tEQQ); } +-#line 6829 "ripper.c" /* yacc.c:1646 */ ++#line 6821 "ripper.c" /* yacc.c:1646 */ + break; + + case 135: +-#line 2142 "ripper.y" /* yacc.c:1646 */ ++#line 2134 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tMATCH); } +-#line 6835 "ripper.c" /* yacc.c:1646 */ ++#line 6827 "ripper.c" /* yacc.c:1646 */ + break; + + case 136: +-#line 2143 "ripper.y" /* yacc.c:1646 */ ++#line 2135 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tNMATCH); } +-#line 6841 "ripper.c" /* yacc.c:1646 */ ++#line 6833 "ripper.c" /* yacc.c:1646 */ + break; + + case 137: +-#line 2144 "ripper.y" /* yacc.c:1646 */ ++#line 2136 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '>'); } +-#line 6847 "ripper.c" /* yacc.c:1646 */ ++#line 6839 "ripper.c" /* yacc.c:1646 */ + break; + + case 138: +-#line 2145 "ripper.y" /* yacc.c:1646 */ ++#line 2137 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tGEQ); } +-#line 6853 "ripper.c" /* yacc.c:1646 */ ++#line 6845 "ripper.c" /* yacc.c:1646 */ + break; + + case 139: +-#line 2146 "ripper.y" /* yacc.c:1646 */ ++#line 2138 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '<'); } +-#line 6859 "ripper.c" /* yacc.c:1646 */ ++#line 6851 "ripper.c" /* yacc.c:1646 */ + break; + + case 140: +-#line 2147 "ripper.y" /* yacc.c:1646 */ ++#line 2139 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tLEQ); } +-#line 6865 "ripper.c" /* yacc.c:1646 */ ++#line 6857 "ripper.c" /* yacc.c:1646 */ + break; + + case 141: +-#line 2148 "ripper.y" /* yacc.c:1646 */ ++#line 2140 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tNEQ); } +-#line 6871 "ripper.c" /* yacc.c:1646 */ ++#line 6863 "ripper.c" /* yacc.c:1646 */ + break; + + case 142: +-#line 2149 "ripper.y" /* yacc.c:1646 */ ++#line 2141 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tLSHFT); } +-#line 6877 "ripper.c" /* yacc.c:1646 */ ++#line 6869 "ripper.c" /* yacc.c:1646 */ + break; + + case 143: +-#line 2150 "ripper.y" /* yacc.c:1646 */ ++#line 2142 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tRSHFT); } +-#line 6883 "ripper.c" /* yacc.c:1646 */ ++#line 6875 "ripper.c" /* yacc.c:1646 */ + break; + + case 144: +-#line 2151 "ripper.y" /* yacc.c:1646 */ ++#line 2143 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '+'); } +-#line 6889 "ripper.c" /* yacc.c:1646 */ ++#line 6881 "ripper.c" /* yacc.c:1646 */ + break; + + case 145: +-#line 2152 "ripper.y" /* yacc.c:1646 */ ++#line 2144 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '-'); } +-#line 6895 "ripper.c" /* yacc.c:1646 */ ++#line 6887 "ripper.c" /* yacc.c:1646 */ + break; + + case 146: +-#line 2153 "ripper.y" /* yacc.c:1646 */ ++#line 2145 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '*'); } +-#line 6901 "ripper.c" /* yacc.c:1646 */ ++#line 6893 "ripper.c" /* yacc.c:1646 */ + break; + + case 147: +-#line 2154 "ripper.y" /* yacc.c:1646 */ ++#line 2146 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '*'); } +-#line 6907 "ripper.c" /* yacc.c:1646 */ ++#line 6899 "ripper.c" /* yacc.c:1646 */ + break; + + case 148: +-#line 2155 "ripper.y" /* yacc.c:1646 */ ++#line 2147 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '/'); } +-#line 6913 "ripper.c" /* yacc.c:1646 */ ++#line 6905 "ripper.c" /* yacc.c:1646 */ + break; + + case 149: +-#line 2156 "ripper.y" /* yacc.c:1646 */ ++#line 2148 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '%'); } +-#line 6919 "ripper.c" /* yacc.c:1646 */ ++#line 6911 "ripper.c" /* yacc.c:1646 */ + break; + + case 150: +-#line 2157 "ripper.y" /* yacc.c:1646 */ ++#line 2149 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tPOW); } +-#line 6925 "ripper.c" /* yacc.c:1646 */ ++#line 6917 "ripper.c" /* yacc.c:1646 */ + break; + + case 151: +-#line 2158 "ripper.y" /* yacc.c:1646 */ ++#line 2150 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tDSTAR); } +-#line 6931 "ripper.c" /* yacc.c:1646 */ ++#line 6923 "ripper.c" /* yacc.c:1646 */ + break; + + case 152: +-#line 2159 "ripper.y" /* yacc.c:1646 */ ++#line 2151 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '!'); } +-#line 6937 "ripper.c" /* yacc.c:1646 */ ++#line 6929 "ripper.c" /* yacc.c:1646 */ + break; + + case 153: +-#line 2160 "ripper.y" /* yacc.c:1646 */ ++#line 2152 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '~'); } +-#line 6943 "ripper.c" /* yacc.c:1646 */ ++#line 6935 "ripper.c" /* yacc.c:1646 */ + break; + + case 154: +-#line 2161 "ripper.y" /* yacc.c:1646 */ ++#line 2153 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tUPLUS); } +-#line 6949 "ripper.c" /* yacc.c:1646 */ ++#line 6941 "ripper.c" /* yacc.c:1646 */ + break; + + case 155: +-#line 2162 "ripper.y" /* yacc.c:1646 */ ++#line 2154 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tUMINUS); } +-#line 6955 "ripper.c" /* yacc.c:1646 */ ++#line 6947 "ripper.c" /* yacc.c:1646 */ + break; + + case 156: +-#line 2163 "ripper.y" /* yacc.c:1646 */ ++#line 2155 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tAREF); } +-#line 6961 "ripper.c" /* yacc.c:1646 */ ++#line 6953 "ripper.c" /* yacc.c:1646 */ + break; + + case 157: +-#line 2164 "ripper.y" /* yacc.c:1646 */ ++#line 2156 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = tASET); } +-#line 6967 "ripper.c" /* yacc.c:1646 */ ++#line 6959 "ripper.c" /* yacc.c:1646 */ + break; + + case 158: +-#line 2165 "ripper.y" /* yacc.c:1646 */ ++#line 2157 "ripper.y" /* yacc.c:1646 */ + { ifndef_ripper((yyval.val) = '`'); } +-#line 6973 "ripper.c" /* yacc.c:1646 */ ++#line 6965 "ripper.c" /* yacc.c:1646 */ + break; + + case 200: +-#line 2183 "ripper.y" /* yacc.c:1646 */ ++#line 2175 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = node_assign((yyvsp[-2].val), (yyvsp[0].val), &(yyloc)); + } +-#line 6981 "ripper.c" /* yacc.c:1646 */ ++#line 6973 "ripper.c" /* yacc.c:1646 */ + break; + + case 201: +-#line 2187 "ripper.y" /* yacc.c:1646 */ ++#line 2179 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = new_op_assign((yyvsp[-2].val), (yyvsp[-1].val), (yyvsp[0].val), &(yyloc)); + } +-#line 6989 "ripper.c" /* yacc.c:1646 */ ++#line 6981 "ripper.c" /* yacc.c:1646 */ + break; + + case 202: +-#line 2191 "ripper.y" /* yacc.c:1646 */ ++#line 2183 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + NODE *args; +@@ -7021,38 +7013,38 @@ yyreduce: + (yyval.val) = dispatch3(opassign, (yyvsp[-5].val), (yyvsp[-1].val), (yyvsp[0].val)); + + } +-#line 7021 "ripper.c" /* yacc.c:1646 */ ++#line 7013 "ripper.c" /* yacc.c:1646 */ + break; + + case 203: +-#line 2219 "ripper.y" /* yacc.c:1646 */ ++#line 2211 "ripper.y" /* yacc.c:1646 */ + { + value_expr((yyvsp[0].val)); + (yyval.val) = new_attr_op_assign((yyvsp[-4].val), (yyvsp[-3].val), (yyvsp[-2].val), (yyvsp[-1].val), (yyvsp[0].val), &(yyloc)); + } +-#line 7030 "ripper.c" /* yacc.c:1646 */ ++#line 7022 "ripper.c" /* yacc.c:1646 */ + break; + + case 204: +-#line 2224 "ripper.y" /* yacc.c:1646 */ ++#line 2216 "ripper.y" /* yacc.c:1646 */ + { + value_expr((yyvsp[0].val)); + (yyval.val) = new_attr_op_assign((yyvsp[-4].val), (yyvsp[-3].val), (yyvsp[-2].val), (yyvsp[-1].val), (yyvsp[0].val), &(yyloc)); + } +-#line 7039 "ripper.c" /* yacc.c:1646 */ ++#line 7031 "ripper.c" /* yacc.c:1646 */ + break; + + case 205: +-#line 2229 "ripper.y" /* yacc.c:1646 */ ++#line 2221 "ripper.y" /* yacc.c:1646 */ + { + value_expr((yyvsp[0].val)); + (yyval.val) = new_attr_op_assign((yyvsp[-4].val), ID2VAL(idCOLON2), (yyvsp[-2].val), (yyvsp[-1].val), (yyvsp[0].val), &(yyloc)); + } +-#line 7048 "ripper.c" /* yacc.c:1646 */ ++#line 7040 "ripper.c" /* yacc.c:1646 */ + break; + + case 206: +-#line 2234 "ripper.y" /* yacc.c:1646 */ ++#line 2226 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + YYLTYPE location; +@@ -7063,29 +7055,29 @@ yyreduce: + (yyval.val) = const_path_field((yyvsp[-4].val), (yyvsp[-2].val), &location); + (yyval.val) = new_const_op_assign((yyval.val), (yyvsp[-1].val), (yyvsp[0].val), &(yyloc)); + } +-#line 7063 "ripper.c" /* yacc.c:1646 */ ++#line 7055 "ripper.c" /* yacc.c:1646 */ + break; + + case 207: +-#line 2245 "ripper.y" /* yacc.c:1646 */ ++#line 2237 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = top_const_field((yyvsp[-2].val)); + (yyval.val) = new_const_op_assign((yyval.val), (yyvsp[-1].val), (yyvsp[0].val), &(yyloc)); + } +-#line 7072 "ripper.c" /* yacc.c:1646 */ ++#line 7064 "ripper.c" /* yacc.c:1646 */ + break; + + case 208: +-#line 2250 "ripper.y" /* yacc.c:1646 */ ++#line 2242 "ripper.y" /* yacc.c:1646 */ + { + (yyvsp[-2].val) = var_field((yyvsp[-2].val)); + (yyval.val) = backref_assign_error((yyvsp[-2].val), new_op_assign((yyvsp[-2].val), (yyvsp[-1].val), (yyvsp[0].val), &(yyloc)), &(yyloc)); + } +-#line 7081 "ripper.c" /* yacc.c:1646 */ ++#line 7073 "ripper.c" /* yacc.c:1646 */ + break; + + case 209: +-#line 2255 "ripper.y" /* yacc.c:1646 */ ++#line 2247 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + value_expr((yyvsp[-2].val)); +@@ -7096,11 +7088,11 @@ yyreduce: + (yyval.val) = dispatch2(dot2, (yyvsp[-2].val), (yyvsp[0].val)); + + } +-#line 7096 "ripper.c" /* yacc.c:1646 */ ++#line 7088 "ripper.c" /* yacc.c:1646 */ + break; + + case 210: +-#line 2266 "ripper.y" /* yacc.c:1646 */ ++#line 2258 "ripper.y" /* yacc.c:1646 */ + { + #if 0 + value_expr((yyvsp[-2].val)); +@@ -7111,218 +7103,218 @@ yyreduce: + (yyval.val) = dispatch2(dot3, (yyvsp[-2].val), (yyvsp[0].val)); + + } +-#line 7111 "ripper.c" /* yacc.c:1646 */ ++#line 7103 "ripper.c" /* yacc.c:1646 */ + break; + + case 211: +-#line 2277 "ripper.y" /* yacc.c:1646 */ ++#line 2269 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), '+', (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7119 "ripper.c" /* yacc.c:1646 */ ++#line 7111 "ripper.c" /* yacc.c:1646 */ + break; + + case 212: +-#line 2281 "ripper.y" /* yacc.c:1646 */ ++#line 2273 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), '-', (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7127 "ripper.c" /* yacc.c:1646 */ ++#line 7119 "ripper.c" /* yacc.c:1646 */ + break; + + case 213: +-#line 2285 "ripper.y" /* yacc.c:1646 */ ++#line 2277 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), '*', (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7135 "ripper.c" /* yacc.c:1646 */ ++#line 7127 "ripper.c" /* yacc.c:1646 */ + break; + + case 214: +-#line 2289 "ripper.y" /* yacc.c:1646 */ ++#line 2281 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), '/', (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7143 "ripper.c" /* yacc.c:1646 */ ++#line 7135 "ripper.c" /* yacc.c:1646 */ + break; + + case 215: +-#line 2293 "ripper.y" /* yacc.c:1646 */ ++#line 2285 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), '%', (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7151 "ripper.c" /* yacc.c:1646 */ ++#line 7143 "ripper.c" /* yacc.c:1646 */ + break; + + case 216: +-#line 2297 "ripper.y" /* yacc.c:1646 */ ++#line 2289 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), idPow, (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7159 "ripper.c" /* yacc.c:1646 */ ++#line 7151 "ripper.c" /* yacc.c:1646 */ + break; + + case 217: +-#line 2301 "ripper.y" /* yacc.c:1646 */ ++#line 2293 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_uni_op(call_bin_op((yyvsp[-2].val), idPow, (yyvsp[0].val), &(yylsp[-2]), &(yyloc)), idUMinus, &(yylsp[-3]), &(yyloc)); + } +-#line 7167 "ripper.c" /* yacc.c:1646 */ ++#line 7159 "ripper.c" /* yacc.c:1646 */ + break; + + case 218: +-#line 2305 "ripper.y" /* yacc.c:1646 */ ++#line 2297 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_uni_op((yyvsp[0].val), idUPlus, &(yylsp[-1]), &(yyloc)); + } +-#line 7175 "ripper.c" /* yacc.c:1646 */ ++#line 7167 "ripper.c" /* yacc.c:1646 */ + break; + + case 219: +-#line 2309 "ripper.y" /* yacc.c:1646 */ ++#line 2301 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_uni_op((yyvsp[0].val), idUMinus, &(yylsp[-1]), &(yyloc)); + } +-#line 7183 "ripper.c" /* yacc.c:1646 */ ++#line 7175 "ripper.c" /* yacc.c:1646 */ + break; + + case 220: +-#line 2313 "ripper.y" /* yacc.c:1646 */ ++#line 2305 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), '|', (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7191 "ripper.c" /* yacc.c:1646 */ ++#line 7183 "ripper.c" /* yacc.c:1646 */ + break; + + case 221: +-#line 2317 "ripper.y" /* yacc.c:1646 */ ++#line 2309 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), '^', (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7199 "ripper.c" /* yacc.c:1646 */ ++#line 7191 "ripper.c" /* yacc.c:1646 */ + break; + + case 222: +-#line 2321 "ripper.y" /* yacc.c:1646 */ ++#line 2313 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), '&', (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7207 "ripper.c" /* yacc.c:1646 */ ++#line 7199 "ripper.c" /* yacc.c:1646 */ + break; + + case 223: +-#line 2325 "ripper.y" /* yacc.c:1646 */ ++#line 2317 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), idCmp, (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7215 "ripper.c" /* yacc.c:1646 */ ++#line 7207 "ripper.c" /* yacc.c:1646 */ + break; + + case 225: +-#line 2330 "ripper.y" /* yacc.c:1646 */ ++#line 2322 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), idEq, (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7223 "ripper.c" /* yacc.c:1646 */ ++#line 7215 "ripper.c" /* yacc.c:1646 */ + break; + + case 226: +-#line 2334 "ripper.y" /* yacc.c:1646 */ ++#line 2326 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), idEqq, (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7231 "ripper.c" /* yacc.c:1646 */ ++#line 7223 "ripper.c" /* yacc.c:1646 */ + break; + + case 227: +-#line 2338 "ripper.y" /* yacc.c:1646 */ ++#line 2330 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), idNeq, (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7239 "ripper.c" /* yacc.c:1646 */ ++#line 7231 "ripper.c" /* yacc.c:1646 */ + break; + + case 228: +-#line 2342 "ripper.y" /* yacc.c:1646 */ ++#line 2334 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = match_op((yyvsp[-2].val), (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7247 "ripper.c" /* yacc.c:1646 */ ++#line 7239 "ripper.c" /* yacc.c:1646 */ + break; + + case 229: +-#line 2346 "ripper.y" /* yacc.c:1646 */ ++#line 2338 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), idNeqTilde, (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7255 "ripper.c" /* yacc.c:1646 */ ++#line 7247 "ripper.c" /* yacc.c:1646 */ + break; + + case 230: +-#line 2350 "ripper.y" /* yacc.c:1646 */ ++#line 2342 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_uni_op(method_cond((yyvsp[0].val), &(yylsp[0])), '!', &(yylsp[-1]), &(yyloc)); + } +-#line 7263 "ripper.c" /* yacc.c:1646 */ ++#line 7255 "ripper.c" /* yacc.c:1646 */ + break; + + case 231: +-#line 2354 "ripper.y" /* yacc.c:1646 */ ++#line 2346 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_uni_op((yyvsp[0].val), '~', &(yylsp[-1]), &(yyloc)); + } +-#line 7271 "ripper.c" /* yacc.c:1646 */ ++#line 7263 "ripper.c" /* yacc.c:1646 */ + break; + + case 232: +-#line 2358 "ripper.y" /* yacc.c:1646 */ ++#line 2350 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), idLTLT, (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7279 "ripper.c" /* yacc.c:1646 */ ++#line 7271 "ripper.c" /* yacc.c:1646 */ + break; + + case 233: +-#line 2362 "ripper.y" /* yacc.c:1646 */ ++#line 2354 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = call_bin_op((yyvsp[-2].val), idGTGT, (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7287 "ripper.c" /* yacc.c:1646 */ ++#line 7279 "ripper.c" /* yacc.c:1646 */ + break; + + case 234: +-#line 2366 "ripper.y" /* yacc.c:1646 */ ++#line 2358 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = logop(idANDOP, (yyvsp[-2].val), (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7295 "ripper.c" /* yacc.c:1646 */ ++#line 7287 "ripper.c" /* yacc.c:1646 */ + break; + + case 235: +-#line 2370 "ripper.y" /* yacc.c:1646 */ ++#line 2362 "ripper.y" /* yacc.c:1646 */ + { + (yyval.val) = logop(idOROP, (yyvsp[-2].val), (yyvsp[0].val), &(yylsp[-1]), &(yyloc)); + } +-#line 7303 "ripper.c" /* yacc.c:1646 */ ++#line 7295 "ripper.c" /* yacc.c:1646 */ + break; + + case 236: +-#line 2373 "ripper.y" /* yacc.c:1646 */ ++#line 2365 "ripper.y" /* yacc.c:1646 */ + {in_defined = 1;} +-#line 7309 "ripper.c" /* yacc.c:1646 */ ++#line 7301 "ripper.c" /* yacc.c:1646 */ + break; + + case 237: +-#line 2374 "ripper.y" /* yacc.c:1646 */ ++#line 2366 "ripper.y" /* yacc.c:1646 */ + { + in_defined = 0; + (yyval.val) = new_defined((yyvsp[0].val), &(yyloc)); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802160311.w1G3BklY084741>