diff options
Diffstat (limited to 'parse.c')
| -rw-r--r-- | parse.c | 1451 |
1 files changed, 756 insertions, 695 deletions
@@ -104,6 +104,8 @@ #include "node.h" #include "st.h" #include <stdio.h> +#include <string.h> +#include <errno.h> /* hack for bison */ #ifdef const @@ -191,7 +193,7 @@ static NODE *cur_cref; static void top_local_init(); static void top_local_setup(); -#line 109 "parse.y" +#line 111 "parse.y" typedef union { NODE *node; VALUE val; @@ -273,24 +275,25 @@ static const short yyprhs[] = { 0, 419, 422, 425, 429, 433, 437, 441, 445, 449, 453, 457, 461, 465, 469, 473, 477, 480, 483, 487, 491, 495, 499, 500, 505, 511, 513, 515, 516, 519, 521, - 524, 530, 533, 539, 544, 552, 556, 558, 561, 564, - 565, 567, 568, 570, 574, 576, 581, 584, 586, 587, - 590, 592, 596, 600, 603, 605, 607, 609, 611, 613, - 615, 617, 622, 626, 630, 635, 639, 641, 646, 650, - 652, 653, 660, 662, 665, 667, 670, 677, 684, 690, - 696, 701, 709, 716, 720, 721, 728, 729, 737, 738, - 744, 745, 752, 753, 754, 764, 766, 768, 770, 772, - 774, 776, 779, 781, 783, 785, 791, 792, 795, 797, - 799, 800, 803, 805, 809, 810, 816, 817, 823, 825, - 827, 829, 831, 833, 838, 845, 849, 856, 861, 863, - 869, 871, 876, 879, 881, 883, 889, 890, 891, 894, - 896, 899, 901, 903, 905, 907, 909, 911, 913, 915, - 917, 919, 921, 923, 925, 927, 929, 931, 933, 935, - 937, 939, 940, 945, 948, 953, 956, 963, 968, 973, - 976, 981, 984, 987, 989, 990, 992, 996, 1000, 1002, - 1006, 1009, 1012, 1015, 1016, 1018, 1023, 1024, 1027, 1030, - 1032, 1036, 1040, 1042, 1044, 1046, 1048, 1050, 1051, 1053, - 1054, 1056, 1057, 1059, 1061, 1063, 1065, 1067 + 524, 527, 533, 536, 539, 545, 550, 555, 563, 567, + 569, 572, 575, 576, 578, 579, 581, 585, 587, 592, + 595, 597, 598, 601, 603, 607, 611, 614, 616, 618, + 620, 622, 624, 626, 628, 633, 637, 641, 646, 650, + 652, 657, 661, 663, 664, 671, 673, 676, 678, 681, + 688, 695, 701, 707, 712, 720, 727, 731, 732, 739, + 740, 748, 749, 755, 756, 763, 764, 765, 775, 777, + 779, 781, 783, 785, 787, 790, 792, 794, 796, 802, + 803, 806, 808, 810, 811, 814, 816, 820, 821, 827, + 828, 834, 836, 838, 840, 842, 844, 849, 856, 860, + 867, 872, 874, 880, 882, 887, 890, 892, 894, 900, + 901, 902, 905, 907, 910, 912, 914, 916, 918, 920, + 922, 924, 926, 928, 930, 932, 934, 936, 938, 940, + 942, 944, 946, 948, 950, 951, 956, 959, 964, 967, + 974, 979, 984, 987, 992, 995, 998, 1000, 1001, 1003, + 1007, 1011, 1013, 1017, 1020, 1023, 1026, 1027, 1029, 1034, + 1035, 1038, 1041, 1043, 1047, 1051, 1053, 1055, 1057, 1059, + 1061, 1062, 1064, 1065, 1067, 1068, 1070, 1072, 1074, 1076, + 1078 }; static const short yyrhs[] = { -1, @@ -346,103 +349,105 @@ static const short yyrhs[] = { -1, 140, 71, 140, 0, 140, 72, 140, 0, 0, 42, 202, 143, 140, 0, 140, 92, 140, 93, 140, 0, 154, 0, 145, 0, 0, 146, 202, 0, 126, 0, - 150, 148, 0, 150, 111, 88, 140, 148, 0, 197, - 148, 0, 197, 111, 88, 140, 148, 0, 150, 111, - 197, 148, 0, 150, 111, 197, 111, 88, 140, 148, - 0, 88, 140, 148, 0, 147, 0, 89, 140, 0, - 111, 147, 0, 0, 150, 0, 0, 140, 0, 150, - 111, 140, 0, 150, 0, 150, 111, 88, 140, 0, - 88, 140, 0, 146, 0, 0, 150, 203, 0, 179, - 0, 154, 81, 51, 0, 154, 81, 47, 0, 82, - 134, 0, 54, 0, 57, 0, 55, 0, 58, 0, - 59, 0, 183, 0, 184, 0, 154, 112, 144, 113, - 0, 86, 153, 113, 0, 87, 196, 108, 0, 27, - 115, 152, 110, 0, 27, 115, 110, 0, 27, 0, - 28, 115, 152, 110, 0, 28, 115, 110, 0, 28, - 0, 0, 42, 202, 115, 155, 125, 110, 0, 48, - 0, 199, 170, 0, 173, 0, 173, 170, 0, 11, - 125, 162, 120, 164, 10, 0, 12, 125, 162, 120, - 165, 10, 0, 18, 125, 163, 120, 10, 0, 19, - 125, 163, 120, 10, 0, 16, 120, 174, 10, 0, - 20, 166, 25, 125, 163, 120, 10, 0, 7, 120, - 177, 165, 178, 10, 0, 85, 120, 110, 0, 0, - 3, 134, 185, 156, 120, 10, 0, 0, 3, 79, - 125, 204, 157, 120, 10, 0, 0, 4, 134, 158, - 120, 10, 0, 0, 5, 135, 159, 187, 120, 10, - 0, 0, 0, 5, 195, 200, 160, 135, 161, 187, - 120, 10, 0, 21, 0, 22, 0, 23, 0, 24, - 0, 204, 0, 13, 0, 204, 13, 0, 204, 0, - 26, 0, 165, 0, 14, 125, 162, 120, 164, 0, - 0, 15, 120, 0, 133, 0, 127, 0, 0, 96, - 96, 0, 72, 0, 96, 166, 96, 0, 0, 26, - 169, 167, 120, 10, 0, 0, 107, 171, 167, 120, - 108, 0, 47, 0, 51, 0, 48, 0, 173, 0, - 126, 0, 199, 115, 145, 110, 0, 154, 109, 199, - 115, 145, 110, 0, 154, 109, 199, 0, 154, 81, - 199, 115, 145, 110, 0, 29, 115, 145, 110, 0, - 29, 0, 17, 175, 162, 120, 176, 0, 150, 0, - 150, 111, 88, 140, 0, 88, 140, 0, 165, 0, - 174, 0, 8, 149, 163, 120, 177, 0, 0, 0, - 9, 120, 0, 181, 0, 90, 180, 0, 56, 0, - 135, 0, 50, 0, 49, 0, 52, 0, 53, 0, - 47, 0, 50, 0, 49, 0, 51, 0, 31, 0, - 30, 0, 32, 0, 33, 0, 46, 0, 45, 0, - 182, 0, 60, 0, 61, 0, 204, 0, 0, 95, - 186, 125, 204, 0, 1, 204, 0, 115, 188, 202, - 110, 0, 188, 204, 0, 189, 111, 191, 111, 192, - 194, 0, 189, 111, 191, 194, 0, 189, 111, 192, - 194, 0, 189, 194, 0, 191, 111, 192, 194, 0, - 191, 194, 0, 192, 194, 0, 193, 0, 0, 47, - 0, 189, 111, 47, 0, 47, 91, 140, 0, 190, - 0, 191, 111, 190, 0, 88, 47, 0, 89, 47, - 0, 111, 193, 0, 0, 183, 0, 85, 125, 202, - 110, 0, 0, 197, 203, 0, 150, 203, 0, 198, - 0, 197, 111, 198, 0, 140, 84, 140, 0, 47, - 0, 51, 0, 48, 0, 109, 0, 81, 0, 0, - 205, 0, 0, 116, 0, 0, 116, 0, 111, 0, - 117, 0, 116, 0, 204, 0, 205, 117, 0 + 150, 111, 0, 150, 148, 0, 150, 111, 88, 140, + 148, 0, 197, 111, 0, 197, 148, 0, 197, 111, + 88, 140, 148, 0, 150, 111, 197, 148, 0, 150, + 111, 197, 111, 0, 150, 111, 197, 111, 88, 140, + 148, 0, 88, 140, 148, 0, 147, 0, 89, 140, + 0, 111, 147, 0, 0, 150, 0, 0, 140, 0, + 150, 111, 140, 0, 150, 0, 150, 111, 88, 140, + 0, 88, 140, 0, 146, 0, 0, 150, 203, 0, + 179, 0, 154, 81, 51, 0, 154, 81, 47, 0, + 82, 134, 0, 54, 0, 57, 0, 55, 0, 58, + 0, 59, 0, 183, 0, 184, 0, 154, 112, 144, + 113, 0, 86, 153, 113, 0, 87, 196, 108, 0, + 27, 115, 152, 110, 0, 27, 115, 110, 0, 27, + 0, 28, 115, 152, 110, 0, 28, 115, 110, 0, + 28, 0, 0, 42, 202, 115, 155, 125, 110, 0, + 48, 0, 199, 170, 0, 173, 0, 173, 170, 0, + 11, 125, 162, 120, 164, 10, 0, 12, 125, 162, + 120, 165, 10, 0, 18, 125, 163, 120, 10, 0, + 19, 125, 163, 120, 10, 0, 16, 120, 174, 10, + 0, 20, 166, 25, 125, 163, 120, 10, 0, 7, + 120, 177, 165, 178, 10, 0, 85, 120, 110, 0, + 0, 3, 134, 185, 156, 120, 10, 0, 0, 3, + 79, 125, 204, 157, 120, 10, 0, 0, 4, 134, + 158, 120, 10, 0, 0, 5, 135, 159, 187, 120, + 10, 0, 0, 0, 5, 195, 200, 160, 135, 161, + 187, 120, 10, 0, 21, 0, 22, 0, 23, 0, + 24, 0, 204, 0, 13, 0, 204, 13, 0, 204, + 0, 26, 0, 165, 0, 14, 125, 162, 120, 164, + 0, 0, 15, 120, 0, 133, 0, 127, 0, 0, + 96, 96, 0, 72, 0, 96, 166, 96, 0, 0, + 26, 169, 167, 120, 10, 0, 0, 107, 171, 167, + 120, 108, 0, 47, 0, 51, 0, 48, 0, 173, + 0, 126, 0, 199, 115, 145, 110, 0, 154, 109, + 199, 115, 145, 110, 0, 154, 109, 199, 0, 154, + 81, 199, 115, 145, 110, 0, 29, 115, 145, 110, + 0, 29, 0, 17, 175, 162, 120, 176, 0, 150, + 0, 150, 111, 88, 140, 0, 88, 140, 0, 165, + 0, 174, 0, 8, 149, 163, 120, 177, 0, 0, + 0, 9, 120, 0, 181, 0, 90, 180, 0, 56, + 0, 135, 0, 50, 0, 49, 0, 52, 0, 53, + 0, 47, 0, 50, 0, 49, 0, 51, 0, 31, + 0, 30, 0, 32, 0, 33, 0, 46, 0, 45, + 0, 182, 0, 60, 0, 61, 0, 204, 0, 0, + 95, 186, 125, 204, 0, 1, 204, 0, 115, 188, + 202, 110, 0, 188, 204, 0, 189, 111, 191, 111, + 192, 194, 0, 189, 111, 191, 194, 0, 189, 111, + 192, 194, 0, 189, 194, 0, 191, 111, 192, 194, + 0, 191, 194, 0, 192, 194, 0, 193, 0, 0, + 47, 0, 189, 111, 47, 0, 47, 91, 140, 0, + 190, 0, 191, 111, 190, 0, 88, 47, 0, 89, + 47, 0, 111, 193, 0, 0, 183, 0, 85, 125, + 202, 110, 0, 0, 197, 203, 0, 150, 203, 0, + 198, 0, 197, 111, 198, 0, 140, 84, 140, 0, + 47, 0, 51, 0, 48, 0, 109, 0, 81, 0, + 0, 205, 0, 0, 116, 0, 0, 116, 0, 111, + 0, 117, 0, 116, 0, 204, 0, 205, 117, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 231, 240, 248, 250, 254, 258, 262, 267, 276, 277, - 282, 288, 297, 302, 308, 314, 320, 330, 340, 348, - 355, 363, 365, 371, 378, 383, 384, 388, 392, 397, - 402, 404, 409, 415, 421, 429, 430, 435, 436, 441, - 445, 449, 453, 457, 462, 463, 468, 473, 477, 482, - 486, 490, 494, 500, 504, 506, 507, 508, 509, 514, - 520, 524, 525, 529, 530, 531, 532, 533, 534, 535, - 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, - 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, - 557, 557, 557, 557, 558, 558, 558, 558, 558, 558, - 558, 559, 559, 559, 559, 559, 559, 559, 560, 560, - 560, 560, 560, 560, 560, 561, 561, 561, 561, 561, - 561, 561, 562, 562, 562, 562, 562, 562, 563, 563, - 565, 566, 573, 578, 583, 588, 594, 595, 610, 625, - 636, 647, 652, 656, 660, 664, 668, 672, 676, 680, - 684, 688, 692, 696, 700, 704, 708, 712, 716, 720, - 724, 728, 732, 736, 740, 744, 749, 753, 757, 761, - 765, 769, 770, 774, 780, 785, 793, 797, 799, 804, - 808, 813, 818, 823, 828, 833, 838, 840, 846, 850, - 855, 856, 861, 866, 872, 884, 889, 895, 909, 913, - 915, 919, 924, 929, 933, 937, 938, 942, 943, 944, - 945, 946, 951, 959, 963, 970, 976, 982, 987, 991, - 995, 995, 1000, 1004, 1009, 1010, 1019, 1028, 1037, 1045, - 1053, 1061, 1069, 1089, 1093, 1103, 1111, 1118, 1126, 1135, - 1143, 1151, 1160, 1161, 1168, 1176, 1180, 1184, 1188, 1193, - 1194, 1195, 1197, 1198, 1200, 1201, 1210, 1214, 1219, 1220, - 1222, 1226, 1230, 1234, 1239, 1244, 1252, 1257, 1264, 1268, - 1272, 1276, 1277, 1279, 1284, 1290, 1296, 1302, 1308, 1316, - 1323, 1324, 1329, 1335, 1336, 1338, 1345, 1350, 1354, 1359, - 1360, 1364, 1366, 1367, 1368, 1370, 1371, 1373, 1374, 1375, - 1376, 1377, 1378, 1379, 1380, 1381, 1382, 1384, 1389, 1390, - 1392, 1396, 1400, 1404, 1406, 1411, 1416, 1420, 1424, 1428, - 1432, 1436, 1440, 1444, 1448, 1453, 1460, 1468, 1475, 1480, - 1485, 1492, 1497, 1501, 1506, 1519, 1537, 1541, 1545, 1553, - 1554, 1559, 1564, 1565, 1566, 1568, 1569, 1571, 1572, 1574, - 1575, 1577, 1578, 1579, 1581, 1582, 1584, 1585 + 233, 242, 250, 252, 256, 260, 264, 269, 278, 279, + 284, 290, 299, 304, 310, 316, 322, 332, 342, 350, + 357, 365, 367, 373, 380, 385, 386, 390, 394, 399, + 404, 406, 411, 417, 423, 431, 432, 437, 438, 443, + 447, 451, 455, 459, 464, 465, 470, 475, 479, 484, + 488, 492, 496, 502, 506, 508, 509, 510, 511, 516, + 522, 526, 527, 531, 532, 533, 534, 535, 536, 537, + 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, + 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, + 559, 559, 559, 559, 560, 560, 560, 560, 560, 560, + 560, 561, 561, 561, 561, 561, 561, 561, 562, 562, + 562, 562, 562, 562, 562, 563, 563, 563, 563, 563, + 563, 563, 564, 564, 564, 564, 564, 564, 565, 565, + 567, 568, 575, 580, 585, 590, 596, 597, 612, 627, + 638, 649, 654, 658, 662, 666, 670, 674, 678, 682, + 686, 690, 694, 698, 702, 706, 710, 714, 718, 722, + 726, 730, 734, 738, 742, 746, 751, 755, 759, 763, + 767, 771, 772, 776, 782, 787, 795, 799, 801, 806, + 810, 814, 819, 823, 828, 833, 838, 842, 847, 852, + 854, 860, 864, 869, 870, 875, 880, 886, 898, 903, + 909, 923, 927, 929, 933, 938, 943, 947, 951, 952, + 956, 957, 958, 959, 960, 965, 973, 977, 984, 990, + 996, 1001, 1005, 1009, 1009, 1014, 1018, 1023, 1024, 1033, + 1042, 1051, 1059, 1067, 1075, 1083, 1103, 1107, 1117, 1125, + 1132, 1140, 1149, 1157, 1165, 1174, 1175, 1182, 1190, 1194, + 1198, 1202, 1207, 1208, 1209, 1211, 1212, 1214, 1215, 1224, + 1228, 1233, 1234, 1236, 1240, 1244, 1248, 1253, 1258, 1266, + 1271, 1278, 1282, 1286, 1290, 1291, 1293, 1298, 1304, 1310, + 1316, 1322, 1330, 1337, 1338, 1343, 1349, 1350, 1352, 1359, + 1364, 1368, 1373, 1374, 1378, 1380, 1381, 1382, 1384, 1385, + 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, + 1398, 1403, 1404, 1406, 1410, 1414, 1418, 1420, 1425, 1430, + 1434, 1438, 1442, 1446, 1450, 1454, 1458, 1462, 1467, 1474, + 1482, 1489, 1494, 1499, 1506, 1511, 1515, 1520, 1533, 1551, + 1555, 1559, 1567, 1568, 1573, 1578, 1579, 1580, 1582, 1583, + 1585, 1586, 1588, 1589, 1591, 1592, 1593, 1595, 1596, 1598, + 1599 }; #endif @@ -495,24 +500,25 @@ static const short yyr1[] = { 0, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 143, 140, 140, 140, 144, 145, 145, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 147, 148, 148, - 149, 149, 150, 150, 151, 151, 151, 152, 153, 153, + 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, 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, 173, 173, 173, 173, 173, 174, - 175, 175, 175, 176, 176, 177, 177, 178, 178, 179, - 179, 179, 180, 180, 180, 181, 181, 182, 182, 182, - 182, 182, 182, 182, 182, 182, 182, 183, 184, 184, - 185, 186, 185, 185, 187, 187, 188, 188, 188, 188, - 188, 188, 188, 188, 188, 189, 189, 190, 191, 191, - 192, 193, 194, 194, 195, 195, 196, 196, 196, 197, - 197, 198, 199, 199, 199, 200, 200, 201, 201, 202, - 202, 203, 203, 203, 204, 204, 205, 205 + 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, 173, 173, 173, + 173, 173, 174, 175, 175, 175, 176, 176, 177, 177, + 178, 178, 179, 179, 179, 180, 180, 180, 181, 181, + 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, + 183, 184, 184, 185, 186, 185, 185, 187, 187, 188, + 188, 188, 188, 188, 188, 188, 188, 188, 189, 189, + 190, 191, 191, 192, 193, 194, 194, 195, 195, 196, + 196, 196, 197, 197, 198, 199, 199, 199, 200, 200, + 201, 201, 202, 202, 203, 203, 203, 204, 204, 205, + 205 }; static const short yyr2[] = { 0, @@ -534,89 +540,90 @@ static const short yyr2[] = { 0, 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, 0, 2, 1, 2, - 5, 2, 5, 4, 7, 3, 1, 2, 2, 0, - 1, 0, 1, 3, 1, 4, 2, 1, 0, 2, - 1, 3, 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, 0, 2, 1, 1, - 0, 2, 1, 3, 0, 5, 0, 5, 1, 1, - 1, 1, 1, 4, 6, 3, 6, 4, 1, 5, - 1, 4, 2, 1, 1, 5, 0, 0, 2, 1, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 5, 2, 2, 5, 4, 4, 7, 3, 1, + 2, 2, 0, 1, 0, 1, 3, 1, 4, 2, + 1, 0, 2, 1, 3, 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, 0, + 2, 1, 1, 0, 2, 1, 3, 0, 5, 0, + 5, 1, 1, 1, 1, 1, 4, 6, 3, 6, + 4, 1, 5, 1, 4, 2, 1, 1, 5, 0, + 0, 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, 0, 1, 4, 0, 2, 2, 1, - 3, 3, 1, 1, 1, 1, 1, 0, 1, 0, - 1, 0, 1, 1, 1, 1, 1, 2 + 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, 0, 1, 4, 0, + 2, 2, 1, 3, 3, 1, 1, 1, 1, 1, + 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, + 2 }; static const short yydefact[] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 246, 247, 248, 249, 217, 220, 279, - 303, 302, 304, 305, 0, 0, 350, 19, 0, 307, - 306, 343, 345, 300, 299, 344, 296, 297, 205, 207, - 292, 206, 208, 209, 309, 310, 0, 0, 0, 0, - 199, 337, 0, 0, 0, 0, 2, 348, 5, 22, - 26, 0, 36, 0, 40, 45, 31, 175, 0, 225, - 201, 290, 308, 210, 211, 0, 7, 54, 55, 0, - 0, 239, 100, 112, 101, 125, 97, 118, 107, 106, + 0, 0, 0, 249, 250, 251, 252, 220, 223, 282, + 306, 305, 307, 308, 0, 0, 353, 19, 0, 310, + 309, 346, 348, 303, 302, 347, 299, 300, 208, 210, + 295, 209, 211, 212, 312, 313, 0, 0, 0, 0, + 202, 340, 0, 0, 0, 0, 2, 351, 5, 22, + 26, 0, 36, 0, 40, 45, 31, 175, 0, 228, + 204, 293, 311, 213, 214, 0, 7, 54, 55, 0, + 0, 242, 100, 112, 101, 125, 97, 118, 107, 106, 123, 105, 104, 99, 128, 109, 98, 113, 117, 119, 111, 103, 120, 130, 122, 121, 114, 124, 108, 96, 116, 115, 110, 126, 129, 127, 95, 102, 93, 94, 91, 92, 56, 58, 57, 86, 87, 84, 68, 69, 70, 73, 75, 71, 64, 88, 89, 76, 77, 0, 81, 72, 74, 65, 66, 67, 78, 79, 80, 82, - 83, 85, 90, 241, 59, 60, 308, 335, 0, 121, - 114, 124, 108, 91, 92, 56, 57, 61, 14, 287, - 298, 223, 301, 0, 26, 225, 0, 0, 0, 0, - 217, 220, 279, 350, 260, 259, 0, 0, 50, 53, - 0, 0, 0, 0, 0, 0, 179, 193, 198, 187, - 190, 24, 175, 308, 211, 190, 340, 0, 25, 177, - 35, 29, 0, 9, 351, 172, 0, 0, 151, 175, - 152, 204, 0, 0, 0, 36, 193, 352, 0, 352, - 0, 352, 44, 295, 294, 293, 291, 30, 166, 167, - 356, 355, 3, 357, 349, 0, 0, 0, 0, 0, + 83, 85, 90, 244, 59, 60, 311, 338, 0, 121, + 114, 124, 108, 91, 92, 56, 57, 61, 14, 290, + 301, 226, 304, 0, 26, 228, 0, 0, 0, 0, + 220, 223, 282, 353, 263, 262, 0, 0, 50, 53, + 0, 0, 0, 0, 0, 0, 179, 196, 201, 190, + 193, 24, 175, 311, 214, 193, 343, 0, 25, 177, + 35, 29, 0, 9, 354, 172, 0, 0, 151, 175, + 152, 207, 0, 0, 0, 36, 196, 355, 0, 355, + 0, 355, 44, 298, 297, 296, 294, 30, 166, 167, + 359, 358, 3, 360, 352, 0, 0, 0, 0, 0, 0, 0, 47, 0, 0, 48, 42, 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, 177, 265, 8, 267, 226, - 137, 131, 0, 0, 177, 32, 224, 0, 0, 312, - 235, 311, 0, 350, 325, 347, 346, 243, 62, 192, - 257, 251, 0, 250, 0, 0, 0, 254, 0, 253, - 0, 0, 0, 0, 177, 0, 190, 188, 216, 0, - 0, 0, 180, 0, 177, 0, 182, 219, 0, 0, - 350, 11, 13, 12, 0, 221, 0, 0, 0, 0, - 0, 234, 37, 354, 353, 200, 213, 339, 214, 354, - 338, 358, 6, 15, 16, 17, 18, 27, 28, 0, - 195, 23, 0, 41, 0, 150, 156, 161, 162, 163, + 0, 0, 0, 0, 0, 177, 268, 8, 270, 229, + 137, 131, 0, 0, 177, 32, 227, 0, 0, 315, + 238, 314, 0, 353, 328, 350, 349, 246, 62, 195, + 260, 254, 0, 253, 0, 0, 0, 257, 0, 256, + 0, 0, 0, 0, 177, 0, 193, 191, 219, 0, + 0, 180, 181, 0, 177, 183, 184, 222, 0, 0, + 353, 11, 13, 12, 0, 224, 0, 0, 0, 0, + 0, 237, 37, 357, 356, 203, 216, 342, 217, 357, + 341, 361, 6, 15, 16, 17, 18, 27, 28, 0, + 198, 23, 0, 41, 0, 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, 203, 345, 202, 0, 343, 344, 276, 0, 176, - 261, 261, 0, 0, 142, 136, 0, 237, 314, 0, - 0, 0, 0, 326, 0, 0, 325, 0, 0, 334, - 329, 334, 334, 324, 0, 0, 0, 191, 0, 288, - 257, 252, 257, 0, 281, 0, 231, 0, 0, 0, - 52, 344, 276, 0, 0, 0, 186, 215, 342, 0, - 194, 189, 190, 343, 0, 0, 0, 341, 218, 278, - 178, 10, 0, 173, 0, 21, 37, 194, 197, 0, + 149, 206, 348, 205, 0, 346, 347, 279, 0, 176, + 264, 264, 0, 0, 142, 136, 0, 240, 317, 0, + 0, 0, 0, 329, 0, 0, 328, 0, 0, 337, + 332, 337, 337, 327, 0, 0, 0, 194, 0, 291, + 260, 255, 260, 0, 284, 0, 234, 0, 0, 0, + 52, 347, 279, 0, 0, 0, 189, 218, 345, 0, + 197, 192, 193, 346, 0, 0, 0, 344, 221, 281, + 178, 10, 0, 173, 0, 21, 37, 197, 200, 0, 46, 0, 49, 0, 177, 34, 0, 0, 0, 0, - 177, 33, 212, 263, 0, 0, 0, 138, 132, 274, - 0, 0, 0, 240, 336, 0, 331, 332, 350, 0, - 316, 0, 320, 0, 322, 0, 323, 244, 63, 0, - 0, 258, 0, 0, 0, 0, 255, 0, 283, 0, - 0, 229, 230, 51, 0, 190, 0, 184, 212, 190, + 177, 33, 215, 266, 0, 0, 0, 138, 132, 277, + 0, 0, 0, 243, 339, 0, 334, 335, 353, 0, + 319, 0, 323, 0, 325, 0, 326, 247, 63, 0, + 0, 261, 0, 0, 0, 0, 258, 0, 286, 0, + 0, 232, 233, 51, 0, 193, 187, 186, 215, 193, 0, 20, 0, 43, 174, 0, 140, 134, 141, 135, - 0, 0, 0, 262, 0, 0, 0, 0, 313, 236, - 328, 0, 242, 327, 334, 334, 333, 0, 330, 334, - 325, 287, 289, 233, 0, 227, 228, 0, 257, 0, - 181, 0, 183, 222, 196, 277, 275, 139, 133, 264, - 266, 268, 238, 315, 0, 318, 319, 321, 0, 286, - 0, 282, 284, 285, 280, 232, 190, 334, 0, 257, - 185, 317, 245, 256, 0, 0, 0 + 0, 0, 0, 265, 0, 0, 0, 0, 316, 239, + 331, 0, 245, 330, 337, 337, 336, 0, 333, 337, + 328, 290, 292, 236, 0, 230, 231, 0, 260, 0, + 182, 0, 185, 225, 199, 280, 278, 139, 133, 267, + 269, 271, 241, 318, 0, 321, 322, 324, 0, 289, + 0, 285, 287, 288, 283, 235, 193, 337, 0, 260, + 188, 320, 248, 259, 0, 0, 0 }; static const short yydefgoto[] = { 615, @@ -717,30 +724,30 @@ static const short yytable[] = { 68, 68, 187, 168, 340, 322, 256, 203, 203, 203, 232, 321, 440, 226, 68, 302, 199, 199, 211, 186, 297, 434, 462, 214, 77, 468, 462, 209, 312, 228, 230, - 318, 299, 515, 517, 424, 312, 318, -272, 68, 82, + 318, 299, 515, 517, 424, 312, 318, -275, 68, 82, 566, 187, 570, 203, 250, 251, 250, 251, 468, 424, 236, 250, 251, 187, 250, 251, 250, 251, 233, 569, - 215, -303, 564, 351, 203, 78, 568, 454, 68, 79, - 284, -302, -304, 296, 342, 425, 426, 465, 354, 289, - 241, 242, -305, 355, 222, 343, 344, 295, 417, -303, - 425, 426, 174, 177, 373, 179, 180, 80, 285, -302, - -304, 286, 427, 425, 426, 70, 70, 425, 426, 212, - -305, 70, 320, 320, 70, 457, 250, 251, 289, 258, + 215, -306, 564, 351, 203, 78, 568, 454, 68, 79, + 284, -305, -307, 296, 342, 425, 426, 465, 354, 289, + 241, 242, -308, 355, 222, 343, 344, 295, 417, -306, + 425, 426, 174, 177, 373, 179, 180, 80, 285, -305, + -307, 286, 427, 425, 426, 70, 70, 425, 426, 212, + -308, 70, 320, 320, 70, 457, 250, 251, 289, 258, 241, 242, 584, 608, 423, 300, 241, 242, 68, 494, 241, 242, 323, 215, 297, 218, 241, 242, 241, 242, - 569, -308, 434, 528, 252, 462, 241, 242, -211, -307, - 284, -273, 258, 495, 70, -306, 281, 282, 283, 253, - 324, 471, 287, 325, 298, 596, 597, 271, 272, -308, - 598, 78, -308, -343, 309, 79, -211, -307, 334, -211, - 68, 335, 258, -306, 203, 226, 278, 279, 280, 281, - 282, 283, 360, 199, 291, -298, 203, 355, 203, -343, - -301, -343, 292, 330, -343, 199, 68, -343, 612, 310, + 569, -311, 434, 528, 252, 462, 241, 242, -214, -310, + 284, -276, 258, 495, 70, -309, 281, 282, 283, 253, + 324, 471, 287, 325, 298, 596, 597, 271, 272, -311, + 598, 78, -311, -346, 309, 79, -214, -310, 334, -214, + 68, 335, 258, -309, 203, 226, 278, 279, 280, 281, + 282, 283, 360, 199, 291, -301, 203, 355, 203, -346, + -304, -346, 292, 330, -346, 199, 68, -346, 612, 310, 439, 68, 316, 323, 289, 339, 226, 279, 280, 281, - 282, 283, -50, -298, 304, 468, 462, 316, -301, 371, - -212, 418, 419, 68, 68, 68, 68, 68, 68, 68, + 282, 283, -50, -301, 304, 468, 462, 316, -304, 371, + -215, 418, 419, 68, 68, 68, 68, 68, 68, 68, 293, 350, 68, 187, 335, 306, 76, 76, 294, 525, - 439, 538, 76, 76, 76, 76, 76, 76, -212, 196, - 374, -212, 531, 76, 76, 76, 363, 520, -53, 487, + 439, 538, 76, 76, 76, 76, 76, 76, -215, 196, + 374, -215, 531, 76, 76, 76, 363, 520, -53, 487, 76, 402, 403, 307, 203, 404, 208, 488, 546, 603, 552, 210, 291, 203, 551, 535, 434, 438, 553, 463, 292, 68, -45, 445, 293, 76, 70, -52, 489, 326, @@ -880,41 +887,41 @@ static const short yytable[] = { 68, 45, 46, 47, 48, 0, 197, 175, 0, 0, 0, 0, 0, 0, 0, 0, 197, 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, 0, - 54, 0, 0, 0, 0, 0, 0, 0, -298, 0, - 0, 0, 0, 0, 55, 56, -298, -298, -298, 0, - 0, 0, -298, -298, 0, -298, -4, -4, 0, 0, - 0, 0, 0, 0, -269, 0, 0, 0, 0, 0, - 0, 0, -298, -298, 0, -298, -298, -298, -298, 0, + 54, 0, 0, 0, 0, 0, 0, 0, -301, 0, + 0, 0, 0, 0, 55, 56, -301, -301, -301, 0, + 0, 0, -301, -301, 0, -301, -4, -4, 0, 0, + 0, 0, 0, 0, -272, 0, 0, 0, 0, 0, + 0, 0, -301, -301, 0, -301, -301, -301, -301, 0, 0, 0, 0, 0, 0, 197, 0, 0, 197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 175, 0, -298, -298, -298, -298, -298, -298, -298, -298, - -298, -298, -298, -298, -298, 0, 0, -298, -298, -298, - 0, -298, 0, 0, 0, 0, 0, 0, 0, -298, - -298, 0, -298, -298, -298, -298, -298, -298, -298, -298, - -298, -298, 0, 0, 0, 0, -298, -298, -298, -298, - -298, 0, -301, 175, -298, -298, 0, 0, 0, 0, - -301, -301, -301, 0, 0, 197, -301, -301, 0, -301, - 0, 197, 0, 0, 0, 0, 0, 0, -270, 0, - 0, 0, 0, 0, 0, 0, -301, -301, 0, -301, - -301, -301, -301, 0, 0, 0, 0, 0, 0, 0, + 175, 0, -301, -301, -301, -301, -301, -301, -301, -301, + -301, -301, -301, -301, -301, 0, 0, -301, -301, -301, + 0, -301, 0, 0, 0, 0, 0, 0, 0, -301, + -301, 0, -301, -301, -301, -301, -301, -301, -301, -301, + -301, -301, 0, 0, 0, 0, -301, -301, -301, -301, + -301, 0, -304, 175, -301, -301, 0, 0, 0, 0, + -304, -304, -304, 0, 0, 197, -304, -304, 0, -304, + 0, 197, 0, 0, 0, 0, 0, 0, -273, 0, + 0, 0, 0, 0, 0, 0, -304, -304, 0, -304, + -304, -304, -304, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 175, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -301, -301, -301, -301, - -301, -301, -301, -301, -301, -301, -301, -301, -301, 0, - 0, -301, -301, -301, 0, -301, 0, 0, 0, 0, - 0, 0, 0, -301, -301, 0, -301, -301, -301, -301, - -301, -301, -301, -301, -301, -301, 0, -223, 0, 0, - -301, -301, -301, -301, -301, -223, -223, -223, -301, -301, - 0, -223, -223, 0, -223, 0, 0, 0, 0, 0, - 0, 0, 0, -271, 0, 0, 0, 0, 0, 0, - 0, -223, -223, 0, -223, -223, -223, -223, 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, 0, + 0, 0, 0, -304, -304, 0, -304, -304, -304, -304, + -304, -304, -304, -304, -304, -304, 0, -226, 0, 0, + -304, -304, -304, -304, -304, -226, -226, -226, -304, -304, + 0, -226, -226, 0, -226, 0, 0, 0, 0, 0, + 0, 0, 0, -274, 0, 0, 0, 0, 0, 0, + 0, -226, -226, 0, -226, -226, -226, -226, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, 0, 0, -223, -223, -223, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, -223, - 0, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, 0, 0, 0, 0, -223, -223, -223, 0, -223, - 0, 0, 0, -223, -223, 2, 0, 3, 4, 5, + 0, -226, -226, -226, -226, -226, -226, -226, -226, -226, + -226, -226, -226, -226, 0, 0, -226, -226, -226, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, -226, + 0, -226, -226, -226, -226, -226, -226, -226, -226, -226, + -226, 0, 0, 0, 0, -226, -226, -226, 0, -226, + 0, 0, 0, -226, -226, 2, 0, 3, 4, 5, 6, 7, -4, -4, -4, 8, 9, 0, 0, -4, 10, 0, 11, 12, 13, 14, 15, 16, 17, 0, 0, 18, 19, 20, 21, 22, 23, 24, 0, 0, @@ -1028,37 +1035,37 @@ static const short yytable[] = { 68, 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, 192, 51, 52, 193, 194, 54, 0, 0, -343, - -343, -343, 0, -343, 0, 0, 0, -343, -343, 0, - 195, 56, -343, 289, -343, -343, -343, -343, -343, -343, - -343, 295, 0, -343, -343, -343, -343, -343, -343, -343, - 0, 0, 0, 0, 0, 0, 0, 0, -343, 0, - 0, -343, -343, -343, -343, -343, -343, -343, -343, -343, - -343, -343, -343, -343, -343, -343, -343, -343, -343, -343, + 0, 192, 51, 52, 193, 194, 54, 0, 0, -346, + -346, -346, 0, -346, 0, 0, 0, -346, -346, 0, + 195, 56, -346, 289, -346, -346, -346, -346, -346, -346, + -346, 295, 0, -346, -346, -346, -346, -346, -346, -346, + 0, 0, 0, 0, 0, 0, 0, 0, -346, 0, + 0, -346, -346, -346, -346, -346, -346, -346, -346, -346, + -346, -346, -346, -346, -346, -346, -346, -346, -346, -346, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -343, 0, - 0, -343, -343, -343, -343, -343, -343, 0, 0, -345, - -345, -345, 0, -345, 0, 0, 0, -345, -345, 0, - -343, -343, -345, -343, -345, -345, -345, -345, -345, -345, - -345, -343, 0, -345, -345, -345, -345, -345, -345, -345, - 0, 0, 0, 0, 0, 0, 0, 0, -345, 0, - 0, -345, -345, -345, -345, -345, -345, -345, -345, -345, - -345, -345, -345, -345, -345, -345, -345, -345, -345, -345, + 0, 0, 0, 0, 0, 0, 0, 0, -346, 0, + 0, -346, -346, -346, -346, -346, -346, 0, 0, -348, + -348, -348, 0, -348, 0, 0, 0, -348, -348, 0, + -346, -346, -348, -346, -348, -348, -348, -348, -348, -348, + -348, -346, 0, -348, -348, -348, -348, -348, -348, -348, + 0, 0, 0, 0, 0, 0, 0, 0, -348, 0, + 0, -348, -348, -348, -348, -348, -348, -348, -348, -348, + -348, -348, -348, -348, -348, -348, -348, -348, -348, -348, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -345, 0, - 0, -345, -345, -345, -345, -345, -345, 0, 0, -344, - -344, -344, 0, -344, 0, 0, 0, -344, -344, 0, - -345, -345, -344, -345, -344, -344, -344, -344, -344, -344, - -344, -345, 0, -344, -344, -344, -344, -344, -344, -344, - 0, 0, 0, 0, 0, 0, 0, 0, -344, 0, - 0, -344, -344, -344, -344, -344, -344, -344, -344, -344, - -344, -344, -344, -344, -344, -344, -344, -344, -344, -344, + 0, 0, 0, 0, 0, 0, 0, 0, -348, 0, + 0, -348, -348, -348, -348, -348, -348, 0, 0, -347, + -347, -347, 0, -347, 0, 0, 0, -347, -347, 0, + -348, -348, -347, -348, -347, -347, -347, -347, -347, -347, + -347, -348, 0, -347, -347, -347, -347, -347, -347, -347, + 0, 0, 0, 0, 0, 0, 0, 0, -347, 0, + 0, -347, -347, -347, -347, -347, -347, -347, -347, -347, + -347, -347, -347, -347, -347, -347, -347, -347, -347, -347, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -344, 0, - 0, -344, -344, -344, -344, -344, -344, 0, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 0, -347, 0, + 0, -347, -347, -347, -347, -347, -347, 0, 0, 3, 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - -344, -344, 10, -344, 11, 12, 13, 14, 15, 16, - 17, -344, 0, 181, 182, 20, 21, 22, 23, 24, + -347, -347, 10, -347, 11, 12, 13, 14, 15, 16, + 17, -347, 0, 181, 182, 20, 21, 22, 23, 24, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, @@ -1082,28 +1089,28 @@ static const short yytable[] = { 68, 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, 192, 51, 52, 193, 194, 54, 0, 0, -343, - -343, -343, 0, -343, 0, 0, 0, -343, -343, 0, - 195, 56, -343, 0, -343, -343, -343, -343, -343, -343, - -343, 210, 0, -343, -343, -343, -343, -343, -343, -343, - 0, 0, 0, 0, 0, 0, 0, 0, -343, 0, - 0, -343, -343, -343, -343, -343, -343, -343, -343, -343, - -343, -343, -343, -343, -343, -343, -343, -343, -343, -343, + 0, 192, 51, 52, 193, 194, 54, 0, 0, -346, + -346, -346, 0, -346, 0, 0, 0, -346, -346, 0, + 195, 56, -346, 0, -346, -346, -346, -346, -346, -346, + -346, 210, 0, -346, -346, -346, -346, -346, -346, -346, + 0, 0, 0, 0, 0, 0, 0, 0, -346, 0, + 0, -346, -346, -346, -346, -346, -346, -346, -346, -346, + -346, -346, -346, -346, -346, -346, -346, -346, -346, -346, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -343, 0, - 0, -343, -343, -343, -343, -343, -343, 0, 0, -344, - -344, -344, 0, -344, 0, 0, 0, -344, -344, 0, - -343, -343, -344, 0, -344, -344, -344, -344, -344, -344, - -344, -343, 0, -344, -344, -344, -344, -344, -344, -344, - 0, 0, 0, 0, 0, 0, 0, 0, -344, 0, - 0, -344, -344, -344, -344, -344, -344, -344, -344, -344, - -344, -344, -344, -344, -344, -344, -344, -344, -344, -344, + 0, 0, 0, 0, 0, 0, 0, 0, -346, 0, + 0, -346, -346, -346, -346, -346, -346, 0, 0, -347, + -347, -347, 0, -347, 0, 0, 0, -347, -347, 0, + -346, -346, -347, 0, -347, -347, -347, -347, -347, -347, + -347, -346, 0, -347, -347, -347, -347, -347, -347, -347, + 0, 0, 0, 0, 0, 0, 0, 0, -347, 0, + 0, -347, -347, -347, -347, -347, -347, -347, -347, -347, + -347, -347, -347, -347, -347, -347, -347, -347, -347, -347, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -344, 0, - 0, -344, -344, -344, -344, -344, -344, 0, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 0, -347, 0, + 0, -347, -347, -347, -347, -347, -347, 0, 0, 3, 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - -344, -344, 10, 0, 11, 12, 13, 14, 15, 16, - 17, -344, 0, 181, 182, 20, 21, 22, 23, 24, + -347, -347, 10, 0, 11, 12, 13, 14, 15, 16, + 17, -347, 0, 181, 182, 20, 21, 22, 23, 24, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, @@ -2518,7 +2525,7 @@ yyreduce: switch (yyn) { case 1: -#line 231 "parse.y" +#line 233 "parse.y" { yyval.vars = ruby_dyna_vars; lex_state = EXPR_BEG; @@ -2529,7 +2536,7 @@ case 1: ; break;} case 2: -#line 240 "parse.y" +#line 242 "parse.y" { ruby_eval_tree = block_append(ruby_eval_tree, yyvsp[0].node); top_local_setup(); @@ -2539,31 +2546,31 @@ case 2: ; break;} case 4: -#line 251 "parse.y" +#line 253 "parse.y" { yyval.node = 0; ; break;} case 5: -#line 255 "parse.y" +#line 257 "parse.y" { yyval.node = newline_node(yyvsp[0].node); ; break;} case 6: -#line 259 "parse.y" +#line 261 "parse.y" { yyval.node = block_append(yyvsp[-2].node, newline_node(yyvsp[0].node)); ; break;} case 7: -#line 263 "parse.y" +#line 265 "parse.y" { yyval.node = yyvsp[0].node; ; break;} case 8: -#line 268 "parse.y" +#line 270 "parse.y" { if (yyvsp[-1].node && nd_type(yyvsp[-1].node) == NODE_BLOCK_PASS) { rb_compile_error("both block arg and actual block given"); @@ -2574,11 +2581,11 @@ case 8: ; break;} case 9: -#line 276 "parse.y" +#line 278 "parse.y" {lex_state = EXPR_FNAME;; break;} case 10: -#line 277 "parse.y" +#line 279 "parse.y" { if (cur_mid || in_single) yyerror("alias within method"); @@ -2586,7 +2593,7 @@ case 10: ; break;} case 11: -#line 283 "parse.y" +#line 285 "parse.y" { if (cur_mid || in_single) yyerror("alias within method"); @@ -2594,7 +2601,7 @@ case 11: ; break;} case 12: -#line 289 "parse.y" +#line 291 "parse.y" { char buf[3]; @@ -2605,14 +2612,14 @@ case 12: ; break;} case 13: -#line 298 "parse.y" +#line 300 "parse.y" { yyerror("can't make alias for the number variables"); yyval.node = 0; ; break;} case 14: -#line 303 "parse.y" +#line 305 "parse.y" { if (cur_mid || in_single) yyerror("undef within method"); @@ -2620,7 +2627,7 @@ case 14: ; break;} case 15: -#line 309 "parse.y" +#line 311 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_IF(cond(yyvsp[0].node), yyvsp[-2].node, 0); @@ -2628,7 +2635,7 @@ case 15: ; break;} case 16: -#line 315 "parse.y" +#line 317 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_UNLESS(cond(yyvsp[0].node), yyvsp[-2].node, 0); @@ -2636,7 +2643,7 @@ case 16: ; break;} case 17: -#line 321 "parse.y" +#line 323 "parse.y" { value_expr(yyvsp[0].node); if (nd_type(yyvsp[-2].node) == NODE_BEGIN) { @@ -2648,7 +2655,7 @@ case 17: ; break;} case 18: -#line 331 "parse.y" +#line 333 "parse.y" { value_expr(yyvsp[0].node); if (nd_type(yyvsp[-2].node) == NODE_BEGIN) { @@ -2660,7 +2667,7 @@ case 18: ; break;} case 19: -#line 341 "parse.y" +#line 343 "parse.y" { if (cur_mid || in_single) { yyerror("BEGIN in method"); @@ -2670,7 +2677,7 @@ case 19: ; break;} case 20: -#line 349 "parse.y" +#line 351 "parse.y" { ruby_eval_tree_begin = block_append(ruby_eval_tree_begin, NEW_PREEXE(yyvsp[-1].node)); @@ -2679,7 +2686,7 @@ case 20: ; break;} case 21: -#line 356 "parse.y" +#line 358 "parse.y" { if (cur_mid || in_single) { yyerror("END in method; use at_exit"); @@ -2689,7 +2696,7 @@ case 21: ; break;} case 23: -#line 366 "parse.y" +#line 368 "parse.y" { value_expr(yyvsp[0].node); yyvsp[-2].node->nd_value = yyvsp[0].node; @@ -2697,7 +2704,7 @@ case 23: ; break;} case 24: -#line 372 "parse.y" +#line 374 "parse.y" { value_expr(yyvsp[0].node); if (!cur_mid && !in_single) @@ -2706,47 +2713,47 @@ case 24: ; break;} case 25: -#line 379 "parse.y" +#line 381 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_YIELD(yyvsp[0].node); ; break;} case 27: -#line 385 "parse.y" +#line 387 "parse.y" { yyval.node = logop(NODE_AND, yyvsp[-2].node, yyvsp[0].node); ; break;} case 28: -#line 389 "parse.y" +#line 391 "parse.y" { yyval.node = logop(NODE_OR, yyvsp[-2].node, yyvsp[0].node); ; break;} case 29: -#line 393 "parse.y" +#line 395 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_NOT(cond(yyvsp[0].node)); ; break;} case 30: -#line 398 "parse.y" +#line 400 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_NOT(cond(yyvsp[0].node)); ; break;} case 32: -#line 405 "parse.y" +#line 407 "parse.y" { yyval.node = new_fcall(yyvsp[-1].id, yyvsp[0].node); fixpos(yyval.node, yyvsp[0].node); ; break;} case 33: -#line 410 "parse.y" +#line 412 "parse.y" { value_expr(yyvsp[-3].node); yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node); @@ -2754,7 +2761,7 @@ case 33: ; break;} case 34: -#line 416 "parse.y" +#line 418 "parse.y" { value_expr(yyvsp[-3].node); yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node); @@ -2762,7 +2769,7 @@ case 34: ; break;} case 35: -#line 422 "parse.y" +#line 424 "parse.y" { if (!cur_mid && !in_single && !in_defined) yyerror("super called outside of method"); @@ -2771,246 +2778,246 @@ case 35: ; break;} case 37: -#line 431 "parse.y" +#line 433 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} case 39: -#line 437 "parse.y" +#line 439 "parse.y" { yyval.node = NEW_MASGN(NEW_LIST(yyvsp[-1].node), 0); ; break;} case 40: -#line 442 "parse.y" +#line 444 "parse.y" { yyval.node = NEW_MASGN(NEW_LIST(yyvsp[0].node), 0); ; break;} case 41: -#line 446 "parse.y" +#line 448 "parse.y" { yyval.node = NEW_MASGN(NEW_LIST(yyvsp[-2].node), yyvsp[0].node); ; break;} case 42: -#line 450 "parse.y" +#line 452 "parse.y" { yyval.node = NEW_MASGN(list_concat(NEW_LIST(yyvsp[-1].node),yyvsp[0].node), 0); ; break;} case 43: -#line 454 "parse.y" +#line 456 "parse.y" { yyval.node = NEW_MASGN(list_concat(NEW_LIST(yyvsp[-4].node),yyvsp[-3].node),yyvsp[0].node); ; break;} case 44: -#line 458 "parse.y" +#line 460 "parse.y" { yyval.node = NEW_MASGN(0, yyvsp[0].node); ; break;} case 46: -#line 464 "parse.y" +#line 466 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} case 47: -#line 469 "parse.y" +#line 471 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} case 48: -#line 474 "parse.y" +#line 476 "parse.y" { yyval.node = NEW_LIST(yyvsp[0].node); ; break;} case 49: -#line 478 "parse.y" +#line 480 "parse.y" { yyval.node = list_append(yyvsp[-2].node, yyvsp[0].node); ; break;} case 50: -#line 483 "parse.y" +#line 485 "parse.y" { yyval.node = assignable(yyvsp[0].id, 0); ; break;} case 51: -#line 487 "parse.y" +#line 489 "parse.y" { yyval.node = aryset(yyvsp[-3].node, yyvsp[-1].node, 0); ; break;} case 52: -#line 491 "parse.y" +#line 493 "parse.y" { yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id, 0); ; break;} case 53: -#line 495 "parse.y" +#line 497 "parse.y" { rb_backref_error(yyvsp[0].node); yyval.node = 0; ; break;} case 54: -#line 501 "parse.y" +#line 503 "parse.y" { yyerror("class/module name must be CONSTANT"); ; break;} case 59: -#line 510 "parse.y" +#line 512 "parse.y" { lex_state = EXPR_END; yyval.id = yyvsp[0].id; ; break;} case 60: -#line 515 "parse.y" +#line 517 "parse.y" { lex_state = EXPR_END; yyval.id = yyvsp[0].id; ; break;} case 61: -#line 521 "parse.y" +#line 523 "parse.y" { yyval.node = NEW_UNDEF(yyvsp[0].id); ; break;} case 62: -#line 524 "parse.y" +#line 526 "parse.y" {lex_state = EXPR_FNAME;; break;} case 63: -#line 525 "parse.y" +#line 527 "parse.y" { yyval.node = block_append(yyvsp[-3].node, NEW_UNDEF(yyvsp[0].id)); ; break;} case 64: -#line 529 "parse.y" +#line 531 "parse.y" { yyval.id = tDOT2; ; break;} case 65: -#line 530 "parse.y" +#line 532 "parse.y" { yyval.id = '|'; ; break;} case 66: -#line 531 "parse.y" +#line 533 "parse.y" { yyval.id = '^'; ; break;} case 67: -#line 532 "parse.y" +#line 534 "parse.y" { yyval.id = '&'; ; break;} case 68: -#line 533 "parse.y" +#line 535 "parse.y" { yyval.id = tCMP; ; break;} case 69: -#line 534 "parse.y" +#line 536 "parse.y" { yyval.id = tEQ; ; break;} case 70: -#line 535 "parse.y" +#line 537 "parse.y" { yyval.id = tEQQ; ; break;} case 71: -#line 536 "parse.y" +#line 538 "parse.y" { yyval.id = tMATCH; ; break;} case 72: -#line 537 "parse.y" +#line 539 "parse.y" { yyval.id = '>'; ; break;} case 73: -#line 538 "parse.y" +#line 540 "parse.y" { yyval.id = tGEQ; ; break;} case 74: -#line 539 "parse.y" +#line 541 "parse.y" { yyval.id = '<'; ; break;} case 75: -#line 540 "parse.y" +#line 542 "parse.y" { yyval.id = tLEQ; ; break;} case 76: -#line 541 "parse.y" +#line 543 "parse.y" { yyval.id = tLSHFT; ; break;} case 77: -#line 542 "parse.y" +#line 544 "parse.y" { yyval.id = tRSHFT; ; break;} case 78: -#line 543 "parse.y" +#line 545 "parse.y" { yyval.id = '+'; ; break;} case 79: -#line 544 "parse.y" +#line 546 "parse.y" { yyval.id = '-'; ; break;} case 80: -#line 545 "parse.y" +#line 547 "parse.y" { yyval.id = '*'; ; break;} case 81: -#line 546 "parse.y" +#line 548 "parse.y" { yyval.id = '*'; ; break;} case 82: -#line 547 "parse.y" +#line 549 "parse.y" { yyval.id = '/'; ; break;} case 83: -#line 548 "parse.y" +#line 550 "parse.y" { yyval.id = '%'; ; break;} case 84: -#line 549 "parse.y" +#line 551 "parse.y" { yyval.id = tPOW; ; break;} case 85: -#line 550 "parse.y" +#line 552 "parse.y" { yyval.id = '~'; ; break;} case 86: -#line 551 "parse.y" +#line 553 "parse.y" { yyval.id = tUPLUS; ; break;} case 87: -#line 552 "parse.y" +#line 554 "parse.y" { yyval.id = tUMINUS; ; break;} case 88: -#line 553 "parse.y" +#line 555 "parse.y" { yyval.id = tAREF; ; break;} case 89: -#line 554 "parse.y" +#line 556 "parse.y" { yyval.id = tASET; ; break;} case 90: -#line 555 "parse.y" +#line 557 "parse.y" { yyval.id = '`'; ; break;} case 131: -#line 565 "parse.y" +#line 567 "parse.y" {yyval.node = assignable(yyvsp[-1].id, 0);; break;} case 132: -#line 566 "parse.y" +#line 568 "parse.y" { yyval.node = yyvsp[-1].node; if (yyval.node) { @@ -3020,28 +3027,28 @@ case 132: ; break;} case 133: -#line 574 "parse.y" +#line 576 "parse.y" { yyval.node = aryset(yyvsp[-5].node, yyvsp[-3].node, yyvsp[0].node); fixpos(yyval.node, yyvsp[-5].node); ; break;} case 134: -#line 579 "parse.y" +#line 581 "parse.y" { yyval.node = attrset(yyvsp[-4].node, yyvsp[-2].id, yyvsp[0].node); fixpos(yyval.node, yyvsp[0].node); ; break;} case 135: -#line 584 "parse.y" +#line 586 "parse.y" { yyval.node = attrset(yyvsp[-4].node, yyvsp[-2].id, yyvsp[0].node); fixpos(yyval.node, yyvsp[0].node); ; break;} case 136: -#line 589 "parse.y" +#line 591 "parse.y" { value_expr(yyvsp[0].node); rb_backref_error(yyvsp[-2].node); @@ -3049,11 +3056,11 @@ case 136: ; break;} case 137: -#line 594 "parse.y" +#line 596 "parse.y" {yyval.node = assignable(yyvsp[-1].id, 0);; break;} case 138: -#line 595 "parse.y" +#line 597 "parse.y" { if (yyvsp[-2].id == tOROP) { yyvsp[-1].node->nd_value = yyvsp[0].node; @@ -3071,7 +3078,7 @@ case 138: ; break;} case 139: -#line 611 "parse.y" +#line 613 "parse.y" { NODE *args = NEW_LIST(yyvsp[0].node); @@ -3088,7 +3095,7 @@ case 139: ; break;} case 140: -#line 626 "parse.y" +#line 628 "parse.y" { if (yyvsp[-1].id == tOROP) { yyvsp[-1].id = 0; @@ -3101,7 +3108,7 @@ case 140: ; break;} case 141: -#line 637 "parse.y" +#line 639 "parse.y" { if (yyvsp[-1].id == tOROP) { yyvsp[-1].id = 0; @@ -3114,200 +3121,200 @@ case 141: ; break;} case 142: -#line 648 "parse.y" +#line 650 "parse.y" { rb_backref_error(yyvsp[-2].node); yyval.node = 0; ; break;} case 143: -#line 653 "parse.y" +#line 655 "parse.y" { yyval.node = NEW_DOT2(yyvsp[-2].node, yyvsp[0].node); ; break;} case 144: -#line 657 "parse.y" +#line 659 "parse.y" { yyval.node = NEW_DOT3(yyvsp[-2].node, yyvsp[0].node); ; break;} case 145: -#line 661 "parse.y" +#line 663 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '+', 1, yyvsp[0].node); ; break;} case 146: -#line 665 "parse.y" +#line 667 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '-', 1, yyvsp[0].node); ; break;} case 147: -#line 669 "parse.y" +#line 671 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '*', 1, yyvsp[0].node); ; break;} case 148: -#line 673 "parse.y" +#line 675 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '/', 1, yyvsp[0].node); ; break;} case 149: -#line 677 "parse.y" +#line 679 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '%', 1, yyvsp[0].node); ; break;} case 150: -#line 681 "parse.y" +#line 683 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tPOW, 1, yyvsp[0].node); ; break;} case 151: -#line 685 "parse.y" +#line 687 "parse.y" { yyval.node = call_op(yyvsp[0].node, tUPLUS, 0); ; break;} case 152: -#line 689 "parse.y" +#line 691 "parse.y" { yyval.node = call_op(yyvsp[0].node, tUMINUS, 0); ; break;} case 153: -#line 693 "parse.y" +#line 695 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '|', 1, yyvsp[0].node); ; break;} case 154: -#line 697 "parse.y" +#line 699 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '^', 1, yyvsp[0].node); ; break;} case 155: -#line 701 "parse.y" +#line 703 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '&', 1, yyvsp[0].node); ; break;} case 156: -#line 705 "parse.y" +#line 707 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tCMP, 1, yyvsp[0].node); ; break;} case 157: -#line 709 "parse.y" +#line 711 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '>', 1, yyvsp[0].node); ; break;} case 158: -#line 713 "parse.y" +#line 715 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tGEQ, 1, yyvsp[0].node); ; break;} case 159: -#line 717 "parse.y" +#line 719 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '<', 1, yyvsp[0].node); ; break;} case 160: -#line 721 "parse.y" +#line 723 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tLEQ, 1, yyvsp[0].node); ; break;} case 161: -#line 725 "parse.y" +#line 727 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tEQ, 1, yyvsp[0].node); ; break;} case 162: -#line 729 "parse.y" +#line 731 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tEQQ, 1, yyvsp[0].node); ; break;} case 163: -#line 733 "parse.y" +#line 735 "parse.y" { yyval.node = NEW_NOT(call_op(yyvsp[-2].node, tEQ, 1, yyvsp[0].node)); ; break;} case 164: -#line 737 "parse.y" +#line 739 "parse.y" { yyval.node = match_gen(yyvsp[-2].node, yyvsp[0].node); ; break;} case 165: -#line 741 "parse.y" +#line 743 "parse.y" { yyval.node = NEW_NOT(match_gen(yyvsp[-2].node, yyvsp[0].node)); ; break;} case 166: -#line 745 "parse.y" +#line 747 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_NOT(cond(yyvsp[0].node)); ; break;} case 167: -#line 750 "parse.y" +#line 752 "parse.y" { yyval.node = call_op(yyvsp[0].node, '~', 0); ; break;} case 168: -#line 754 "parse.y" +#line 756 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tLSHFT, 1, yyvsp[0].node); ; break;} case 169: -#line 758 "parse.y" +#line 760 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tRSHFT, 1, yyvsp[0].node); ; break;} case 170: -#line 762 "parse.y" +#line 764 "parse.y" { yyval.node = logop(NODE_AND, yyvsp[-2].node, yyvsp[0].node); ; break;} case 171: -#line 766 "parse.y" +#line 768 "parse.y" { yyval.node = logop(NODE_OR, yyvsp[-2].node, yyvsp[0].node); ; break;} case 172: -#line 769 "parse.y" +#line 771 "parse.y" {in_defined = 1;; break;} case 173: -#line 770 "parse.y" +#line 772 "parse.y" { in_defined = 0; yyval.node = NEW_DEFINED(yyvsp[0].node); ; break;} case 174: -#line 775 "parse.y" +#line 777 "parse.y" { value_expr(yyvsp[-4].node); yyval.node = NEW_IF(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[0].node); @@ -3315,13 +3322,13 @@ case 174: ; break;} case 175: -#line 781 "parse.y" +#line 783 "parse.y" { yyval.node = yyvsp[0].node; ; break;} case 176: -#line 786 "parse.y" +#line 788 "parse.y" { if (yyvsp[0].node && nd_type(yyvsp[0].node) == NODE_BLOCK_PASS) { rb_compile_error("block argument should not be given"); @@ -3330,107 +3337,125 @@ case 176: ; break;} case 177: -#line 794 "parse.y" +#line 796 "parse.y" { yyval.node = 0; ; break;} case 179: -#line 800 "parse.y" +#line 802 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_LIST(yyvsp[0].node); ; break;} case 180: -#line 805 "parse.y" +#line 807 "parse.y" { - yyval.node = arg_blk_pass(yyvsp[-1].node, yyvsp[0].node); + yyval.node = yyvsp[-1].node; ; break;} case 181: -#line 809 "parse.y" +#line 811 "parse.y" { - yyval.node = arg_add(yyvsp[-4].node, yyvsp[-1].node); - yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); + yyval.node = arg_blk_pass(yyvsp[-1].node, yyvsp[0].node); ; break;} case 182: -#line 814 "parse.y" +#line 815 "parse.y" { - yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node)); + yyval.node = arg_add(yyvsp[-4].node, yyvsp[-1].node); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} case 183: -#line 819 "parse.y" +#line 820 "parse.y" { - yyval.node = arg_add(NEW_LIST(NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node); - yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); + yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node)); ; break;} case 184: #line 824 "parse.y" { - yyval.node = list_append(yyvsp[-3].node, NEW_HASH(yyvsp[-1].node)); + yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node)); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} case 185: #line 829 "parse.y" { - yyval.node = arg_add(list_append(yyvsp[-6].node, NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node); + yyval.node = arg_add(NEW_LIST(NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} case 186: #line 834 "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 839 "parse.y" +{ + yyval.node = list_append(yyvsp[-3].node, NEW_HASH(yyvsp[-1].node)); + ; + break;} +case 188: +#line 843 "parse.y" +{ + yyval.node = arg_add(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 848 "parse.y" +{ value_expr(yyvsp[-1].node); yyval.node = arg_blk_pass(NEW_RESTARGS(yyvsp[-1].node), yyvsp[0].node); ; break;} -case 188: -#line 841 "parse.y" +case 191: +#line 855 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_BLOCK_PASS(yyvsp[0].node); ; break;} -case 189: -#line 847 "parse.y" +case 192: +#line 861 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 190: -#line 851 "parse.y" +case 193: +#line 865 "parse.y" { yyval.node = 0; ; break;} -case 192: -#line 857 "parse.y" +case 195: +#line 871 "parse.y" { yyval.node = 0; ; break;} -case 193: -#line 862 "parse.y" +case 196: +#line 876 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_LIST(yyvsp[0].node); ; break;} -case 194: -#line 867 "parse.y" +case 197: +#line 881 "parse.y" { value_expr(yyvsp[0].node); yyval.node = list_append(yyvsp[-2].node, yyvsp[0].node); ; break;} -case 195: -#line 873 "parse.y" +case 198: +#line 887 "parse.y" { if (yyvsp[0].node && nd_type(yyvsp[0].node) == NODE_ARRAY && @@ -3443,22 +3468,22 @@ case 195: } ; break;} -case 196: -#line 885 "parse.y" +case 199: +#line 899 "parse.y" { value_expr(yyvsp[0].node); yyval.node = arg_add(yyvsp[-3].node, yyvsp[0].node); ; break;} -case 197: -#line 890 "parse.y" +case 200: +#line 904 "parse.y" { value_expr(yyvsp[0].node); yyval.node = yyvsp[0].node; ; break;} -case 198: -#line 896 "parse.y" +case 201: +#line 910 "parse.y" { yyval.node = yyvsp[0].node; if (yyvsp[0].node) { @@ -3472,59 +3497,59 @@ case 198: } ; break;} -case 199: -#line 910 "parse.y" +case 202: +#line 924 "parse.y" { yyval.node = 0; ; break;} -case 201: -#line 916 "parse.y" +case 204: +#line 930 "parse.y" { yyval.node = NEW_LIT(yyvsp[0].val); ; break;} -case 202: -#line 920 "parse.y" +case 205: +#line 934 "parse.y" { value_expr(yyvsp[-2].node); yyval.node = NEW_COLON2(yyvsp[-2].node, yyvsp[0].id); ; break;} -case 203: -#line 925 "parse.y" +case 206: +#line 939 "parse.y" { value_expr(yyvsp[-2].node); yyval.node = new_call(yyvsp[-2].node, yyvsp[0].id, 0); ; break;} -case 204: -#line 930 "parse.y" +case 207: +#line 944 "parse.y" { yyval.node = NEW_COLON3(yyvsp[0].id); ; break;} -case 205: -#line 934 "parse.y" +case 208: +#line 948 "parse.y" { yyval.node = NEW_STR(yyvsp[0].val); ; break;} -case 207: -#line 939 "parse.y" +case 210: +#line 953 "parse.y" { yyval.node = NEW_XSTR(yyvsp[0].val); ; break;} -case 212: -#line 947 "parse.y" +case 215: +#line 961 "parse.y" { value_expr(yyvsp[-3].node); yyval.node = NEW_CALL(yyvsp[-3].node, tAREF, yyvsp[-1].node); ; break;} -case 213: -#line 952 "parse.y" +case 216: +#line 966 "parse.y" { if (yyvsp[-1].node == 0) yyval.node = NEW_ZARRAY(); /* zero length array*/ @@ -3533,14 +3558,14 @@ case 213: } ; break;} -case 214: -#line 960 "parse.y" +case 217: +#line 974 "parse.y" { yyval.node = NEW_HASH(yyvsp[-1].node); ; break;} -case 215: -#line 964 "parse.y" +case 218: +#line 978 "parse.y" { if (!cur_mid && !in_single) yyerror("return appeared outside of method"); @@ -3548,67 +3573,67 @@ case 215: yyval.node = NEW_RETURN(yyvsp[-1].node); ; break;} -case 216: -#line 971 "parse.y" +case 219: +#line 985 "parse.y" { if (!cur_mid && !in_single) yyerror("return appeared outside of method"); yyval.node = NEW_RETURN(0); ; break;} -case 217: -#line 977 "parse.y" +case 220: +#line 991 "parse.y" { if (!cur_mid && !in_single) yyerror("return appeared outside of method"); yyval.node = NEW_RETURN(0); ; break;} -case 218: -#line 983 "parse.y" +case 221: +#line 997 "parse.y" { value_expr(yyvsp[-1].node); yyval.node = NEW_YIELD(yyvsp[-1].node); ; break;} -case 219: -#line 988 "parse.y" +case 222: +#line 1002 "parse.y" { yyval.node = NEW_YIELD(0); ; break;} -case 220: -#line 992 "parse.y" +case 223: +#line 1006 "parse.y" { yyval.node = NEW_YIELD(0); ; break;} -case 221: -#line 995 "parse.y" +case 224: +#line 1009 "parse.y" {in_defined = 1;; break;} -case 222: -#line 996 "parse.y" +case 225: +#line 1010 "parse.y" { in_defined = 0; yyval.node = NEW_DEFINED(yyvsp[-1].node); ; break;} -case 223: -#line 1001 "parse.y" +case 226: +#line 1015 "parse.y" { yyval.node = NEW_VCALL(yyvsp[0].id); ; break;} -case 224: -#line 1005 "parse.y" +case 227: +#line 1019 "parse.y" { yyvsp[0].node->nd_iter = NEW_FCALL(yyvsp[-1].id, 0); yyval.node = yyvsp[0].node; ; break;} -case 226: -#line 1011 "parse.y" +case 229: +#line 1025 "parse.y" { if (yyvsp[-1].node && nd_type(yyvsp[-1].node) == NODE_BLOCK_PASS) { rb_compile_error("both block arg and actual block given"); @@ -3618,56 +3643,56 @@ case 226: fixpos(yyval.node, yyvsp[-1].node); ; break;} -case 227: -#line 1023 "parse.y" +case 230: +#line 1037 "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 228: -#line 1032 "parse.y" +case 231: +#line 1046 "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 229: -#line 1040 "parse.y" +case 232: +#line 1054 "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 230: -#line 1048 "parse.y" +case 233: +#line 1062 "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 231: -#line 1056 "parse.y" +case 234: +#line 1070 "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 232: -#line 1064 "parse.y" +case 235: +#line 1078 "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 233: -#line 1075 "parse.y" +case 236: +#line 1089 "parse.y" { if (!yyvsp[-3].node && !yyvsp[-2].node && !yyvsp[-1].node) yyval.node = NEW_BEGIN(yyvsp[-4].node); @@ -3683,14 +3708,14 @@ case 233: fixpos(yyval.node, yyvsp[-4].node); ; break;} -case 234: -#line 1090 "parse.y" +case 237: +#line 1104 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 235: -#line 1094 "parse.y" +case 238: +#line 1108 "parse.y" { if (cur_mid || in_single) yyerror("class definition in method body"); @@ -3700,8 +3725,8 @@ case 235: local_push(); ; break;} -case 236: -#line 1104 "parse.y" +case 239: +#line 1118 "parse.y" { yyval.node = NEW_CLASS(yyvsp[-4].id, yyvsp[-1].node, yyvsp[-3].node); fixpos(yyval.node, yyvsp[-3].node); @@ -3710,16 +3735,16 @@ case 236: class_nest--; ; break;} -case 237: -#line 1112 "parse.y" +case 240: +#line 1126 "parse.y" { class_nest++; cref_push(); local_push(); ; break;} -case 238: -#line 1119 "parse.y" +case 241: +#line 1133 "parse.y" { yyval.node = NEW_SCLASS(yyvsp[-4].node, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-4].node); @@ -3728,8 +3753,8 @@ case 238: class_nest--; ; break;} -case 239: -#line 1127 "parse.y" +case 242: +#line 1141 "parse.y" { if (cur_mid || in_single) yyerror("module definition in method body"); @@ -3738,8 +3763,8 @@ case 239: local_push(); ; break;} -case 240: -#line 1136 "parse.y" +case 243: +#line 1150 "parse.y" { yyval.node = NEW_MODULE(yyvsp[-3].id, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-1].node); @@ -3748,8 +3773,8 @@ case 240: class_nest--; ; break;} -case 241: -#line 1144 "parse.y" +case 244: +#line 1158 "parse.y" { if (cur_mid || in_single) yyerror("nested method definition"); @@ -3757,8 +3782,8 @@ case 241: local_push(); ; break;} -case 242: -#line 1153 "parse.y" +case 245: +#line 1167 "parse.y" { /* NOEX_PRIVATE for toplevel */ yyval.node = NEW_DEFN(yyvsp[-4].id, yyvsp[-2].node, yyvsp[-1].node, class_nest?0:1); @@ -3767,12 +3792,12 @@ case 242: cur_mid = 0; ; break;} -case 243: -#line 1160 "parse.y" +case 246: +#line 1174 "parse.y" {lex_state = EXPR_FNAME;; break;} -case 244: -#line 1161 "parse.y" +case 247: +#line 1175 "parse.y" { value_expr(yyvsp[-3].node); in_single++; @@ -3780,8 +3805,8 @@ case 244: lex_state = EXPR_END; /* force for args */ ; break;} -case 245: -#line 1170 "parse.y" +case 248: +#line 1184 "parse.y" { yyval.node = NEW_DEFS(yyvsp[-7].node, yyvsp[-4].id, yyvsp[-2].node, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-7].node); @@ -3789,339 +3814,339 @@ case 245: in_single--; ; break;} -case 246: -#line 1177 "parse.y" +case 249: +#line 1191 "parse.y" { yyval.node = NEW_BREAK(); ; break;} -case 247: -#line 1181 "parse.y" +case 250: +#line 1195 "parse.y" { yyval.node = NEW_NEXT(); ; break;} -case 248: -#line 1185 "parse.y" +case 251: +#line 1199 "parse.y" { yyval.node = NEW_REDO(); ; break;} -case 249: -#line 1189 "parse.y" +case 252: +#line 1203 "parse.y" { yyval.node = NEW_RETRY(); ; break;} -case 256: -#line 1204 "parse.y" +case 259: +#line 1218 "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 257: -#line 1211 "parse.y" +case 260: +#line 1225 "parse.y" { yyval.node = 0; ; break;} -case 258: -#line 1215 "parse.y" +case 261: +#line 1229 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 261: -#line 1223 "parse.y" +case 264: +#line 1237 "parse.y" { yyval.node = 0; ; break;} -case 262: -#line 1227 "parse.y" +case 265: +#line 1241 "parse.y" { yyval.node = 0; ; break;} -case 263: -#line 1231 "parse.y" +case 266: +#line 1245 "parse.y" { yyval.node = 0; ; break;} -case 264: -#line 1235 "parse.y" +case 267: +#line 1249 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 265: -#line 1240 "parse.y" +case 268: +#line 1254 "parse.y" { yyval.vars = dyna_push(); ; break;} -case 266: -#line 1246 "parse.y" +case 269: +#line 1260 "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 267: -#line 1253 "parse.y" +case 270: +#line 1267 "parse.y" { yyval.vars = dyna_push(); ; break;} -case 268: -#line 1258 "parse.y" +case 271: +#line 1272 "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 1265 "parse.y" +case 272: +#line 1279 "parse.y" { yyval.node = NEW_VCALL(yyvsp[0].id); ; break;} -case 270: -#line 1269 "parse.y" +case 273: +#line 1283 "parse.y" { yyval.node = NEW_VCALL(yyvsp[0].id); ; break;} -case 271: -#line 1273 "parse.y" +case 274: +#line 1287 "parse.y" { yyval.node = NEW_VCALL(yyvsp[0].id); ; break;} -case 274: -#line 1280 "parse.y" +case 277: +#line 1294 "parse.y" { yyval.node = new_fcall(yyvsp[-3].id, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-1].node); ; break;} -case 275: -#line 1285 "parse.y" +case 278: +#line 1299 "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 276: -#line 1291 "parse.y" +case 279: +#line 1305 "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 277: -#line 1297 "parse.y" +case 280: +#line 1311 "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 278: -#line 1303 "parse.y" +case 281: +#line 1317 "parse.y" { if (!cur_mid && !in_single && !in_defined) yyerror("super called outside of method"); yyval.node = NEW_SUPER(yyvsp[-1].node); ; break;} -case 279: -#line 1309 "parse.y" +case 282: +#line 1323 "parse.y" { if (!cur_mid && !in_single && !in_defined) yyerror("super called outside of method"); yyval.node = NEW_ZSUPER(); ; break;} -case 280: -#line 1319 "parse.y" +case 283: +#line 1333 "parse.y" { yyval.node = NEW_WHEN(yyvsp[-3].node, yyvsp[-1].node, yyvsp[0].node); ; break;} -case 282: -#line 1325 "parse.y" +case 285: +#line 1339 "parse.y" { value_expr(yyvsp[0].node); yyval.node = list_append(yyvsp[-3].node, NEW_WHEN(yyvsp[0].node, 0, 0)); ; break;} -case 283: -#line 1330 "parse.y" +case 286: +#line 1344 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_LIST(NEW_WHEN(yyvsp[0].node, 0, 0)); ; break;} -case 286: -#line 1341 "parse.y" +case 289: +#line 1355 "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 287: -#line 1346 "parse.y" +case 290: +#line 1360 "parse.y" { yyval.node = 0; ; break;} -case 288: -#line 1351 "parse.y" +case 291: +#line 1365 "parse.y" { yyval.node = 0; ; break;} -case 289: -#line 1355 "parse.y" +case 292: +#line 1369 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 291: -#line 1361 "parse.y" +case 294: +#line 1375 "parse.y" { yyval.val = INT2FIX(yyvsp[0].id); ; break;} -case 302: -#line 1377 "parse.y" +case 305: +#line 1391 "parse.y" {yyval.id = kNIL;; break;} -case 303: -#line 1378 "parse.y" +case 306: +#line 1392 "parse.y" {yyval.id = kSELF;; break;} -case 304: -#line 1379 "parse.y" +case 307: +#line 1393 "parse.y" {yyval.id = kTRUE;; break;} -case 305: -#line 1380 "parse.y" +case 308: +#line 1394 "parse.y" {yyval.id = kFALSE;; break;} -case 306: -#line 1381 "parse.y" +case 309: +#line 1395 "parse.y" {yyval.id = k__FILE__;; break;} -case 307: -#line 1382 "parse.y" +case 310: +#line 1396 "parse.y" {yyval.id = k__LINE__;; break;} -case 308: -#line 1385 "parse.y" +case 311: +#line 1399 "parse.y" { yyval.node = gettable(yyvsp[0].id); ; break;} -case 311: -#line 1393 "parse.y" +case 314: +#line 1407 "parse.y" { yyval.node = 0; ; break;} -case 312: -#line 1397 "parse.y" +case 315: +#line 1411 "parse.y" { lex_state = EXPR_BEG; ; break;} -case 313: -#line 1401 "parse.y" +case 316: +#line 1415 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 314: -#line 1404 "parse.y" +case 317: +#line 1418 "parse.y" {yyerrok; yyval.node = 0;; break;} -case 315: -#line 1407 "parse.y" +case 318: +#line 1421 "parse.y" { yyval.node = yyvsp[-2].node; lex_state = EXPR_BEG; ; break;} -case 316: -#line 1412 "parse.y" +case 319: +#line 1426 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 317: -#line 1417 "parse.y" +case 320: +#line 1431 "parse.y" { yyval.node = block_append(NEW_ARGS(yyvsp[-5].num, yyvsp[-3].node, yyvsp[-1].id), yyvsp[0].node); ; break;} -case 318: -#line 1421 "parse.y" +case 321: +#line 1435 "parse.y" { yyval.node = block_append(NEW_ARGS(yyvsp[-3].num, yyvsp[-1].node, -1), yyvsp[0].node); ; break;} -case 319: -#line 1425 "parse.y" +case 322: +#line 1439 "parse.y" { yyval.node = block_append(NEW_ARGS(yyvsp[-3].num, 0, yyvsp[-1].id), yyvsp[0].node); ; break;} -case 320: -#line 1429 "parse.y" +case 323: +#line 1443 "parse.y" { yyval.node = block_append(NEW_ARGS(yyvsp[-1].num, 0, -1), yyvsp[0].node); ; break;} -case 321: -#line 1433 "parse.y" +case 324: +#line 1447 "parse.y" { yyval.node = block_append(NEW_ARGS(0, yyvsp[-3].node, yyvsp[-1].id), yyvsp[0].node); ; break;} -case 322: -#line 1437 "parse.y" +case 325: +#line 1451 "parse.y" { yyval.node = block_append(NEW_ARGS(0, yyvsp[-1].node, -1), yyvsp[0].node); ; break;} -case 323: -#line 1441 "parse.y" +case 326: +#line 1455 "parse.y" { yyval.node = block_append(NEW_ARGS(0, 0, yyvsp[-1].id), yyvsp[0].node); ; break;} -case 324: -#line 1445 "parse.y" +case 327: +#line 1459 "parse.y" { yyval.node = block_append(NEW_ARGS(0, 0, -1), yyvsp[0].node); ; break;} -case 325: -#line 1449 "parse.y" +case 328: +#line 1463 "parse.y" { yyval.node = NEW_ARGS(0, 0, -1); ; break;} -case 326: -#line 1454 "parse.y" +case 329: +#line 1468 "parse.y" { if (!is_local_id(yyvsp[0].id)) yyerror("formal argument must be local variable"); @@ -4129,8 +4154,8 @@ case 326: yyval.num = 1; ; break;} -case 327: -#line 1461 "parse.y" +case 330: +#line 1475 "parse.y" { if (!is_local_id(yyvsp[0].id)) yyerror("formal argument must be local variable"); @@ -4138,55 +4163,55 @@ case 327: yyval.num += 1; ; break;} -case 328: -#line 1469 "parse.y" +case 331: +#line 1483 "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 329: -#line 1476 "parse.y" +case 332: +#line 1490 "parse.y" { yyval.node = NEW_BLOCK(yyvsp[0].node); yyval.node->nd_end = yyval.node; ; break;} -case 330: -#line 1481 "parse.y" +case 333: +#line 1495 "parse.y" { yyval.node = block_append(yyvsp[-2].node, yyvsp[0].node); ; break;} -case 331: -#line 1486 "parse.y" +case 334: +#line 1500 "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 332: -#line 1493 "parse.y" +case 335: +#line 1507 "parse.y" { yyval.node = NEW_BLOCK_ARG(yyvsp[0].id); ; break;} -case 333: -#line 1498 "parse.y" +case 336: +#line 1512 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 334: -#line 1502 "parse.y" +case 337: +#line 1516 "parse.y" { yyval.node = 0; ; break;} -case 335: -#line 1507 "parse.y" +case 338: +#line 1521 "parse.y" { if (nd_type(yyvsp[0].node) == NODE_SELF) { yyval.node = NEW_SELF(); @@ -4200,8 +4225,8 @@ case 335: } ; break;} -case 336: -#line 1520 "parse.y" +case 339: +#line 1534 "parse.y" { switch (nd_type(yyvsp[-2].node)) { case NODE_STR: @@ -4219,20 +4244,20 @@ case 336: yyval.node = yyvsp[-2].node; ; break;} -case 337: -#line 1538 "parse.y" +case 340: +#line 1552 "parse.y" { yyval.node = 0; ; break;} -case 338: -#line 1542 "parse.y" +case 341: +#line 1556 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 339: -#line 1546 "parse.y" +case 342: +#line 1560 "parse.y" { if (yyvsp[-1].node->nd_alen%2 != 0) { yyerror("odd number list for Hash"); @@ -4240,24 +4265,24 @@ case 339: yyval.node = yyvsp[-1].node; ; break;} -case 341: -#line 1555 "parse.y" +case 344: +#line 1569 "parse.y" { yyval.node = list_concat(yyvsp[-2].node, yyvsp[0].node); ; break;} -case 342: -#line 1560 "parse.y" +case 345: +#line 1574 "parse.y" { yyval.node = list_append(NEW_LIST(yyvsp[-2].node), yyvsp[0].node); ; break;} -case 355: -#line 1581 "parse.y" +case 358: +#line 1595 "parse.y" {yyerrok;; break;} -case 358: -#line 1585 "parse.y" +case 361: +#line 1599 "parse.y" {yyerrok;; break;} } @@ -4482,7 +4507,7 @@ yyerrhandle: } return 1; } -#line 1586 "parse.y" +#line 1600 "parse.y" #include <ctype.h> #include <sys/types.h> @@ -4565,6 +4590,7 @@ yycompile(f) ruby__end__seen = 0; ruby_eval_tree = 0; newline_seen = 0; + heredoc_end = 0; ruby_sourcefile = f; ruby_in_compile = 1; n = yyparse(); @@ -4645,6 +4671,10 @@ normalize_newline(line) RSTRING(line)->ptr[RSTRING(line)->len-2] = '\n'; RSTRING(line)->len--; } +#ifdef __MACOS__ + else if (RSTRING(line)->ptr[RSTRING(line)->len-1] == '\r') + RSTRING(line)->ptr[RSTRING(line)->len-1] = '\n'; +#endif } static int @@ -4911,8 +4941,10 @@ parse_regx(term, paren) } /* fall through */ default: - if (c == paren) nest++; - if (c == term) nest--; + if (paren) { + if (c == paren) nest++; + if (c == term) nest--; + } if (c == '\n') { ruby_sourceline++; } @@ -5056,10 +5088,12 @@ parse_string(func, term, paren) } continue; } - if (c == paren) nest++; - if (c == term) { - nest--; - if (nest == 0) break; + if (paren) { + if (c == paren) nest++; + if (c == term) { + nest--; + if (nest == 0) break; + } } tokadd(c); } @@ -5134,10 +5168,12 @@ parse_qstring(term, paren) tokadd('\\'); } } - if (c == paren) nest++; - if (c == term) { - nest--; - if (nest == 0) break; + if (paren) { + if (c == paren) nest++; + if (c == term) { + nest--; + if (nest == 0) break; + } } tokadd(c); } @@ -5296,8 +5332,8 @@ arg_ambiguous() rb_warning("ambiguous first argument; make sure"); } -#ifndef atof -double atof(); +#ifndef strtod +double strtod (); #endif static int @@ -5340,7 +5376,7 @@ retry: for (i = 0; i < len; i++) { c = nextc(); if (c == '\n') { - ruby_sourceline++; + pushback(c); break; } } @@ -5498,7 +5534,7 @@ retry: return parse_string(c,c,c); case '\'': - return parse_qstring(c,c); + return parse_qstring(c,0); case '?': if (lex_state == EXPR_END) { @@ -5653,29 +5689,49 @@ retry: c = nextc(); if (c == 'x' || c == 'X') { /* hexadecimal */ - while (c = nextc()) { + c = nextc(); + if (!ISXDIGIT(c)) { + yyerror("hexadecimal number without hex-digits"); + } + do { if (c == '_') continue; if (!ISXDIGIT(c)) break; tokadd(c); - } + } while (c = nextc()); pushback(c); tokfix(); yylval.val = rb_str2inum(tok(), 16); return tINTEGER; } - else if (c >= '0' && c <= '7') { - /* octal */ + if (c == 'b' || c == 'B') { + /* binary */ + c = nextc(); + if (c != '0' && c != '1') { + yyerror("numeric constant with no digits"); + } do { + if (c == '_') continue; + if (c != '0'&& c != '1') break; + tokadd(c); + } while (c = nextc()); + pushback(c); + tokfix(); + yylval.val = rb_str2inum(tok(), 2); + return tINTEGER; + } + if (c >= '0' && c <= '7' || c == '_') { + /* octal */ + do { + if (c == '_') continue; + if (c < '0' || c > '7') break; tokadd(c); - while ((c = nextc()) == '_') - ; - } while (c >= '0' && c <= '9'); + } while (c = nextc()); pushback(c); tokfix(); yylval.val = rb_str2inum(tok(), 8); return tINTEGER; } - else if (c > '7' && c <= '9') { + if (c > '7' && c <= '9') { yyerror("Illegal octal digit"); } else if (c == '.') { @@ -5740,7 +5796,12 @@ retry: pushback(c); tokfix(); if (is_float) { - yylval.val = rb_float_new(atof(tok())); + double d = strtod(tok(), 0); + if (errno == ERANGE) { + rb_warn("Float %s out of range", tok()); + errno = 0; + } + yylval.val = rb_float_new(d); return tFLOAT; } yylval.val = rb_str2inum(tok(), 10); @@ -5885,7 +5946,7 @@ retry: rb_compile_error("unterminated quoted string meets end of file"); return 0; } - paren = term; + paren = 0; if (term == '(') term = ')'; else if (term == '[') term = ']'; else if (term == '{') term = '}'; @@ -6323,7 +6384,7 @@ block_append(head, tail) end = head->nd_end; } - if (RTEST(rb_verbose)) { + if (RTEST(ruby_verbose)) { NODE *nd = end->nd_head; newline: switch (nd_type(nd)) { |