diff options
Diffstat (limited to 'parse.c')
| -rw-r--r-- | parse.c | 1544 |
1 files changed, 787 insertions, 757 deletions
@@ -265,40 +265,40 @@ static const short yyprhs[] = { 0, 26, 30, 34, 38, 41, 45, 49, 53, 57, 58, 64, 69, 73, 75, 79, 82, 85, 87, 91, 95, 98, 101, 103, 106, 111, 116, 119, 121, 125, 127, - 131, 133, 137, 140, 146, 149, 151, 155, 158, 160, - 164, 166, 171, 175, 177, 179, 184, 188, 190, 192, - 194, 196, 198, 200, 202, 204, 206, 207, 212, 214, - 216, 218, 220, 222, 224, 226, 228, 230, 232, 234, - 236, 238, 240, 242, 244, 246, 248, 250, 252, 254, - 256, 258, 260, 262, 264, 266, 268, 270, 272, 274, - 276, 278, 280, 282, 284, 286, 288, 290, 292, 294, - 296, 298, 300, 302, 304, 306, 308, 310, 312, 314, - 316, 318, 320, 322, 324, 326, 328, 330, 332, 334, - 336, 338, 340, 342, 344, 346, 350, 351, 356, 363, - 369, 375, 379, 383, 387, 391, 395, 399, 403, 407, - 411, 414, 417, 421, 425, 429, 433, 437, 441, 445, - 449, 453, 457, 461, 465, 469, 472, 475, 479, 483, - 487, 491, 492, 497, 503, 505, 507, 509, 512, 514, - 517, 520, 526, 529, 532, 538, 543, 548, 556, 560, - 562, 565, 568, 570, 572, 574, 576, 580, 582, 587, - 590, 592, 594, 597, 599, 603, 606, 608, 610, 612, - 614, 616, 618, 620, 625, 629, 633, 638, 642, 644, - 649, 653, 655, 656, 663, 665, 668, 670, 673, 680, - 687, 693, 699, 704, 712, 719, 723, 724, 731, 732, - 740, 741, 747, 748, 755, 756, 757, 767, 769, 771, - 773, 775, 777, 779, 782, 784, 786, 788, 794, 796, - 799, 801, 803, 805, 808, 810, 814, 815, 821, 822, - 828, 830, 832, 834, 836, 838, 841, 846, 853, 857, - 864, 868, 873, 875, 877, 879, 885, 887, 892, 895, - 897, 899, 905, 907, 909, 912, 914, 917, 919, 921, - 923, 925, 927, 929, 931, 933, 935, 937, 939, 941, - 943, 945, 947, 949, 951, 953, 955, 957, 958, 963, - 966, 971, 974, 981, 986, 991, 994, 999, 1002, 1005, - 1007, 1008, 1010, 1014, 1018, 1020, 1024, 1027, 1030, 1033, - 1035, 1037, 1038, 1044, 1046, 1049, 1052, 1054, 1058, 1062, - 1064, 1066, 1068, 1070, 1072, 1074, 1076, 1078, 1080, 1082, - 1084, 1086, 1087, 1089, 1090, 1092, 1093, 1095, 1097, 1099, - 1101, 1103, 1106 + 131, 133, 137, 140, 143, 149, 154, 157, 159, 161, + 165, 168, 170, 174, 176, 181, 185, 187, 189, 194, + 198, 200, 202, 204, 206, 208, 210, 212, 214, 216, + 217, 222, 224, 226, 228, 230, 232, 234, 236, 238, + 240, 242, 244, 246, 248, 250, 252, 254, 256, 258, + 260, 262, 264, 266, 268, 270, 272, 274, 276, 278, + 280, 282, 284, 286, 288, 290, 292, 294, 296, 298, + 300, 302, 304, 306, 308, 310, 312, 314, 316, 318, + 320, 322, 324, 326, 328, 330, 332, 334, 336, 338, + 340, 342, 344, 346, 348, 350, 352, 354, 356, 360, + 361, 366, 373, 379, 385, 389, 393, 397, 401, 405, + 409, 413, 417, 421, 424, 427, 431, 435, 439, 443, + 447, 451, 455, 459, 463, 467, 471, 475, 479, 482, + 485, 489, 493, 497, 501, 502, 507, 513, 515, 517, + 519, 522, 524, 527, 530, 536, 539, 542, 548, 553, + 558, 566, 570, 572, 575, 578, 580, 582, 584, 586, + 590, 592, 597, 600, 602, 604, 607, 609, 613, 616, + 618, 620, 622, 624, 626, 628, 630, 635, 639, 643, + 648, 652, 654, 659, 663, 665, 666, 673, 675, 678, + 680, 683, 690, 697, 703, 709, 714, 722, 729, 733, + 734, 741, 742, 750, 751, 757, 758, 765, 766, 767, + 777, 779, 781, 783, 785, 787, 789, 792, 794, 796, + 798, 804, 806, 809, 811, 813, 815, 818, 820, 824, + 825, 831, 832, 838, 840, 842, 844, 846, 848, 851, + 856, 863, 867, 874, 878, 883, 885, 887, 889, 895, + 897, 902, 905, 907, 909, 915, 917, 919, 922, 924, + 927, 929, 931, 933, 935, 937, 939, 941, 943, 945, + 947, 949, 951, 953, 955, 957, 959, 961, 963, 965, + 967, 968, 973, 976, 981, 984, 991, 996, 1001, 1004, + 1009, 1012, 1015, 1017, 1018, 1020, 1024, 1028, 1030, 1034, + 1037, 1039, 1042, 1045, 1047, 1049, 1050, 1056, 1058, 1061, + 1064, 1066, 1070, 1074, 1076, 1078, 1080, 1082, 1084, 1086, + 1088, 1090, 1092, 1094, 1096, 1098, 1099, 1101, 1102, 1104, + 1105, 1107, 1109, 1111, 1113, 1115, 1118 }; static const short yyrhs[] = { -1, @@ -315,8 +315,9 @@ static const short yyrhs[] = { -1, 141, 0, 202, 146, 0, 154, 109, 203, 146, 0, 154, 81, 203, 146, 0, 29, 146, 0, 129, 0, 85, 128, 110, 0, 129, 0, 85, 128, 110, 0, - 131, 0, 131, 88, 134, 0, 131, 132, 0, 131, - 132, 111, 88, 134, 0, 88, 133, 0, 133, 0, + 131, 0, 131, 88, 134, 0, 131, 88, 0, 131, + 132, 0, 131, 132, 111, 88, 134, 0, 131, 132, + 111, 88, 0, 88, 133, 0, 88, 0, 133, 0, 85, 128, 110, 0, 130, 111, 0, 130, 0, 132, 111, 130, 0, 184, 0, 154, 112, 144, 113, 0, 154, 109, 47, 0, 186, 0, 184, 0, 154, 112, @@ -404,15 +405,15 @@ static const short yyrhs[] = { -1, 191, 196, 0, 193, 111, 194, 196, 0, 193, 196, 0, 194, 196, 0, 195, 0, 0, 47, 0, 191, 111, 47, 0, 47, 91, 141, 0, 192, 0, 193, - 111, 192, 0, 88, 47, 0, 89, 47, 0, 111, - 195, 0, 211, 0, 185, 0, 0, 115, 198, 125, - 207, 110, 0, 211, 0, 200, 208, 0, 150, 208, - 0, 201, 0, 200, 111, 201, 0, 141, 84, 141, - 0, 47, 0, 51, 0, 48, 0, 47, 0, 51, - 0, 48, 0, 139, 0, 47, 0, 48, 0, 139, - 0, 109, 0, 81, 0, 0, 210, 0, 0, 116, - 0, 0, 116, 0, 111, 0, 117, 0, 116, 0, - 209, 0, 210, 117, 0, 0 + 111, 192, 0, 88, 47, 0, 88, 0, 89, 47, + 0, 111, 195, 0, 211, 0, 185, 0, 0, 115, + 198, 125, 207, 110, 0, 211, 0, 200, 208, 0, + 150, 208, 0, 201, 0, 200, 111, 201, 0, 141, + 84, 141, 0, 47, 0, 51, 0, 48, 0, 47, + 0, 51, 0, 48, 0, 139, 0, 47, 0, 48, + 0, 139, 0, 109, 0, 81, 0, 0, 210, 0, + 0, 116, 0, 0, 116, 0, 111, 0, 117, 0, + 116, 0, 209, 0, 210, 117, 0, 0 }; #endif @@ -423,40 +424,40 @@ static const short yyrline[] = { 0, 292, 298, 307, 312, 318, 324, 330, 340, 350, 357, 364, 372, 377, 379, 385, 392, 397, 398, 402, 406, 411, 416, 418, 423, 429, 435, 443, 444, 449, 450, - 455, 459, 463, 467, 471, 476, 477, 482, 487, 491, - 496, 500, 504, 508, 514, 518, 522, 526, 532, 536, - 538, 539, 540, 541, 546, 552, 556, 557, 561, 562, - 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, - 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, - 583, 584, 585, 586, 587, 589, 589, 589, 589, 590, - 590, 590, 590, 590, 590, 590, 591, 591, 591, 591, - 591, 591, 591, 592, 592, 592, 592, 592, 592, 592, - 593, 593, 593, 593, 593, 593, 593, 594, 594, 594, - 594, 594, 594, 595, 595, 597, 602, 603, 618, 633, - 644, 655, 660, 664, 668, 672, 676, 680, 684, 688, + 455, 459, 463, 467, 471, 475, 479, 483, 488, 489, + 494, 499, 503, 508, 512, 516, 520, 526, 530, 534, + 538, 544, 548, 550, 551, 552, 553, 558, 564, 568, + 569, 573, 574, 575, 576, 577, 578, 579, 580, 581, + 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, + 592, 593, 594, 595, 596, 597, 598, 599, 601, 601, + 601, 601, 602, 602, 602, 602, 602, 602, 602, 603, + 603, 603, 603, 603, 603, 603, 604, 604, 604, 604, + 604, 604, 604, 605, 605, 605, 605, 605, 605, 605, + 606, 606, 606, 606, 606, 606, 607, 607, 609, 614, + 615, 630, 645, 656, 667, 672, 676, 680, 684, 688, 692, 696, 700, 704, 708, 712, 716, 720, 724, 728, - 732, 736, 740, 744, 748, 752, 757, 761, 765, 769, - 773, 777, 778, 782, 788, 793, 801, 802, 804, 809, - 813, 817, 822, 826, 831, 836, 841, 845, 850, 855, - 857, 863, 867, 869, 870, 872, 877, 883, 895, 900, - 906, 920, 921, 923, 927, 932, 936, 940, 941, 945, - 946, 947, 948, 949, 954, 962, 966, 973, 979, 985, - 990, 994, 998, 998, 1003, 1007, 1012, 1013, 1022, 1031, - 1040, 1048, 1056, 1064, 1072, 1092, 1096, 1106, 1114, 1121, - 1129, 1138, 1146, 1154, 1163, 1164, 1171, 1179, 1183, 1187, - 1191, 1196, 1197, 1198, 1200, 1201, 1203, 1204, 1213, 1214, - 1219, 1220, 1222, 1223, 1227, 1231, 1236, 1241, 1249, 1254, - 1261, 1265, 1269, 1273, 1274, 1276, 1286, 1291, 1297, 1303, - 1309, 1314, 1321, 1330, 1331, 1333, 1340, 1341, 1346, 1352, - 1353, 1355, 1362, 1364, 1365, 1370, 1371, 1376, 1378, 1379, - 1380, 1382, 1383, 1385, 1386, 1387, 1388, 1389, 1390, 1391, - 1392, 1393, 1394, 1396, 1401, 1402, 1404, 1408, 1412, 1416, - 1418, 1423, 1428, 1432, 1436, 1440, 1444, 1448, 1452, 1456, - 1460, 1465, 1472, 1480, 1487, 1492, 1497, 1504, 1509, 1513, - 1515, 1528, 1528, 1546, 1547, 1551, 1559, 1560, 1565, 1570, - 1571, 1572, 1574, 1575, 1576, 1577, 1579, 1580, 1581, 1583, - 1584, 1586, 1587, 1589, 1590, 1592, 1593, 1594, 1596, 1597, - 1599, 1600, 1602 + 732, 736, 740, 744, 748, 752, 756, 760, 764, 769, + 773, 777, 781, 785, 789, 790, 794, 800, 805, 813, + 814, 816, 821, 825, 829, 834, 838, 843, 848, 853, + 857, 862, 867, 869, 875, 879, 881, 882, 884, 889, + 895, 907, 912, 918, 932, 933, 935, 939, 944, 948, + 952, 953, 957, 958, 959, 960, 961, 966, 974, 978, + 985, 991, 997, 1002, 1006, 1010, 1010, 1015, 1019, 1024, + 1025, 1034, 1043, 1052, 1060, 1068, 1076, 1084, 1104, 1108, + 1118, 1126, 1133, 1141, 1150, 1158, 1166, 1175, 1176, 1183, + 1191, 1195, 1199, 1203, 1208, 1209, 1210, 1212, 1213, 1215, + 1216, 1225, 1226, 1231, 1232, 1234, 1235, 1239, 1243, 1248, + 1253, 1261, 1266, 1273, 1277, 1281, 1285, 1286, 1288, 1298, + 1303, 1309, 1315, 1321, 1326, 1333, 1342, 1343, 1345, 1352, + 1353, 1358, 1364, 1365, 1367, 1374, 1376, 1377, 1382, 1383, + 1388, 1390, 1391, 1392, 1394, 1395, 1397, 1398, 1399, 1400, + 1401, 1402, 1403, 1404, 1405, 1406, 1408, 1413, 1414, 1416, + 1420, 1424, 1428, 1430, 1435, 1440, 1444, 1448, 1452, 1456, + 1460, 1464, 1468, 1472, 1477, 1484, 1492, 1499, 1504, 1509, + 1515, 1520, 1525, 1529, 1531, 1544, 1544, 1562, 1563, 1567, + 1575, 1576, 1581, 1586, 1587, 1588, 1590, 1591, 1592, 1593, + 1595, 1596, 1597, 1599, 1600, 1602, 1603, 1605, 1606, 1608, + 1609, 1610, 1612, 1613, 1615, 1616, 1618 }; #endif @@ -496,40 +497,40 @@ static const short yyr1[] = { 0, 122, 122, 122, 122, 122, 122, 122, 122, 124, 122, 122, 122, 122, 125, 125, 125, 125, 125, 125, 125, 125, 125, 126, 126, 126, 126, 127, 127, 128, 128, - 129, 129, 129, 129, 129, 130, 130, 131, 132, 132, - 133, 133, 133, 133, 134, 134, 134, 134, 135, 135, - 136, 136, 136, 136, 136, 137, 138, 137, 139, 139, + 129, 129, 129, 129, 129, 129, 129, 129, 130, 130, + 131, 132, 132, 133, 133, 133, 133, 134, 134, 134, + 134, 135, 135, 136, 136, 136, 136, 136, 137, 138, + 137, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, - 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, - 139, 139, 139, 139, 139, 140, 140, 140, 140, 140, + 139, 139, 139, 139, 139, 139, 139, 139, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 141, 142, 141, 141, 141, + 140, 140, 140, 140, 140, 140, 140, 140, 141, 142, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 143, 141, 141, 141, 144, 145, 145, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 147, 148, 148, 149, 149, 150, 150, 151, 151, 151, - 152, 153, 153, 154, 154, 154, 154, 154, 154, 154, + 141, 141, 141, 141, 143, 141, 141, 141, 144, 145, + 145, 146, 146, 146, 146, 146, 146, 146, 146, 146, + 146, 146, 146, 147, 148, 148, 149, 149, 150, 150, + 151, 151, 151, 152, 153, 153, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 155, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 156, 154, 157, 154, - 158, 154, 159, 154, 160, 161, 154, 154, 154, 154, - 154, 162, 162, 162, 163, 163, 164, 164, 165, 165, - 166, 166, 167, 167, 167, 167, 169, 168, 171, 170, - 172, 172, 172, 172, 172, 173, 174, 174, 174, 174, - 174, 174, 174, 175, 175, 176, 177, 177, 177, 178, - 178, 179, 179, 180, 180, 181, 181, 181, 182, 182, - 182, 183, 183, 184, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 185, 186, 186, 187, 188, 187, 187, - 189, 189, 190, 190, 190, 190, 190, 190, 190, 190, - 190, 191, 191, 192, 193, 193, 194, 195, 196, 196, - 197, 198, 197, 199, 199, 199, 200, 200, 201, 202, - 202, 202, 203, 203, 203, 203, 204, 204, 204, 205, - 205, 206, 206, 207, 207, 208, 208, 208, 209, 209, - 210, 210, 211 + 154, 154, 154, 154, 154, 155, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 156, + 154, 157, 154, 158, 154, 159, 154, 160, 161, 154, + 154, 154, 154, 154, 162, 162, 162, 163, 163, 164, + 164, 165, 165, 166, 166, 167, 167, 167, 167, 169, + 168, 171, 170, 172, 172, 172, 172, 172, 173, 174, + 174, 174, 174, 174, 174, 174, 175, 175, 176, 177, + 177, 177, 178, 178, 179, 179, 180, 180, 181, 181, + 181, 182, 182, 182, 183, 183, 184, 184, 184, 184, + 184, 184, 184, 184, 184, 184, 185, 186, 186, 187, + 188, 187, 187, 189, 189, 190, 190, 190, 190, 190, + 190, 190, 190, 190, 191, 191, 192, 193, 193, 194, + 194, 195, 196, 196, 197, 198, 197, 199, 199, 199, + 200, 200, 201, 202, 202, 202, 203, 203, 203, 203, + 204, 204, 204, 205, 205, 206, 206, 207, 207, 208, + 208, 208, 209, 209, 210, 210, 211 }; static const short yyr2[] = { 0, @@ -537,108 +538,108 @@ static const short yyr2[] = { 0, 3, 3, 3, 2, 3, 3, 3, 3, 0, 5, 4, 3, 1, 3, 2, 2, 1, 3, 3, 2, 2, 1, 2, 4, 4, 2, 1, 3, 1, 3, - 1, 3, 2, 5, 2, 1, 3, 2, 1, 3, - 1, 4, 3, 1, 1, 4, 3, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 0, 4, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 3, 2, 2, 5, 4, 2, 1, 1, 3, + 2, 1, 3, 1, 4, 3, 1, 1, 4, 3, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 0, 4, 6, 5, - 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, - 3, 0, 4, 5, 1, 1, 1, 2, 1, 2, - 2, 5, 2, 2, 5, 4, 4, 7, 3, 1, - 2, 2, 1, 1, 1, 1, 3, 1, 4, 2, - 1, 1, 2, 1, 3, 2, 1, 1, 1, 1, - 1, 1, 1, 4, 3, 3, 4, 3, 1, 4, - 3, 1, 0, 6, 1, 2, 1, 2, 6, 6, - 5, 5, 4, 7, 6, 3, 0, 6, 0, 7, - 0, 5, 0, 6, 0, 0, 9, 1, 1, 1, - 1, 1, 1, 2, 1, 1, 1, 5, 1, 2, - 1, 1, 1, 2, 1, 3, 0, 5, 0, 5, - 1, 1, 1, 1, 1, 2, 4, 6, 3, 6, - 3, 4, 1, 1, 1, 5, 1, 4, 2, 1, - 1, 5, 1, 1, 2, 1, 2, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 3, 0, + 4, 6, 5, 5, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, + 3, 3, 3, 3, 0, 4, 5, 1, 1, 1, + 2, 1, 2, 2, 5, 2, 2, 5, 4, 4, + 7, 3, 1, 2, 2, 1, 1, 1, 1, 3, + 1, 4, 2, 1, 1, 2, 1, 3, 2, 1, + 1, 1, 1, 1, 1, 1, 4, 3, 3, 4, + 3, 1, 4, 3, 1, 0, 6, 1, 2, 1, + 2, 6, 6, 5, 5, 4, 7, 6, 3, 0, + 6, 0, 7, 0, 5, 0, 6, 0, 0, 9, + 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, + 5, 1, 2, 1, 1, 1, 2, 1, 3, 0, + 5, 0, 5, 1, 1, 1, 1, 1, 2, 4, + 6, 3, 6, 3, 4, 1, 1, 1, 5, 1, + 4, 2, 1, 1, 5, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 4, 2, - 4, 2, 6, 4, 4, 2, 4, 2, 2, 1, - 0, 1, 3, 3, 1, 3, 2, 2, 2, 1, - 1, 0, 5, 1, 2, 2, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, - 1, 2, 0 + 0, 4, 2, 4, 2, 6, 4, 4, 2, 4, + 2, 2, 1, 0, 1, 3, 3, 1, 3, 2, + 1, 2, 2, 1, 1, 0, 5, 1, 2, 2, + 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, + 1, 1, 1, 1, 1, 2, 0 }; static const short yydefact[] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 248, 249, 250, 251, 219, 222, 283, - 309, 308, 310, 311, 0, 0, 364, 19, 0, 313, - 312, 350, 352, 306, 305, 351, 302, 303, 207, 209, - 298, 208, 210, 211, 315, 316, 0, 0, 0, 0, - 373, 373, 0, 0, 0, 0, 2, 362, 5, 23, - 27, 0, 37, 0, 41, 46, 0, 32, 175, 0, - 8, 227, 204, 296, 314, 212, 213, 0, 4, 7, - 59, 60, 0, 0, 241, 105, 117, 106, 130, 102, - 123, 112, 111, 128, 110, 109, 104, 133, 114, 103, - 118, 122, 124, 116, 108, 125, 135, 127, 126, 119, - 129, 113, 101, 121, 120, 115, 131, 134, 132, 100, - 107, 98, 99, 96, 97, 61, 63, 62, 91, 92, - 89, 73, 74, 75, 78, 80, 76, 69, 93, 94, - 81, 82, 86, 77, 79, 70, 71, 72, 83, 84, - 85, 87, 88, 90, 95, 342, 243, 64, 65, 314, - 341, 0, 126, 119, 129, 113, 96, 97, 61, 62, - 66, 14, 373, 304, 225, 307, 0, 27, 0, 227, - 0, 0, 0, 0, 219, 222, 283, 364, 262, 261, - 0, 0, 314, 213, 0, 0, 0, 0, 0, 0, - 179, 196, 201, 190, 373, 25, 175, 314, 213, 373, - 347, 0, 26, 373, 36, 30, 0, 9, 365, 172, - 0, 0, 151, 175, 152, 206, 0, 0, 0, 37, - 196, 366, 0, 202, 366, 0, 366, 344, 45, 0, - 51, 54, 301, 300, 299, 297, 31, 166, 167, 370, - 369, 3, 371, 363, 0, 0, 0, 0, 0, 0, - 0, 48, 0, 0, 49, 43, 0, 0, 0, 0, + 0, 0, 0, 251, 252, 253, 254, 222, 225, 286, + 312, 311, 313, 314, 0, 0, 368, 19, 0, 316, + 315, 354, 356, 309, 308, 355, 305, 306, 210, 212, + 301, 211, 213, 214, 318, 319, 0, 0, 0, 0, + 377, 377, 48, 0, 0, 0, 2, 366, 5, 23, + 27, 0, 37, 0, 41, 49, 0, 32, 178, 0, + 8, 230, 207, 299, 317, 215, 216, 0, 4, 7, + 62, 63, 0, 0, 244, 108, 120, 109, 133, 105, + 126, 115, 114, 131, 113, 112, 107, 136, 117, 106, + 121, 125, 127, 119, 111, 128, 138, 130, 129, 122, + 132, 116, 104, 124, 123, 118, 134, 137, 135, 103, + 110, 101, 102, 99, 100, 64, 66, 65, 94, 95, + 92, 76, 77, 78, 81, 83, 79, 72, 96, 97, + 84, 85, 89, 80, 82, 73, 74, 75, 86, 87, + 88, 90, 91, 93, 98, 346, 246, 67, 68, 317, + 345, 0, 129, 122, 132, 116, 99, 100, 64, 65, + 69, 14, 377, 307, 228, 310, 0, 27, 0, 230, + 0, 0, 0, 0, 222, 225, 286, 368, 265, 264, + 0, 0, 317, 216, 0, 0, 0, 0, 0, 0, + 182, 199, 204, 193, 377, 25, 178, 317, 216, 377, + 351, 0, 26, 377, 36, 30, 0, 9, 369, 175, + 0, 0, 154, 178, 155, 209, 0, 0, 0, 37, + 199, 370, 0, 205, 370, 0, 370, 348, 47, 0, + 54, 57, 304, 303, 302, 300, 31, 169, 170, 374, + 373, 3, 375, 367, 0, 0, 0, 0, 0, 0, + 0, 51, 0, 43, 52, 44, 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, 0, 0, 373, 267, 276, 269, 228, - 137, 0, 373, 33, 226, 0, 0, 318, 237, 317, - 0, 0, 331, 361, 360, 245, 67, 373, 373, 293, - 253, 0, 252, 0, 0, 0, 0, 256, 0, 255, - 0, 0, 0, 0, 373, 0, 373, 191, 218, 0, - 0, 180, 181, 193, 0, 373, 183, 184, 221, 0, - 0, 364, 177, 11, 13, 12, 0, 223, 0, 0, - 0, 0, 0, 236, 38, 368, 367, 203, 215, 346, - 216, 368, 345, 0, 373, 372, 6, 15, 16, 17, - 18, 28, 29, 0, 198, 24, 0, 42, 0, 55, - 58, 0, 285, 136, 284, 22, 150, 156, 161, 162, - 163, 158, 160, 170, 171, 164, 165, 143, 144, 168, - 169, 0, 157, 159, 153, 154, 155, 145, 146, 147, - 148, 149, 357, 358, 205, 359, 0, 281, 353, 355, - 354, 356, 279, 0, 176, 373, 373, 0, 142, 0, - 239, 320, 0, 0, 0, 364, 332, 0, 0, 331, - 0, 0, 373, 335, 373, 373, 330, 0, 0, 0, - 194, 195, 0, 373, 259, 373, 254, 373, 0, 287, - 0, 233, 0, 0, 0, 353, 354, 279, 0, 0, - 0, 189, 217, 349, 0, 197, 192, 373, 353, 0, - 0, 0, 348, 220, 282, 178, 10, 0, 173, 0, - 21, 38, 197, 53, 0, 200, 0, 47, 0, 373, - 0, 50, 0, 373, 35, 0, 0, 373, 34, 214, - 265, 0, 0, 263, 0, 138, 277, 0, 0, 0, - 242, 0, 0, 337, 338, 364, 0, 322, 0, 326, - 340, 0, 328, 0, 329, 246, 68, 0, 0, 260, - 0, 0, 294, 0, 0, 257, 0, 289, 0, 0, - 231, 232, 214, 0, 373, 187, 186, 214, 373, 0, - 20, 52, 0, 353, 0, 44, 174, 0, 140, 141, - 0, 0, 264, 0, 0, 0, 0, 319, 238, 343, - 334, 0, 244, 333, 373, 373, 339, 0, 336, 373, - 331, 373, 295, 235, 0, 229, 230, 0, 373, 0, - 182, 0, 185, 224, 199, 56, 280, 278, 139, 266, - 268, 270, 240, 321, 0, 324, 325, 327, 0, 292, - 0, 288, 290, 291, 286, 234, 373, 373, 0, 373, - 188, 323, 247, 258, 0, 0, 0 + 0, 0, 0, 0, 0, 377, 270, 279, 272, 231, + 140, 0, 377, 33, 229, 0, 0, 321, 240, 320, + 0, 0, 334, 365, 364, 248, 70, 377, 377, 296, + 256, 0, 255, 0, 0, 0, 0, 259, 0, 258, + 0, 0, 0, 0, 377, 0, 377, 194, 221, 0, + 0, 183, 184, 196, 0, 377, 186, 187, 224, 0, + 0, 368, 180, 11, 13, 12, 0, 226, 0, 0, + 0, 0, 0, 239, 38, 372, 371, 206, 218, 350, + 219, 372, 349, 0, 377, 376, 6, 15, 16, 17, + 18, 28, 29, 0, 201, 24, 0, 42, 0, 58, + 61, 0, 288, 139, 287, 22, 153, 159, 164, 165, + 166, 161, 163, 173, 174, 167, 168, 146, 147, 171, + 172, 0, 160, 162, 156, 157, 158, 148, 149, 150, + 151, 152, 361, 362, 208, 363, 0, 284, 357, 359, + 358, 360, 282, 0, 179, 377, 377, 0, 145, 0, + 242, 323, 0, 0, 0, 368, 335, 341, 0, 334, + 0, 0, 377, 338, 377, 377, 333, 0, 0, 0, + 197, 198, 0, 377, 262, 377, 257, 377, 0, 290, + 0, 236, 0, 0, 0, 357, 358, 282, 0, 0, + 0, 192, 220, 353, 0, 200, 195, 377, 357, 0, + 0, 0, 352, 223, 285, 181, 10, 0, 176, 0, + 21, 38, 200, 56, 0, 203, 0, 50, 0, 377, + 46, 53, 0, 377, 35, 0, 0, 377, 34, 217, + 268, 0, 0, 266, 0, 141, 280, 0, 0, 0, + 245, 0, 0, 340, 342, 368, 0, 325, 0, 329, + 344, 0, 331, 0, 332, 249, 71, 0, 0, 263, + 0, 0, 297, 0, 0, 260, 0, 292, 0, 0, + 234, 235, 217, 0, 377, 190, 189, 217, 377, 0, + 20, 55, 0, 357, 0, 45, 177, 0, 143, 144, + 0, 0, 267, 0, 0, 0, 0, 322, 241, 347, + 337, 0, 247, 336, 377, 377, 343, 0, 339, 377, + 334, 377, 298, 238, 0, 232, 233, 0, 377, 0, + 185, 0, 188, 227, 202, 59, 283, 281, 142, 269, + 271, 273, 243, 324, 0, 327, 328, 330, 0, 295, + 0, 291, 293, 294, 289, 237, 377, 377, 0, 377, + 191, 326, 250, 261, 0, 0, 0 }; static const short yydefgoto[] = { 645, @@ -745,45 +746,45 @@ static const short yytable[] = { 69, 332, 331, 230, 69, 253, 203, 203, 215, 457, 493, 321, 351, 232, 235, 213, 487, 305, 321, 479, 218, 487, 543, 545, 307, 596, 259, 260, 600, 69, 490, - 310, 240, -55, 207, 328, 294, 426, 432, 259, 260, - 599, 328, 219, 240, 85, 521, 366, 245, -58, 259, - 260, 367, 447, 259, 260, -57, 207, -56, 505, -274, + 310, 240, -58, 207, 328, 294, 426, 432, 259, 260, + 599, 328, 219, 240, 85, 521, 366, 245, -61, 259, + 260, 367, 447, 259, 260, -60, 207, -59, 505, -277, 594, 69, 372, 295, 598, 304, 296, 367, 81, 522, - 259, 260, 82, 78, 78, 426, 432, 299, -57, 78, + 259, 260, 82, 78, 78, 426, 432, 299, -60, 78, 78, 78, 78, 78, 78, 303, 463, 432, 326, 226, 78, 78, 78, 448, 449, 177, 181, 78, 183, 184, - 440, 448, 449, -55, 432, 448, 449, 250, 251, 482, - 638, 261, 216, 250, 251, 447, 432, 308, -51, -58, - 250, 251, 78, 599, 250, 251, -57, 78, -56, 330, - 330, 250, 251, 305, -54, 219, 363, -275, 250, 251, - 299, -53, 557, -52, -57, 457, 614, 427, 433, -57, + 440, 448, 449, -58, 432, 448, 449, 250, 251, 482, + 638, 261, 216, 250, 251, 447, 432, 308, -54, -61, + 250, 251, 78, 599, 250, 251, -60, 78, -59, 330, + 330, 250, 251, 305, -57, 219, 363, -278, 250, 251, + 299, -56, 557, -55, -60, 457, 614, 427, 433, -60, 78, 370, 301, 373, 487, 78, 448, 449, 222, 301, - -55, 626, 627, -57, 496, 81, 628, -55, 302, 82, - 306, 262, 387, 268, 69, 267, -58, 297, 207, 230, - -51, 268, 318, 450, 317, -309, 475, 203, 281, 282, + -58, 626, 627, -60, 496, 81, 628, -58, 302, 82, + 306, 262, 387, 268, 69, 267, -61, 297, 207, 230, + -54, 268, 318, 450, 317, -312, 475, 203, 281, 282, 207, 324, 207, 575, 326, 340, 333, 83, 433, 203, - 69, 299, -308, 493, 642, 69, 516, 350, 289, 290, - 291, 292, 293, -309, -57, 230, 289, 290, 291, 292, - 293, 302, 385, 200, 334, 259, 260, 335, 268, -58, - -308, -310, 69, 69, 69, 69, 69, 69, 69, 487, - 212, 69, 389, 281, 282, 207, 377, 294, 516, -54, - 214, 432, 441, 442, 268, 336, -57, 342, 532, -310, - 567, 582, 288, 289, 290, 291, 292, 293, 78, -56, - 333, 347, 78, 358, 207, 345, -53, 548, 346, 461, - -311, 207, 560, 633, 78, 488, 78, 470, 333, 69, + 69, 299, -311, 493, 642, 69, 516, 350, 289, 290, + 291, 292, 293, -312, -60, 230, 289, 290, 291, 292, + 293, 302, 385, 200, 334, 259, 260, 335, 268, -61, + -311, -313, 69, 69, 69, 69, 69, 69, 69, 487, + 212, 69, 389, 281, 282, 207, 377, 294, 516, -57, + 214, 432, 441, 442, 268, 336, -60, 342, 532, -313, + 567, 582, 288, 289, 290, 291, 292, 293, 78, -59, + 333, 347, 78, 358, 207, 345, -56, 548, 346, 461, + -314, 207, 560, 633, 78, 488, 78, 470, 333, 69, 69, 291, 292, 293, 78, 360, 457, 564, 362, 78, - 69, 346, 268, 69, 364, -314, 354, 69, -311, 69, + 69, 346, 268, 69, 364, -317, 354, 69, -314, 69, 512, 578, 582, 207, 69, 581, 374, 355, 356, 375, - -56, 250, 251, -353, 207, 365, 78, 78, 78, 78, - 78, 78, 78, -314, -213, 78, -314, 611, 69, 78, - -52, 613, 378, 379, 380, 381, 382, 383, 592, -353, - 497, -353, -313, 207, -353, 554, 463, -353, 333, -214, - -312, -39, -213, -304, -307, -213, 371, 314, 78, 369, - 240, 255, 256, 257, 258, 78, -40, -47, 392, 463, - -313, 467, 472, 78, 78, 483, 509, -214, -312, 510, - -214, -304, -307, 501, 78, 315, 517, 78, 538, 446, + -59, 250, 251, -357, 207, 365, 78, 78, 78, 78, + 78, 78, 78, -317, -216, 78, -317, 611, 69, 78, + -55, 613, 378, 379, 380, 381, 382, 383, 592, -357, + 497, -357, -316, 207, -357, 554, 463, -357, 333, -217, + -315, -39, -216, -307, -310, -216, 371, 314, 78, 369, + 240, 255, 256, 257, 258, 78, -40, -50, 392, 463, + -316, 467, 472, 78, 78, 483, 509, -217, -315, 510, + -217, -307, -310, 501, 78, 315, 517, 78, 538, 446, 494, 78, 495, 78, 502, 207, 330, 78, 78, 641, - -47, 207, 507, 508, 515, 520, 631, 527, 78, 531, + -50, 207, 507, 508, 515, 520, 631, 527, 78, 531, 519, 69, 69, 480, 533, 534, 330, 535, 539, 69, 542, 544, 78, 67, 67, 549, 551, 559, 561, 67, 562, 69, 67, 514, 518, 190, 198, 78, 563, 566, @@ -920,7 +921,7 @@ static const short yytable[] = { 69, 0, 283, 178, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 201, 178, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 201, 0, 0, -373, + 0, 0, 0, 0, 0, 0, 201, 0, 0, -377, 2, 0, 3, 4, 5, 6, 7, 0, 0, 0, 8, 9, 0, 0, 0, 10, 0, 11, 12, 13, 14, 15, 16, 17, 0, 201, 18, 19, 20, 21, @@ -932,41 +933,41 @@ static const short yytable[] = { 69, 0, 49, 0, 201, 50, 51, 52, 53, 0, 54, 0, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 56, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -373, -373, -304, 0, 0, - 0, 0, 0, 0, 0, -304, -304, -304, 0, 0, - 0, -304, -304, 0, -304, 0, 0, 0, 0, 0, - 0, 0, 0, -271, 0, 0, 0, 0, 178, 0, - 0, -304, -304, 0, -304, -304, -304, -304, 0, 0, + 0, 0, 0, 0, 0, -377, -377, -307, 0, 0, + 0, 0, 0, 0, 0, -307, -307, -307, 0, 0, + 0, -307, -307, 0, -307, 0, 0, 0, 0, 0, + 0, 0, 0, -274, 0, 0, 0, 0, 178, 0, + 0, -307, -307, 0, -307, -307, -307, -307, 0, 0, 201, 0, 0, 0, 201, 0, 0, 0, 201, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -304, -304, -304, -304, -304, -304, -304, -304, -304, - -304, -304, -304, -304, 0, 0, -304, -304, -304, 0, - -304, 0, 0, 0, 178, 0, 0, 0, -304, -304, - 0, -304, -304, -304, -304, -304, -304, -304, -304, -304, - -304, 0, -307, 0, 0, -304, -304, -304, -304, -304, - -307, -307, -307, -304, -304, 0, -307, -307, 0, -307, - 0, 0, 0, 0, 0, 0, 0, 0, -272, 0, - 0, 0, 0, 0, 0, 0, -307, -307, 0, -307, - -307, -307, -307, 0, 0, 0, 0, 0, 0, 0, + 0, -307, -307, -307, -307, -307, -307, -307, -307, -307, + -307, -307, -307, -307, 0, 0, -307, -307, -307, 0, + -307, 0, 0, 0, 178, 0, 0, 0, -307, -307, + 0, -307, -307, -307, -307, -307, -307, -307, -307, -307, + -307, 0, -310, 0, 0, -307, -307, -307, -307, -307, + -310, -310, -310, -307, -307, 0, -310, -310, 0, -310, + 0, 0, 0, 0, 0, 0, 0, 0, -275, 0, + 0, 0, 0, 0, 0, 0, -310, -310, 0, -310, + -310, -310, -310, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -307, -307, -307, -307, - -307, -307, -307, -307, -307, -307, -307, -307, -307, 0, - 0, -307, -307, -307, 0, -307, 0, 0, 0, 0, - 0, 0, 0, -307, -307, 0, -307, -307, -307, -307, - -307, -307, -307, -307, -307, -307, 0, -225, 0, 0, - -307, -307, -307, -307, -307, -225, -225, -225, -307, -307, - 0, -225, -225, 0, -225, 0, 0, 0, 0, 0, - 0, 0, 0, -273, 0, 0, 0, 0, 0, 0, - 0, -225, -225, 0, -225, -225, -225, -225, 0, 0, + 0, 0, 0, 0, 0, 0, -310, -310, -310, -310, + -310, -310, -310, -310, -310, -310, -310, -310, -310, 0, + 0, -310, -310, -310, 0, -310, 0, 0, 0, 0, + 0, 0, 0, -310, -310, 0, -310, -310, -310, -310, + -310, -310, -310, -310, -310, -310, 0, -228, 0, 0, + -310, -310, -310, -310, -310, -228, -228, -228, -310, -310, + 0, -228, -228, 0, -228, 0, 0, 0, 0, 0, + 0, 0, 0, -276, 0, 0, 0, 0, 0, 0, + 0, -228, -228, 0, -228, -228, -228, -228, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -225, -225, -225, -225, -225, -225, -225, -225, -225, - -225, -225, -225, -225, 0, 0, -225, -225, -225, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, -225, - 0, -225, -225, -225, -225, -225, -225, -225, -225, -225, - -225, 0, 0, 0, 0, -225, -225, -225, 0, -225, - 0, 0, 0, -225, -225, 2, 0, 3, 4, 5, - 6, 7, -373, -373, -373, 8, 9, 0, 0, -373, + 0, -228, -228, -228, -228, -228, -228, -228, -228, -228, + -228, -228, -228, -228, 0, 0, -228, -228, -228, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, -228, + 0, -228, -228, -228, -228, -228, -228, -228, -228, -228, + -228, 0, 0, 0, 0, -228, -228, -228, 0, -228, + 0, 0, 0, -228, -228, 2, 0, 3, 4, 5, + 6, 7, -377, -377, -377, 8, 9, 0, 0, -377, 10, 0, 11, 12, 13, 14, 15, 16, 17, 0, 0, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, @@ -977,7 +978,7 @@ static const short yytable[] = { 69, 51, 52, 53, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 56, 0, 0, 0, 2, 0, 3, 4, 5, 6, 7, - -373, -373, -373, 8, 9, 0, -373, -373, 10, 0, + -377, -377, -377, 8, 9, 0, -377, -377, 10, 0, 11, 12, 13, 14, 15, 16, 17, 0, 0, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, @@ -986,8 +987,8 @@ static const short yytable[] = { 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, 0, 54, 0, 2, 0, 3, 4, 5, 6, - 7, 0, 0, -373, 8, 9, 55, 56, -373, 10, - -373, 11, 12, 13, 14, 15, 16, 17, -373, -373, + 7, 0, 0, -377, 8, 9, 55, 56, -377, 10, + -377, 11, 12, 13, 14, 15, 16, 17, -377, -377, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, @@ -995,18 +996,18 @@ static const short yytable[] = { 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, 0, 54, 0, 2, 0, 3, 4, 5, - 6, 7, 0, 0, -373, 8, 9, 55, 56, -373, - 10, 0, 11, 12, 13, 14, 15, 16, 17, -373, - -373, 18, 19, 20, 21, 22, 23, 24, 0, 0, + 6, 7, 0, 0, -377, 8, 9, 55, 56, -377, + 10, 0, 11, 12, 13, 14, 15, 16, 17, -377, + -377, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, 0, 54, 0, 2, 0, 3, 4, - 5, 6, 7, 0, -373, -373, 8, 9, 55, 56, + 5, 6, 7, 0, -377, -377, 8, 9, 55, 56, 0, 10, 0, 11, 12, 13, 14, 15, 16, 17, - -373, -373, 18, 19, 20, 21, 22, 23, 24, 0, + -377, -377, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, @@ -1014,8 +1015,8 @@ static const short yytable[] = { 69, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, 0, 54, 0, 2, 0, 3, 4, 5, 6, 7, 0, 0, 0, 8, 9, 55, - 56, 0, 10, -373, 11, 12, 13, 14, 15, 16, - 17, -373, -373, 18, 19, 20, 21, 22, 23, 24, + 56, 0, 10, -377, 11, 12, 13, 14, 15, 16, + 17, -377, -377, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, @@ -1024,7 +1025,7 @@ static const short yytable[] = { 69, 0, 50, 51, 52, 53, 0, 54, 0, 2, 0, 3, 4, 5, 6, 7, 0, 0, 0, 8, 9, 55, 56, 0, 10, 0, 11, 12, 13, 14, 15, - 16, 17, -373, -373, 18, 19, 20, 21, 22, 23, + 16, 17, -377, -377, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, @@ -1032,8 +1033,8 @@ static const short yytable[] = { 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 227, 51, 52, 53, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 55, 56, 0, 0, 0, 2, -373, 3, 4, - 5, 6, 7, -373, -373, 0, 8, 9, 0, 0, + 0, 55, 56, 0, 0, 0, 2, -377, 3, 4, + 5, 6, 7, -377, -377, 0, 8, 9, 0, 0, 0, 10, 0, 11, 12, 13, 14, 15, 16, 17, 0, 0, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, @@ -1043,8 +1044,8 @@ static const short yytable[] = { 69, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, - 56, 0, 0, 0, 2, -373, 3, 4, 5, 6, - 7, -373, -373, 0, 8, 9, 0, 0, 0, 10, + 56, 0, 0, 0, 2, -377, 3, 4, 5, 6, + 7, -377, -377, 0, 8, 9, 0, 0, 0, 10, 0, 11, 12, 13, 14, 15, 16, 17, 0, 0, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, @@ -1053,9 +1054,9 @@ static const short yytable[] = { 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, 0, 54, 0, 2, 0, 3, 4, 5, - 6, 7, 0, 0, -373, 8, 9, 55, 56, 0, - 10, -373, 11, 12, 13, 14, 15, 16, 17, -373, - -373, 18, 19, 20, 21, 22, 23, 24, 0, 0, + 6, 7, 0, 0, -377, 8, 9, 55, 56, 0, + 10, -377, 11, 12, 13, 14, 15, 16, 17, -377, + -377, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, 0, @@ -1064,7 +1065,7 @@ static const short yytable[] = { 69, 51, 52, 53, 0, 54, 0, 0, 0, 3, 4, 5, 6, 7, 0, 0, 0, 8, 9, 55, 56, 0, 10, 0, 11, 12, 13, 14, 15, 16, 17, - -373, -373, 18, 19, 20, 21, 22, 23, 24, 0, + -377, -377, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, @@ -1091,37 +1092,37 @@ static const short yytable[] = { 69, 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, - 196, 51, 52, 197, 198, 54, 0, 0, -350, -350, - -350, 0, -350, 0, 0, 0, -350, -350, 0, 199, - 56, -350, 299, -350, -350, -350, -350, -350, -350, -350, - 303, 0, -350, -350, -350, -350, -350, -350, -350, 0, - 0, 0, 0, 0, 0, 0, 0, -350, 0, 0, - -350, -350, -350, -350, -350, -350, -350, -350, -350, -350, - -350, -350, -350, -350, -350, -350, -350, -350, -350, 0, + 196, 51, 52, 197, 198, 54, 0, 0, -354, -354, + -354, 0, -354, 0, 0, 0, -354, -354, 0, 199, + 56, -354, 299, -354, -354, -354, -354, -354, -354, -354, + 303, 0, -354, -354, -354, -354, -354, -354, -354, 0, + 0, 0, 0, 0, 0, 0, 0, -354, 0, 0, + -354, -354, -354, -354, -354, -354, -354, -354, -354, -354, + -354, -354, -354, -354, -354, -354, -354, -354, -354, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -350, 0, 0, - -350, -350, -350, -350, -350, -350, 0, 0, -352, -352, - -352, 0, -352, 0, 0, 0, -352, -352, 0, -350, - -350, -352, -350, -352, -352, -352, -352, -352, -352, -352, - -350, 0, -352, -352, -352, -352, -352, -352, -352, 0, - 0, 0, 0, 0, 0, 0, 0, -352, 0, 0, - -352, -352, -352, -352, -352, -352, -352, -352, -352, -352, - -352, -352, -352, -352, -352, -352, -352, -352, -352, 0, + 0, 0, 0, 0, 0, 0, 0, -354, 0, 0, + -354, -354, -354, -354, -354, -354, 0, 0, -356, -356, + -356, 0, -356, 0, 0, 0, -356, -356, 0, -354, + -354, -356, -354, -356, -356, -356, -356, -356, -356, -356, + -354, 0, -356, -356, -356, -356, -356, -356, -356, 0, + 0, 0, 0, 0, 0, 0, 0, -356, 0, 0, + -356, -356, -356, -356, -356, -356, -356, -356, -356, -356, + -356, -356, -356, -356, -356, -356, -356, -356, -356, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -352, 0, 0, - -352, -352, -352, -352, -352, -352, 0, 0, -351, -351, - -351, 0, -351, 0, 0, 0, -351, -351, 0, -352, - -352, -351, -352, -351, -351, -351, -351, -351, -351, -351, - -352, 0, -351, -351, -351, -351, -351, -351, -351, 0, - 0, 0, 0, 0, 0, 0, 0, -351, 0, 0, - -351, -351, -351, -351, -351, -351, -351, -351, -351, -351, - -351, -351, -351, -351, -351, -351, -351, -351, -351, 0, + 0, 0, 0, 0, 0, 0, 0, -356, 0, 0, + -356, -356, -356, -356, -356, -356, 0, 0, -355, -355, + -355, 0, -355, 0, 0, 0, -355, -355, 0, -356, + -356, -355, -356, -355, -355, -355, -355, -355, -355, -355, + -356, 0, -355, -355, -355, -355, -355, -355, -355, 0, + 0, 0, 0, 0, 0, 0, 0, -355, 0, 0, + -355, -355, -355, -355, -355, -355, -355, -355, -355, -355, + -355, -355, -355, -355, -355, -355, -355, -355, -355, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -351, 0, 0, - -351, -351, -351, -351, -351, -351, 0, 0, 3, 4, - 5, 0, 7, 0, 0, 0, 8, 9, 0, -351, - -351, 10, -351, 11, 12, 13, 14, 15, 16, 17, - -351, 0, 185, 186, 20, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, -355, 0, 0, + -355, -355, -355, -355, -355, -355, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, -355, + -355, 10, -355, 11, 12, 13, 14, 15, 16, 17, + -355, 0, 185, 186, 20, 21, 22, 23, 24, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, @@ -1145,46 +1146,46 @@ static const short yytable[] = { 69, 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, - 196, 51, 52, 197, 198, 54, 0, 0, -353, -353, - -353, 0, -353, 0, 0, 0, -353, -353, 0, 199, - 56, -353, 0, -353, -353, -353, -353, -353, -353, -353, - 214, 0, -353, -353, -353, -353, -353, -353, -353, 0, - 0, 0, 0, 0, 0, 0, 0, -353, 0, 0, - -353, -353, -353, -353, -353, -353, -353, -353, -353, -353, - -353, -353, -353, -353, -353, -353, -353, -353, -353, 0, + 196, 51, 52, 197, 198, 54, 0, 0, -357, -357, + -357, 0, -357, 0, 0, 0, -357, -357, 0, 199, + 56, -357, 0, -357, -357, -357, -357, -357, -357, -357, + 214, 0, -357, -357, -357, -357, -357, -357, -357, 0, + 0, 0, 0, 0, 0, 0, 0, -357, 0, 0, + -357, -357, -357, -357, -357, -357, -357, -357, -357, -357, + -357, -357, -357, -357, -357, -357, -357, -357, -357, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -353, 0, 0, - -353, -353, -353, -353, -353, -353, 0, 0, -355, -355, - -355, 0, -355, 0, 0, 0, -355, -355, 0, -353, - -353, -355, 0, -355, -355, -355, -355, -355, -355, -355, - -353, 0, -355, -355, -355, -355, -355, -355, -355, 0, - 0, 0, 0, 0, 0, 0, 0, -355, 0, 0, - -355, -355, -355, -355, -355, -355, -355, -355, -355, -355, - -355, -355, -355, -355, -355, -355, -355, -355, -355, 0, + 0, 0, 0, 0, 0, 0, 0, -357, 0, 0, + -357, -357, -357, -357, -357, -357, 0, 0, -359, -359, + -359, 0, -359, 0, 0, 0, -359, -359, 0, -357, + -357, -359, 0, -359, -359, -359, -359, -359, -359, -359, + -357, 0, -359, -359, -359, -359, -359, -359, -359, 0, + 0, 0, 0, 0, 0, 0, 0, -359, 0, 0, + -359, -359, -359, -359, -359, -359, -359, -359, -359, -359, + -359, -359, -359, -359, -359, -359, -359, -359, -359, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -355, 0, 0, - -355, -355, -355, -355, -355, -355, 0, 0, -354, -354, - -354, 0, -354, 0, 0, 0, -354, -354, 0, -355, - -355, -354, 0, -354, -354, -354, -354, -354, -354, -354, - -355, 0, -354, -354, -354, -354, -354, -354, -354, 0, - 0, 0, 0, 0, 0, 0, 0, -354, 0, 0, - -354, -354, -354, -354, -354, -354, -354, -354, -354, -354, - -354, -354, -354, -354, -354, -354, -354, -354, -354, 0, + 0, 0, 0, 0, 0, 0, 0, -359, 0, 0, + -359, -359, -359, -359, -359, -359, 0, 0, -358, -358, + -358, 0, -358, 0, 0, 0, -358, -358, 0, -359, + -359, -358, 0, -358, -358, -358, -358, -358, -358, -358, + -359, 0, -358, -358, -358, -358, -358, -358, -358, 0, + 0, 0, 0, 0, 0, 0, 0, -358, 0, 0, + -358, -358, -358, -358, -358, -358, -358, -358, -358, -358, + -358, -358, -358, -358, -358, -358, -358, -358, -358, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -354, 0, 0, - -354, -354, -354, -354, -354, -354, 0, 0, -356, -356, - -356, 0, -356, 0, 0, 0, -356, -356, 0, -354, - -354, -356, 0, -356, -356, -356, -356, -356, -356, -356, - -354, 0, -356, -356, -356, -356, -356, -356, -356, 0, - 0, 0, 0, 0, 0, 0, 0, -356, 0, 0, - -356, -356, -356, -356, -356, -356, -356, -356, -356, -356, - -356, -356, -356, -356, -356, -356, -356, -356, -356, 0, + 0, 0, 0, 0, 0, 0, 0, -358, 0, 0, + -358, -358, -358, -358, -358, -358, 0, 0, -360, -360, + -360, 0, -360, 0, 0, 0, -360, -360, 0, -358, + -358, -360, 0, -360, -360, -360, -360, -360, -360, -360, + -358, 0, -360, -360, -360, -360, -360, -360, -360, 0, + 0, 0, 0, 0, 0, 0, 0, -360, 0, 0, + -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, + -360, -360, -360, -360, -360, -360, -360, -360, -360, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -356, 0, 0, - -356, -356, -356, -356, -356, -356, 0, 0, 3, 4, - 5, 0, 7, 0, 0, 0, 8, 9, 0, -356, - -356, 10, 0, 11, 12, 13, 14, 15, 16, 17, - -356, 0, 185, 186, 20, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, -360, 0, 0, + -360, -360, -360, -360, -360, -360, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, -360, + -360, 10, 0, 11, 12, 13, 14, 15, 16, 17, + -360, 0, 185, 186, 20, 21, 22, 23, 24, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, @@ -3009,252 +3010,270 @@ case 42: case 43: #line 464 "parse.y" { - yyval.node = NEW_MASGN(list_concat(NEW_LIST(yyvsp[-1].node),yyvsp[0].node), 0); + yyval.node = NEW_MASGN(NEW_LIST(yyvsp[-1].node), -1); ; break;} case 44: #line 468 "parse.y" { - yyval.node = NEW_MASGN(list_concat(NEW_LIST(yyvsp[-4].node),yyvsp[-3].node),yyvsp[0].node); + yyval.node = NEW_MASGN(list_concat(NEW_LIST(yyvsp[-1].node),yyvsp[0].node), 0); ; break;} case 45: #line 472 "parse.y" { - yyval.node = NEW_MASGN(0, yyvsp[0].node); + yyval.node = NEW_MASGN(list_concat(NEW_LIST(yyvsp[-4].node),yyvsp[-3].node),yyvsp[0].node); + ; + break;} +case 46: +#line 476 "parse.y" +{ + yyval.node = NEW_MASGN(list_concat(NEW_LIST(yyvsp[-3].node),yyvsp[-2].node),-1); ; break;} case 47: -#line 478 "parse.y" +#line 480 "parse.y" { - yyval.node = yyvsp[-1].node; + yyval.node = NEW_MASGN(0, yyvsp[0].node); ; break;} case 48: -#line 483 "parse.y" +#line 484 "parse.y" +{ + yyval.node = NEW_MASGN(0, -1); + ; + break;} +case 50: +#line 490 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 49: -#line 488 "parse.y" +case 51: +#line 495 "parse.y" +{ + yyval.node = yyvsp[-1].node; + ; + break;} +case 52: +#line 500 "parse.y" { yyval.node = NEW_LIST(yyvsp[0].node); ; break;} -case 50: -#line 492 "parse.y" +case 53: +#line 504 "parse.y" { yyval.node = list_append(yyvsp[-2].node, yyvsp[0].node); ; break;} -case 51: -#line 497 "parse.y" +case 54: +#line 509 "parse.y" { yyval.node = assignable(yyvsp[0].id, 0); ; break;} -case 52: -#line 501 "parse.y" +case 55: +#line 513 "parse.y" { yyval.node = aryset(yyvsp[-3].node, yyvsp[-1].node); ; break;} -case 53: -#line 505 "parse.y" +case 56: +#line 517 "parse.y" { yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id); ; break;} -case 54: -#line 509 "parse.y" +case 57: +#line 521 "parse.y" { rb_backref_error(yyvsp[0].node); yyval.node = 0; ; break;} -case 55: -#line 515 "parse.y" +case 58: +#line 527 "parse.y" { yyval.node = assignable(yyvsp[0].id, 0); ; break;} -case 56: -#line 519 "parse.y" +case 59: +#line 531 "parse.y" { yyval.node = aryset(yyvsp[-3].node, yyvsp[-1].node); ; break;} -case 57: -#line 523 "parse.y" +case 60: +#line 535 "parse.y" { yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id); ; break;} -case 58: -#line 527 "parse.y" +case 61: +#line 539 "parse.y" { rb_backref_error(yyvsp[0].node); yyval.node = 0; ; break;} -case 59: -#line 533 "parse.y" +case 62: +#line 545 "parse.y" { yyerror("class/module name must be CONSTANT"); ; break;} -case 64: -#line 542 "parse.y" +case 67: +#line 554 "parse.y" { lex_state = EXPR_END; yyval.id = yyvsp[0].id; ; break;} -case 65: -#line 547 "parse.y" +case 68: +#line 559 "parse.y" { lex_state = EXPR_END; yyval.id = yyvsp[0].id; ; break;} -case 66: -#line 553 "parse.y" +case 69: +#line 565 "parse.y" { yyval.node = NEW_UNDEF(yyvsp[0].id); ; break;} -case 67: -#line 556 "parse.y" +case 70: +#line 568 "parse.y" {lex_state = EXPR_FNAME;; break;} -case 68: -#line 557 "parse.y" +case 71: +#line 569 "parse.y" { yyval.node = block_append(yyvsp[-3].node, NEW_UNDEF(yyvsp[0].id)); ; break;} -case 69: -#line 561 "parse.y" +case 72: +#line 573 "parse.y" { yyval.id = tDOT2; ; break;} -case 70: -#line 562 "parse.y" +case 73: +#line 574 "parse.y" { yyval.id = '|'; ; break;} -case 71: -#line 563 "parse.y" +case 74: +#line 575 "parse.y" { yyval.id = '^'; ; break;} -case 72: -#line 564 "parse.y" +case 75: +#line 576 "parse.y" { yyval.id = '&'; ; break;} -case 73: -#line 565 "parse.y" +case 76: +#line 577 "parse.y" { yyval.id = tCMP; ; break;} -case 74: -#line 566 "parse.y" +case 77: +#line 578 "parse.y" { yyval.id = tEQ; ; break;} -case 75: -#line 567 "parse.y" +case 78: +#line 579 "parse.y" { yyval.id = tEQQ; ; break;} -case 76: -#line 568 "parse.y" +case 79: +#line 580 "parse.y" { yyval.id = tMATCH; ; break;} -case 77: -#line 569 "parse.y" +case 80: +#line 581 "parse.y" { yyval.id = '>'; ; break;} -case 78: -#line 570 "parse.y" +case 81: +#line 582 "parse.y" { yyval.id = tGEQ; ; break;} -case 79: -#line 571 "parse.y" +case 82: +#line 583 "parse.y" { yyval.id = '<'; ; break;} -case 80: -#line 572 "parse.y" +case 83: +#line 584 "parse.y" { yyval.id = tLEQ; ; break;} -case 81: -#line 573 "parse.y" +case 84: +#line 585 "parse.y" { yyval.id = tLSHFT; ; break;} -case 82: -#line 574 "parse.y" +case 85: +#line 586 "parse.y" { yyval.id = tRSHFT; ; break;} -case 83: -#line 575 "parse.y" +case 86: +#line 587 "parse.y" { yyval.id = '+'; ; break;} -case 84: -#line 576 "parse.y" +case 87: +#line 588 "parse.y" { yyval.id = '-'; ; break;} -case 85: -#line 577 "parse.y" +case 88: +#line 589 "parse.y" { yyval.id = '*'; ; break;} -case 86: -#line 578 "parse.y" +case 89: +#line 590 "parse.y" { yyval.id = '*'; ; break;} -case 87: -#line 579 "parse.y" +case 90: +#line 591 "parse.y" { yyval.id = '/'; ; break;} -case 88: -#line 580 "parse.y" +case 91: +#line 592 "parse.y" { yyval.id = '%'; ; break;} -case 89: -#line 581 "parse.y" +case 92: +#line 593 "parse.y" { yyval.id = tPOW; ; break;} -case 90: -#line 582 "parse.y" +case 93: +#line 594 "parse.y" { yyval.id = '~'; ; break;} -case 91: -#line 583 "parse.y" +case 94: +#line 595 "parse.y" { yyval.id = tUPLUS; ; break;} -case 92: -#line 584 "parse.y" +case 95: +#line 596 "parse.y" { yyval.id = tUMINUS; ; break;} -case 93: -#line 585 "parse.y" +case 96: +#line 597 "parse.y" { yyval.id = tAREF; ; break;} -case 94: -#line 586 "parse.y" +case 97: +#line 598 "parse.y" { yyval.id = tASET; ; break;} -case 95: -#line 587 "parse.y" +case 98: +#line 599 "parse.y" { yyval.id = '`'; ; break;} -case 136: -#line 598 "parse.y" +case 139: +#line 610 "parse.y" { value_expr(yyvsp[0].node); yyval.node = node_assign(yyvsp[-2].node, yyvsp[0].node); ; break;} -case 137: -#line 602 "parse.y" +case 140: +#line 614 "parse.y" {yyval.node = assignable(yyvsp[-1].id, 0);; break;} -case 138: -#line 603 "parse.y" +case 141: +#line 615 "parse.y" { if (yyvsp[-2].id == tOROP) { yyvsp[-1].node->nd_value = yyvsp[0].node; @@ -3271,8 +3290,8 @@ case 138: fixpos(yyval.node, yyvsp[0].node); ; break;} -case 139: -#line 619 "parse.y" +case 142: +#line 631 "parse.y" { NODE *args = NEW_LIST(yyvsp[0].node); @@ -3288,8 +3307,8 @@ case 139: fixpos(yyval.node, yyvsp[-5].node); ; break;} -case 140: -#line 634 "parse.y" +case 143: +#line 646 "parse.y" { if (yyvsp[-1].id == tOROP) { yyvsp[-1].id = 0; @@ -3301,8 +3320,8 @@ case 140: fixpos(yyval.node, yyvsp[-4].node); ; break;} -case 141: -#line 645 "parse.y" +case 144: +#line 657 "parse.y" { if (yyvsp[-1].id == tOROP) { yyvsp[-1].id = 0; @@ -3314,215 +3333,215 @@ case 141: fixpos(yyval.node, yyvsp[-4].node); ; break;} -case 142: -#line 656 "parse.y" +case 145: +#line 668 "parse.y" { rb_backref_error(yyvsp[-2].node); yyval.node = 0; ; break;} -case 143: -#line 661 "parse.y" -{ - yyval.node = NEW_DOT2(yyvsp[-2].node, yyvsp[0].node); - ; - break;} -case 144: -#line 665 "parse.y" -{ - yyval.node = NEW_DOT3(yyvsp[-2].node, yyvsp[0].node); - ; - break;} -case 145: -#line 669 "parse.y" -{ - yyval.node = call_op(yyvsp[-2].node, '+', 1, yyvsp[0].node); - ; - break;} case 146: #line 673 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, '-', 1, yyvsp[0].node); + yyval.node = NEW_DOT2(yyvsp[-2].node, yyvsp[0].node); ; break;} case 147: #line 677 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, '*', 1, yyvsp[0].node); + yyval.node = NEW_DOT3(yyvsp[-2].node, yyvsp[0].node); ; break;} case 148: #line 681 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, '/', 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, '+', 1, yyvsp[0].node); ; break;} case 149: #line 685 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, '%', 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, '-', 1, yyvsp[0].node); ; break;} case 150: #line 689 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, tPOW, 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, '*', 1, yyvsp[0].node); ; break;} case 151: #line 693 "parse.y" { - yyval.node = call_op(yyvsp[0].node, tUPLUS, 0); + yyval.node = call_op(yyvsp[-2].node, '/', 1, yyvsp[0].node); ; break;} case 152: #line 697 "parse.y" { - yyval.node = call_op(yyvsp[0].node, tUMINUS, 0); + yyval.node = call_op(yyvsp[-2].node, '%', 1, yyvsp[0].node); ; break;} case 153: #line 701 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, '|', 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, tPOW, 1, yyvsp[0].node); ; break;} case 154: #line 705 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, '^', 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[0].node, tUPLUS, 0); ; break;} case 155: #line 709 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, '&', 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[0].node, tUMINUS, 0); ; break;} case 156: #line 713 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, tCMP, 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, '|', 1, yyvsp[0].node); ; break;} case 157: #line 717 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, '>', 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, '^', 1, yyvsp[0].node); ; break;} case 158: #line 721 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, tGEQ, 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, '&', 1, yyvsp[0].node); ; break;} case 159: #line 725 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, '<', 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, tCMP, 1, yyvsp[0].node); ; break;} case 160: #line 729 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, tLEQ, 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, '>', 1, yyvsp[0].node); ; break;} case 161: #line 733 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, tEQ, 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, tGEQ, 1, yyvsp[0].node); ; break;} case 162: #line 737 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, tEQQ, 1, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, '<', 1, yyvsp[0].node); ; break;} case 163: #line 741 "parse.y" { - yyval.node = NEW_NOT(call_op(yyvsp[-2].node, tEQ, 1, yyvsp[0].node)); + yyval.node = call_op(yyvsp[-2].node, tLEQ, 1, yyvsp[0].node); ; break;} case 164: #line 745 "parse.y" { - yyval.node = match_gen(yyvsp[-2].node, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, tEQ, 1, yyvsp[0].node); ; break;} case 165: #line 749 "parse.y" { - yyval.node = NEW_NOT(match_gen(yyvsp[-2].node, yyvsp[0].node)); + yyval.node = call_op(yyvsp[-2].node, tEQQ, 1, yyvsp[0].node); ; break;} case 166: #line 753 "parse.y" { - value_expr(yyvsp[0].node); - yyval.node = NEW_NOT(cond(yyvsp[0].node)); + yyval.node = NEW_NOT(call_op(yyvsp[-2].node, tEQ, 1, yyvsp[0].node)); ; break;} case 167: -#line 758 "parse.y" +#line 757 "parse.y" { - yyval.node = call_op(yyvsp[0].node, '~', 0); + yyval.node = match_gen(yyvsp[-2].node, yyvsp[0].node); ; break;} case 168: -#line 762 "parse.y" +#line 761 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, tLSHFT, 1, yyvsp[0].node); + yyval.node = NEW_NOT(match_gen(yyvsp[-2].node, yyvsp[0].node)); ; break;} case 169: -#line 766 "parse.y" +#line 765 "parse.y" { - yyval.node = call_op(yyvsp[-2].node, tRSHFT, 1, yyvsp[0].node); + value_expr(yyvsp[0].node); + yyval.node = NEW_NOT(cond(yyvsp[0].node)); ; break;} case 170: #line 770 "parse.y" { - yyval.node = logop(NODE_AND, yyvsp[-2].node, yyvsp[0].node); + yyval.node = call_op(yyvsp[0].node, '~', 0); ; break;} case 171: #line 774 "parse.y" { - yyval.node = logop(NODE_OR, yyvsp[-2].node, yyvsp[0].node); + yyval.node = call_op(yyvsp[-2].node, tLSHFT, 1, yyvsp[0].node); ; break;} case 172: -#line 777 "parse.y" -{in_defined = 1;; +#line 778 "parse.y" +{ + yyval.node = call_op(yyvsp[-2].node, tRSHFT, 1, yyvsp[0].node); + ; break;} case 173: -#line 778 "parse.y" +#line 782 "parse.y" +{ + yyval.node = logop(NODE_AND, yyvsp[-2].node, yyvsp[0].node); + ; + break;} +case 174: +#line 786 "parse.y" +{ + yyval.node = logop(NODE_OR, yyvsp[-2].node, yyvsp[0].node); + ; + break;} +case 175: +#line 789 "parse.y" +{in_defined = 1;; + break;} +case 176: +#line 790 "parse.y" { in_defined = 0; yyval.node = NEW_DEFINED(yyvsp[0].node); ; break;} -case 174: -#line 783 "parse.y" +case 177: +#line 795 "parse.y" { value_expr(yyvsp[-4].node); yyval.node = NEW_IF(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[0].node); fixpos(yyval.node, yyvsp[-4].node); ; break;} -case 175: -#line 789 "parse.y" +case 178: +#line 801 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 176: -#line 794 "parse.y" +case 179: +#line 806 "parse.y" { if (yyvsp[0].node && nd_type(yyvsp[0].node) == NODE_BLOCK_PASS) { rb_compile_error("block argument should not be given"); @@ -3530,108 +3549,108 @@ case 176: yyval.node = yyvsp[0].node; ; break;} -case 179: -#line 805 "parse.y" +case 182: +#line 817 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_LIST(yyvsp[0].node); ; break;} -case 180: -#line 810 "parse.y" +case 183: +#line 822 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 181: -#line 814 "parse.y" +case 184: +#line 826 "parse.y" { yyval.node = arg_blk_pass(yyvsp[-1].node, yyvsp[0].node); ; break;} -case 182: -#line 818 "parse.y" +case 185: +#line 830 "parse.y" { yyval.node = arg_concat(yyvsp[-4].node, yyvsp[-1].node); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} -case 183: -#line 823 "parse.y" +case 186: +#line 835 "parse.y" { yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node)); ; break;} -case 184: -#line 827 "parse.y" +case 187: +#line 839 "parse.y" { yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node)); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} -case 185: -#line 832 "parse.y" +case 188: +#line 844 "parse.y" { yyval.node = arg_concat(NEW_LIST(NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} -case 186: -#line 837 "parse.y" +case 189: +#line 849 "parse.y" { yyval.node = list_append(yyvsp[-3].node, NEW_HASH(yyvsp[-1].node)); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} -case 187: -#line 842 "parse.y" +case 190: +#line 854 "parse.y" { yyval.node = list_append(yyvsp[-3].node, NEW_HASH(yyvsp[-1].node)); ; break;} -case 188: -#line 846 "parse.y" +case 191: +#line 858 "parse.y" { yyval.node = arg_concat(list_append(yyvsp[-6].node, NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} -case 189: -#line 851 "parse.y" +case 192: +#line 863 "parse.y" { value_expr(yyvsp[-1].node); yyval.node = arg_blk_pass(NEW_RESTARGS(yyvsp[-1].node), yyvsp[0].node); ; break;} -case 191: -#line 858 "parse.y" +case 194: +#line 870 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_BLOCK_PASS(yyvsp[0].node); ; break;} -case 192: -#line 864 "parse.y" +case 195: +#line 876 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 196: -#line 873 "parse.y" +case 199: +#line 885 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_LIST(yyvsp[0].node); ; break;} -case 197: -#line 878 "parse.y" +case 200: +#line 890 "parse.y" { value_expr(yyvsp[0].node); yyval.node = list_append(yyvsp[-2].node, yyvsp[0].node); ; break;} -case 198: -#line 884 "parse.y" +case 201: +#line 896 "parse.y" { if (yyvsp[0].node && nd_type(yyvsp[0].node) == NODE_ARRAY && @@ -3644,22 +3663,22 @@ case 198: } ; break;} -case 199: -#line 896 "parse.y" +case 202: +#line 908 "parse.y" { value_expr(yyvsp[0].node); yyval.node = arg_concat(yyvsp[-3].node, yyvsp[0].node); ; break;} -case 200: -#line 901 "parse.y" +case 203: +#line 913 "parse.y" { value_expr(yyvsp[0].node); yyval.node = yyvsp[0].node; ; break;} -case 201: -#line 907 "parse.y" +case 204: +#line 919 "parse.y" { yyval.node = yyvsp[0].node; if (yyvsp[0].node) { @@ -3673,46 +3692,46 @@ case 201: } ; break;} -case 204: -#line 924 "parse.y" +case 207: +#line 936 "parse.y" { yyval.node = NEW_LIT(yyvsp[0].val); ; break;} -case 205: -#line 928 "parse.y" +case 208: +#line 940 "parse.y" { value_expr(yyvsp[-2].node); yyval.node = NEW_COLON2(yyvsp[-2].node, yyvsp[0].id); ; break;} -case 206: -#line 933 "parse.y" +case 209: +#line 945 "parse.y" { yyval.node = NEW_COLON3(yyvsp[0].id); ; break;} -case 207: -#line 937 "parse.y" +case 210: +#line 949 "parse.y" { yyval.node = NEW_STR(yyvsp[0].val); ; break;} -case 209: -#line 942 "parse.y" +case 212: +#line 954 "parse.y" { yyval.node = NEW_XSTR(yyvsp[0].val); ; break;} -case 214: -#line 950 "parse.y" +case 217: +#line 962 "parse.y" { value_expr(yyvsp[-3].node); yyval.node = NEW_CALL(yyvsp[-3].node, tAREF, yyvsp[-1].node); ; break;} -case 215: -#line 955 "parse.y" +case 218: +#line 967 "parse.y" { if (yyvsp[-1].node == 0) yyval.node = NEW_ZARRAY(); /* zero length array*/ @@ -3721,14 +3740,14 @@ case 215: } ; break;} -case 216: -#line 963 "parse.y" +case 219: +#line 975 "parse.y" { yyval.node = NEW_HASH(yyvsp[-1].node); ; break;} -case 217: -#line 967 "parse.y" +case 220: +#line 979 "parse.y" { if (!compile_for_eval && !cur_mid && !in_single) yyerror("return appeared outside of method"); @@ -3736,67 +3755,67 @@ case 217: yyval.node = NEW_RETURN(yyvsp[-1].node); ; break;} -case 218: -#line 974 "parse.y" +case 221: +#line 986 "parse.y" { if (!compile_for_eval && !cur_mid && !in_single) yyerror("return appeared outside of method"); yyval.node = NEW_RETURN(0); ; break;} -case 219: -#line 980 "parse.y" +case 222: +#line 992 "parse.y" { if (!compile_for_eval && !cur_mid && !in_single) yyerror("return appeared outside of method"); yyval.node = NEW_RETURN(0); ; break;} -case 220: -#line 986 "parse.y" +case 223: +#line 998 "parse.y" { value_expr(yyvsp[-1].node); yyval.node = NEW_YIELD(yyvsp[-1].node); ; break;} -case 221: -#line 991 "parse.y" +case 224: +#line 1003 "parse.y" { yyval.node = NEW_YIELD(0); ; break;} -case 222: -#line 995 "parse.y" +case 225: +#line 1007 "parse.y" { yyval.node = NEW_YIELD(0); ; break;} -case 223: -#line 998 "parse.y" +case 226: +#line 1010 "parse.y" {in_defined = 1;; break;} -case 224: -#line 999 "parse.y" +case 227: +#line 1011 "parse.y" { in_defined = 0; yyval.node = NEW_DEFINED(yyvsp[-1].node); ; break;} -case 225: -#line 1004 "parse.y" +case 228: +#line 1016 "parse.y" { yyval.node = NEW_VCALL(yyvsp[0].id); ; break;} -case 226: -#line 1008 "parse.y" +case 229: +#line 1020 "parse.y" { yyvsp[0].node->nd_iter = NEW_FCALL(yyvsp[-1].id, 0); yyval.node = yyvsp[0].node; ; break;} -case 228: -#line 1014 "parse.y" +case 231: +#line 1026 "parse.y" { if (yyvsp[-1].node && nd_type(yyvsp[-1].node) == NODE_BLOCK_PASS) { rb_compile_error("both block arg and actual block given"); @@ -3806,56 +3825,56 @@ case 228: fixpos(yyval.node, yyvsp[-1].node); ; break;} -case 229: -#line 1026 "parse.y" +case 232: +#line 1038 "parse.y" { value_expr(yyvsp[-4].node); yyval.node = NEW_IF(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-4].node); ; break;} -case 230: -#line 1035 "parse.y" +case 233: +#line 1047 "parse.y" { value_expr(yyvsp[-4].node); yyval.node = NEW_UNLESS(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-4].node); ; break;} -case 231: -#line 1043 "parse.y" +case 234: +#line 1055 "parse.y" { value_expr(yyvsp[-3].node); yyval.node = NEW_WHILE(cond(yyvsp[-3].node), yyvsp[-1].node, 1); fixpos(yyval.node, yyvsp[-3].node); ; break;} -case 232: -#line 1051 "parse.y" +case 235: +#line 1063 "parse.y" { value_expr(yyvsp[-3].node); yyval.node = NEW_UNTIL(cond(yyvsp[-3].node), yyvsp[-1].node, 1); fixpos(yyval.node, yyvsp[-3].node); ; break;} -case 233: -#line 1059 "parse.y" +case 236: +#line 1071 "parse.y" { value_expr(yyvsp[-2].node); yyval.node = NEW_CASE(yyvsp[-2].node, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-2].node); ; break;} -case 234: -#line 1067 "parse.y" +case 237: +#line 1079 "parse.y" { value_expr(yyvsp[-5].node); yyval.node = NEW_FOR(yyvsp[-5].node, yyvsp[-3].node, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-5].node); ; break;} -case 235: -#line 1078 "parse.y" +case 238: +#line 1090 "parse.y" { if (!yyvsp[-3].node && !yyvsp[-2].node && !yyvsp[-1].node) yyval.node = NEW_BEGIN(yyvsp[-4].node); @@ -3871,14 +3890,14 @@ case 235: fixpos(yyval.node, yyvsp[-4].node); ; break;} -case 236: -#line 1093 "parse.y" +case 239: +#line 1105 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 237: -#line 1097 "parse.y" +case 240: +#line 1109 "parse.y" { if (cur_mid || in_single) yyerror("class definition in method body"); @@ -3888,8 +3907,8 @@ case 237: local_push(); ; break;} -case 238: -#line 1107 "parse.y" +case 241: +#line 1119 "parse.y" { yyval.node = NEW_CLASS(yyvsp[-4].id, yyvsp[-1].node, yyvsp[-3].node); fixpos(yyval.node, yyvsp[-3].node); @@ -3898,16 +3917,16 @@ case 238: class_nest--; ; break;} -case 239: -#line 1115 "parse.y" +case 242: +#line 1127 "parse.y" { class_nest++; cref_push(); local_push(); ; break;} -case 240: -#line 1122 "parse.y" +case 243: +#line 1134 "parse.y" { yyval.node = NEW_SCLASS(yyvsp[-4].node, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-4].node); @@ -3916,8 +3935,8 @@ case 240: class_nest--; ; break;} -case 241: -#line 1130 "parse.y" +case 244: +#line 1142 "parse.y" { if (cur_mid || in_single) yyerror("module definition in method body"); @@ -3926,8 +3945,8 @@ case 241: local_push(); ; break;} -case 242: -#line 1139 "parse.y" +case 245: +#line 1151 "parse.y" { yyval.node = NEW_MODULE(yyvsp[-3].id, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-1].node); @@ -3936,8 +3955,8 @@ case 242: class_nest--; ; break;} -case 243: -#line 1147 "parse.y" +case 246: +#line 1159 "parse.y" { if (cur_mid || in_single) yyerror("nested method definition"); @@ -3945,8 +3964,8 @@ case 243: local_push(); ; break;} -case 244: -#line 1156 "parse.y" +case 247: +#line 1168 "parse.y" { /* NOEX_PRIVATE for toplevel */ yyval.node = NEW_DEFN(yyvsp[-4].id, yyvsp[-2].node, yyvsp[-1].node, class_nest?0:1); @@ -3955,12 +3974,12 @@ case 244: cur_mid = 0; ; break;} -case 245: -#line 1163 "parse.y" +case 248: +#line 1175 "parse.y" {lex_state = EXPR_FNAME;; break;} -case 246: -#line 1164 "parse.y" +case 249: +#line 1176 "parse.y" { value_expr(yyvsp[-3].node); in_single++; @@ -3968,8 +3987,8 @@ case 246: lex_state = EXPR_END; /* force for args */ ; break;} -case 247: -#line 1173 "parse.y" +case 250: +#line 1185 "parse.y" { yyval.node = NEW_DEFS(yyvsp[-7].node, yyvsp[-4].id, yyvsp[-2].node, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-7].node); @@ -3977,110 +3996,110 @@ case 247: in_single--; ; break;} -case 248: -#line 1180 "parse.y" +case 251: +#line 1192 "parse.y" { yyval.node = NEW_BREAK(); ; break;} -case 249: -#line 1184 "parse.y" +case 252: +#line 1196 "parse.y" { yyval.node = NEW_NEXT(); ; break;} -case 250: -#line 1188 "parse.y" +case 253: +#line 1200 "parse.y" { yyval.node = NEW_REDO(); ; break;} -case 251: -#line 1192 "parse.y" +case 254: +#line 1204 "parse.y" { yyval.node = NEW_RETRY(); ; break;} -case 258: -#line 1207 "parse.y" +case 261: +#line 1219 "parse.y" { value_expr(yyvsp[-3].node); yyval.node = NEW_IF(cond(yyvsp[-3].node), yyvsp[-1].node, yyvsp[0].node); fixpos(yyval.node, yyvsp[-3].node); ; break;} -case 260: -#line 1215 "parse.y" +case 263: +#line 1227 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 264: -#line 1224 "parse.y" +case 267: +#line 1236 "parse.y" { yyval.node = 0; ; break;} -case 265: -#line 1228 "parse.y" +case 268: +#line 1240 "parse.y" { yyval.node = 0; ; break;} -case 266: -#line 1232 "parse.y" +case 269: +#line 1244 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 267: -#line 1237 "parse.y" +case 270: +#line 1249 "parse.y" { yyval.vars = dyna_push(); ; break;} -case 268: -#line 1243 "parse.y" +case 271: +#line 1255 "parse.y" { yyval.node = NEW_ITER(yyvsp[-2].node, 0, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-2].node?yyvsp[-2].node:yyvsp[-1].node); dyna_pop(yyvsp[-3].vars); ; break;} -case 269: -#line 1250 "parse.y" +case 272: +#line 1262 "parse.y" { yyval.vars = dyna_push(); ; break;} -case 270: -#line 1255 "parse.y" +case 273: +#line 1267 "parse.y" { yyval.node = NEW_ITER(yyvsp[-2].node, 0, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-2].node?yyvsp[-2].node:yyvsp[-1].node); dyna_pop(yyvsp[-3].vars); ; break;} -case 271: -#line 1262 "parse.y" +case 274: +#line 1274 "parse.y" { yyval.node = NEW_VCALL(yyvsp[0].id); ; break;} -case 272: -#line 1266 "parse.y" +case 275: +#line 1278 "parse.y" { yyval.node = NEW_VCALL(yyvsp[0].id); ; break;} -case 273: -#line 1270 "parse.y" +case 276: +#line 1282 "parse.y" { yyval.node = NEW_VCALL(yyvsp[0].id); ; break;} -case 276: -#line 1277 "parse.y" +case 279: +#line 1289 "parse.y" { if (yyvsp[-1].node && nd_type(yyvsp[-1].node) == NODE_BLOCK_PASS) { rb_compile_error("both block arg and actual block given"); @@ -4090,46 +4109,46 @@ case 276: fixpos(yyval.node, yyvsp[0].node); ; break;} -case 277: -#line 1287 "parse.y" +case 280: +#line 1299 "parse.y" { yyval.node = new_fcall(yyvsp[-3].id, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-1].node); ; break;} -case 278: -#line 1292 "parse.y" +case 281: +#line 1304 "parse.y" { value_expr(yyvsp[-5].node); yyval.node = new_call(yyvsp[-5].node, yyvsp[-3].id, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-5].node); ; break;} -case 279: -#line 1298 "parse.y" +case 282: +#line 1310 "parse.y" { value_expr(yyvsp[-2].node); yyval.node = new_call(yyvsp[-2].node, yyvsp[0].id, 0); fixpos(yyval.node, yyvsp[-2].node); ; break;} -case 280: -#line 1304 "parse.y" +case 283: +#line 1316 "parse.y" { value_expr(yyvsp[-5].node); yyval.node = new_call(yyvsp[-5].node, yyvsp[-3].id, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-5].node); ; break;} -case 281: -#line 1310 "parse.y" +case 284: +#line 1322 "parse.y" { value_expr(yyvsp[-2].node); yyval.node = new_call(yyvsp[-2].node, yyvsp[0].id, 0); ; break;} -case 282: -#line 1315 "parse.y" +case 285: +#line 1327 "parse.y" { if (!compile_for_eval && !cur_mid && !in_single && !in_defined) @@ -4137,8 +4156,8 @@ case 282: yyval.node = NEW_SUPER(yyvsp[-1].node); ; break;} -case 283: -#line 1322 "parse.y" +case 286: +#line 1334 "parse.y" { if (!compile_for_eval && !cur_mid && !in_single && !in_defined) @@ -4146,167 +4165,167 @@ case 283: yyval.node = NEW_ZSUPER(); ; break;} -case 286: -#line 1336 "parse.y" +case 289: +#line 1348 "parse.y" { yyval.node = NEW_WHEN(yyvsp[-3].node, yyvsp[-1].node, yyvsp[0].node); ; break;} -case 288: -#line 1342 "parse.y" +case 291: +#line 1354 "parse.y" { value_expr(yyvsp[0].node); yyval.node = list_append(yyvsp[-3].node, NEW_WHEN(yyvsp[0].node, 0, 0)); ; break;} -case 289: -#line 1347 "parse.y" +case 292: +#line 1359 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_LIST(NEW_WHEN(yyvsp[0].node, 0, 0)); ; break;} -case 292: -#line 1358 "parse.y" +case 295: +#line 1370 "parse.y" { yyval.node = NEW_RESBODY(yyvsp[-3].node, yyvsp[-1].node, yyvsp[0].node); fixpos(yyval.node, yyvsp[-3].node?yyvsp[-3].node:yyvsp[-1].node); ; break;} -case 295: -#line 1366 "parse.y" +case 298: +#line 1378 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 297: -#line 1372 "parse.y" +case 300: +#line 1384 "parse.y" { lex_state = EXPR_END; yyval.val = INT2FIX(yyvsp[0].id); ; break;} -case 308: -#line 1389 "parse.y" +case 311: +#line 1401 "parse.y" {yyval.id = kNIL;; break;} -case 309: -#line 1390 "parse.y" +case 312: +#line 1402 "parse.y" {yyval.id = kSELF;; break;} -case 310: -#line 1391 "parse.y" +case 313: +#line 1403 "parse.y" {yyval.id = kTRUE;; break;} -case 311: -#line 1392 "parse.y" +case 314: +#line 1404 "parse.y" {yyval.id = kFALSE;; break;} -case 312: -#line 1393 "parse.y" +case 315: +#line 1405 "parse.y" {yyval.id = k__FILE__;; break;} -case 313: -#line 1394 "parse.y" +case 316: +#line 1406 "parse.y" {yyval.id = k__LINE__;; break;} -case 314: -#line 1397 "parse.y" +case 317: +#line 1409 "parse.y" { yyval.node = gettable(yyvsp[0].id); ; break;} -case 317: -#line 1405 "parse.y" +case 320: +#line 1417 "parse.y" { yyval.node = 0; ; break;} -case 318: -#line 1409 "parse.y" +case 321: +#line 1421 "parse.y" { lex_state = EXPR_BEG; ; break;} -case 319: -#line 1413 "parse.y" +case 322: +#line 1425 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 320: -#line 1416 "parse.y" +case 323: +#line 1428 "parse.y" {yyerrok; yyval.node = 0;; break;} -case 321: -#line 1419 "parse.y" +case 324: +#line 1431 "parse.y" { yyval.node = yyvsp[-2].node; lex_state = EXPR_BEG; ; break;} -case 322: -#line 1424 "parse.y" +case 325: +#line 1436 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 323: -#line 1429 "parse.y" +case 326: +#line 1441 "parse.y" { yyval.node = block_append(NEW_ARGS(yyvsp[-5].num, yyvsp[-3].node, yyvsp[-1].id), yyvsp[0].node); ; break;} -case 324: -#line 1433 "parse.y" +case 327: +#line 1445 "parse.y" { yyval.node = block_append(NEW_ARGS(yyvsp[-3].num, yyvsp[-1].node, -1), yyvsp[0].node); ; break;} -case 325: -#line 1437 "parse.y" +case 328: +#line 1449 "parse.y" { yyval.node = block_append(NEW_ARGS(yyvsp[-3].num, 0, yyvsp[-1].id), yyvsp[0].node); ; break;} -case 326: -#line 1441 "parse.y" +case 329: +#line 1453 "parse.y" { yyval.node = block_append(NEW_ARGS(yyvsp[-1].num, 0, -1), yyvsp[0].node); ; break;} -case 327: -#line 1445 "parse.y" +case 330: +#line 1457 "parse.y" { yyval.node = block_append(NEW_ARGS(0, yyvsp[-3].node, yyvsp[-1].id), yyvsp[0].node); ; break;} -case 328: -#line 1449 "parse.y" +case 331: +#line 1461 "parse.y" { yyval.node = block_append(NEW_ARGS(0, yyvsp[-1].node, -1), yyvsp[0].node); ; break;} -case 329: -#line 1453 "parse.y" +case 332: +#line 1465 "parse.y" { yyval.node = block_append(NEW_ARGS(0, 0, yyvsp[-1].id), yyvsp[0].node); ; break;} -case 330: -#line 1457 "parse.y" +case 333: +#line 1469 "parse.y" { yyval.node = block_append(NEW_ARGS(0, 0, -1), yyvsp[0].node); ; break;} -case 331: -#line 1461 "parse.y" +case 334: +#line 1473 "parse.y" { yyval.node = NEW_ARGS(0, 0, -1); ; break;} -case 332: -#line 1466 "parse.y" +case 335: +#line 1478 "parse.y" { if (!is_local_id(yyvsp[0].id)) yyerror("formal argument must be local variable"); @@ -4314,8 +4333,8 @@ case 332: yyval.num = 1; ; break;} -case 333: -#line 1473 "parse.y" +case 336: +#line 1485 "parse.y" { if (!is_local_id(yyvsp[0].id)) yyerror("formal argument must be local variable"); @@ -4323,49 +4342,55 @@ case 333: yyval.num += 1; ; break;} -case 334: -#line 1481 "parse.y" +case 337: +#line 1493 "parse.y" { if (!is_local_id(yyvsp[-2].id)) yyerror("formal argument must be local variable"); yyval.node = assignable(yyvsp[-2].id, yyvsp[0].node); ; break;} -case 335: -#line 1488 "parse.y" +case 338: +#line 1500 "parse.y" { yyval.node = NEW_BLOCK(yyvsp[0].node); yyval.node->nd_end = yyval.node; ; break;} -case 336: -#line 1493 "parse.y" +case 339: +#line 1505 "parse.y" { yyval.node = block_append(yyvsp[-2].node, yyvsp[0].node); ; break;} -case 337: -#line 1498 "parse.y" +case 340: +#line 1510 "parse.y" { if (!is_local_id(yyvsp[0].id)) yyerror("rest argument must be local variable"); yyval.id = local_cnt(yyvsp[0].id); ; break;} -case 338: -#line 1505 "parse.y" +case 341: +#line 1516 "parse.y" +{ + yyval.id = -2; + ; + break;} +case 342: +#line 1521 "parse.y" { yyval.node = NEW_BLOCK_ARG(yyvsp[0].id); ; break;} -case 339: -#line 1510 "parse.y" +case 343: +#line 1526 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 341: -#line 1516 "parse.y" +case 345: +#line 1532 "parse.y" { if (nd_type(yyvsp[0].node) == NODE_SELF) { yyval.node = NEW_SELF(); @@ -4379,12 +4404,12 @@ case 341: } ; break;} -case 342: -#line 1528 "parse.y" +case 346: +#line 1544 "parse.y" {lex_state = EXPR_BEG;; break;} -case 343: -#line 1529 "parse.y" +case 347: +#line 1545 "parse.y" { switch (nd_type(yyvsp[-2].node)) { case NODE_STR: @@ -4402,14 +4427,14 @@ case 343: yyval.node = yyvsp[-2].node; ; break;} -case 345: -#line 1548 "parse.y" +case 349: +#line 1564 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 346: -#line 1552 "parse.y" +case 350: +#line 1568 "parse.y" { if (yyvsp[-1].node->nd_alen%2 != 0) { yyerror("odd number list for Hash"); @@ -4417,28 +4442,28 @@ case 346: yyval.node = yyvsp[-1].node; ; break;} -case 348: -#line 1561 "parse.y" +case 352: +#line 1577 "parse.y" { yyval.node = list_concat(yyvsp[-2].node, yyvsp[0].node); ; break;} -case 349: -#line 1566 "parse.y" +case 353: +#line 1582 "parse.y" { yyval.node = list_append(NEW_LIST(yyvsp[-2].node), yyvsp[0].node); ; break;} -case 369: -#line 1596 "parse.y" +case 373: +#line 1612 "parse.y" {yyerrok;; break;} -case 372: -#line 1600 "parse.y" +case 376: +#line 1616 "parse.y" {yyerrok;; break;} -case 373: -#line 1603 "parse.y" +case 377: +#line 1619 "parse.y" { yyval.node = 0; ; @@ -4665,14 +4690,14 @@ yyerrhandle: } return 1; } -#line 1606 "parse.y" +#line 1622 "parse.y" #include <ctype.h> #include <sys/types.h> #include "regex.h" #include "util.h" -#define is_identchar(c) ((c)!=-1&&(ISALNUM(c) || (c) == '_' || ismbchar(c))) +#define is_identchar(c) (((int)(c))!=-1&&(ISALNUM(c) || (c) == '_' || ismbchar(c))) static char *tokenbuf = NULL; static int tokidx, toksiz = 0; @@ -5076,6 +5101,7 @@ parse_regx(term, paren) tokadd(c); } else { +#if 0 int c1; pushback(c); c1 = read_escape(); @@ -5086,6 +5112,10 @@ parse_regx(term, paren) tokadd('\\'); tokadd(c); } +#else + tokadd('\\'); + tokadd(c); +#endif } } continue; |