From aec849888ec79b2bb434fda1ea1f2b6136574cf7 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Fri, 3 Jun 2022 12:10:23 +0900 Subject: [PATCH] parse.y (new_kw_rest_args): aggregate integer to node* type casts. --- mrbgems/mruby-compiler/core/parse.y | 8 +- mrbgems/mruby-compiler/core/y.tab.c | 2298 ++++++++++++++------------- 2 files changed, 1161 insertions(+), 1145 deletions(-) diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y index 831b45d02..bf1a5a5c6 100644 --- a/mrbgems/mruby-compiler/core/parse.y +++ b/mrbgems/mruby-compiler/core/parse.y @@ -892,9 +892,9 @@ new_kw_arg(parser_state *p, mrb_sym kw, node *def_arg) /* (:kw_rest_args . a) */ static node* -new_kw_rest_args(parser_state *p, node *a) +new_kw_rest_args(parser_state *p, mrb_sym sym) { - return cons((node*)NODE_KW_REST_ARGS, a); + return cons((node*)NODE_KW_REST_ARGS, nsym(sym)); } static node* @@ -905,7 +905,7 @@ new_args_dots(parser_state *p, node *m) mrb_sym b = intern_op(and); local_add_f(p, r); return new_args(p, m, 0, r, 0, - new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b)); + new_args_tail(p, 0, new_kw_rest_args(p, k), b)); } /* (:block_arg . a) */ @@ -3726,7 +3726,7 @@ kwrest_mark : tPOW f_kwrest : kwrest_mark tIDENTIFIER { - $$ = new_kw_rest_args(p, nsym($2)); + $$ = new_kw_rest_args(p, $2); } | kwrest_mark { diff --git a/mrbgems/mruby-compiler/core/y.tab.c b/mrbgems/mruby-compiler/core/y.tab.c index d12e98a4f..59b09ffef 100644 --- a/mrbgems/mruby-compiler/core/y.tab.c +++ b/mrbgems/mruby-compiler/core/y.tab.c @@ -955,9 +955,9 @@ new_kw_arg(parser_state *p, mrb_sym kw, node *def_arg) /* (:kw_rest_args . a) */ static node* -new_kw_rest_args(parser_state *p, node *a) +new_kw_rest_args(parser_state *p, mrb_sym sym) { - return cons((node*)NODE_KW_REST_ARGS, a); + return cons((node*)NODE_KW_REST_ARGS, nsym(sym)); } static node* @@ -968,7 +968,7 @@ new_args_dots(parser_state *p, node *m) mrb_sym b = intern_op(and); local_add_f(p, r); return new_args(p, m, 0, r, 0, - new_args_tail(p, 0, new_kw_rest_args(p, nsym(k)), b)); + new_args_tail(p, 0, new_kw_rest_args(p, k), b)); } /* (:block_arg . a) */ @@ -2003,7 +2003,7 @@ union yyalloc /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 176 /* YYNRULES -- Number of rules. */ -#define YYNRULES 613 +#define YYNRULES 615 /* YYNSTATES -- Number of states. */ #define YYNSTATES 1078 @@ -2091,41 +2091,41 @@ static const yytype_int16 yyrline[] = 2423, 2427, 2431, 2435, 2439, 2448, 2457, 2466, 2475, 2481, 2482, 2487, 2491, 2498, 2502, 2509, 2513, 2522, 2539, 2540, 2543, 2544, 2545, 2550, 2555, 2562, 2568, 2573, 2578, 2583, - 2590, 2590, 2601, 2605, 2611, 2615, 2621, 2624, 2630, 2635, - 2640, 2646, 2651, 2655, 2661, 2662, 2663, 2664, 2665, 2666, - 2667, 2668, 2672, 2677, 2676, 2688, 2692, 2687, 2697, 2697, - 2701, 2705, 2709, 2713, 2718, 2723, 2727, 2731, 2735, 2739, - 2743, 2744, 2750, 2757, 2749, 2770, 2778, 2786, 2786, 2786, - 2793, 2793, 2793, 2800, 2806, 2811, 2813, 2810, 2822, 2820, - 2838, 2843, 2836, 2860, 2858, 2874, 2884, 2895, 2899, 2903, - 2907, 2913, 2920, 2921, 2922, 2925, 2926, 2929, 2930, 2938, - 2939, 2945, 2949, 2952, 2956, 2960, 2964, 2969, 2973, 2977, - 2981, 2987, 2986, 2996, 3000, 3004, 3008, 3014, 3019, 3024, + 2590, 2590, 2601, 2605, 2611, 2615, 2621, 2624, 2630, 2634, + 2639, 2644, 2650, 2655, 2659, 2665, 2666, 2667, 2668, 2669, + 2670, 2671, 2672, 2676, 2681, 2680, 2692, 2696, 2691, 2701, + 2701, 2705, 2709, 2713, 2717, 2722, 2727, 2731, 2735, 2739, + 2743, 2747, 2748, 2754, 2761, 2753, 2774, 2782, 2790, 2790, + 2790, 2797, 2797, 2797, 2804, 2810, 2815, 2817, 2814, 2826, + 2824, 2842, 2847, 2840, 2864, 2862, 2878, 2888, 2899, 2903, + 2907, 2911, 2917, 2924, 2925, 2926, 2929, 2930, 2933, 2934, + 2942, 2943, 2949, 2953, 2956, 2960, 2964, 2968, 2973, 2977, + 2981, 2985, 2991, 2990, 3000, 3004, 3008, 3012, 3018, 3023, 3028, 3032, 3036, 3040, 3044, 3048, 3052, 3056, 3060, 3064, - 3068, 3072, 3076, 3080, 3086, 3091, 3098, 3098, 3102, 3107, - 3114, 3118, 3124, 3125, 3128, 3133, 3136, 3140, 3146, 3150, - 3157, 3156, 3171, 3181, 3185, 3190, 3197, 3201, 3205, 3209, - 3213, 3217, 3221, 3225, 3229, 3236, 3235, 3250, 3249, 3265, - 3273, 3282, 3285, 3292, 3295, 3299, 3300, 3303, 3307, 3310, - 3314, 3317, 3318, 3319, 3320, 3323, 3324, 3330, 3331, 3332, - 3336, 3349, 3350, 3356, 3361, 3360, 3371, 3375, 3381, 3385, - 3398, 3402, 3408, 3411, 3412, 3415, 3421, 3427, 3428, 3431, - 3438, 3437, 3451, 3455, 3469, 3474, 3488, 3494, 3495, 3496, - 3497, 3498, 3502, 3508, 3512, 3522, 3523, 3524, 3528, 3534, - 3538, 3542, 3546, 3550, 3556, 3560, 3566, 3570, 3574, 3578, - 3582, 3586, 3594, 3601, 3607, 3608, 3612, 3616, 3615, 3632, - 3633, 3636, 3642, 3646, 3652, 3653, 3657, 3661, 3667, 3673, - 3679, 3686, 3692, 3699, 3703, 3709, 3713, 3719, 3720, 3723, - 3727, 3733, 3737, 3741, 3745, 3751, 3756, 3761, 3765, 3769, + 3068, 3072, 3076, 3080, 3084, 3090, 3095, 3102, 3102, 3106, + 3111, 3118, 3122, 3128, 3129, 3132, 3137, 3140, 3144, 3150, + 3154, 3161, 3160, 3175, 3185, 3189, 3194, 3201, 3205, 3209, + 3213, 3217, 3221, 3225, 3229, 3233, 3240, 3239, 3254, 3253, + 3269, 3277, 3286, 3289, 3296, 3299, 3303, 3304, 3307, 3311, + 3314, 3318, 3321, 3322, 3323, 3324, 3327, 3328, 3334, 3335, + 3336, 3340, 3353, 3354, 3360, 3365, 3364, 3375, 3379, 3385, + 3389, 3402, 3406, 3412, 3415, 3416, 3419, 3425, 3431, 3432, + 3435, 3442, 3441, 3455, 3459, 3473, 3478, 3492, 3498, 3499, + 3500, 3501, 3502, 3506, 3512, 3516, 3526, 3527, 3528, 3532, + 3538, 3542, 3546, 3550, 3554, 3560, 3564, 3570, 3574, 3578, + 3582, 3586, 3590, 3598, 3605, 3611, 3612, 3616, 3620, 3619, + 3636, 3637, 3640, 3646, 3650, 3656, 3657, 3661, 3665, 3671, + 3677, 3683, 3690, 3696, 3703, 3707, 3713, 3717, 3723, 3724, + 3727, 3731, 3737, 3741, 3745, 3749, 3755, 3760, 3765, 3769, 3773, 3777, 3781, 3785, 3789, 3793, 3797, 3801, 3805, 3809, - 3813, 3818, 3824, 3829, 3834, 3839, 3844, 3851, 3855, 3862, - 3867, 3866, 3878, 3882, 3888, 3896, 3904, 3912, 3916, 3922, - 3926, 3932, 3933, 3936, 3941, 3948, 3949, 3952, 3956, 3962, - 3966, 3972, 3977, 3977, 4002, 4003, 4009, 4014, 4020, 4026, - 4031, 4035, 4045, 4052, 4053, 4054, 4057, 4058, 4059, 4060, - 4063, 4064, 4065, 4068, 4069, 4072, 4076, 4082, 4083, 4089, - 4090, 4093, 4094, 4097, 4100, 4101, 4102, 4105, 4106, 4109, - 4114, 4117, 4118, 4122 + 3813, 3817, 3822, 3828, 3833, 3838, 3843, 3848, 3855, 3859, + 3866, 3871, 3870, 3882, 3886, 3892, 3900, 3908, 3916, 3920, + 3926, 3930, 3936, 3937, 3940, 3945, 3952, 3953, 3956, 3960, + 3966, 3970, 3976, 3981, 3981, 4006, 4007, 4013, 4018, 4024, + 4030, 4035, 4039, 4049, 4054, 4060, 4061, 4062, 4065, 4066, + 4067, 4068, 4071, 4072, 4073, 4076, 4077, 4080, 4084, 4090, + 4091, 4097, 4098, 4101, 4102, 4105, 4108, 4109, 4110, 4113, + 4114, 4117, 4122, 4125, 4126, 4130 }; #endif @@ -2226,7 +2226,7 @@ static const yytype_int16 yytoknum[] = #define yypact_value_is_default(Yyn) \ ((Yyn) == YYPACT_NINF) -#define YYTABLE_NINF (-614) +#define YYTABLE_NINF (-616) #define yytable_value_is_error(Yyn) \ ((Yyn) == YYTABLE_NINF) @@ -2350,114 +2350,114 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_int16 yydefact[] = { - 2, 0, 0, 1, 0, 0, 0, 0, 293, 0, - 0, 317, 320, 0, 0, 599, 337, 338, 339, 340, - 305, 270, 270, 488, 487, 489, 490, 601, 0, 10, - 0, 492, 491, 493, 479, 585, 481, 480, 483, 482, - 475, 476, 437, 438, 494, 495, 291, 0, 0, 0, - 0, 0, 0, 295, 613, 613, 88, 312, 0, 0, - 0, 0, 0, 0, 452, 0, 0, 0, 3, 599, - 6, 9, 27, 33, 541, 541, 49, 60, 59, 0, - 76, 0, 80, 90, 0, 54, 248, 0, 61, 310, - 284, 285, 435, 286, 287, 288, 433, 432, 464, 434, - 431, 486, 0, 289, 290, 270, 5, 8, 337, 338, - 305, 613, 413, 0, 113, 114, 291, 0, 0, 0, - 0, 541, 541, 116, 496, 341, 0, 486, 290, 0, - 333, 168, 178, 169, 165, 194, 195, 196, 197, 176, + 2, 0, 0, 1, 0, 0, 0, 0, 294, 0, + 0, 318, 321, 0, 0, 601, 338, 339, 340, 341, + 306, 270, 270, 489, 488, 490, 491, 603, 0, 10, + 0, 493, 492, 494, 480, 587, 482, 481, 484, 483, + 476, 477, 438, 439, 495, 496, 292, 0, 0, 0, + 0, 0, 0, 296, 615, 615, 88, 313, 0, 0, + 0, 0, 0, 0, 453, 0, 0, 0, 3, 601, + 6, 9, 27, 33, 542, 542, 49, 60, 59, 0, + 76, 0, 80, 90, 0, 54, 248, 0, 61, 311, + 285, 286, 436, 287, 288, 289, 434, 433, 465, 435, + 432, 487, 0, 290, 291, 270, 5, 8, 338, 339, + 306, 615, 414, 0, 113, 114, 292, 0, 0, 0, + 0, 542, 542, 116, 497, 342, 0, 487, 291, 0, + 334, 168, 178, 169, 165, 194, 195, 196, 197, 176, 191, 184, 174, 173, 189, 172, 171, 167, 192, 166, 179, 183, 185, 177, 170, 186, 193, 188, 187, 180, 190, 175, 164, 182, 181, 163, 161, 162, 158, 159, 160, 118, 120, 119, 153, 154, 131, 132, 133, 140, 137, 139, 134, 135, 155, 156, 141, 142, 146, 149, 150, 136, 138, 128, 129, 130, 143, 144, 145, 147, - 148, 151, 152, 157, 572, 55, 121, 122, 571, 0, - 0, 0, 58, 541, 541, 0, 0, 54, 0, 486, - 0, 290, 0, 0, 0, 112, 0, 352, 351, 0, - 0, 486, 290, 187, 180, 190, 175, 158, 159, 160, - 118, 119, 0, 123, 125, 20, 124, 455, 460, 459, - 607, 609, 599, 610, 0, 457, 0, 611, 608, 600, - 583, 0, 0, 273, 0, 265, 277, 74, 269, 613, - 435, 613, 576, 75, 73, 613, 259, 306, 72, 0, - 258, 412, 71, 599, 0, 18, 0, 0, 221, 0, - 222, 209, 212, 302, 0, 0, 0, 599, 15, 599, - 78, 14, 0, 599, 0, 604, 604, 249, 0, 0, - 604, 574, 0, 0, 86, 0, 96, 103, 541, 469, - 468, 470, 471, 0, 467, 466, 439, 444, 443, 446, - 0, 0, 441, 448, 0, 450, 0, 462, 0, 473, - 0, 477, 478, 53, 236, 237, 4, 600, 0, 0, - 0, 0, 0, 0, 0, 548, 544, 543, 542, 545, - 546, 0, 550, 562, 517, 518, 566, 565, 561, 541, - 0, 504, 0, 510, 515, 613, 520, 613, 540, 0, - 547, 549, 552, 526, 0, 559, 526, 564, 526, 568, - 524, 500, 0, 0, 400, 402, 0, 92, 0, 84, + 148, 151, 152, 157, 573, 55, 121, 122, 572, 0, + 0, 0, 58, 542, 542, 0, 0, 54, 0, 487, + 0, 291, 0, 0, 0, 112, 0, 353, 352, 0, + 0, 487, 291, 187, 180, 190, 175, 158, 159, 160, + 118, 119, 0, 123, 125, 20, 124, 456, 461, 460, + 609, 611, 601, 612, 0, 458, 0, 613, 610, 602, + 585, 278, 584, 273, 0, 265, 277, 74, 269, 615, + 436, 615, 577, 75, 73, 615, 259, 307, 72, 0, + 258, 413, 71, 601, 0, 18, 0, 0, 221, 0, + 222, 209, 212, 303, 0, 0, 0, 601, 15, 601, + 78, 14, 0, 601, 0, 606, 606, 249, 0, 0, + 606, 575, 0, 0, 86, 0, 96, 103, 542, 470, + 469, 471, 472, 0, 468, 467, 440, 445, 444, 447, + 0, 0, 442, 449, 0, 451, 0, 463, 0, 474, + 0, 478, 479, 53, 236, 237, 4, 602, 0, 0, + 0, 0, 0, 0, 0, 549, 545, 544, 543, 546, + 547, 0, 551, 563, 518, 519, 567, 566, 562, 542, + 0, 505, 0, 511, 516, 615, 521, 615, 541, 0, + 548, 550, 553, 527, 0, 560, 527, 565, 527, 569, + 525, 501, 0, 0, 401, 403, 0, 92, 0, 84, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 208, 211, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 596, 613, 595, 0, 598, 597, 0, 417, 415, 311, - 436, 0, 0, 406, 65, 309, 330, 113, 114, 115, - 477, 478, 504, 497, 328, 0, 613, 0, 0, 0, - 594, 593, 56, 0, 613, 302, 0, 0, 343, 0, - 342, 0, 0, 613, 0, 0, 0, 0, 0, 0, - 302, 0, 613, 0, 325, 0, 126, 0, 0, 456, - 458, 0, 0, 612, 580, 278, 582, 272, 0, 601, - 266, 0, 275, 0, 267, 0, 599, 0, 599, 613, - 613, 260, 271, 599, 0, 308, 52, 602, 0, 0, - 0, 0, 0, 0, 17, 599, 300, 13, 600, 77, - 296, 299, 303, 606, 250, 605, 606, 252, 304, 575, - 102, 94, 0, 89, 0, 0, 613, 0, 541, 313, - 397, 526, 472, 0, 0, 447, 453, 440, 442, 449, - 451, 463, 474, 0, 0, 7, 21, 22, 23, 24, - 25, 50, 51, 508, 554, 507, 0, 599, 599, 526, - 0, 0, 509, 0, 522, 570, 519, 0, 523, 505, - 0, 533, 555, 0, 536, 563, 0, 538, 567, 0, - 0, 613, 0, 28, 30, 0, 31, 599, 0, 82, - 93, 48, 34, 46, 0, 253, 198, 29, 0, 290, + 598, 615, 597, 0, 600, 599, 0, 418, 416, 312, + 437, 0, 0, 407, 65, 310, 331, 113, 114, 115, + 478, 479, 505, 498, 329, 0, 615, 0, 0, 0, + 596, 595, 56, 0, 615, 303, 0, 0, 344, 0, + 343, 0, 0, 615, 0, 0, 0, 0, 0, 0, + 303, 0, 615, 0, 326, 0, 126, 0, 0, 457, + 459, 0, 0, 614, 581, 279, 583, 272, 0, 603, + 266, 0, 275, 0, 267, 0, 601, 0, 601, 615, + 615, 260, 271, 601, 0, 309, 52, 604, 0, 0, + 0, 0, 0, 0, 17, 601, 301, 13, 602, 77, + 297, 300, 304, 608, 250, 607, 608, 252, 305, 576, + 102, 94, 0, 89, 0, 0, 615, 0, 542, 314, + 398, 527, 473, 0, 0, 448, 454, 441, 443, 450, + 452, 464, 475, 0, 0, 7, 21, 22, 23, 24, + 25, 50, 51, 509, 555, 508, 0, 601, 601, 527, + 0, 0, 510, 0, 523, 571, 520, 0, 524, 506, + 0, 534, 556, 0, 537, 564, 0, 539, 568, 0, + 0, 615, 278, 28, 30, 0, 31, 601, 0, 82, + 93, 48, 34, 46, 0, 253, 198, 29, 0, 291, 226, 231, 232, 233, 228, 230, 240, 241, 234, 235, - 207, 210, 238, 239, 32, 218, 601, 227, 229, 223, - 224, 225, 213, 214, 215, 216, 217, 586, 591, 587, - 592, 411, 270, 409, 0, 613, 586, 588, 587, 589, - 410, 270, 586, 587, 270, 613, 613, 35, 253, 199, + 207, 210, 238, 239, 32, 218, 603, 227, 229, 223, + 224, 225, 213, 214, 215, 216, 217, 588, 593, 589, + 594, 412, 270, 410, 0, 615, 588, 590, 589, 591, + 411, 270, 588, 589, 270, 615, 615, 35, 253, 199, 45, 206, 63, 66, 0, 0, 0, 113, 114, 117, - 0, 0, 613, 0, 599, 0, 294, 613, 613, 423, - 0, 0, 613, 344, 590, 301, 0, 586, 587, 613, - 346, 318, 345, 321, 590, 301, 0, 586, 587, 0, - 0, 0, 0, 277, 0, 324, 579, 578, 276, 0, - 279, 274, 613, 581, 577, 257, 255, 261, 262, 264, - 307, 603, 19, 0, 26, 205, 79, 16, 599, 604, - 95, 87, 99, 101, 0, 98, 100, 601, 0, 0, - 465, 0, 454, 219, 220, 548, 360, 599, 353, 503, - 501, 0, 41, 244, 335, 0, 516, 613, 569, 0, - 525, 553, 526, 526, 526, 560, 526, 548, 526, 43, - 246, 336, 388, 386, 0, 385, 384, 283, 0, 91, - 85, 0, 0, 0, 0, 0, 613, 0, 0, 0, - 0, 408, 69, 414, 262, 0, 0, 407, 67, 403, - 62, 0, 0, 613, 331, 0, 0, 414, 334, 573, - 57, 424, 425, 613, 426, 0, 613, 349, 0, 0, - 347, 0, 0, 414, 0, 0, 0, 0, 0, 414, - 0, 127, 461, 323, 0, 0, 280, 268, 599, 613, - 11, 297, 251, 97, 0, 390, 0, 0, 314, 445, - 361, 358, 551, 0, 599, 0, 0, 521, 506, 0, - 529, 0, 531, 0, 537, 0, 534, 539, 0, 0, - 383, 601, 601, 512, 513, 613, 613, 368, 0, 557, - 368, 368, 366, 0, 0, 281, 83, 47, 254, 586, - 587, 0, 586, 587, 0, 0, 40, 203, 39, 204, - 70, 0, 37, 201, 38, 202, 68, 404, 405, 0, - 0, 0, 0, 498, 329, 0, 0, 428, 350, 0, - 12, 430, 0, 315, 0, 316, 0, 0, 326, 279, - 613, 256, 263, 396, 0, 0, 0, 0, 0, 356, - 502, 42, 245, 526, 526, 526, 526, 44, 247, 0, - 0, 0, 511, 0, 364, 365, 368, 376, 556, 0, - 379, 0, 381, 401, 282, 414, 243, 242, 36, 200, - 418, 416, 0, 0, 0, 427, 0, 104, 111, 0, - 429, 0, 319, 322, 0, 420, 421, 419, 394, 601, - 392, 395, 399, 398, 362, 359, 0, 354, 530, 0, - 527, 532, 535, 389, 387, 302, 0, 514, 613, 0, - 367, 374, 368, 368, 368, 558, 368, 368, 64, 332, - 110, 0, 613, 0, 613, 613, 0, 0, 391, 0, - 357, 0, 526, 590, 301, 363, 0, 371, 0, 373, - 0, 380, 0, 377, 382, 107, 109, 0, 586, 587, - 422, 348, 327, 393, 355, 528, 368, 368, 368, 368, - 105, 372, 0, 369, 375, 378, 368, 370 + 0, 0, 615, 0, 601, 0, 295, 615, 615, 424, + 0, 0, 615, 345, 592, 302, 0, 588, 589, 615, + 347, 319, 346, 322, 592, 302, 0, 588, 589, 0, + 0, 0, 0, 277, 0, 325, 580, 579, 276, 0, + 280, 274, 615, 582, 578, 257, 255, 261, 262, 264, + 308, 605, 19, 0, 26, 205, 79, 16, 601, 606, + 95, 87, 99, 101, 0, 98, 100, 603, 0, 0, + 466, 0, 455, 219, 220, 549, 361, 601, 354, 504, + 502, 0, 41, 244, 336, 0, 517, 615, 570, 0, + 526, 554, 527, 527, 527, 561, 527, 549, 527, 43, + 246, 337, 389, 387, 0, 386, 385, 284, 0, 91, + 85, 0, 0, 0, 0, 0, 615, 0, 0, 0, + 0, 409, 69, 415, 262, 0, 0, 408, 67, 404, + 62, 0, 0, 615, 332, 0, 0, 415, 335, 574, + 57, 425, 426, 615, 427, 0, 615, 350, 0, 0, + 348, 0, 0, 415, 0, 0, 0, 0, 0, 415, + 0, 127, 462, 324, 0, 0, 281, 268, 601, 615, + 11, 298, 251, 97, 0, 391, 0, 0, 315, 446, + 362, 359, 552, 0, 601, 0, 0, 522, 507, 0, + 530, 0, 532, 0, 538, 0, 535, 540, 0, 0, + 384, 603, 603, 513, 514, 615, 615, 369, 0, 558, + 369, 369, 367, 0, 0, 282, 83, 47, 254, 588, + 589, 0, 588, 589, 0, 0, 40, 203, 39, 204, + 70, 0, 37, 201, 38, 202, 68, 405, 406, 0, + 0, 0, 0, 499, 330, 0, 0, 429, 351, 0, + 12, 431, 0, 316, 0, 317, 0, 0, 327, 280, + 615, 256, 263, 397, 0, 0, 0, 0, 0, 357, + 503, 42, 245, 527, 527, 527, 527, 44, 247, 0, + 0, 0, 512, 0, 365, 366, 369, 377, 557, 0, + 380, 0, 382, 402, 283, 415, 243, 242, 36, 200, + 419, 417, 0, 0, 0, 428, 0, 104, 111, 0, + 430, 0, 320, 323, 0, 421, 422, 420, 395, 603, + 393, 396, 400, 399, 363, 360, 0, 355, 531, 0, + 528, 533, 536, 390, 388, 303, 0, 515, 615, 0, + 368, 375, 369, 369, 369, 559, 369, 369, 64, 333, + 110, 0, 615, 0, 615, 615, 0, 0, 392, 0, + 358, 0, 527, 592, 302, 364, 0, 372, 0, 374, + 0, 381, 0, 378, 383, 107, 109, 0, 588, 589, + 423, 349, 328, 394, 356, 529, 369, 369, 369, 369, + 105, 373, 0, 370, 376, 379, 369, 371 }; /* YYPGOTO[NTERM-NUM]. */ @@ -2522,117 +2522,117 @@ static const yytype_int16 yytable[] = -107, 256, 661, -104, 525, 664, 334, 336, 338, 340, 315, 681, 306, 310, 276, 281, 550, 1025, 444, 392, 206, 1001, 125, 125, -109, 573, 682, 724, 696, 280, - 125, -111, 501, -488, 505, 267, 273, 706, 437, 274, + 125, -111, 501, -489, 505, 267, 273, 706, 437, 274, 856, 652, 393, 661, 3, 218, 782, 87, 700, 811, - 812, 283, 682, 790, 287, 346, -487, -485, 474, 581, - -110, -301, 773, 437, 293, 776, 434, 578, 533, 483, - -489, -106, 771, 125, -108, -105, -301, 366, 378, 378, + 812, 283, 682, 790, 287, 346, -488, -486, 474, 581, + -110, -302, 773, 437, 293, 776, 434, 578, 533, 483, + -490, -106, 771, 125, -108, -105, -302, 366, 378, 378, 600, 430, 910, 269, 269, 396, -112, 269, 916, 574, - -488, 682, -490, 783, 1025, 825, 468, 491, 443, 125, + -489, 682, -491, 783, 1025, 825, 468, 491, 443, 125, 394, 744, 367, 558, 276, 281, 558, 607, 558, 296, - 558, -301, 558, -487, 1001, -587, 682, -99, -301, -586, - -96, 305, 443, 432, 857, 378, 378, -489, 401, 522, - -484, 391, 391, 611, 393, 441, 247, -492, 87, 248, - 249, -101, 772, -587, 904, 683, 667, 670, -103, -490, + 558, -302, 558, -488, 1001, -589, 682, -99, -302, -588, + -96, 305, 443, 432, 857, 378, 378, -490, 401, 522, + -485, 391, 391, 611, 393, 441, 247, -493, 87, 248, + 249, -101, 772, -589, 904, 683, 667, 670, -103, -491, 438, 218, 218, 528, 772, 547, 275, 466, 467, -104, 397, 535, 535, 478, 479, 888, 535, 250, 888, 251, 275, 324, 1007, 611, 611, 438, 296, -102, 542, -77, 594, 270, 597, 541, 453, 270, 465, 502, -98, 502, - 504, -100, -97, 511, -492, 247, 300, 921, 248, 249, - -91, -491, 247, 218, 206, 248, 249, 218, 721, 721, - 905, 218, 218, -493, -479, 87, 752, 378, 378, 476, - 724, 773, 87, 87, -484, 265, 250, 523, 251, 265, - 87, 771, 442, 773, 471, 251, 896, 271, 488, -483, + 504, -100, -97, 511, -493, 247, 300, 921, 248, 249, + -91, -492, 247, 218, 206, 248, 249, 218, 721, 721, + 905, 218, 218, -494, -480, 87, 752, 378, 378, 476, + 724, 773, 87, 87, -485, 265, 250, 523, 251, 265, + 87, 771, 442, 773, 471, 251, 896, 271, 488, -484, 995, 315, 542, 771, 775, 888, 747, 755, -111, 356, - 357, 358, 359, -104, 524, 891, -110, 822, -491, 603, + 357, 358, 359, -104, 524, 891, -110, 822, -492, 603, 475, -111, 530, 460, 613, 360, 341, 342, 834, 553, - -493, -479, 728, 729, -96, 87, 218, 218, 218, 218, + -494, -480, 728, 729, -96, 87, 218, 218, 218, 218, 87, 218, 218, 527, 721, 353, 354, 480, 566, 567, - 568, 569, 484, 585, 835, 585, -483, -106, 512, 300, + 568, 569, 484, 585, 835, 585, -484, -106, 512, 300, 87, 565, 486, 442, 613, 613, 765, 71, 609, 491, 938, 523, 570, 755, 679, 356, 357, 358, 359, 934, - 461, 87, 378, -108, 218, 558, 87, 315, -341, 618, + 461, 87, 378, -108, 218, 558, 87, 315, -342, 618, 125, 360, -111, 450, 451, 447, 805, 270, 860, 448, - -110, 954, 509, -341, 520, 771, 269, 867, -105, 511, + -110, 954, 509, -342, 520, 771, 269, 867, -105, 511, 503, 901, 296, -103, 499, 771, 364, 365, 366, 218, 806, -102, 270, 816, 652, -106, 661, 519, 788, 618, - 618, 417, 807, 378, 511, 809, 828, 825, -341, 270, - 517, 265, 689, 367, 218, -341, 87, 218, 270, -108, + 618, 417, 807, 378, 511, 809, 828, 825, -342, 270, + 517, 265, 689, 367, 218, -342, 87, 218, 270, -108, 526, 511, 852, 807, -76, 659, 718, 87, 659, 417, 511, 218, 847, 538, 1006, 87, 265, 270, 996, 540, 218, 270, 740, 532, 541, 87, 125, 563, 804, 659, 544, 732, 721, 265, 911, 542, 660, 502, 502, 426, 427, 428, 265, 724, 845, 564, 659, 106, 1023, 270, - 580, 1026, 270, -414, 246, 659, 42, 87, 771, 43, - 660, -499, 270, -105, 583, 296, 87, 586, 797, 722, + 580, 1026, 270, -415, 246, 659, 42, 87, 771, 43, + 660, -500, 270, -105, 583, 296, 87, 586, 797, 722, 517, 595, 470, 605, 511, 964, 965, 660, 605, 470, 315, 893, 315, 805, 218, 587, 660, 844, 541, 71, 206, 590, 87, 247, 659, 505, 248, 249, 737, 212, 212, 739, 593, 59, 727, 212, 265, 429, 919, 959, - 960, 598, -106, 596, 906, 599, 493, -414, 218, 659, + 960, 598, -106, 596, 906, 599, 493, -415, 218, 659, 912, 914, 430, 806, 250, 660, 251, 517, 1067, 786, - 610, 771, -414, -98, 634, 611, 692, 218, -106, 847, + 610, 771, -415, -98, 634, 611, 692, 218, -106, 847, 762, 611, 771, 798, 699, 672, 315, 611, 611, 551, 660, 686, -108, 945, 711, 452, 452, 431, 687, 779, - 690, 691, 378, 693, 432, -414, 552, -414, 714, 125, - 715, 125, -91, -100, -414, 802, 870, 872, 874, -583, + 690, 691, 378, 693, 432, -415, 552, -415, 714, 125, + 715, 125, -91, -100, -415, 802, 870, 872, 874, -585, 876, 726, 877, 502, 808, 468, 731, 810, 105, 280, 105, 734, 280, 786, 786, 105, 105, 1057, 749, 911, 579, 105, 105, 105, 493, 535, 105, 446, 1045, 761, 280, 764, 682, 218, 87, 824, 827, 781, 575, 983, 827, 751, 942, 841, 820, 815, 978, 827, -105, 792, - -298, 791, 793, -298, -298, 125, 589, -106, 105, 803, - -106, -106, 817, -479, 270, 270, 246, 218, 818, -97, - 502, 917, 105, 611, 825, 801, 989, 206, -479, 840, - -298, -298, 991, -298, 276, 833, 613, 276, -106, 839, + -299, 791, 793, -299, -299, 125, 589, -106, 105, 803, + -106, -106, 817, -480, 270, 270, 246, 218, 818, -97, + 502, 917, 105, 611, 825, 801, 989, 206, -480, 840, + -299, -299, 991, -299, 276, 833, 613, 276, -106, 839, -106, 541, 613, 908, 326, 327, 328, 489, 613, 613, 248, 249, 206, 801, 247, 276, 843, 248, 249, 455, - 842, -583, 863, -479, 865, 585, 849, -583, 247, -108, - -479, 248, 249, 105, 430, 105, 850, 853, 573, 859, + 842, -585, 863, -480, 865, 585, 849, -585, 247, -108, + -480, 248, 249, 105, 430, 105, 850, 853, 573, 859, 517, 499, 270, 212, 212, 250, 869, 251, 871, 873, 270, 768, 87, 875, 511, 768, 878, 329, 330, 315, - 87, 618, 472, -584, 218, 702, 702, 618, 218, 456, + 87, 618, 472, -586, 218, 702, 702, 618, 218, 456, 924, 786, 925, 618, 618, 929, 432, 430, 933, 87, 87, 927, 935, 943, 931, 948, 265, 1008, 1010, 1011, 1012, 963, 897, 87, 605, 966, 218, 333, 969, 659, 327, 328, 849, 513, 516, 87, 87, 502, 932, 551, 971, 973, 473, 87, 613, 493, 529, 975, 980, 432, - 531, 981, 493, 992, 87, 87, 105, -483, -108, 993, + 531, 981, 493, 992, 87, 87, 105, -484, -108, 993, 660, -108, -108, 1002, 1003, 353, 354, 758, 1009, 105, - 105, 1013, -483, 585, 585, 767, 559, 1014, 125, 327, + 105, 1013, -484, 585, 585, 767, 559, 1014, 125, 327, 328, 962, 329, 330, 774, 1015, 968, 778, 1028, -108, 998, -108, 356, 357, 358, 359, 1033, 1029, 212, 212, - 212, 212, 1030, 571, 572, -584, 1065, -483, 360, 618, - 1037, -584, 1039, 1041, -483, 883, 1046, 1048, 270, 87, - 87, 105, -590, 986, 1050, 105, 1052, 87, 827, 105, - 105, 329, 330, 105, 669, 671, 1062, 1070, -586, 920, - 105, 105, -587, 247, 1072, 733, 248, 249, 105, -586, - -587, 227, 928, 130, 1061, 880, 335, 247, 327, 328, - 248, 249, 1063, 918, 936, 937, 1038, -291, 669, 671, + 212, 212, 1030, 571, 572, -586, 1065, -484, 360, 618, + 1037, -586, 1039, 1041, -484, 883, 1046, 1048, 270, 87, + 87, 105, -592, 986, 1050, 105, 1052, 87, 827, 105, + 105, 329, 330, 105, 669, 671, 1062, 1070, -588, 920, + 105, 105, -589, 247, 1072, 733, 248, 249, 105, -588, + -589, 227, 928, 130, 1061, 880, 335, 247, 327, 328, + 248, 249, 1063, 918, 936, 937, 1038, -292, 669, 671, 125, 1060, 940, 490, 250, 125, 251, 208, 766, 0, - 1017, 892, -291, 0, 946, 1022, -590, 87, 481, 87, + 1017, 892, -292, 0, 946, 1022, -592, 87, 481, 87, 251, 814, 87, 105, 105, 105, 105, 105, 105, 105, - 105, -590, 0, 430, 0, 0, 585, 0, 270, 684, - 329, 330, 125, -586, -587, 0, 735, -291, 105, 0, - 511, 0, 689, 827, -291, 0, 0, 0, -586, -587, - 218, 470, 0, 0, -590, 521, -590, 0, 482, 105, - -586, 0, 105, -590, 105, 432, 0, 105, 982, 0, + 105, -592, 0, 430, 0, 0, 585, 0, 270, 684, + 329, 330, 125, -588, -589, 0, 735, -292, 105, 0, + 511, 0, 689, 827, -292, 0, 0, 0, -588, -589, + 218, 470, 0, 0, -592, 521, -592, 0, 482, 105, + -588, 0, 105, -592, 105, 432, 0, 105, 982, 0, 430, 0, 265, 725, 0, 560, 990, 327, 328, 0, - 730, -586, -587, -586, -587, 659, 0, -586, -587, 0, - -586, -587, 736, 0, 887, 886, 0, 105, 0, 777, + 730, -588, -589, -588, -589, 659, 0, -588, -589, 0, + -588, -589, 736, 0, 887, 886, 0, 105, 0, 777, 0, 356, 357, 358, 359, 473, 868, 105, 105, 0, 0, 0, 432, 545, 0, 883, 660, 360, 883, 0, 0, 883, 105, 883, 105, 105, 0, 0, 430, 329, 330, 0, 0, 0, 0, 105, 1034, 0, 1035, 105, - -486, 1036, 362, 105, 759, 760, 0, 0, 105, 364, - 365, 366, 923, 105, 0, -486, 0, -290, 0, 0, - 970, 972, 0, 546, 0, 0, 0, 0, -302, 0, - 432, 883, -290, 0, 789, 0, 367, 702, 795, 0, - 953, 768, 955, -302, 892, 105, 956, 892, 0, 892, - -486, 1016, 0, 430, 105, 0, 0, -486, 883, 0, - 883, 0, 883, 0, 883, 0, 430, -290, 0, 0, - 0, 0, 105, 0, -290, 217, 217, 1031, -302, 0, - 105, 217, 266, 266, 883, -302, 266, 0, 796, 0, + -487, 1036, 362, 105, 759, 760, 0, 0, 105, 364, + 365, 366, 923, 105, 0, -487, 0, -291, 0, 0, + 970, 972, 0, 546, 0, 0, 0, 0, -303, 0, + 432, 883, -291, 0, 789, 0, 367, 702, 795, 0, + 953, 768, 955, -303, 892, 105, 956, 892, 0, 892, + -487, 1016, 0, 430, 105, 0, 0, -487, 883, 0, + 883, 0, 883, 0, 883, 0, 430, -291, 0, 0, + 0, 0, 105, 0, -291, 217, 217, 1031, -303, 0, + 105, 217, 266, 266, 883, -303, 266, 0, 796, 0, 0, 0, 430, 0, 0, 432, 1021, 892, 0, 0, 0, 456, 0, 0, 0, 212, 105, 0, 432, 0, 0, 819, 0, 288, 290, 291, 292, 417, 1004, 1005, @@ -2653,7 +2653,7 @@ static const yytype_int16 yytable[] = 361, 0, 329, 330, 0, 0, 0, 0, 0, 360, 0, 362, 0, 0, 0, 941, 0, 363, 364, 365, 366, 562, 327, 328, 979, 0, 750, 327, 328, 217, - 217, 950, 0, 74, 362, 74, 121, 121, -613, 0, + 217, 950, 0, 74, 362, 74, 121, 121, -615, 0, 329, 330, 0, 0, 121, 367, 0, 979, 368, 0, 105, 247, 0, 0, 248, 249, 0, 0, 105, 105, 0, 369, 105, 0, 0, 105, 105, 495, 496, 497, @@ -2690,21 +2690,21 @@ static const yytype_int16 yytable[] = 754, 0, 0, 0, 0, 362, 0, 0, 74, 0, 0, 949, 0, 74, 0, 0, 763, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -613, 0, 74, 0, 780, 0, 355, 787, 356, - 357, 358, 359, 0, -613, -613, -613, -613, -613, -613, - 0, -613, 0, 0, 74, 360, 0, -613, -613, 74, - 121, 0, 74, 0, 0, 0, 0, 0, -613, -613, - 0, -613, -613, -613, -613, -613, 0, 0, 0, 0, + 0, -615, 0, 74, 0, 780, 0, 355, 787, 356, + 357, 358, 359, 0, -615, -615, -615, -615, -615, -615, + 0, -615, 0, 0, 74, 360, 0, -615, -615, 74, + 121, 0, 74, 0, 0, 0, 0, 0, -615, -615, + 0, -615, -615, -615, -615, -615, 0, 0, 0, 0, 362, 0, 0, 0, 0, 0, 363, 364, 365, 366, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, 74, 0, 0, 0, 0, 0, 0, 0, 217, 0, 0, 367, 0, 0, 368, 0, 74, - 0, -613, 0, 821, 0, 0, 763, 780, 1019, 0, - 74, 75, 0, 75, 122, 122, -613, 0, 74, 0, - 0, 0, 122, 0, 0, 217, -613, 0, 74, -613, - -613, 0, 0, 0, 0, 846, 0, 0, 0, 0, - 0, 0, 0, 0, 720, 308, 0, 0, 0, -613, - -613, 0, 0, 0, 0, 275, -613, -613, -613, -613, + 0, -615, 0, 821, 0, 0, 763, 780, 1019, 0, + 74, 75, 0, 75, 122, 122, -615, 0, 74, 0, + 0, 0, 122, 0, 0, 217, -615, 0, 74, -615, + -615, 0, 0, 0, 0, 846, 0, 0, 0, 0, + 0, 0, 0, 0, 720, 308, 0, 0, 0, -615, + -615, 0, 0, 0, 0, 275, -615, -615, -615, -615, 74, 75, 0, 0, 0, 122, 0, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 121, 0, 121, 0, 0, 0, 0, @@ -2822,8 +2822,8 @@ static const yytype_int16 yytable[] = 0, 0, 102, 0, 0, 0, 0, 102, 0, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 102, 0, 0, - 0, 84, 0, 0, -614, -614, -614, -614, 406, 407, - 0, 84, -614, -614, 0, 0, 0, 0, 102, 0, + 0, 84, 0, 0, -616, -616, -616, -616, 406, 407, + 0, 84, -616, -616, 0, 0, 0, 0, 102, 0, 414, 415, 0, 102, 0, 0, 102, 0, 0, 0, 0, 0, 0, 417, 0, 101, 0, 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, @@ -2879,7 +2879,7 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 0, 0, 102, 102, 0, 0, 0, 0, 0, 0, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -613, 4, 0, 5, + 0, 0, 0, 0, 0, 0, -615, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 0, 0, 0, 0, 0, 15, 0, 16, 17, 18, 19, 0, 0, 0, 0, 0, 20, 21, 22, 23, @@ -2890,133 +2890,133 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 50, 0, 0, 0, 0, 0, 51, 0, 0, 52, 53, 0, 54, 55, 0, 56, 0, 0, 0, - 57, 0, 58, 59, 60, 0, 61, 62, 63, -292, - 64, -613, 0, 0, -613, -613, 0, 0, 0, 0, - 0, 0, -292, -292, -292, -292, -292, -292, 0, -292, - 65, 66, 67, 0, 0, 0, -292, -292, -292, 0, - 0, 0, -613, 0, -613, 0, -292, -292, 0, -292, - -292, -292, -292, -292, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -292, 0, 0, 0, + 57, 0, 58, 59, 60, 0, 61, 62, 63, -293, + 64, -615, 0, 0, -615, -615, 0, 0, 0, 0, + 0, 0, -293, -293, -293, -293, -293, -293, 0, -293, + 65, 66, 67, 0, 0, 0, -293, -293, -293, 0, + 0, 0, -615, 0, -615, 0, -293, -293, 0, -293, + -293, -293, -293, -293, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -293, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -292, -292, -292, -292, -292, -292, -292, -292, -292, - -292, -292, -292, 0, 0, 0, 0, -292, -292, -292, - 0, 0, -292, 0, 0, 0, 0, 0, -292, 0, - -292, 0, 0, 0, -292, 0, 0, 0, 0, 0, - 0, 0, -292, 0, -292, 0, 0, -292, -292, 0, - 0, -292, -292, -292, -292, -292, -292, -292, -292, -292, - -292, -292, -292, 0, 0, -413, 0, 0, -292, -292, - -292, -292, 0, 0, -292, -292, -292, -292, -413, -413, - -413, -413, -413, -413, 0, -413, 0, 0, 0, 0, - 0, -413, -413, -413, 0, 0, 0, 0, 0, 0, - 0, 0, -413, -413, 0, -413, -413, -413, -413, -413, + 0, -293, -293, -293, -293, -293, -293, -293, -293, -293, + -293, -293, -293, 0, 0, 0, 0, -293, -293, -293, + 0, 0, -293, 0, 0, 0, 0, 0, -293, 0, + -293, 0, 0, 0, -293, 0, 0, 0, 0, 0, + 0, 0, -293, 0, -293, 0, 0, -293, -293, 0, + 0, -293, -293, -293, -293, -293, -293, -293, -293, -293, + -293, -293, -293, 0, 0, -414, 0, 0, -293, -293, + -293, -293, 0, 0, -293, -293, -293, -293, -414, -414, + -414, -414, -414, -414, 0, -414, 0, 0, 0, 0, + 0, -414, -414, -414, 0, 0, 0, 0, 0, 0, + 0, 0, -414, -414, 0, -414, -414, -414, -414, -414, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -413, -413, -413, - -413, -413, -413, -413, -413, -413, -413, -413, -413, 0, - 0, 0, 0, -413, -413, -413, 0, 0, -413, 0, - 0, 0, 0, 0, -413, 0, -413, 0, 0, 0, - -413, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -413, 0, 0, -413, -413, 0, 0, -413, 0, -413, - -413, -413, -413, -413, -413, -413, -413, -413, -413, 0, - 0, -479, 0, -413, -413, -413, -413, -413, 0, 275, - -413, -413, -413, -413, -479, -479, -479, -479, -479, -479, - 0, -479, 0, 0, 0, 0, 0, 0, -479, -479, - 0, 0, 0, 0, 0, 0, 0, 0, -479, -479, - 0, -479, -479, -479, -479, -479, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -414, -414, -414, + -414, -414, -414, -414, -414, -414, -414, -414, -414, 0, + 0, 0, 0, -414, -414, -414, 0, 0, -414, 0, + 0, 0, 0, 0, -414, 0, -414, 0, 0, 0, + -414, 0, 0, 0, 0, 0, 0, 0, 0, 0, + -414, 0, 0, -414, -414, 0, 0, -414, 0, -414, + -414, -414, -414, -414, -414, -414, -414, -414, -414, 0, + 0, -480, 0, -414, -414, -414, -414, -414, 0, 275, + -414, -414, -414, -414, -480, -480, -480, -480, -480, -480, + 0, -480, 0, 0, 0, 0, 0, 0, -480, -480, + 0, 0, 0, 0, 0, 0, 0, 0, -480, -480, + 0, -480, -480, -480, -480, -480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 494, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -479, -479, -479, -479, -479, -479, -479, - -479, -479, -479, -479, -479, 0, 0, 0, 0, -479, - -479, -479, 0, -479, -479, 0, 0, 0, 0, 0, - -479, 0, -479, 0, 0, 0, -479, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -479, 0, 0, -479, - -479, 0, -479, -479, 0, -479, -479, -479, -479, -479, - -479, -479, -479, -479, -479, 0, 0, -613, 0, 0, - -479, -479, -479, -479, 0, 0, -479, -479, -479, -479, - -613, -613, -613, -613, -613, -613, 0, -613, 0, 0, - 0, 0, 0, -613, -613, -613, 0, 0, 0, 0, - 0, 0, 0, 0, -613, -613, 0, -613, -613, -613, - -613, -613, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -480, -480, -480, -480, -480, -480, -480, + -480, -480, -480, -480, -480, 0, 0, 0, 0, -480, + -480, -480, 0, -480, -480, 0, 0, 0, 0, 0, + -480, 0, -480, 0, 0, 0, -480, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -480, 0, 0, -480, + -480, 0, -480, -480, 0, -480, -480, -480, -480, -480, + -480, -480, -480, -480, -480, 0, 0, -615, 0, 0, + -480, -480, -480, -480, 0, 0, -480, -480, -480, -480, + -615, -615, -615, -615, -615, -615, 0, -615, 0, 0, + 0, 0, 0, -615, -615, -615, 0, 0, 0, 0, + 0, 0, 0, 0, -615, -615, 0, -615, -615, -615, + -615, -615, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, -613, - -613, -613, -613, -613, -613, -613, -613, -613, -613, -613, - -613, 0, 0, 0, 0, -613, -613, -613, 0, 0, - -613, 0, 0, 0, 0, 0, -613, 0, -613, 0, - 0, 0, -613, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -613, 0, 0, -613, -613, 0, 0, -613, - 0, -613, -613, -613, -613, -613, -613, -613, -613, -613, - -613, 0, 0, -613, 0, -613, -613, -613, -613, -613, - 0, 275, -613, -613, -613, -613, -613, -613, -613, -613, - -613, -613, 0, -613, 0, 0, 0, 0, 0, 0, - -613, -613, 0, 0, 0, 0, 0, 0, 0, 0, - -613, -613, 0, -613, -613, -613, -613, -613, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, -615, + -615, -615, -615, -615, -615, -615, -615, -615, -615, -615, + -615, 0, 0, 0, 0, -615, -615, -615, 0, 0, + -615, 0, 0, 0, 0, 0, -615, 0, -615, 0, + 0, 0, -615, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -615, 0, 0, -615, -615, 0, 0, -615, + 0, -615, -615, -615, -615, -615, -615, -615, -615, -615, + -615, 0, 0, -615, 0, -615, -615, -615, -615, -615, + 0, 275, -615, -615, -615, -615, -615, -615, -615, -615, + -615, -615, 0, -615, 0, 0, 0, 0, 0, 0, + -615, -615, 0, 0, 0, 0, 0, 0, 0, 0, + -615, -615, 0, -615, -615, -615, -615, -615, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -613, -613, -613, -613, -613, - -613, -613, -613, -613, -613, -613, -613, 0, 0, 0, - 0, -613, -613, -613, 0, 0, -613, 0, 0, 0, - 0, 0, -613, 0, -613, 0, 0, 0, -613, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -613, 0, - 0, -613, -613, 0, 0, -613, 0, -613, -613, -613, - -613, -613, -613, -613, -613, -613, -613, 0, 0, -590, - 0, 0, -613, -613, -613, -613, 0, 275, -613, -613, - -613, -613, -590, -590, -590, 0, -590, -590, 0, -590, - 0, 0, 0, 0, 0, -590, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -590, -590, 0, -590, - -590, -590, -590, -590, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -615, -615, -615, -615, -615, + -615, -615, -615, -615, -615, -615, -615, 0, 0, 0, + 0, -615, -615, -615, 0, 0, -615, 0, 0, 0, + 0, 0, -615, 0, -615, 0, 0, 0, -615, 0, + 0, 0, 0, 0, 0, 0, 0, 0, -615, 0, + 0, -615, -615, 0, 0, -615, 0, -615, -615, -615, + -615, -615, -615, -615, -615, -615, -615, 0, 0, -592, + 0, 0, -615, -615, -615, -615, 0, 275, -615, -615, + -615, -615, -592, -592, -592, 0, -592, -592, 0, -592, + 0, 0, 0, 0, 0, -592, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -592, -592, 0, -592, + -592, -592, -592, -592, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -590, -590, -590, -590, -590, -590, -590, -590, -590, - -590, -590, -590, 0, 0, 0, 0, -590, -590, -590, - 0, 799, -590, 0, 0, 0, 0, 0, 0, 0, - -590, 0, 0, 0, -590, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -590, 0, 0, -590, -590, 0, - -107, -590, 0, -590, -590, -590, -590, -590, -590, -590, - -590, -590, -590, 0, 0, -590, 0, -590, -590, -590, - 0, -99, 0, 0, -590, -590, -590, -590, -590, -590, - -590, 0, -590, -590, 0, -590, 0, 0, 0, 0, - 0, -590, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -590, -590, 0, -590, -590, -590, -590, -590, + 0, -592, -592, -592, -592, -592, -592, -592, -592, -592, + -592, -592, -592, 0, 0, 0, 0, -592, -592, -592, + 0, 799, -592, 0, 0, 0, 0, 0, 0, 0, + -592, 0, 0, 0, -592, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -592, 0, 0, -592, -592, 0, + -107, -592, 0, -592, -592, -592, -592, -592, -592, -592, + -592, -592, -592, 0, 0, -592, 0, -592, -592, -592, + 0, -99, 0, 0, -592, -592, -592, -592, -592, -592, + -592, 0, -592, -592, 0, -592, 0, 0, 0, 0, + 0, -592, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -592, -592, 0, -592, -592, -592, -592, -592, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -590, -590, -590, - -590, -590, -590, -590, -590, -590, -590, -590, -590, 0, - 0, 0, 0, -590, -590, -590, 0, 799, -590, 0, - 0, 0, 0, 0, 0, 0, -590, 0, 0, 0, - -590, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -590, 0, 0, -590, -590, 0, -107, -590, 0, -590, - -590, -590, -590, -590, -590, -590, -590, -590, -590, 0, - 0, -301, 0, -590, -590, -590, 0, -590, 0, 0, - -590, -590, -590, -590, -301, -301, -301, 0, -301, -301, - 0, -301, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -301, -301, - 0, -301, -301, -301, -301, -301, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -592, -592, -592, + -592, -592, -592, -592, -592, -592, -592, -592, -592, 0, + 0, 0, 0, -592, -592, -592, 0, 799, -592, 0, + 0, 0, 0, 0, 0, 0, -592, 0, 0, 0, + -592, 0, 0, 0, 0, 0, 0, 0, 0, 0, + -592, 0, 0, -592, -592, 0, -107, -592, 0, -592, + -592, -592, -592, -592, -592, -592, -592, -592, -592, 0, + 0, -302, 0, -592, -592, -592, 0, -592, 0, 0, + -592, -592, -592, -592, -302, -302, -302, 0, -302, -302, + 0, -302, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, -302, -302, + 0, -302, -302, -302, -302, -302, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -301, -301, -301, -301, -301, -301, -301, - -301, -301, -301, -301, -301, 0, 0, 0, 0, -301, - -301, -301, 0, 800, -301, 0, 0, 0, 0, 0, - 0, 0, -301, 0, 0, 0, -301, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -301, 0, 0, -301, - -301, 0, -109, -301, 0, -301, -301, -301, -301, -301, - -301, -301, -301, -301, -301, 0, 0, -301, 0, 0, - -301, -301, 0, -101, 0, 0, -301, -301, -301, -301, - -301, -301, -301, 0, -301, -301, 0, -301, 0, 0, + 0, 0, 0, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, 0, 0, 0, 0, -302, + -302, -302, 0, 800, -302, 0, 0, 0, 0, 0, + 0, 0, -302, 0, 0, 0, -302, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -302, 0, 0, -302, + -302, 0, -109, -302, 0, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, 0, 0, -302, 0, 0, + -302, -302, 0, -101, 0, 0, -302, -302, -302, -302, + -302, -302, -302, 0, -302, -302, 0, -302, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -301, -301, 0, -301, -301, -301, - -301, -301, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -302, -302, 0, -302, -302, -302, + -302, -302, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, -301, - -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, - -301, 0, 0, 0, 0, -301, -301, -301, 0, 800, - -301, 0, 0, 0, 0, 0, 0, 0, -301, 0, - 0, 0, -301, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -301, 0, 0, -301, -301, 0, -109, -301, - 0, -301, -301, -301, -301, -301, -301, -301, -301, -301, - -301, 0, 0, 0, 0, 0, -301, -301, 0, -301, - 0, 0, -301, -301, -301, -301, 294, 0, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, -613, -613, - -613, 0, 0, -613, 15, 0, 16, 17, 18, 19, + 0, 0, 0, 0, 0, 0, 0, 0, 0, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, 0, 0, 0, 0, -302, -302, -302, 0, 800, + -302, 0, 0, 0, 0, 0, 0, 0, -302, 0, + 0, 0, -302, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -302, 0, 0, -302, -302, 0, -109, -302, + 0, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, 0, 0, 0, 0, 0, -302, -302, 0, -302, + 0, 0, -302, -302, -302, -302, 294, 0, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, -615, -615, + -615, 0, 0, -615, 15, 0, 16, 17, 18, 19, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 0, 0, 27, 0, 0, 0, 0, 0, 28, 0, 30, 31, 32, 33, 34, 35, 36, 37, @@ -3026,11 +3026,11 @@ static const yytype_int16 yytable[] = 50, 0, 0, 0, 0, 0, 51, 0, 0, 52, 53, 0, 54, 55, 0, 56, 0, 0, 0, 57, 0, 58, 59, 60, 0, 61, 62, 63, 0, 64, - -613, 0, 0, -613, -613, 0, 0, 0, 0, 0, + -615, 0, 0, -615, -615, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 66, 67, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -613, 294, -613, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 0, 0, -613, 0, -613, -613, + 0, -615, 294, -615, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 0, 0, -615, 0, -615, -615, 15, 0, 16, 17, 18, 19, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 0, 0, 27, 0, 0, 0, 0, 0, 28, 0, 30, 31, @@ -3040,12 +3040,12 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 0, 49, 50, 0, 0, 0, 0, 0, 51, 0, 0, 52, 53, 0, 54, 55, 0, 56, 0, 0, 0, 57, 0, 58, 59, 60, - 0, 61, 62, 63, 0, 64, -613, 0, 0, -613, - -613, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 61, 62, 63, 0, 64, -615, 0, 0, -615, + -615, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 66, 67, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -613, 294, -613, + 0, 0, 0, 0, 0, 0, 0, -615, 294, -615, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 0, 0, -613, 0, 0, -613, 15, -613, 16, 17, + 0, 0, -615, 0, 0, -615, 15, -615, 16, 17, 18, 19, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 0, 0, 27, 0, 0, 0, 0, 0, 28, 0, 30, 31, 32, 33, 34, 35, @@ -3055,12 +3055,12 @@ static const yytype_int16 yytable[] = 0, 49, 50, 0, 0, 0, 0, 0, 51, 0, 0, 52, 53, 0, 54, 55, 0, 56, 0, 0, 0, 57, 0, 58, 59, 60, 0, 61, 62, 63, - 0, 64, -613, 0, 0, -613, -613, 0, 0, 0, + 0, 64, -615, 0, 0, -615, -615, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 66, 67, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -613, 294, -613, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 0, 0, -613, 0, - 0, -613, 15, 0, 16, 17, 18, 19, 0, 0, + 0, 0, 0, -615, 294, -615, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 0, 0, -615, 0, + 0, -615, 15, 0, 16, 17, 18, 19, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 0, 0, 27, 0, 0, 0, 0, 0, 28, 0, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, @@ -3069,11 +3069,11 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 0, 0, 0, 49, 50, 0, 0, 0, 0, 0, 51, 0, 0, 52, 53, 0, 54, 55, 0, 56, 0, 0, 0, 57, 0, 58, - 59, 60, 0, 61, 62, 63, 0, 64, -613, 0, - 0, -613, -613, 4, 0, 5, 6, 7, 8, 9, + 59, 60, 0, 61, 62, 63, 0, 64, -615, 0, + 0, -615, -615, 4, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 0, 65, 66, 67, - 0, 15, 0, 16, 17, 18, 19, 0, 0, -613, - 0, -613, 20, 21, 22, 23, 24, 25, 26, 0, + 0, 15, 0, 16, 17, 18, 19, 0, 0, -615, + 0, -615, 20, 21, 22, 23, 24, 25, 26, 0, 0, 27, 0, 0, 0, 0, 0, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 0, 40, 41, 42, 0, 0, 43, 0, 0, 44, 45, @@ -3081,12 +3081,12 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 0, 0, 49, 50, 0, 0, 0, 0, 0, 51, 0, 0, 52, 53, 0, 54, 55, 0, 56, 0, 0, 0, 57, 0, 58, 59, - 60, 0, 61, 62, 63, 0, 64, -613, 0, 0, - -613, -613, 0, 0, 0, 0, 0, 0, 0, 0, + 60, 0, 61, 62, 63, 0, 64, -615, 0, 0, + -615, -615, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 66, 67, 0, - 0, -613, 0, 0, 0, 0, 0, 0, -613, 294, - -613, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 0, -613, -613, 0, 0, 0, 15, 0, 16, + 0, -615, 0, 0, 0, 0, 0, 0, -615, 294, + -615, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 0, -615, -615, 0, 0, 0, 15, 0, 16, 17, 18, 19, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 0, 0, 27, 0, 0, 0, 0, 0, 28, 0, 30, 31, 32, 33, 34, @@ -3096,10 +3096,10 @@ static const yytype_int16 yytable[] = 0, 0, 49, 50, 0, 0, 0, 0, 0, 51, 0, 0, 52, 53, 0, 54, 55, 0, 56, 0, 0, 0, 57, 0, 58, 59, 60, 0, 61, 62, - 63, 0, 64, -613, 0, 0, -613, -613, 294, 0, + 63, 0, 64, -615, 0, 0, -615, -615, 294, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 0, 65, 66, 67, 0, 15, 0, 16, 17, - 18, 19, 0, 0, -613, 0, -613, 20, 21, 22, + 18, 19, 0, 0, -615, 0, -615, 20, 21, 22, 23, 24, 25, 26, 0, 0, 27, 0, 0, 0, 0, 0, 28, 0, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 0, 40, 41, 42, 0, 0, @@ -3108,10 +3108,10 @@ static const yytype_int16 yytable[] = 0, 49, 50, 0, 0, 0, 0, 0, 51, 0, 0, 295, 53, 0, 54, 55, 0, 56, 0, 0, 0, 57, 0, 58, 59, 60, 0, 61, 62, 63, - 0, 64, -613, 0, 0, -613, -613, 294, 0, 5, + 0, 64, -615, 0, 0, -615, -615, 294, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 0, 65, 66, 67, 0, 15, 0, 16, 17, 18, - 19, 0, -613, -613, 0, -613, 20, 21, 22, 23, + 19, 0, -615, -615, 0, -615, 20, 21, 22, 23, 24, 25, 26, 0, 0, 27, 0, 0, 0, 0, 0, 28, 0, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 0, 40, 41, 42, 0, 0, 43, @@ -3120,10 +3120,10 @@ static const yytype_int16 yytable[] = 49, 50, 0, 0, 0, 0, 0, 51, 0, 0, 52, 53, 0, 54, 55, 0, 56, 0, 0, 0, 57, 0, 58, 59, 60, 0, 61, 62, 63, 0, - 64, -613, 0, 0, -613, -613, 294, 0, 5, 6, + 64, -615, 0, 0, -615, -615, 294, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 0, 65, 66, 67, 0, 15, 0, 16, 17, 18, 19, - 0, -613, -613, 0, -613, 20, 21, 22, 23, 24, + 0, -615, -615, 0, -615, 20, 21, 22, 23, 24, 25, 26, 0, 0, 27, 0, 0, 0, 0, 0, 28, 0, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 0, 40, 41, 42, 0, 0, 43, 0, @@ -3132,11 +3132,11 @@ static const yytype_int16 yytable[] = 50, 0, 0, 0, 0, 0, 51, 0, 0, 52, 53, 0, 54, 55, 0, 56, 0, 0, 0, 57, 0, 58, 59, 60, 0, 61, 62, 63, 0, 64, - -613, 0, 0, -613, -613, 0, 0, 0, 0, 0, + -615, 0, 0, -615, -615, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, - 66, 67, 0, 0, -613, 0, 0, 0, 0, 0, - 0, -613, 294, -613, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 0, 0, -613, 0, 0, 0, + 66, 67, 0, 0, -615, 0, 0, 0, 0, 0, + 0, -615, 294, -615, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 0, 0, -615, 0, 0, 0, 15, 0, 16, 17, 18, 19, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 0, 0, 27, 0, 0, 0, 0, 0, 28, 0, 30, 31, @@ -3146,10 +3146,10 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 0, 49, 50, 0, 0, 0, 0, 0, 51, 0, 0, 52, 53, 0, 54, 55, 0, 56, 0, 0, 0, 57, 0, 58, 59, 60, - 0, 61, 62, 63, 0, 64, -613, 0, 0, -613, - -613, 0, 0, 5, 6, 7, 8, 9, 10, 11, + 0, 61, 62, 63, 0, 64, -615, 0, 0, -615, + -615, 0, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 0, 65, 66, 67, 0, 15, - 0, 16, 17, 18, 19, 0, 0, -613, 0, -613, + 0, 16, 17, 18, 19, 0, 0, -615, 0, -615, 20, 21, 22, 23, 24, 25, 26, 0, 0, 27, 0, 0, 0, 0, 0, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 0, 40, 41, @@ -3223,83 +3223,83 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 0, 201, 202, 0, - 0, 0, 0, 0, 0, 203, 204, -583, -583, -583, - -583, -583, -583, -583, -583, -583, 0, 0, 0, 0, - 0, 0, 0, -583, 0, -583, -583, -583, -583, 0, - -583, 0, 0, 0, -583, -583, -583, -583, -583, -583, - -583, 0, 0, -583, 0, 0, 0, 0, 0, 0, - 0, 0, -583, -583, -583, -583, -583, -583, -583, -583, - -583, 0, -583, -583, -583, 0, 0, -583, 0, 0, - -583, -583, 0, -583, -583, -583, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -583, -583, - 0, 0, 0, 0, 0, -583, 0, 0, -583, -583, - 0, -583, -583, 0, -583, 0, -583, -583, -583, 0, - -583, -583, -583, 0, -583, -583, -583, 0, -583, 0, + 0, 0, 0, 0, 0, 203, 204, -585, -585, -585, + -585, -585, -585, -585, -585, -585, 0, 0, 0, 0, + 0, 0, 0, -585, 0, -585, -585, -585, -585, 0, + -585, 0, 0, 0, -585, -585, -585, -585, -585, -585, + -585, 0, 0, -585, 0, 0, 0, 0, 0, 0, + 0, 0, -585, -585, -585, -585, -585, -585, -585, -585, + -585, 0, -585, -585, -585, 0, 0, -585, 0, 0, + -585, -585, 0, -585, -585, -585, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, -585, -585, + 0, 0, 0, 0, 0, -585, 0, 0, -585, -585, + 0, -585, -585, 0, -585, 0, -585, -585, -585, 0, + -585, -585, -585, 0, -585, -585, -585, 0, -585, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -583, -583, - -583, 0, -583, 0, 0, 0, 0, 0, -583, -584, - -584, -584, -584, -584, -584, -584, -584, -584, 0, 0, - 0, 0, 0, 0, 0, -584, 0, -584, -584, -584, - -584, 0, -584, 0, 0, 0, -584, -584, -584, -584, - -584, -584, -584, 0, 0, -584, 0, 0, 0, 0, - 0, 0, 0, 0, -584, -584, -584, -584, -584, -584, - -584, -584, -584, 0, -584, -584, -584, 0, 0, -584, - 0, 0, -584, -584, 0, -584, -584, -584, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, -585, -585, + -585, 0, -585, 0, 0, 0, 0, 0, -585, -586, + -586, -586, -586, -586, -586, -586, -586, -586, 0, 0, + 0, 0, 0, 0, 0, -586, 0, -586, -586, -586, + -586, 0, -586, 0, 0, 0, -586, -586, -586, -586, + -586, -586, -586, 0, 0, -586, 0, 0, 0, 0, + 0, 0, 0, 0, -586, -586, -586, -586, -586, -586, + -586, -586, -586, 0, -586, -586, -586, 0, 0, -586, + 0, 0, -586, -586, 0, -586, -586, -586, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -584, -584, 0, 0, 0, 0, 0, -584, 0, 0, - -584, -584, 0, -584, -584, 0, -584, 0, -584, -584, - -584, 0, -584, -584, -584, 0, -584, -584, -584, 0, - -584, 0, 0, 0, 0, 0, 0, -586, -586, -586, - -586, -586, -586, -586, -586, -586, 0, 0, 0, 0, - -584, -584, -584, -586, -584, -586, -586, -586, -586, 0, - -584, 0, 0, 0, -586, -586, -586, -586, -586, -586, - -586, 0, 0, -586, 0, 0, 0, 0, 0, 0, - 0, 0, -586, -586, -586, -586, -586, -586, -586, -586, - -586, 0, -586, -586, -586, 0, 0, -586, 0, 0, - -586, -586, 0, -586, -586, -586, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -586, -586, - 0, 0, 0, 0, 0, -586, 831, 0, -586, -586, - 0, -586, -586, 0, -586, 0, -586, -586, -586, 0, - -586, -586, -586, 0, -586, -586, -586, 0, -586, 0, - 0, 0, 0, 0, 0, -107, -587, -587, -587, -587, - -587, -587, -587, -587, -587, 0, 0, 0, -586, -586, - -586, 0, -587, 0, -587, -587, -587, -587, -586, 0, - 0, 0, 0, -587, -587, -587, -587, -587, -587, -587, - 0, 0, -587, 0, 0, 0, 0, 0, 0, 0, - 0, -587, -587, -587, -587, -587, -587, -587, -587, -587, - 0, -587, -587, -587, 0, 0, -587, 0, 0, -587, - -587, 0, -587, -587, -587, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -587, -587, 0, - 0, 0, 0, 0, -587, 832, 0, -587, -587, 0, - -587, -587, 0, -587, 0, -587, -587, -587, 0, -587, - -587, -587, 0, -587, -587, -587, 0, -587, 0, 0, - 0, 0, 0, 0, -109, -588, -588, -588, -588, -588, - -588, -588, -588, -588, 0, 0, 0, -587, -587, -587, - 0, -588, 0, -588, -588, -588, -588, -587, 0, 0, - 0, 0, -588, -588, -588, -588, -588, -588, -588, 0, - 0, -588, 0, 0, 0, 0, 0, 0, 0, 0, - -588, -588, -588, -588, -588, -588, -588, -588, -588, 0, - -588, -588, -588, 0, 0, -588, 0, 0, -588, -588, - 0, -588, -588, -588, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -588, -588, 0, 0, - 0, 0, 0, -588, 0, 0, -588, -588, 0, -588, - -588, 0, -588, 0, -588, -588, -588, 0, -588, -588, - -588, 0, -588, -588, -588, 0, -588, 0, 0, 0, + -586, -586, 0, 0, 0, 0, 0, -586, 0, 0, + -586, -586, 0, -586, -586, 0, -586, 0, -586, -586, + -586, 0, -586, -586, -586, 0, -586, -586, -586, 0, + -586, 0, 0, 0, 0, 0, 0, -588, -588, -588, + -588, -588, -588, -588, -588, -588, 0, 0, 0, 0, + -586, -586, -586, -588, -586, -588, -588, -588, -588, 0, + -586, 0, 0, 0, -588, -588, -588, -588, -588, -588, + -588, 0, 0, -588, 0, 0, 0, 0, 0, 0, + 0, 0, -588, -588, -588, -588, -588, -588, -588, -588, + -588, 0, -588, -588, -588, 0, 0, -588, 0, 0, + -588, -588, 0, -588, -588, -588, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, -588, -588, + 0, 0, 0, 0, 0, -588, 831, 0, -588, -588, + 0, -588, -588, 0, -588, 0, -588, -588, -588, 0, + -588, -588, -588, 0, -588, -588, -588, 0, -588, 0, + 0, 0, 0, 0, 0, -107, -589, -589, -589, -589, + -589, -589, -589, -589, -589, 0, 0, 0, -588, -588, + -588, 0, -589, 0, -589, -589, -589, -589, -588, 0, 0, 0, 0, -589, -589, -589, -589, -589, -589, -589, - -589, -589, 0, 0, 0, 0, -588, -588, -588, -589, - 0, -589, -589, -589, -589, 0, -588, 0, 0, 0, - -589, -589, -589, -589, -589, -589, -589, 0, 0, -589, - 0, 0, 0, 0, 0, 0, 0, 0, -589, -589, - -589, -589, -589, -589, -589, -589, -589, 0, -589, -589, - -589, 0, 0, -589, 0, 0, -589, -589, 0, -589, - -589, -589, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -589, -589, 0, 0, 0, 0, - 0, -589, 0, 0, -589, -589, 0, -589, -589, 0, - -589, 0, -589, -589, -589, 0, -589, -589, -589, 0, - -589, -589, -589, 0, -589, 0, 0, 0, 0, 0, + 0, 0, -589, 0, 0, 0, 0, 0, 0, 0, + 0, -589, -589, -589, -589, -589, -589, -589, -589, -589, + 0, -589, -589, -589, 0, 0, -589, 0, 0, -589, + -589, 0, -589, -589, -589, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -589, -589, 0, + 0, 0, 0, 0, -589, 832, 0, -589, -589, 0, + -589, -589, 0, -589, 0, -589, -589, -589, 0, -589, + -589, -589, 0, -589, -589, -589, 0, -589, 0, 0, + 0, 0, 0, 0, -109, -590, -590, -590, -590, -590, + -590, -590, -590, -590, 0, 0, 0, -589, -589, -589, + 0, -590, 0, -590, -590, -590, -590, -589, 0, 0, + 0, 0, -590, -590, -590, -590, -590, -590, -590, 0, + 0, -590, 0, 0, 0, 0, 0, 0, 0, 0, + -590, -590, -590, -590, -590, -590, -590, -590, -590, 0, + -590, -590, -590, 0, 0, -590, 0, 0, -590, -590, + 0, -590, -590, -590, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -590, -590, 0, 0, + 0, 0, 0, -590, 0, 0, -590, -590, 0, -590, + -590, 0, -590, 0, -590, -590, -590, 0, -590, -590, + -590, 0, -590, -590, -590, 0, -590, 0, 0, 0, + 0, 0, 0, -591, -591, -591, -591, -591, -591, -591, + -591, -591, 0, 0, 0, 0, -590, -590, -590, -591, + 0, -591, -591, -591, -591, 0, -590, 0, 0, 0, + -591, -591, -591, -591, -591, -591, -591, 0, 0, -591, + 0, 0, 0, 0, 0, 0, 0, 0, -591, -591, + -591, -591, -591, -591, -591, -591, -591, 0, -591, -591, + -591, 0, 0, -591, 0, 0, -591, -591, 0, -591, + -591, -591, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -591, -591, 0, 0, 0, 0, + 0, -591, 0, 0, -591, -591, 0, -591, -591, 0, + -591, 0, -591, -591, -591, 0, -591, -591, -591, 0, + -591, -591, -591, 0, -591, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -589, -589, -589, 0, 0, 0, - 0, 0, 0, 0, -589, 131, 132, 133, 134, 135, + 0, 0, 0, 0, -591, -591, -591, 0, 0, 0, + 0, 0, 0, 0, -591, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 0, 0, 0, 155, 156, 157, 233, 234, 235, 236, 162, @@ -3810,21 +3810,21 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 418, 0, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 0, - 0, 0, 0, 0, 0, 0, 0, -278, 402, 403, + 0, 0, 0, 0, 0, 0, 0, -279, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 0, 0, 0, 0, 414, 415, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 417, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 418, 0, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, - 0, 0, 0, 0, 0, 0, 0, 0, -279, 402, + 0, 0, 0, 0, 0, 0, 0, 0, -280, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 0, 0, 0, 0, 414, 415, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 417, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 418, 0, 419, 420, 421, 422, 423, 424, 425, 426, 427, - 428, 0, 0, 0, 0, 0, 0, 0, 0, -280, + 428, 0, 0, 0, 0, 0, 0, 0, 0, -281, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 0, 0, 0, 0, 414, 415, 0, 0, 0, 416, 0, 0, 0, 0, 0, 0, 0, 417, @@ -3844,7 +3844,7 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 418, 0, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 402, 403, 404, 405, - 406, 407, 408, 409, 410, 411, -614, -614, 0, 0, + 406, 407, 408, 409, 410, 411, -616, -616, 0, 0, 0, 0, 414, 415, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 417, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5340,40 +5340,40 @@ static const yytype_int16 yyr1[] = 190, 190, 190, 191, 191, 192, 192, 192, 193, 193, 194, 194, 194, 194, 194, 195, 195, 195, 195, 195, 197, 196, 198, 198, 199, 199, 200, 201, 201, 201, - 201, 202, 202, 202, 203, 203, 203, 203, 203, 203, - 203, 203, 203, 204, 203, 205, 206, 203, 207, 203, + 201, 201, 202, 202, 202, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 204, 203, 205, 206, 203, 207, 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, - 203, 203, 208, 209, 203, 203, 203, 210, 211, 203, - 212, 213, 203, 203, 203, 214, 215, 203, 216, 203, - 217, 218, 203, 219, 203, 203, 203, 203, 203, 203, - 203, 220, 221, 221, 221, 222, 222, 223, 223, 224, - 224, 225, 225, 226, 226, 226, 226, 226, 226, 226, - 226, 227, 226, 228, 228, 228, 228, 229, 229, 230, + 203, 203, 203, 208, 209, 203, 203, 203, 210, 211, + 203, 212, 213, 203, 203, 203, 214, 215, 203, 216, + 203, 217, 218, 203, 219, 203, 203, 203, 203, 203, + 203, 203, 220, 221, 221, 221, 222, 222, 223, 223, + 224, 224, 225, 225, 226, 226, 226, 226, 226, 226, + 226, 226, 227, 226, 228, 228, 228, 228, 229, 229, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, - 230, 230, 230, 230, 231, 231, 233, 232, 232, 232, - 234, 234, 235, 235, 236, 236, 237, 237, 238, 238, - 240, 239, 241, 241, 241, 241, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 244, 243, 245, 243, 246, - 247, 247, 248, 248, 249, 249, 249, 250, 250, 251, - 251, 252, 252, 252, 252, 253, 253, 254, 254, 254, - 254, 255, 255, 256, 257, 256, 256, 256, 258, 258, - 259, 259, 260, 261, 261, 262, 262, 263, 263, 264, - 265, 264, 266, 266, 267, 267, 268, 269, 269, 269, - 269, 269, 269, 270, 270, 271, 271, 271, 271, 272, - 272, 272, 272, 272, 273, 273, 274, 274, 274, 274, - 274, 274, 274, 274, 275, 275, 276, 277, 276, 278, - 278, 279, 279, 279, 280, 280, 280, 280, 281, 282, - 282, 283, 283, 284, 284, 285, 285, 286, 286, 287, - 287, 288, 288, 288, 288, 289, 289, 290, 290, 290, + 230, 230, 230, 230, 230, 231, 231, 233, 232, 232, + 232, 234, 234, 235, 235, 236, 236, 237, 237, 238, + 238, 240, 239, 241, 241, 241, 241, 242, 242, 242, + 242, 242, 242, 242, 242, 242, 244, 243, 245, 243, + 246, 247, 247, 248, 248, 249, 249, 249, 250, 250, + 251, 251, 252, 252, 252, 252, 253, 253, 254, 254, + 254, 254, 255, 255, 256, 257, 256, 256, 256, 258, + 258, 259, 259, 260, 261, 261, 262, 262, 263, 263, + 264, 265, 264, 266, 266, 267, 267, 268, 269, 269, + 269, 269, 269, 269, 270, 270, 271, 271, 271, 271, + 272, 272, 272, 272, 272, 273, 273, 274, 274, 274, + 274, 274, 274, 274, 274, 275, 275, 276, 277, 276, + 278, 278, 279, 279, 279, 280, 280, 280, 280, 281, + 282, 282, 283, 283, 284, 284, 285, 285, 286, 286, + 287, 287, 288, 288, 288, 288, 289, 289, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, - 290, 290, 291, 291, 291, 291, 291, 292, 292, 293, - 294, 293, 295, 295, 296, 297, 298, 299, 299, 300, - 300, 301, 301, 302, 302, 303, 303, 304, 304, 305, - 305, 306, 307, 306, 308, 308, 309, 309, 310, 310, - 310, 310, 310, 311, 311, 311, 312, 312, 312, 312, - 313, 313, 313, 314, 314, 315, 315, 316, 316, 317, - 317, 318, 318, 319, 320, 320, 320, 321, 321, 322, - 322, 323, 323, 324 + 290, 290, 290, 291, 291, 291, 291, 291, 292, 292, + 293, 294, 293, 295, 295, 296, 297, 298, 299, 299, + 300, 300, 301, 301, 302, 302, 303, 303, 304, 304, + 305, 305, 306, 307, 306, 308, 308, 309, 309, 310, + 310, 310, 310, 310, 310, 311, 311, 311, 312, 312, + 312, 312, 313, 313, 313, 314, 314, 315, 315, 316, + 316, 317, 317, 318, 318, 319, 320, 320, 320, 321, + 321, 322, 322, 323, 323, 324 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -5406,41 +5406,41 @@ static const yytype_int8 yyr2[] = 3, 3, 6, 6, 4, 6, 4, 6, 1, 1, 2, 4, 2, 1, 3, 3, 5, 3, 1, 1, 1, 2, 2, 4, 2, 1, 2, 2, 4, 1, - 0, 2, 2, 1, 2, 1, 2, 1, 2, 3, - 4, 3, 4, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 0, 4, 0, 0, 5, 0, 3, - 3, 3, 2, 3, 3, 1, 2, 4, 3, 2, - 1, 2, 0, 0, 5, 6, 6, 0, 0, 7, - 0, 0, 7, 5, 4, 0, 0, 9, 0, 6, - 0, 0, 8, 0, 5, 4, 4, 1, 1, 1, - 1, 1, 1, 1, 2, 1, 1, 1, 5, 1, - 2, 1, 1, 1, 4, 6, 3, 5, 2, 4, - 1, 0, 4, 4, 2, 2, 1, 2, 0, 6, - 8, 4, 6, 4, 3, 6, 2, 4, 6, 2, - 4, 2, 4, 1, 1, 1, 0, 4, 1, 4, - 1, 4, 1, 3, 1, 1, 4, 1, 3, 3, - 0, 5, 2, 4, 5, 5, 2, 4, 4, 3, - 3, 3, 2, 1, 4, 0, 5, 0, 5, 5, - 1, 1, 6, 1, 1, 1, 1, 2, 1, 2, - 1, 1, 1, 1, 1, 1, 2, 1, 1, 2, - 3, 1, 2, 1, 0, 4, 1, 2, 2, 3, - 2, 3, 1, 1, 2, 1, 2, 1, 2, 1, - 0, 4, 2, 3, 1, 4, 2, 1, 1, 1, - 1, 1, 2, 2, 3, 1, 1, 2, 2, 1, + 0, 2, 2, 1, 2, 1, 2, 1, 1, 2, + 3, 4, 3, 4, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 4, 0, 0, 5, 0, + 3, 3, 3, 2, 3, 3, 1, 2, 4, 3, + 2, 1, 2, 0, 0, 5, 6, 6, 0, 0, + 7, 0, 0, 7, 5, 4, 0, 0, 9, 0, + 6, 0, 0, 8, 0, 5, 4, 4, 1, 1, + 1, 1, 1, 1, 1, 2, 1, 1, 1, 5, + 1, 2, 1, 1, 1, 4, 6, 3, 5, 2, + 4, 1, 0, 4, 4, 2, 2, 1, 2, 0, + 6, 8, 4, 6, 4, 3, 6, 2, 4, 6, + 2, 4, 2, 4, 1, 1, 1, 0, 4, 1, + 4, 1, 4, 1, 3, 1, 1, 4, 1, 3, + 3, 0, 5, 2, 4, 5, 5, 2, 4, 4, + 3, 3, 3, 2, 1, 4, 0, 5, 0, 5, + 5, 1, 1, 6, 1, 1, 1, 1, 2, 1, + 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, + 2, 3, 1, 2, 1, 0, 4, 1, 2, 2, + 3, 2, 3, 1, 1, 2, 1, 2, 1, 2, + 1, 0, 4, 2, 3, 1, 4, 2, 1, 1, + 1, 1, 1, 2, 2, 3, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 0, 0, 4, 1, - 1, 3, 5, 3, 1, 2, 4, 2, 2, 2, - 1, 2, 1, 1, 3, 1, 3, 1, 1, 2, - 1, 4, 2, 2, 1, 2, 0, 6, 8, 4, - 6, 4, 6, 2, 4, 6, 2, 4, 2, 4, - 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 4, 1, 3, 2, 2, 2, 1, 3, 1, - 3, 1, 1, 2, 1, 1, 1, 2, 1, 2, - 1, 1, 0, 4, 1, 2, 1, 3, 3, 3, - 2, 3, 2, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, - 1, 0, 2, 2, 0, 1, 1, 1, 1, 1, - 1, 1, 2, 0 + 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, + 1, 1, 3, 5, 3, 1, 2, 4, 2, 2, + 2, 1, 2, 1, 1, 3, 1, 3, 1, 1, + 2, 1, 4, 2, 2, 1, 2, 0, 6, 8, + 4, 6, 4, 6, 2, 4, 6, 2, 4, 2, + 4, 1, 0, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 4, 1, 3, 2, 2, 2, 1, 3, + 1, 3, 1, 1, 2, 1, 1, 1, 2, 1, + 2, 1, 1, 0, 4, 1, 2, 1, 3, 3, + 3, 2, 3, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 1, 0, 2, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 2, 0 }; @@ -7912,42 +7912,42 @@ yyreduce: case 278: #line 2631 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1(new_splat(p, (yyvsp[0].nd))); - NODE_LINENO((yyval.nd), (yyvsp[0].nd)); + (yyval.nd) = list1(new_splat(p, new_lvar(p, intern_op(mul)))); } -#line 7919 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7918 "mrbgems/mruby-compiler/core/y.tab.c" break; case 279: -#line 2636 "mrbgems/mruby-compiler/core/parse.y" +#line 2635 "mrbgems/mruby-compiler/core/parse.y" { - void_expr_error(p, (yyvsp[0].nd)); - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = list1(new_splat(p, (yyvsp[0].nd))); + NODE_LINENO((yyval.nd), (yyvsp[0].nd)); } -#line 7928 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7927 "mrbgems/mruby-compiler/core/y.tab.c" break; case 280: -#line 2641 "mrbgems/mruby-compiler/core/parse.y" +#line 2640 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd))); + void_expr_error(p, (yyvsp[0].nd)); + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } #line 7936 "mrbgems/mruby-compiler/core/y.tab.c" break; case 281: -#line 2647 "mrbgems/mruby-compiler/core/parse.y" +#line 2645 "mrbgems/mruby-compiler/core/parse.y" { - void_expr_error(p, (yyvsp[0].nd)); - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd))); } -#line 7945 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7944 "mrbgems/mruby-compiler/core/y.tab.c" break; case 282: -#line 2652 "mrbgems/mruby-compiler/core/parse.y" +#line 2651 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd))); + void_expr_error(p, (yyvsp[0].nd)); + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } #line 7953 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -7955,15 +7955,15 @@ yyreduce: case 283: #line 2656 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1(new_splat(p, (yyvsp[0].nd))); + (yyval.nd) = push((yyvsp[-3].nd), new_splat(p, (yyvsp[0].nd))); } #line 7961 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 291: -#line 2669 "mrbgems/mruby-compiler/core/parse.y" + case 284: +#line 2660 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_nvar(p, (yyvsp[0].num)); + (yyval.nd) = list1(new_splat(p, (yyvsp[0].nd))); } #line 7969 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -7971,7 +7971,7 @@ yyreduce: case 292: #line 2673 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_fcall(p, (yyvsp[0].id), 0); + (yyval.nd) = new_nvar(p, (yyvsp[0].num)); } #line 7977 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -7979,63 +7979,63 @@ yyreduce: case 293: #line 2677 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.stack) = p->cmdarg_stack; - p->cmdarg_stack = 0; + (yyval.nd) = new_fcall(p, (yyvsp[0].id), 0); } -#line 7986 "mrbgems/mruby-compiler/core/y.tab.c" +#line 7985 "mrbgems/mruby-compiler/core/y.tab.c" break; case 294: -#line 2683 "mrbgems/mruby-compiler/core/parse.y" +#line 2681 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.stack) = p->cmdarg_stack; + p->cmdarg_stack = 0; + } +#line 7994 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 295: +#line 2687 "mrbgems/mruby-compiler/core/parse.y" { p->cmdarg_stack = (yyvsp[-2].stack); (yyval.nd) = (yyvsp[-1].nd); } -#line 7995 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 295: -#line 2688 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.stack) = p->cmdarg_stack; - p->cmdarg_stack = 0; - } -#line 8004 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8003 "mrbgems/mruby-compiler/core/y.tab.c" break; case 296: #line 2692 "mrbgems/mruby-compiler/core/parse.y" - {p->lstate = EXPR_ENDARG;} -#line 8010 "mrbgems/mruby-compiler/core/y.tab.c" + { + (yyval.stack) = p->cmdarg_stack; + p->cmdarg_stack = 0; + } +#line 8012 "mrbgems/mruby-compiler/core/y.tab.c" break; case 297: -#line 2693 "mrbgems/mruby-compiler/core/parse.y" - { - p->cmdarg_stack = (yyvsp[-3].stack); - (yyval.nd) = (yyvsp[-2].nd); - } -#line 8019 "mrbgems/mruby-compiler/core/y.tab.c" +#line 2696 "mrbgems/mruby-compiler/core/parse.y" + {p->lstate = EXPR_ENDARG;} +#line 8018 "mrbgems/mruby-compiler/core/y.tab.c" break; case 298: #line 2697 "mrbgems/mruby-compiler/core/parse.y" - {p->lstate = EXPR_ENDARG;} -#line 8025 "mrbgems/mruby-compiler/core/y.tab.c" + { + p->cmdarg_stack = (yyvsp[-3].stack); + (yyval.nd) = (yyvsp[-2].nd); + } +#line 8027 "mrbgems/mruby-compiler/core/y.tab.c" break; case 299: -#line 2698 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_nil(p); - } +#line 2701 "mrbgems/mruby-compiler/core/parse.y" + {p->lstate = EXPR_ENDARG;} #line 8033 "mrbgems/mruby-compiler/core/y.tab.c" break; case 300: #line 2702 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[-1].nd); + (yyval.nd) = new_nil(p); } #line 8041 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8043,7 +8043,7 @@ yyreduce: case 301: #line 2706 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id)); + (yyval.nd) = (yyvsp[-1].nd); } #line 8049 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8051,7 +8051,7 @@ yyreduce: case 302: #line 2710 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_colon3(p, (yyvsp[0].id)); + (yyval.nd) = new_colon2(p, (yyvsp[-2].nd), (yyvsp[0].id)); } #line 8057 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8059,25 +8059,25 @@ yyreduce: case 303: #line 2714 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_array(p, (yyvsp[-1].nd)); - NODE_LINENO((yyval.nd), (yyvsp[-1].nd)); + (yyval.nd) = new_colon3(p, (yyvsp[0].id)); } -#line 8066 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8065 "mrbgems/mruby-compiler/core/y.tab.c" break; case 304: -#line 2719 "mrbgems/mruby-compiler/core/parse.y" +#line 2718 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_hash(p, (yyvsp[-1].nd)); + (yyval.nd) = new_array(p, (yyvsp[-1].nd)); NODE_LINENO((yyval.nd), (yyvsp[-1].nd)); } -#line 8075 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8074 "mrbgems/mruby-compiler/core/y.tab.c" break; case 305: -#line 2724 "mrbgems/mruby-compiler/core/parse.y" +#line 2723 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_return(p, 0); + (yyval.nd) = new_hash(p, (yyvsp[-1].nd)); + NODE_LINENO((yyval.nd), (yyvsp[-1].nd)); } #line 8083 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8085,7 +8085,7 @@ yyreduce: case 306: #line 2728 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_yield(p, (yyvsp[0].nd)); + (yyval.nd) = new_return(p, 0); } #line 8091 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8093,7 +8093,7 @@ yyreduce: case 307: #line 2732 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_uni_op(p, cond((yyvsp[-1].nd)), "!"); + (yyval.nd) = new_yield(p, (yyvsp[0].nd)); } #line 8099 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8101,7 +8101,7 @@ yyreduce: case 308: #line 2736 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = call_uni_op(p, new_nil(p), "!"); + (yyval.nd) = call_uni_op(p, cond((yyvsp[-1].nd)), "!"); } #line 8107 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8109,42 +8109,50 @@ yyreduce: case 309: #line 2740 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_fcall(p, (yyvsp[-1].id), new_callargs(p, 0, 0, (yyvsp[0].nd))); + (yyval.nd) = call_uni_op(p, new_nil(p), "!"); } #line 8115 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 311: -#line 2745 "mrbgems/mruby-compiler/core/parse.y" + case 310: +#line 2744 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_fcall(p, (yyvsp[-1].id), new_callargs(p, 0, 0, (yyvsp[0].nd))); + } +#line 8123 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 312: +#line 2749 "mrbgems/mruby-compiler/core/parse.y" { call_with_block(p, (yyvsp[-1].nd), (yyvsp[0].nd)); (yyval.nd) = (yyvsp[-1].nd); } -#line 8124 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8132 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 312: -#line 2750 "mrbgems/mruby-compiler/core/parse.y" + case 313: +#line 2754 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); (yyval.num) = p->lpar_beg; p->lpar_beg = ++p->paren_nest; } -#line 8135 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8143 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 313: -#line 2757 "mrbgems/mruby-compiler/core/parse.y" + case 314: +#line 2761 "mrbgems/mruby-compiler/core/parse.y" { (yyval.stack) = p->cmdarg_stack; p->cmdarg_stack = 0; } -#line 8144 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8152 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 314: -#line 2762 "mrbgems/mruby-compiler/core/parse.y" + case 315: +#line 2766 "mrbgems/mruby-compiler/core/parse.y" { p->lpar_beg = (yyvsp[-3].num); (yyval.nd) = new_lambda(p, (yyvsp[-2].nd), (yyvsp[0].nd)); @@ -8153,73 +8161,65 @@ yyreduce: p->cmdarg_stack = (yyvsp[-1].stack); CMDARG_LEXPOP(); } -#line 8157 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8165 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 315: -#line 2774 "mrbgems/mruby-compiler/core/parse.y" + case 316: +#line 2778 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_if(p, cond((yyvsp[-4].nd)), (yyvsp[-2].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-5].num)); } -#line 8166 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 316: -#line 2782 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_unless(p, cond((yyvsp[-4].nd)), (yyvsp[-2].nd), (yyvsp[-1].nd)); - SET_LINENO((yyval.nd), (yyvsp[-5].num)); - } -#line 8175 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8174 "mrbgems/mruby-compiler/core/y.tab.c" break; case 317: #line 2786 "mrbgems/mruby-compiler/core/parse.y" - {COND_PUSH(1);} -#line 8181 "mrbgems/mruby-compiler/core/y.tab.c" + { + (yyval.nd) = new_unless(p, cond((yyvsp[-4].nd)), (yyvsp[-2].nd), (yyvsp[-1].nd)); + SET_LINENO((yyval.nd), (yyvsp[-5].num)); + } +#line 8183 "mrbgems/mruby-compiler/core/y.tab.c" break; case 318: -#line 2786 "mrbgems/mruby-compiler/core/parse.y" - {COND_POP();} -#line 8187 "mrbgems/mruby-compiler/core/y.tab.c" +#line 2790 "mrbgems/mruby-compiler/core/parse.y" + {COND_PUSH(1);} +#line 8189 "mrbgems/mruby-compiler/core/y.tab.c" break; case 319: -#line 2789 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_while(p, cond((yyvsp[-4].nd)), (yyvsp[-1].nd)); - SET_LINENO((yyval.nd), (yyvsp[-6].num)); - } -#line 8196 "mrbgems/mruby-compiler/core/y.tab.c" +#line 2790 "mrbgems/mruby-compiler/core/parse.y" + {COND_POP();} +#line 8195 "mrbgems/mruby-compiler/core/y.tab.c" break; case 320: #line 2793 "mrbgems/mruby-compiler/core/parse.y" - {COND_PUSH(1);} -#line 8202 "mrbgems/mruby-compiler/core/y.tab.c" + { + (yyval.nd) = new_while(p, cond((yyvsp[-4].nd)), (yyvsp[-1].nd)); + SET_LINENO((yyval.nd), (yyvsp[-6].num)); + } +#line 8204 "mrbgems/mruby-compiler/core/y.tab.c" break; case 321: -#line 2793 "mrbgems/mruby-compiler/core/parse.y" - {COND_POP();} -#line 8208 "mrbgems/mruby-compiler/core/y.tab.c" +#line 2797 "mrbgems/mruby-compiler/core/parse.y" + {COND_PUSH(1);} +#line 8210 "mrbgems/mruby-compiler/core/y.tab.c" break; case 322: -#line 2796 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_until(p, cond((yyvsp[-4].nd)), (yyvsp[-1].nd)); - SET_LINENO((yyval.nd), (yyvsp[-6].num)); - } -#line 8217 "mrbgems/mruby-compiler/core/y.tab.c" +#line 2797 "mrbgems/mruby-compiler/core/parse.y" + {COND_POP();} +#line 8216 "mrbgems/mruby-compiler/core/y.tab.c" break; case 323: -#line 2803 "mrbgems/mruby-compiler/core/parse.y" +#line 2800 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_case(p, (yyvsp[-3].nd), (yyvsp[-1].nd)); + (yyval.nd) = new_until(p, cond((yyvsp[-4].nd)), (yyvsp[-1].nd)); + SET_LINENO((yyval.nd), (yyvsp[-6].num)); } #line 8225 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8227,75 +8227,83 @@ yyreduce: case 324: #line 2807 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_case(p, 0, (yyvsp[-1].nd)); + (yyval.nd) = new_case(p, (yyvsp[-3].nd), (yyvsp[-1].nd)); } #line 8233 "mrbgems/mruby-compiler/core/y.tab.c" break; case 325: #line 2811 "mrbgems/mruby-compiler/core/parse.y" - {COND_PUSH(1);} -#line 8239 "mrbgems/mruby-compiler/core/y.tab.c" + { + (yyval.nd) = new_case(p, 0, (yyvsp[-1].nd)); + } +#line 8241 "mrbgems/mruby-compiler/core/y.tab.c" break; case 326: -#line 2813 "mrbgems/mruby-compiler/core/parse.y" - {COND_POP();} -#line 8245 "mrbgems/mruby-compiler/core/y.tab.c" +#line 2815 "mrbgems/mruby-compiler/core/parse.y" + {COND_PUSH(1);} +#line 8247 "mrbgems/mruby-compiler/core/y.tab.c" break; case 327: -#line 2816 "mrbgems/mruby-compiler/core/parse.y" +#line 2817 "mrbgems/mruby-compiler/core/parse.y" + {COND_POP();} +#line 8253 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 328: +#line 2820 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_for(p, (yyvsp[-7].nd), (yyvsp[-4].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-8].num)); } -#line 8254 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8262 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 328: -#line 2822 "mrbgems/mruby-compiler/core/parse.y" + case 329: +#line 2826 "mrbgems/mruby-compiler/core/parse.y" { if (p->in_def || p->in_single) yyerror(p, "class definition in method body"); (yyval.nd) = local_switch(p); nvars_block(p); } -#line 8265 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8273 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 329: -#line 2830 "mrbgems/mruby-compiler/core/parse.y" + case 330: +#line 2834 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_class(p, (yyvsp[-4].nd), (yyvsp[-3].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-5].num)); local_resume(p, (yyvsp[-2].nd)); nvars_unnest(p); } -#line 8276 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8284 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 330: -#line 2838 "mrbgems/mruby-compiler/core/parse.y" + case 331: +#line 2842 "mrbgems/mruby-compiler/core/parse.y" { (yyval.num) = p->in_def; p->in_def = 0; } -#line 8285 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8293 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 331: -#line 2843 "mrbgems/mruby-compiler/core/parse.y" + case 332: +#line 2847 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = cons(local_switch(p), nint(p->in_single)); nvars_block(p); p->in_single = 0; } -#line 8295 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8303 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 332: -#line 2850 "mrbgems/mruby-compiler/core/parse.y" + case 333: +#line 2854 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_sclass(p, (yyvsp[-5].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-7].num)); @@ -8304,44 +8312,44 @@ yyreduce: p->in_def = (yyvsp[-4].num); p->in_single = intn((yyvsp[-2].nd)->cdr); } -#line 8308 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8316 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 333: -#line 2860 "mrbgems/mruby-compiler/core/parse.y" + case 334: +#line 2864 "mrbgems/mruby-compiler/core/parse.y" { if (p->in_def || p->in_single) yyerror(p, "module definition in method body"); (yyval.nd) = local_switch(p); nvars_block(p); } -#line 8319 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8327 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 334: -#line 2868 "mrbgems/mruby-compiler/core/parse.y" + case 335: +#line 2872 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_module(p, (yyvsp[-3].nd), (yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-4].num)); local_resume(p, (yyvsp[-2].nd)); nvars_unnest(p); } -#line 8330 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8338 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 335: -#line 2878 "mrbgems/mruby-compiler/core/parse.y" + case 336: +#line 2882 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-3].nd); defn_setup(p, (yyval.nd), (yyvsp[-2].nd), (yyvsp[-1].nd)); nvars_unnest(p); p->in_def--; } -#line 8341 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8349 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 336: -#line 2888 "mrbgems/mruby-compiler/core/parse.y" + case 337: +#line 2892 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-3].nd); defs_setup(p, (yyval.nd), (yyvsp[-2].nd), (yyvsp[-1].nd)); @@ -8349,21 +8357,13 @@ yyreduce: p->in_def--; p->in_single--; } -#line 8353 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 337: -#line 2896 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_break(p, 0); - } #line 8361 "mrbgems/mruby-compiler/core/y.tab.c" break; case 338: #line 2900 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_next(p, 0); + (yyval.nd) = new_break(p, 0); } #line 8369 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8371,7 +8371,7 @@ yyreduce: case 339: #line 2904 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_redo(p); + (yyval.nd) = new_next(p, 0); } #line 8377 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8379,48 +8379,48 @@ yyreduce: case 340: #line 2908 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_retry(p); + (yyval.nd) = new_redo(p); } #line 8385 "mrbgems/mruby-compiler/core/y.tab.c" break; case 341: -#line 2914 "mrbgems/mruby-compiler/core/parse.y" +#line 2912 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_retry(p); + } +#line 8393 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 342: +#line 2918 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); if (!(yyval.nd)) (yyval.nd) = new_nil(p); } -#line 8394 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 348: -#line 2933 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_if(p, cond((yyvsp[-3].nd)), (yyvsp[-1].nd), (yyvsp[0].nd)); - } #line 8402 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 350: -#line 2940 "mrbgems/mruby-compiler/core/parse.y" + case 349: +#line 2937 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[0].nd); + (yyval.nd) = new_if(p, cond((yyvsp[-3].nd)), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 8410 "mrbgems/mruby-compiler/core/y.tab.c" break; case 351: -#line 2946 "mrbgems/mruby-compiler/core/parse.y" +#line 2944 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1(list1((yyvsp[0].nd))); + (yyval.nd) = (yyvsp[0].nd); } #line 8418 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 353: -#line 2953 "mrbgems/mruby-compiler/core/parse.y" + case 352: +#line 2950 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3((yyvsp[0].nd),0,0); + (yyval.nd) = list1(list1((yyvsp[0].nd))); } #line 8426 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8428,7 +8428,7 @@ yyreduce: case 354: #line 2957 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3((yyvsp[-3].nd), new_arg(p, (yyvsp[0].id)), 0); + (yyval.nd) = list3((yyvsp[0].nd),0,0); } #line 8434 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8436,7 +8436,7 @@ yyreduce: case 355: #line 2961 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3((yyvsp[-5].nd), new_arg(p, (yyvsp[-2].id)), (yyvsp[0].nd)); + (yyval.nd) = list3((yyvsp[-3].nd), new_arg(p, (yyvsp[0].id)), 0); } #line 8442 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8444,16 +8444,16 @@ yyreduce: case 356: #line 2965 "mrbgems/mruby-compiler/core/parse.y" { - local_add_f(p, intern_op(mul)); - (yyval.nd) = list3((yyvsp[-2].nd), nint(-1), 0); + (yyval.nd) = list3((yyvsp[-5].nd), new_arg(p, (yyvsp[-2].id)), (yyvsp[0].nd)); } -#line 8451 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8450 "mrbgems/mruby-compiler/core/y.tab.c" break; case 357: -#line 2970 "mrbgems/mruby-compiler/core/parse.y" +#line 2969 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3((yyvsp[-4].nd), nint(-1), (yyvsp[0].nd)); + local_add_f(p, intern_op(mul)); + (yyval.nd) = list3((yyvsp[-2].nd), nint(-1), 0); } #line 8459 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8461,7 +8461,7 @@ yyreduce: case 358: #line 2974 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3(0, new_arg(p, (yyvsp[0].id)), 0); + (yyval.nd) = list3((yyvsp[-4].nd), nint(-1), (yyvsp[0].nd)); } #line 8467 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8469,7 +8469,7 @@ yyreduce: case 359: #line 2978 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3(0, new_arg(p, (yyvsp[-2].id)), (yyvsp[0].nd)); + (yyval.nd) = list3(0, new_arg(p, (yyvsp[0].id)), 0); } #line 8475 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8477,16 +8477,16 @@ yyreduce: case 360: #line 2982 "mrbgems/mruby-compiler/core/parse.y" { - local_add_f(p, intern_op(mul)); - (yyval.nd) = list3(0, nint(-1), 0); + (yyval.nd) = list3(0, new_arg(p, (yyvsp[-2].id)), (yyvsp[0].nd)); } -#line 8484 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8483 "mrbgems/mruby-compiler/core/y.tab.c" break; case 361: -#line 2987 "mrbgems/mruby-compiler/core/parse.y" +#line 2986 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, intern_op(mul)); + (yyval.nd) = list3(0, nint(-1), 0); } #line 8492 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8494,15 +8494,15 @@ yyreduce: case 362: #line 2991 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list3(0, nint(-1), (yyvsp[0].nd)); + local_add_f(p, intern_op(mul)); } #line 8500 "mrbgems/mruby-compiler/core/y.tab.c" break; case 363: -#line 2997 "mrbgems/mruby-compiler/core/parse.y" +#line 2995 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].nd), (yyvsp[0].id)); + (yyval.nd) = list3(0, nint(-1), (yyvsp[0].nd)); } #line 8508 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8510,7 +8510,7 @@ yyreduce: case 364: #line 3001 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); + (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].nd), (yyvsp[0].id)); } #line 8516 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8518,7 +8518,7 @@ yyreduce: case 365: #line 3005 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].nd), (yyvsp[0].id)); + (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); } #line 8524 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8526,15 +8526,15 @@ yyreduce: case 366: #line 3009 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); + (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].nd), (yyvsp[0].id)); } #line 8532 "mrbgems/mruby-compiler/core/y.tab.c" break; case 367: -#line 3015 "mrbgems/mruby-compiler/core/parse.y" +#line 3013 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[0].nd); + (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); } #line 8540 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8542,15 +8542,15 @@ yyreduce: case 368: #line 3019 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, 0, 0, 0); + (yyval.nd) = (yyvsp[0].nd); } #line 8548 "mrbgems/mruby-compiler/core/y.tab.c" break; case 369: -#line 3025 "mrbgems/mruby-compiler/core/parse.y" +#line 3023 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args_tail(p, 0, 0, 0); } #line 8556 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8558,7 +8558,7 @@ yyreduce: case 370: #line 3029 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-7].nd), (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 8564 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8566,7 +8566,7 @@ yyreduce: case 371: #line 3033 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-7].nd), (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 8572 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8574,7 +8574,7 @@ yyreduce: case 372: #line 3037 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } #line 8580 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8582,7 +8582,7 @@ yyreduce: case 373: #line 3041 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 8588 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8590,7 +8590,7 @@ yyreduce: case 374: #line 3045 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-2].nd), 0, 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 8596 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8598,7 +8598,7 @@ yyreduce: case 375: #line 3049 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-5].nd), 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-2].nd), 0, 0, 0, (yyvsp[0].nd)); } #line 8604 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8606,7 +8606,7 @@ yyreduce: case 376: #line 3053 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-5].nd), 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 8612 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8614,7 +8614,7 @@ yyreduce: case 377: #line 3057 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); } #line 8620 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8622,7 +8622,7 @@ yyreduce: case 378: #line 3061 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 8628 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8630,7 +8630,7 @@ yyreduce: case 379: #line 3065 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 8636 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8638,7 +8638,7 @@ yyreduce: case 380: #line 3069 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } #line 8644 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8646,7 +8646,7 @@ yyreduce: case 381: #line 3073 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 8652 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8654,7 +8654,7 @@ yyreduce: case 382: #line 3077 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 8660 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8662,64 +8662,64 @@ yyreduce: case 383: #line 3081 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 8668 "mrbgems/mruby-compiler/core/y.tab.c" break; case 384: -#line 3087 "mrbgems/mruby-compiler/core/parse.y" +#line 3085 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); + } +#line 8676 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 385: +#line 3091 "mrbgems/mruby-compiler/core/parse.y" { local_add_blk(p, 0); (yyval.nd) = 0; } -#line 8677 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8685 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 385: -#line 3092 "mrbgems/mruby-compiler/core/parse.y" + case 386: +#line 3096 "mrbgems/mruby-compiler/core/parse.y" { p->cmd_start = TRUE; (yyval.nd) = (yyvsp[0].nd); } -#line 8686 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 386: -#line 3098 "mrbgems/mruby-compiler/core/parse.y" - {local_add_blk(p, 0);} -#line 8692 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8694 "mrbgems/mruby-compiler/core/y.tab.c" break; case 387: -#line 3099 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = 0; - } +#line 3102 "mrbgems/mruby-compiler/core/parse.y" + {local_add_blk(p, 0);} #line 8700 "mrbgems/mruby-compiler/core/y.tab.c" break; case 388: #line 3103 "mrbgems/mruby-compiler/core/parse.y" { - local_add_blk(p, 0); (yyval.nd) = 0; } -#line 8709 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8708 "mrbgems/mruby-compiler/core/y.tab.c" break; case 389: -#line 3108 "mrbgems/mruby-compiler/core/parse.y" +#line 3107 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[-2].nd); + local_add_blk(p, 0); + (yyval.nd) = 0; } #line 8717 "mrbgems/mruby-compiler/core/y.tab.c" break; case 390: -#line 3115 "mrbgems/mruby-compiler/core/parse.y" +#line 3112 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = 0; + (yyval.nd) = (yyvsp[-2].nd); } #line 8725 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8732,35 +8732,35 @@ yyreduce: #line 8733 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 394: -#line 3129 "mrbgems/mruby-compiler/core/parse.y" + case 392: +#line 3123 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = 0; + } +#line 8741 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 395: +#line 3133 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[0].id)); new_bv(p, (yyvsp[0].id)); } -#line 8742 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 396: -#line 3137 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = (yyvsp[-2].nd); - } #line 8750 "mrbgems/mruby-compiler/core/y.tab.c" break; case 397: #line 3141 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[0].nd); + (yyval.nd) = (yyvsp[-2].nd); } #line 8758 "mrbgems/mruby-compiler/core/y.tab.c" break; case 398: -#line 3147 "mrbgems/mruby-compiler/core/parse.y" +#line 3145 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[-1].nd); + (yyval.nd) = (yyvsp[0].nd); } #line 8766 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8774,26 +8774,34 @@ yyreduce: break; case 400: -#line 3157 "mrbgems/mruby-compiler/core/parse.y" +#line 3155 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = (yyvsp[-1].nd); + } +#line 8782 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 401: +#line 3161 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); } -#line 8783 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8791 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 401: -#line 3164 "mrbgems/mruby-compiler/core/parse.y" + case 402: +#line 3168 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block(p,(yyvsp[-2].nd),(yyvsp[-1].nd)); local_unnest(p); nvars_unnest(p); } -#line 8793 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8801 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 402: -#line 3172 "mrbgems/mruby-compiler/core/parse.y" + case 403: +#line 3176 "mrbgems/mruby-compiler/core/parse.y" { if (typen((yyvsp[-1].nd)->car) == NODE_YIELD) { yyerror(p, "block given to yield"); @@ -8803,39 +8811,31 @@ yyreduce: } (yyval.nd) = (yyvsp[-1].nd); } -#line 8807 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 403: -#line 3182 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); - } #line 8815 "mrbgems/mruby-compiler/core/y.tab.c" break; case 404: #line 3186 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), (yyvsp[-1].nd), (yyvsp[-3].num)); - call_with_block(p, (yyval.nd), (yyvsp[0].nd)); + (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } -#line 8824 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8823 "mrbgems/mruby-compiler/core/y.tab.c" break; case 405: -#line 3191 "mrbgems/mruby-compiler/core/parse.y" +#line 3190 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), (yyvsp[-1].nd), (yyvsp[-3].num)); call_with_block(p, (yyval.nd), (yyvsp[0].nd)); } -#line 8833 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8832 "mrbgems/mruby-compiler/core/y.tab.c" break; case 406: -#line 3198 "mrbgems/mruby-compiler/core/parse.y" +#line 3195 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_fcall(p, (yyvsp[-1].id), (yyvsp[0].nd)); + (yyval.nd) = new_call(p, (yyvsp[-4].nd), (yyvsp[-2].id), (yyvsp[-1].nd), (yyvsp[-3].num)); + call_with_block(p, (yyval.nd), (yyvsp[0].nd)); } #line 8841 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8843,7 +8843,7 @@ yyreduce: case 407: #line 3202 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); + (yyval.nd) = new_fcall(p, (yyvsp[-1].id), (yyvsp[0].nd)); } #line 8849 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8851,7 +8851,7 @@ yyreduce: case 408: #line 3206 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), tCOLON2); + (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), (yyvsp[-2].num)); } #line 8857 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8859,7 +8859,7 @@ yyreduce: case 409: #line 3210 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); + (yyval.nd) = new_call(p, (yyvsp[-3].nd), (yyvsp[-1].id), (yyvsp[0].nd), tCOLON2); } #line 8865 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8867,7 +8867,7 @@ yyreduce: case 410: #line 3214 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), MRB_SYM_2(p->mrb, call), (yyvsp[0].nd), (yyvsp[-1].num)); + (yyval.nd) = new_call(p, (yyvsp[-2].nd), (yyvsp[0].id), 0, tCOLON2); } #line 8873 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8875,7 +8875,7 @@ yyreduce: case 411: #line 3218 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_call(p, (yyvsp[-2].nd), MRB_SYM_2(p->mrb, call), (yyvsp[0].nd), tCOLON2); + (yyval.nd) = new_call(p, (yyvsp[-2].nd), MRB_SYM_2(p->mrb, call), (yyvsp[0].nd), (yyvsp[-1].num)); } #line 8881 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8883,7 +8883,7 @@ yyreduce: case 412: #line 3222 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_super(p, (yyvsp[0].nd)); + (yyval.nd) = new_call(p, (yyvsp[-2].nd), MRB_SYM_2(p->mrb, call), (yyvsp[0].nd), tCOLON2); } #line 8889 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8891,7 +8891,7 @@ yyreduce: case 413: #line 3226 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_zsuper(p); + (yyval.nd) = new_super(p, (yyvsp[0].nd)); } #line 8897 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -8899,63 +8899,71 @@ yyreduce: case 414: #line 3230 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.'); + (yyval.nd) = new_zsuper(p); } #line 8905 "mrbgems/mruby-compiler/core/y.tab.c" break; case 415: -#line 3236 "mrbgems/mruby-compiler/core/parse.y" +#line 3234 "mrbgems/mruby-compiler/core/parse.y" { - local_nest(p); - nvars_nest(p); - (yyval.num) = p->lineno; + (yyval.nd) = new_call(p, (yyvsp[-3].nd), intern_op(aref), (yyvsp[-1].nd), '.'); } -#line 8915 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8913 "mrbgems/mruby-compiler/core/y.tab.c" break; case 416: -#line 3243 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_block(p,(yyvsp[-2].nd),(yyvsp[-1].nd)); - SET_LINENO((yyval.nd), (yyvsp[-3].num)); - local_unnest(p); - nvars_unnest(p); - } -#line 8926 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 417: -#line 3250 "mrbgems/mruby-compiler/core/parse.y" +#line 3240 "mrbgems/mruby-compiler/core/parse.y" { local_nest(p); nvars_nest(p); (yyval.num) = p->lineno; } -#line 8936 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8923 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 418: -#line 3257 "mrbgems/mruby-compiler/core/parse.y" + case 417: +#line 3247 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_block(p,(yyvsp[-2].nd),(yyvsp[-1].nd)); SET_LINENO((yyval.nd), (yyvsp[-3].num)); local_unnest(p); nvars_unnest(p); } -#line 8947 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8934 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 418: +#line 3254 "mrbgems/mruby-compiler/core/parse.y" + { + local_nest(p); + nvars_nest(p); + (yyval.num) = p->lineno; + } +#line 8944 "mrbgems/mruby-compiler/core/y.tab.c" break; case 419: -#line 3268 "mrbgems/mruby-compiler/core/parse.y" +#line 3261 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = cons(cons((yyvsp[-3].nd), (yyvsp[-1].nd)), (yyvsp[0].nd)); + (yyval.nd) = new_block(p,(yyvsp[-2].nd),(yyvsp[-1].nd)); + SET_LINENO((yyval.nd), (yyvsp[-3].num)); + local_unnest(p); + nvars_unnest(p); } #line 8955 "mrbgems/mruby-compiler/core/y.tab.c" break; case 420: -#line 3274 "mrbgems/mruby-compiler/core/parse.y" +#line 3272 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = cons(cons((yyvsp[-3].nd), (yyvsp[-1].nd)), (yyvsp[0].nd)); + } +#line 8963 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 421: +#line 3278 "mrbgems/mruby-compiler/core/parse.y" { if ((yyvsp[0].nd)) { (yyval.nd) = cons(cons(0, (yyvsp[0].nd)), 0); @@ -8964,60 +8972,60 @@ yyreduce: (yyval.nd) = 0; } } -#line 8968 "mrbgems/mruby-compiler/core/y.tab.c" +#line 8976 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 422: -#line 3288 "mrbgems/mruby-compiler/core/parse.y" + case 423: +#line 3292 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = list1(list3((yyvsp[-4].nd), (yyvsp[-3].nd), (yyvsp[-1].nd))); if ((yyvsp[0].nd)) (yyval.nd) = append((yyval.nd), (yyvsp[0].nd)); } -#line 8977 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 424: -#line 3296 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = list1((yyvsp[0].nd)); - } #line 8985 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 427: -#line 3304 "mrbgems/mruby-compiler/core/parse.y" + case 425: +#line 3300 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[0].nd); + (yyval.nd) = list1((yyvsp[0].nd)); } #line 8993 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 429: -#line 3311 "mrbgems/mruby-compiler/core/parse.y" + case 428: +#line 3308 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[0].nd); } #line 9001 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 436: -#line 3325 "mrbgems/mruby-compiler/core/parse.y" + case 430: +#line 3315 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = concat_string(p, (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = (yyvsp[0].nd); } #line 9009 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 439: -#line 3333 "mrbgems/mruby-compiler/core/parse.y" + case 437: +#line 3329 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[0].nd); + (yyval.nd) = concat_string(p, (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9017 "mrbgems/mruby-compiler/core/y.tab.c" break; case 440: #line 3337 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = (yyvsp[0].nd); + } +#line 9025 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 441: +#line 3341 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); if (intn((yyvsp[0].nd)->cdr->cdr) > 0) { @@ -9028,21 +9036,13 @@ yyreduce: } (yyval.nd) = new_dstr(p, n); } -#line 9032 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 442: -#line 3351 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = append((yyvsp[-1].nd), (yyvsp[0].nd)); - } #line 9040 "mrbgems/mruby-compiler/core/y.tab.c" break; case 443: -#line 3357 "mrbgems/mruby-compiler/core/parse.y" +#line 3355 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1((yyvsp[0].nd)); + (yyval.nd) = append((yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9048 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9050,25 +9050,25 @@ yyreduce: case 444: #line 3361 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = p->lex_strterm; - p->lex_strterm = NULL; + (yyval.nd) = list1((yyvsp[0].nd)); } -#line 9057 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9056 "mrbgems/mruby-compiler/core/y.tab.c" break; case 445: -#line 3367 "mrbgems/mruby-compiler/core/parse.y" +#line 3365 "mrbgems/mruby-compiler/core/parse.y" { - p->lex_strterm = (yyvsp[-2].nd); - (yyval.nd) = list2((yyvsp[-3].nd), (yyvsp[-1].nd)); + (yyval.nd) = p->lex_strterm; + p->lex_strterm = NULL; } -#line 9066 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9065 "mrbgems/mruby-compiler/core/y.tab.c" break; case 446: -#line 3372 "mrbgems/mruby-compiler/core/parse.y" +#line 3371 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1(new_literal_delim(p)); + p->lex_strterm = (yyvsp[-2].nd); + (yyval.nd) = list2((yyvsp[-3].nd), (yyvsp[-1].nd)); } #line 9074 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9082,15 +9082,23 @@ yyreduce: break; case 448: -#line 3382 "mrbgems/mruby-compiler/core/parse.y" +#line 3380 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[0].nd); + (yyval.nd) = list1(new_literal_delim(p)); } #line 9090 "mrbgems/mruby-compiler/core/y.tab.c" break; case 449: #line 3386 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = (yyvsp[0].nd); + } +#line 9098 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 450: +#line 3390 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); if (intn((yyvsp[0].nd)->cdr->cdr) > 0) { @@ -9101,82 +9109,82 @@ yyreduce: } (yyval.nd) = new_dxstr(p, n); } -#line 9105 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 450: -#line 3399 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = (yyvsp[0].nd); - } #line 9113 "mrbgems/mruby-compiler/core/y.tab.c" break; case 451: #line 3403 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_dregx(p, (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = (yyvsp[0].nd); } #line 9121 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 455: -#line 3416 "mrbgems/mruby-compiler/core/parse.y" + case 452: +#line 3407 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_dregx(p, (yyvsp[-1].nd), (yyvsp[0].nd)); + } +#line 9129 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 456: +#line 3420 "mrbgems/mruby-compiler/core/parse.y" { parser_heredoc_info * inf = parsing_heredoc_inf(p); inf->doc = push(inf->doc, new_str(p, "", 0)); heredoc_end(p); } -#line 9131 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 456: -#line 3422 "mrbgems/mruby-compiler/core/parse.y" - { - heredoc_end(p); - } #line 9139 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 459: -#line 3432 "mrbgems/mruby-compiler/core/parse.y" + case 457: +#line 3426 "mrbgems/mruby-compiler/core/parse.y" + { + heredoc_end(p); + } +#line 9147 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 460: +#line 3436 "mrbgems/mruby-compiler/core/parse.y" { parser_heredoc_info * inf = parsing_heredoc_inf(p); inf->doc = push(inf->doc, (yyvsp[0].nd)); heredoc_treat_nextline(p); } -#line 9149 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9157 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 460: -#line 3438 "mrbgems/mruby-compiler/core/parse.y" + case 461: +#line 3442 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = p->lex_strterm; p->lex_strterm = NULL; } -#line 9158 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9166 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 461: -#line 3444 "mrbgems/mruby-compiler/core/parse.y" + case 462: +#line 3448 "mrbgems/mruby-compiler/core/parse.y" { parser_heredoc_info * inf = parsing_heredoc_inf(p); p->lex_strterm = (yyvsp[-2].nd); inf->doc = push(push(inf->doc, (yyvsp[-3].nd)), (yyvsp[-1].nd)); } -#line 9168 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 462: -#line 3452 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_words(p, list1((yyvsp[0].nd))); - } #line 9176 "mrbgems/mruby-compiler/core/y.tab.c" break; case 463: #line 3456 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_words(p, list1((yyvsp[0].nd))); + } +#line 9184 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 464: +#line 3460 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); if (intn((yyvsp[0].nd)->cdr->cdr) > 0) { @@ -9187,20 +9195,20 @@ yyreduce: } (yyval.nd) = new_words(p, n); } -#line 9191 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9199 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 464: -#line 3470 "mrbgems/mruby-compiler/core/parse.y" + case 465: +#line 3474 "mrbgems/mruby-compiler/core/parse.y" { p->lstate = EXPR_ENDARG; (yyval.nd) = new_sym(p, (yyvsp[0].id)); } -#line 9200 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9208 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 465: -#line 3475 "mrbgems/mruby-compiler/core/parse.y" + case 466: +#line 3479 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); p->lstate = EXPR_ENDARG; @@ -9212,21 +9220,13 @@ yyreduce: } (yyval.nd) = new_dsym(p, new_dstr(p, n)); } -#line 9216 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 466: -#line 3489 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.id) = (yyvsp[0].id); - } #line 9224 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 471: -#line 3499 "mrbgems/mruby-compiler/core/parse.y" + case 467: +#line 3493 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.id) = new_strsym(p, (yyvsp[0].nd)); + (yyval.id) = (yyvsp[0].id); } #line 9232 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9240,15 +9240,23 @@ yyreduce: break; case 473: -#line 3509 "mrbgems/mruby-compiler/core/parse.y" +#line 3507 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_symbols(p, list1((yyvsp[0].nd))); + (yyval.id) = new_strsym(p, (yyvsp[0].nd)); } #line 9248 "mrbgems/mruby-compiler/core/y.tab.c" break; case 474: #line 3513 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_symbols(p, list1((yyvsp[0].nd))); + } +#line 9256 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 475: +#line 3517 "mrbgems/mruby-compiler/core/parse.y" { node *n = (yyvsp[-1].nd); if (intn((yyvsp[0].nd)->cdr->cdr) > 0) { @@ -9256,14 +9264,6 @@ yyreduce: } (yyval.nd) = new_symbols(p, n); } -#line 9260 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 477: -#line 3525 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_negate(p, (yyvsp[0].nd)); - } #line 9268 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9276,9 +9276,9 @@ yyreduce: break; case 479: -#line 3535 "mrbgems/mruby-compiler/core/parse.y" +#line 3533 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_lvar(p, (yyvsp[0].id)); + (yyval.nd) = new_negate(p, (yyvsp[0].nd)); } #line 9284 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9286,7 +9286,7 @@ yyreduce: case 480: #line 3539 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_ivar(p, (yyvsp[0].id)); + (yyval.nd) = new_lvar(p, (yyvsp[0].id)); } #line 9292 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9294,7 +9294,7 @@ yyreduce: case 481: #line 3543 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_gvar(p, (yyvsp[0].id)); + (yyval.nd) = new_ivar(p, (yyvsp[0].id)); } #line 9300 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9302,7 +9302,7 @@ yyreduce: case 482: #line 3547 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_cvar(p, (yyvsp[0].id)); + (yyval.nd) = new_gvar(p, (yyvsp[0].id)); } #line 9308 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9310,15 +9310,15 @@ yyreduce: case 483: #line 3551 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_const(p, (yyvsp[0].id)); + (yyval.nd) = new_cvar(p, (yyvsp[0].id)); } #line 9316 "mrbgems/mruby-compiler/core/y.tab.c" break; case 484: -#line 3557 "mrbgems/mruby-compiler/core/parse.y" +#line 3555 "mrbgems/mruby-compiler/core/parse.y" { - assignable(p, (yyvsp[0].nd)); + (yyval.nd) = new_const(p, (yyvsp[0].id)); } #line 9324 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9326,15 +9326,15 @@ yyreduce: case 485: #line 3561 "mrbgems/mruby-compiler/core/parse.y" { - yyerror(p, "can't assign to numbered parameter"); + assignable(p, (yyvsp[0].nd)); } #line 9332 "mrbgems/mruby-compiler/core/y.tab.c" break; case 486: -#line 3567 "mrbgems/mruby-compiler/core/parse.y" +#line 3565 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = var_reference(p, (yyvsp[0].nd)); + yyerror(p, "can't assign to numbered parameter"); } #line 9340 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9342,7 +9342,7 @@ yyreduce: case 487: #line 3571 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_nil(p); + (yyval.nd) = var_reference(p, (yyvsp[0].nd)); } #line 9348 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9350,7 +9350,7 @@ yyreduce: case 488: #line 3575 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_self(p); + (yyval.nd) = new_nil(p); } #line 9356 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9358,7 +9358,7 @@ yyreduce: case 489: #line 3579 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_true(p); + (yyval.nd) = new_self(p); } #line 9364 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9366,13 +9366,21 @@ yyreduce: case 490: #line 3583 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_false(p); + (yyval.nd) = new_true(p); } #line 9372 "mrbgems/mruby-compiler/core/y.tab.c" break; case 491: #line 3587 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = new_false(p); + } +#line 9380 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 492: +#line 3591 "mrbgems/mruby-compiler/core/parse.y" { const char *fn = mrb_sym_name_len(p->mrb, p->filename_sym, NULL); if (!fn) { @@ -9380,32 +9388,24 @@ yyreduce: } (yyval.nd) = new_str(p, fn, strlen(fn)); } -#line 9384 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9392 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 492: -#line 3595 "mrbgems/mruby-compiler/core/parse.y" + case 493: +#line 3599 "mrbgems/mruby-compiler/core/parse.y" { char buf[16]; dump_int(p->lineno, buf); (yyval.nd) = new_int(p, buf, 10, 0); } -#line 9395 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 493: -#line 3602 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_fcall(p, MRB_SYM_2(p->mrb, __ENCODING__), 0); - } #line 9403 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 496: -#line 3612 "mrbgems/mruby-compiler/core/parse.y" + case 494: +#line 3606 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = 0; + (yyval.nd) = new_fcall(p, MRB_SYM_2(p->mrb, __ENCODING__), 0); } #line 9411 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9413,50 +9413,50 @@ yyreduce: case 497: #line 3616 "mrbgems/mruby-compiler/core/parse.y" { - p->lstate = EXPR_BEG; - p->cmd_start = TRUE; + (yyval.nd) = 0; } -#line 9420 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9419 "mrbgems/mruby-compiler/core/y.tab.c" break; case 498: -#line 3621 "mrbgems/mruby-compiler/core/parse.y" +#line 3620 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[-1].nd); + p->lstate = EXPR_BEG; + p->cmd_start = TRUE; } #line 9428 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 501: -#line 3637 "mrbgems/mruby-compiler/core/parse.y" + case 499: +#line 3625 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = (yyvsp[-1].nd); + } +#line 9436 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 502: +#line 3641 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = (yyvsp[-1].nd); p->lstate = EXPR_BEG; p->cmd_start = TRUE; } -#line 9438 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 502: -#line 3643 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_args_dots(p, (yyvsp[-3].nd)); - } #line 9446 "mrbgems/mruby-compiler/core/y.tab.c" break; case 503: #line 3647 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_dots(p, 0); + (yyval.nd) = new_args_dots(p, (yyvsp[-3].nd)); } #line 9454 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 505: -#line 3654 "mrbgems/mruby-compiler/core/parse.y" + case 504: +#line 3651 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[-1].nd); + (yyval.nd) = new_args_dots(p, 0); } #line 9462 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9464,7 +9464,7 @@ yyreduce: case 506: #line 3658 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_dots(p, (yyvsp[-3].nd)); + (yyval.nd) = (yyvsp[-1].nd); } #line 9470 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9472,61 +9472,61 @@ yyreduce: case 507: #line 3662 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_dots(p, 0); + (yyval.nd) = new_args_dots(p, (yyvsp[-3].nd)); } #line 9478 "mrbgems/mruby-compiler/core/y.tab.c" break; case 508: -#line 3668 "mrbgems/mruby-compiler/core/parse.y" +#line 3666 "mrbgems/mruby-compiler/core/parse.y" { - local_nest(p); + (yyval.nd) = new_args_dots(p, 0); } #line 9486 "mrbgems/mruby-compiler/core/y.tab.c" break; case 509: -#line 3674 "mrbgems/mruby-compiler/core/parse.y" +#line 3672 "mrbgems/mruby-compiler/core/parse.y" { - void_expr_error(p, (yyvsp[0].nd)); - (yyval.nd) = new_kw_arg(p, (yyvsp[-1].id), cons((yyvsp[0].nd), locals_node(p))); - local_unnest(p); + local_nest(p); } -#line 9496 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9494 "mrbgems/mruby-compiler/core/y.tab.c" break; case 510: -#line 3680 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0); - local_unnest(p); - } -#line 9505 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 511: -#line 3687 "mrbgems/mruby-compiler/core/parse.y" +#line 3678 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = new_kw_arg(p, (yyvsp[-1].id), cons((yyvsp[0].nd), locals_node(p))); local_unnest(p); } -#line 9515 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9504 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 512: -#line 3693 "mrbgems/mruby-compiler/core/parse.y" + case 511: +#line 3684 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0); local_unnest(p); } -#line 9524 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9513 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 512: +#line 3691 "mrbgems/mruby-compiler/core/parse.y" + { + void_expr_error(p, (yyvsp[0].nd)); + (yyval.nd) = new_kw_arg(p, (yyvsp[-1].id), cons((yyvsp[0].nd), locals_node(p))); + local_unnest(p); + } +#line 9523 "mrbgems/mruby-compiler/core/y.tab.c" break; case 513: -#line 3700 "mrbgems/mruby-compiler/core/parse.y" +#line 3697 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1((yyvsp[0].nd)); + (yyval.nd) = new_kw_arg(p, (yyvsp[0].id), 0); + local_unnest(p); } #line 9532 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9534,15 +9534,15 @@ yyreduce: case 514: #line 3704 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = list1((yyvsp[0].nd)); } #line 9540 "mrbgems/mruby-compiler/core/y.tab.c" break; case 515: -#line 3710 "mrbgems/mruby-compiler/core/parse.y" +#line 3708 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1((yyvsp[0].nd)); + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } #line 9548 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9550,15 +9550,15 @@ yyreduce: case 516: #line 3714 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = list1((yyvsp[0].nd)); } #line 9556 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 519: -#line 3724 "mrbgems/mruby-compiler/core/parse.y" + case 517: +#line 3718 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_kw_rest_args(p, nsym((yyvsp[0].id))); + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } #line 9564 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9566,15 +9566,15 @@ yyreduce: case 520: #line 3728 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_kw_rest_args(p, 0); + (yyval.nd) = new_kw_rest_args(p, (yyvsp[0].id)); } #line 9572 "mrbgems/mruby-compiler/core/y.tab.c" break; case 521: -#line 3734 "mrbgems/mruby-compiler/core/parse.y" +#line 3732 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].nd), (yyvsp[0].id)); + (yyval.nd) = new_kw_rest_args(p, 0); } #line 9580 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9582,7 +9582,7 @@ yyreduce: case 522: #line 3738 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); + (yyval.nd) = new_args_tail(p, (yyvsp[-3].nd), (yyvsp[-1].nd), (yyvsp[0].id)); } #line 9588 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9590,7 +9590,7 @@ yyreduce: case 523: #line 3742 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].nd), (yyvsp[0].id)); + (yyval.nd) = new_args_tail(p, (yyvsp[-1].nd), 0, (yyvsp[0].id)); } #line 9596 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9598,15 +9598,15 @@ yyreduce: case 524: #line 3746 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); + (yyval.nd) = new_args_tail(p, 0, (yyvsp[-1].nd), (yyvsp[0].id)); } #line 9604 "mrbgems/mruby-compiler/core/y.tab.c" break; case 525: -#line 3752 "mrbgems/mruby-compiler/core/parse.y" +#line 3750 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[0].nd); + (yyval.nd) = new_args_tail(p, 0, 0, (yyvsp[0].id)); } #line 9612 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9614,15 +9614,15 @@ yyreduce: case 526: #line 3756 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args_tail(p, 0, 0, 0); + (yyval.nd) = (yyvsp[0].nd); } #line 9620 "mrbgems/mruby-compiler/core/y.tab.c" break; case 527: -#line 3762 "mrbgems/mruby-compiler/core/parse.y" +#line 3760 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args_tail(p, 0, 0, 0); } #line 9628 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9630,7 +9630,7 @@ yyreduce: case 528: #line 3766 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-7].nd), (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 9636 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9638,7 +9638,7 @@ yyreduce: case 529: #line 3770 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-7].nd), (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9644 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9646,7 +9646,7 @@ yyreduce: case 530: #line 3774 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-3].nd), (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } #line 9652 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9654,7 +9654,7 @@ yyreduce: case 531: #line 3778 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-5].nd), (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9660 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9662,7 +9662,7 @@ yyreduce: case 532: #line 3782 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-5].nd), 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-3].nd), 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 9668 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9670,7 +9670,7 @@ yyreduce: case 533: #line 3786 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-5].nd), 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9676 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9678,7 +9678,7 @@ yyreduce: case 534: #line 3790 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, (yyvsp[-1].nd), 0, 0, 0, (yyvsp[0].nd)); } #line 9684 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9686,7 +9686,7 @@ yyreduce: case 535: #line 3794 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 9692 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9694,7 +9694,7 @@ yyreduce: case 536: #line 3798 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-5].nd), (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9700 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9702,7 +9702,7 @@ yyreduce: case 537: #line 3802 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-1].nd), 0, 0, (yyvsp[0].nd)); } #line 9708 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9710,7 +9710,7 @@ yyreduce: case 538: #line 3806 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, (yyvsp[-3].nd), 0, (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9716 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9718,7 +9718,7 @@ yyreduce: case 539: #line 3810 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, 0, (yyvsp[-1].id), 0, (yyvsp[0].nd)); } #line 9724 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9726,7 +9726,7 @@ yyreduce: case 540: #line 3814 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); + (yyval.nd) = new_args(p, 0, 0, (yyvsp[-3].id), (yyvsp[-1].nd), (yyvsp[0].nd)); } #line 9732 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9734,61 +9734,61 @@ yyreduce: case 541: #line 3818 "mrbgems/mruby-compiler/core/parse.y" { - local_add_f(p, 0); - (yyval.nd) = new_args(p, 0, 0, 0, 0, 0); + (yyval.nd) = new_args(p, 0, 0, 0, 0, (yyvsp[0].nd)); } -#line 9741 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9740 "mrbgems/mruby-compiler/core/y.tab.c" break; case 542: -#line 3825 "mrbgems/mruby-compiler/core/parse.y" +#line 3822 "mrbgems/mruby-compiler/core/parse.y" + { + local_add_f(p, 0); + (yyval.nd) = new_args(p, 0, 0, 0, 0, 0); + } +#line 9749 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 543: +#line 3829 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "formal argument cannot be a constant"); (yyval.nd) = 0; } -#line 9750 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9758 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 543: -#line 3830 "mrbgems/mruby-compiler/core/parse.y" + case 544: +#line 3834 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "formal argument cannot be an instance variable"); (yyval.nd) = 0; } -#line 9759 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9767 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 544: -#line 3835 "mrbgems/mruby-compiler/core/parse.y" + case 545: +#line 3839 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "formal argument cannot be a global variable"); (yyval.nd) = 0; } -#line 9768 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9776 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 545: -#line 3840 "mrbgems/mruby-compiler/core/parse.y" + case 546: +#line 3844 "mrbgems/mruby-compiler/core/parse.y" { yyerror(p, "formal argument cannot be a class variable"); (yyval.nd) = 0; } -#line 9777 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 546: -#line 3845 "mrbgems/mruby-compiler/core/parse.y" - { - yyerror(p, "formal argument cannot be a numbered parameter"); - (yyval.nd) = 0; - } -#line 9786 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9785 "mrbgems/mruby-compiler/core/y.tab.c" break; case 547: -#line 3852 "mrbgems/mruby-compiler/core/parse.y" +#line 3849 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.id) = 0; + yyerror(p, "formal argument cannot be a numbered parameter"); + (yyval.nd) = 0; } #line 9794 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9796,16 +9796,16 @@ yyreduce: case 548: #line 3856 "mrbgems/mruby-compiler/core/parse.y" { - local_add_f(p, (yyvsp[0].id)); - (yyval.id) = (yyvsp[0].id); + (yyval.id) = 0; } -#line 9803 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9802 "mrbgems/mruby-compiler/core/y.tab.c" break; case 549: -#line 3863 "mrbgems/mruby-compiler/core/parse.y" +#line 3860 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_arg(p, (yyvsp[0].id)); + local_add_f(p, (yyvsp[0].id)); + (yyval.id) = (yyvsp[0].id); } #line 9811 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9813,7 +9813,7 @@ yyreduce: case 550: #line 3867 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = local_switch(p); + (yyval.nd) = new_arg(p, (yyvsp[0].id)); } #line 9819 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9821,17 +9821,17 @@ yyreduce: case 551: #line 3871 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = new_masgn_param(p, (yyvsp[-1].nd), p->locals->car); - local_resume(p, (yyvsp[-2].nd)); - local_add_f(p, 0); + (yyval.nd) = local_switch(p); } -#line 9829 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9827 "mrbgems/mruby-compiler/core/y.tab.c" break; case 552: -#line 3879 "mrbgems/mruby-compiler/core/parse.y" +#line 3875 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1((yyvsp[0].nd)); + (yyval.nd) = new_masgn_param(p, (yyvsp[-1].nd), p->locals->car); + local_resume(p, (yyvsp[-2].nd)); + local_add_f(p, 0); } #line 9837 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9839,45 +9839,45 @@ yyreduce: case 553: #line 3883 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = list1((yyvsp[0].nd)); } #line 9845 "mrbgems/mruby-compiler/core/y.tab.c" break; case 554: -#line 3889 "mrbgems/mruby-compiler/core/parse.y" +#line 3887 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + } +#line 9853 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 555: +#line 3893 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[-1].id)); local_nest(p); (yyval.id) = (yyvsp[-1].id); } -#line 9855 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 555: -#line 3897 "mrbgems/mruby-compiler/core/parse.y" - { - void_expr_error(p, (yyvsp[0].nd)); - (yyval.nd) = cons(nsym((yyvsp[-1].id)), cons((yyvsp[0].nd), locals_node(p))); - local_unnest(p); - } -#line 9865 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9863 "mrbgems/mruby-compiler/core/y.tab.c" break; case 556: -#line 3905 "mrbgems/mruby-compiler/core/parse.y" +#line 3901 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons(nsym((yyvsp[-1].id)), cons((yyvsp[0].nd), locals_node(p))); local_unnest(p); } -#line 9875 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9873 "mrbgems/mruby-compiler/core/y.tab.c" break; case 557: -#line 3913 "mrbgems/mruby-compiler/core/parse.y" +#line 3909 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1((yyvsp[0].nd)); + void_expr_error(p, (yyvsp[0].nd)); + (yyval.nd) = cons(nsym((yyvsp[-1].id)), cons((yyvsp[0].nd), locals_node(p))); + local_unnest(p); } #line 9883 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9885,15 +9885,15 @@ yyreduce: case 558: #line 3917 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = list1((yyvsp[0].nd)); } #line 9891 "mrbgems/mruby-compiler/core/y.tab.c" break; case 559: -#line 3923 "mrbgems/mruby-compiler/core/parse.y" +#line 3921 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1((yyvsp[0].nd)); + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); } #line 9899 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9901,49 +9901,49 @@ yyreduce: case 560: #line 3927 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = list1((yyvsp[0].nd)); } #line 9907 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 563: -#line 3937 "mrbgems/mruby-compiler/core/parse.y" + case 561: +#line 3931 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + } +#line 9915 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 564: +#line 3941 "mrbgems/mruby-compiler/core/parse.y" { local_add_f(p, (yyvsp[0].id)); (yyval.id) = (yyvsp[0].id); } -#line 9916 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9924 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 564: -#line 3942 "mrbgems/mruby-compiler/core/parse.y" + case 565: +#line 3946 "mrbgems/mruby-compiler/core/parse.y" { (yyval.id) = intern_op(mul); local_add_f(p, (yyval.id)); } -#line 9925 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 567: -#line 3953 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.id) = (yyvsp[0].id); - } #line 9933 "mrbgems/mruby-compiler/core/y.tab.c" break; case 568: #line 3957 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.id) = intern_op(and); + (yyval.id) = (yyvsp[0].id); } #line 9941 "mrbgems/mruby-compiler/core/y.tab.c" break; case 569: -#line 3963 "mrbgems/mruby-compiler/core/parse.y" +#line 3961 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.id) = (yyvsp[0].id); + (yyval.id) = intern_op(and); } #line 9949 "mrbgems/mruby-compiler/core/y.tab.c" break; @@ -9951,28 +9951,36 @@ yyreduce: case 570: #line 3967 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.id) = 0; + (yyval.id) = (yyvsp[0].id); } #line 9957 "mrbgems/mruby-compiler/core/y.tab.c" break; case 571: -#line 3973 "mrbgems/mruby-compiler/core/parse.y" +#line 3971 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = (yyvsp[0].nd); - if (!(yyval.nd)) (yyval.nd) = new_nil(p); + (yyval.id) = 0; } -#line 9966 "mrbgems/mruby-compiler/core/y.tab.c" +#line 9965 "mrbgems/mruby-compiler/core/y.tab.c" break; case 572: #line 3977 "mrbgems/mruby-compiler/core/parse.y" - {p->lstate = EXPR_BEG;} -#line 9972 "mrbgems/mruby-compiler/core/y.tab.c" + { + (yyval.nd) = (yyvsp[0].nd); + if (!(yyval.nd)) (yyval.nd) = new_nil(p); + } +#line 9974 "mrbgems/mruby-compiler/core/y.tab.c" break; case 573: -#line 3978 "mrbgems/mruby-compiler/core/parse.y" +#line 3981 "mrbgems/mruby-compiler/core/parse.y" + {p->lstate = EXPR_BEG;} +#line 9980 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 574: +#line 3982 "mrbgems/mruby-compiler/core/parse.y" { if ((yyvsp[-1].nd) == 0) { yyerror(p, "can't define singleton method for ()."); @@ -9995,63 +10003,63 @@ yyreduce: } (yyval.nd) = (yyvsp[-1].nd); } -#line 9999 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 575: -#line 4004 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.nd) = (yyvsp[-1].nd); - } #line 10007 "mrbgems/mruby-compiler/core/y.tab.c" break; case 576: -#line 4010 "mrbgems/mruby-compiler/core/parse.y" +#line 4008 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = list1((yyvsp[0].nd)); - NODE_LINENO((yyval.nd), (yyvsp[0].nd)); + (yyval.nd) = (yyvsp[-1].nd); } -#line 10016 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10015 "mrbgems/mruby-compiler/core/y.tab.c" break; case 577: -#line 4015 "mrbgems/mruby-compiler/core/parse.y" +#line 4014 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + (yyval.nd) = list1((yyvsp[0].nd)); + NODE_LINENO((yyval.nd), (yyvsp[0].nd)); } #line 10024 "mrbgems/mruby-compiler/core/y.tab.c" break; case 578: -#line 4021 "mrbgems/mruby-compiler/core/parse.y" +#line 4019 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = push((yyvsp[-2].nd), (yyvsp[0].nd)); + } +#line 10032 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 579: +#line 4025 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[-2].nd)); void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons((yyvsp[-2].nd), (yyvsp[0].nd)); } -#line 10034 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 579: -#line 4027 "mrbgems/mruby-compiler/core/parse.y" - { - void_expr_error(p, (yyvsp[0].nd)); - (yyval.nd) = cons(new_sym(p, (yyvsp[-2].id)), (yyvsp[0].nd)); - } -#line 10043 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10042 "mrbgems/mruby-compiler/core/y.tab.c" break; case 580: -#line 4032 "mrbgems/mruby-compiler/core/parse.y" +#line 4031 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.nd) = cons(new_sym(p, (yyvsp[-1].id)), label_reference(p, (yyvsp[-1].id))); + void_expr_error(p, (yyvsp[0].nd)); + (yyval.nd) = cons(new_sym(p, (yyvsp[-2].id)), (yyvsp[0].nd)); } #line 10051 "mrbgems/mruby-compiler/core/y.tab.c" break; case 581: #line 4036 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.nd) = cons(new_sym(p, (yyvsp[-1].id)), label_reference(p, (yyvsp[-1].id))); + } +#line 10059 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 582: +#line 4040 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); if (typen((yyvsp[-2].nd)->car) == NODE_DSTR) { @@ -10061,67 +10069,75 @@ yyreduce: (yyval.nd) = cons(new_sym(p, new_strsym(p, (yyvsp[-2].nd))), (yyvsp[0].nd)); } } -#line 10065 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10073 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 582: -#line 4046 "mrbgems/mruby-compiler/core/parse.y" + case 583: +#line 4050 "mrbgems/mruby-compiler/core/parse.y" { void_expr_error(p, (yyvsp[0].nd)); (yyval.nd) = cons(new_kw_rest_args(p, 0), (yyvsp[0].nd)); } -#line 10074 "mrbgems/mruby-compiler/core/y.tab.c" - break; - - case 595: -#line 4073 "mrbgems/mruby-compiler/core/parse.y" - { - (yyval.num) = '.'; - } #line 10082 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 596: -#line 4077 "mrbgems/mruby-compiler/core/parse.y" + case 584: +#line 4055 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.num) = 0; + (yyval.nd) = cons(new_kw_rest_args(p, 0), new_lvar(p, intern_op(pow))); } #line 10090 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 598: -#line 4084 "mrbgems/mruby-compiler/core/parse.y" + case 597: +#line 4081 "mrbgems/mruby-compiler/core/parse.y" { - (yyval.num) = tCOLON2; + (yyval.num) = '.'; } #line 10098 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 607: -#line 4105 "mrbgems/mruby-compiler/core/parse.y" - {yyerrok;} -#line 10104 "mrbgems/mruby-compiler/core/y.tab.c" + case 598: +#line 4085 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.num) = 0; + } +#line 10106 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 600: +#line 4092 "mrbgems/mruby-compiler/core/parse.y" + { + (yyval.num) = tCOLON2; + } +#line 10114 "mrbgems/mruby-compiler/core/y.tab.c" break; case 609: -#line 4110 "mrbgems/mruby-compiler/core/parse.y" +#line 4113 "mrbgems/mruby-compiler/core/parse.y" + {yyerrok;} +#line 10120 "mrbgems/mruby-compiler/core/y.tab.c" + break; + + case 611: +#line 4118 "mrbgems/mruby-compiler/core/parse.y" { p->lineno += (yyvsp[0].num); p->column = 0; } -#line 10113 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10129 "mrbgems/mruby-compiler/core/y.tab.c" break; - case 613: -#line 4122 "mrbgems/mruby-compiler/core/parse.y" + case 615: +#line 4130 "mrbgems/mruby-compiler/core/parse.y" { (yyval.nd) = 0; } -#line 10121 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10137 "mrbgems/mruby-compiler/core/y.tab.c" break; -#line 10125 "mrbgems/mruby-compiler/core/y.tab.c" +#line 10141 "mrbgems/mruby-compiler/core/y.tab.c" default: break; } @@ -10353,7 +10369,7 @@ yyreturn: #endif return yyresult; } -#line 4126 "mrbgems/mruby-compiler/core/parse.y" +#line 4134 "mrbgems/mruby-compiler/core/parse.y" #define pylval (*((YYSTYPE*)(p->ylval)))