diff --git a/dtool/src/cppparser/cppBison.cxx.prebuilt b/dtool/src/cppparser/cppBison.cxx.prebuilt index 45982424b6..2f00575c4f 100644 --- a/dtool/src/cppparser/cppBison.cxx.prebuilt +++ b/dtool/src/cppparser/cppBison.cxx.prebuilt @@ -795,18 +795,18 @@ union yyalloc #endif /* !YYCOPY_NEEDED */ /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 78 +#define YYFINAL 79 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 4444 +#define YYLAST 4452 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 141 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 94 /* YYNRULES -- Number of rules. */ -#define YYNRULES 583 +#define YYNRULES 585 /* YYNRULES -- Number of states. */ -#define YYNSTATES 1074 +#define YYNSTATES 1076 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -885,16 +885,16 @@ static const yytype_uint16 yyprhs[] = 606, 609, 612, 615, 619, 624, 626, 628, 630, 633, 636, 639, 642, 645, 649, 654, 662, 666, 668, 671, 674, 677, 680, 683, 687, 692, 700, 702, 704, 707, - 709, 711, 713, 716, 721, 726, 728, 730, 733, 735, - 737, 739, 742, 747, 750, 755, 757, 759, 762, 765, - 768, 771, 775, 776, 782, 783, 791, 793, 795, 798, - 802, 805, 808, 811, 815, 819, 823, 827, 831, 835, - 840, 845, 848, 852, 854, 856, 858, 860, 864, 870, - 872, 875, 880, 882, 884, 886, 888, 889, 896, 897, - 905, 910, 916, 919, 923, 925, 927, 929, 931, 933, - 935, 937, 939, 941, 943, 945, 947, 949, 951, 954, - 957, 960, 963, 965, 968, 970, 974, 977, 979, 980, - 983, 985, 988, 990, 992, 994, 996, 998, 1000, 1002, + 709, 711, 713, 716, 721, 726, 728, 730, 732, 735, + 737, 739, 741, 744, 749, 752, 757, 759, 761, 763, + 766, 769, 772, 775, 779, 780, 786, 787, 795, 797, + 799, 802, 806, 809, 812, 815, 819, 823, 827, 831, + 835, 839, 844, 849, 852, 856, 858, 860, 862, 864, + 868, 874, 876, 879, 884, 886, 888, 890, 892, 893, + 900, 901, 909, 914, 920, 923, 927, 929, 931, 933, + 935, 937, 939, 941, 943, 945, 947, 949, 951, 953, + 955, 958, 961, 964, 967, 969, 972, 974, 978, 981, + 983, 984, 987, 989, 992, 994, 996, 998, 1000, 1002, 1004, 1006, 1008, 1010, 1012, 1014, 1016, 1018, 1020, 1022, 1024, 1026, 1028, 1030, 1032, 1034, 1036, 1038, 1040, 1042, 1044, 1046, 1048, 1050, 1052, 1054, 1056, 1058, 1060, 1062, @@ -905,23 +905,23 @@ static const yytype_uint16 yyprhs[] = 1144, 1146, 1148, 1150, 1152, 1154, 1156, 1158, 1160, 1162, 1164, 1166, 1168, 1170, 1172, 1174, 1176, 1178, 1180, 1182, 1184, 1186, 1188, 1190, 1192, 1194, 1196, 1198, 1200, 1202, - 1204, 1206, 1208, 1210, 1212, 1214, 1216, 1218, 1222, 1224, - 1226, 1228, 1230, 1232, 1236, 1238, 1243, 1251, 1259, 1264, - 1269, 1272, 1275, 1278, 1281, 1284, 1288, 1292, 1296, 1300, - 1304, 1308, 1312, 1316, 1320, 1324, 1328, 1332, 1336, 1340, - 1344, 1348, 1354, 1359, 1364, 1368, 1372, 1376, 1380, 1382, - 1387, 1395, 1403, 1408, 1413, 1418, 1423, 1428, 1433, 1438, - 1443, 1448, 1453, 1458, 1463, 1468, 1473, 1478, 1481, 1487, - 1490, 1493, 1496, 1499, 1502, 1506, 1510, 1514, 1518, 1522, - 1526, 1530, 1534, 1538, 1542, 1546, 1550, 1554, 1558, 1562, - 1566, 1570, 1574, 1580, 1585, 1590, 1594, 1598, 1602, 1606, - 1608, 1610, 1612, 1614, 1616, 1618, 1620, 1622, 1624, 1626, - 1631, 1639, 1647, 1652, 1657, 1660, 1666, 1669, 1672, 1675, - 1678, 1682, 1686, 1690, 1694, 1698, 1702, 1706, 1710, 1714, - 1718, 1722, 1726, 1730, 1734, 1738, 1742, 1746, 1750, 1756, - 1761, 1766, 1770, 1774, 1778, 1782, 1784, 1786, 1788, 1790, - 1792, 1794, 1796, 1798, 1800, 1802, 1805, 1808, 1810, 1812, - 1814, 1816, 1819, 1822 + 1204, 1206, 1208, 1210, 1212, 1214, 1216, 1218, 1220, 1222, + 1226, 1228, 1230, 1232, 1234, 1236, 1240, 1242, 1247, 1255, + 1263, 1268, 1273, 1276, 1279, 1282, 1285, 1288, 1292, 1296, + 1300, 1304, 1308, 1312, 1316, 1320, 1324, 1328, 1332, 1336, + 1340, 1344, 1348, 1352, 1358, 1363, 1368, 1372, 1376, 1380, + 1384, 1386, 1391, 1399, 1407, 1412, 1417, 1422, 1427, 1432, + 1437, 1442, 1447, 1452, 1457, 1462, 1467, 1472, 1477, 1482, + 1485, 1491, 1494, 1497, 1500, 1503, 1506, 1510, 1514, 1518, + 1522, 1526, 1530, 1534, 1538, 1542, 1546, 1550, 1554, 1558, + 1562, 1566, 1570, 1574, 1578, 1584, 1589, 1594, 1598, 1602, + 1606, 1610, 1612, 1614, 1616, 1618, 1620, 1622, 1624, 1626, + 1628, 1630, 1635, 1643, 1651, 1656, 1661, 1664, 1670, 1673, + 1676, 1679, 1682, 1686, 1690, 1694, 1698, 1702, 1706, 1710, + 1714, 1718, 1722, 1726, 1730, 1734, 1738, 1742, 1746, 1750, + 1754, 1760, 1765, 1770, 1774, 1778, 1782, 1786, 1788, 1790, + 1792, 1794, 1796, 1798, 1800, 1802, 1804, 1806, 1809, 1812, + 1814, 1816, 1818, 1820, 1823, 1826 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -999,117 +999,117 @@ static const yytype_int16 yyrhs[] = 140, -1, 135, 192, 137, 135, 182, 137, 171, -1, 215, -1, 11, -1, 105, 232, -1, 197, -1, 199, -1, 204, -1, 210, 232, -1, 209, 232, 120, 206, - -1, 58, 135, 227, 137, -1, 215, -1, 11, -1, - 105, 232, -1, 197, -1, 199, -1, 204, -1, 210, - 232, -1, 209, 232, 120, 206, -1, 209, 232, -1, - 58, 135, 227, 137, -1, 215, -1, 11, -1, 105, - 232, -1, 210, 232, -1, 209, 232, -1, 193, 192, - -1, 56, 193, 192, -1, -1, 210, 117, 198, 143, - 138, -1, -1, 210, 232, 200, 201, 117, 143, 138, - -1, 234, -1, 202, -1, 120, 203, -1, 202, 118, - 203, -1, 90, 231, -1, 89, 231, -1, 88, 231, - -1, 109, 90, 231, -1, 109, 89, 231, -1, 109, - 88, 231, -1, 90, 109, 231, -1, 89, 109, 231, - -1, 88, 109, 231, -1, 205, 117, 208, 138, -1, - 209, 232, 120, 206, -1, 209, 232, -1, 209, 120, - 206, -1, 209, -1, 216, -1, 11, -1, 234, -1, - 207, 232, 118, -1, 207, 232, 121, 227, 118, -1, - 207, -1, 207, 232, -1, 207, 232, 121, 227, -1, - 65, -1, 55, -1, 99, -1, 106, -1, -1, 83, - 232, 117, 212, 143, 138, -1, -1, 76, 83, 232, - 117, 213, 143, 138, -1, 83, 117, 143, 138, -1, - 76, 83, 117, 143, 138, -1, 108, 232, -1, 108, - 83, 232, -1, 216, -1, 217, -1, 218, -1, 50, - -1, 52, -1, 112, -1, 53, -1, 54, -1, 93, - -1, 78, -1, 79, -1, 107, -1, 94, -1, 77, - -1, 93, 216, -1, 78, 216, -1, 107, 216, -1, - 94, 216, -1, 71, -1, 78, 71, -1, 61, -1, - 78, 78, 71, -1, 78, 61, -1, 110, -1, -1, - 220, 221, -1, 234, -1, 221, 222, -1, 3, -1, - 4, -1, 6, -1, 8, -1, 9, -1, 5, -1, - 10, -1, 11, -1, 12, -1, 7, -1, 14, -1, - 15, -1, 16, -1, 17, -1, 18, -1, 19, -1, - 20, -1, 21, -1, 22, -1, 23, -1, 24, -1, - 31, -1, 32, -1, 33, -1, 34, -1, 35, -1, - 36, -1, 37, -1, 38, -1, 39, -1, 40, -1, - 41, -1, 42, -1, 43, -1, 44, -1, 45, -1, - 46, -1, 47, -1, 50, -1, 51, -1, 52, -1, - 53, -1, 54, -1, 55, -1, 56, -1, 57, -1, - 58, -1, 59, -1, 60, -1, 61, -1, 62, -1, - 63, -1, 65, -1, 67, -1, 68, -1, 70, -1, - 71, -1, 72, -1, 73, -1, 74, -1, 75, -1, - 76, -1, 77, -1, 78, -1, 82, -1, 84, -1, - 86, -1, 87, -1, 88, -1, 89, -1, 90, -1, - 69, -1, 91, -1, 92, -1, 93, -1, 94, -1, - 95, -1, 96, -1, 97, -1, 98, -1, 99, -1, - 101, -1, 102, -1, 103, -1, 104, -1, 105, -1, - 106, -1, 107, -1, 109, -1, 110, -1, 111, -1, - 112, -1, 113, -1, 128, -1, 129, -1, 130, -1, - 131, -1, 125, -1, 123, -1, 124, -1, 139, -1, - 133, -1, 121, -1, 132, -1, 126, -1, 127, -1, - 135, -1, 137, -1, 134, -1, 118, -1, 119, -1, - 120, -1, 136, -1, 140, -1, 122, -1, 117, 221, - 138, -1, 234, -1, 227, -1, 234, -1, 225, -1, - 227, -1, 225, 118, 227, -1, 228, -1, 135, 196, - 137, 226, -1, 98, 126, 196, 127, 135, 225, 137, - -1, 62, 126, 196, 127, 135, 225, 137, -1, 95, - 135, 196, 137, -1, 46, 135, 196, 137, -1, 139, - 226, -1, 133, 226, -1, 129, 226, -1, 130, 226, - -1, 125, 226, -1, 226, 130, 226, -1, 226, 131, - 226, -1, 226, 132, 226, -1, 226, 128, 226, -1, - 226, 129, 226, -1, 226, 123, 226, -1, 226, 124, - 226, -1, 226, 125, 226, -1, 226, 15, 226, -1, - 226, 16, 226, -1, 226, 17, 226, -1, 226, 18, - 226, -1, 226, 19, 226, -1, 226, 20, 226, -1, - 226, 21, 226, -1, 226, 22, 226, -1, 226, 122, - 226, 120, 226, -1, 226, 136, 227, 140, -1, 226, - 135, 225, 137, -1, 226, 135, 137, -1, 226, 134, - 226, -1, 226, 31, 226, -1, 135, 225, 137, -1, - 228, -1, 135, 196, 137, 227, -1, 98, 126, 196, + -1, 58, 135, 227, 137, -1, 47, -1, 215, -1, + 11, -1, 105, 232, -1, 197, -1, 199, -1, 204, + -1, 210, 232, -1, 209, 232, 120, 206, -1, 209, + 232, -1, 58, 135, 227, 137, -1, 47, -1, 215, + -1, 11, -1, 105, 232, -1, 210, 232, -1, 209, + 232, -1, 193, 192, -1, 56, 193, 192, -1, -1, + 210, 117, 198, 143, 138, -1, -1, 210, 232, 200, + 201, 117, 143, 138, -1, 234, -1, 202, -1, 120, + 203, -1, 202, 118, 203, -1, 90, 231, -1, 89, + 231, -1, 88, 231, -1, 109, 90, 231, -1, 109, + 89, 231, -1, 109, 88, 231, -1, 90, 109, 231, + -1, 89, 109, 231, -1, 88, 109, 231, -1, 205, + 117, 208, 138, -1, 209, 232, 120, 206, -1, 209, + 232, -1, 209, 120, 206, -1, 209, -1, 216, -1, + 11, -1, 234, -1, 207, 232, 118, -1, 207, 232, + 121, 227, 118, -1, 207, -1, 207, 232, -1, 207, + 232, 121, 227, -1, 65, -1, 55, -1, 99, -1, + 106, -1, -1, 83, 232, 117, 212, 143, 138, -1, + -1, 76, 83, 232, 117, 213, 143, 138, -1, 83, + 117, 143, 138, -1, 76, 83, 117, 143, 138, -1, + 108, 232, -1, 108, 83, 232, -1, 216, -1, 217, + -1, 218, -1, 50, -1, 52, -1, 112, -1, 53, + -1, 54, -1, 93, -1, 78, -1, 79, -1, 107, + -1, 94, -1, 77, -1, 93, 216, -1, 78, 216, + -1, 107, 216, -1, 94, 216, -1, 71, -1, 78, + 71, -1, 61, -1, 78, 78, 71, -1, 78, 61, + -1, 110, -1, -1, 220, 221, -1, 234, -1, 221, + 222, -1, 3, -1, 4, -1, 6, -1, 8, -1, + 9, -1, 5, -1, 10, -1, 11, -1, 12, -1, + 7, -1, 14, -1, 15, -1, 16, -1, 17, -1, + 18, -1, 19, -1, 20, -1, 21, -1, 22, -1, + 23, -1, 24, -1, 31, -1, 32, -1, 33, -1, + 34, -1, 35, -1, 36, -1, 37, -1, 38, -1, + 39, -1, 40, -1, 41, -1, 42, -1, 43, -1, + 44, -1, 45, -1, 46, -1, 47, -1, 50, -1, + 51, -1, 52, -1, 53, -1, 54, -1, 55, -1, + 56, -1, 57, -1, 58, -1, 59, -1, 60, -1, + 61, -1, 62, -1, 63, -1, 65, -1, 67, -1, + 68, -1, 70, -1, 71, -1, 72, -1, 73, -1, + 74, -1, 75, -1, 76, -1, 77, -1, 78, -1, + 82, -1, 84, -1, 86, -1, 87, -1, 88, -1, + 89, -1, 90, -1, 69, -1, 91, -1, 92, -1, + 93, -1, 94, -1, 95, -1, 96, -1, 97, -1, + 98, -1, 99, -1, 101, -1, 102, -1, 103, -1, + 104, -1, 105, -1, 106, -1, 107, -1, 109, -1, + 110, -1, 111, -1, 112, -1, 113, -1, 128, -1, + 129, -1, 130, -1, 131, -1, 125, -1, 123, -1, + 124, -1, 139, -1, 133, -1, 121, -1, 132, -1, + 126, -1, 127, -1, 135, -1, 137, -1, 134, -1, + 118, -1, 119, -1, 120, -1, 136, -1, 140, -1, + 122, -1, 117, 221, 138, -1, 234, -1, 227, -1, + 234, -1, 225, -1, 227, -1, 225, 118, 227, -1, + 228, -1, 135, 196, 137, 226, -1, 98, 126, 196, 127, 135, 225, 137, -1, 62, 126, 196, 127, 135, - 225, 137, -1, 11, 135, 224, 137, -1, 77, 135, - 224, 137, -1, 52, 135, 224, 137, -1, 112, 135, - 224, 137, -1, 53, 135, 224, 137, -1, 54, 135, - 224, 137, -1, 50, 135, 224, 137, -1, 93, 135, - 224, 137, -1, 78, 135, 224, 137, -1, 107, 135, - 224, 137, -1, 94, 135, 224, 137, -1, 71, 135, - 224, 137, -1, 61, 135, 224, 137, -1, 95, 135, - 196, 137, -1, 46, 135, 196, 137, -1, 84, 195, - -1, 84, 195, 135, 224, 137, -1, 139, 227, -1, - 133, 227, -1, 129, 227, -1, 130, 227, -1, 125, - 227, -1, 227, 130, 227, -1, 227, 131, 227, -1, - 227, 132, 227, -1, 227, 128, 227, -1, 227, 129, - 227, -1, 227, 123, 227, -1, 227, 124, 227, -1, - 227, 125, 227, -1, 227, 15, 227, -1, 227, 16, - 227, -1, 227, 17, 227, -1, 227, 18, 227, -1, - 227, 19, 227, -1, 227, 20, 227, -1, 227, 126, - 227, -1, 227, 127, 227, -1, 227, 21, 227, -1, - 227, 22, 227, -1, 227, 122, 227, 120, 227, -1, - 227, 136, 227, 140, -1, 227, 135, 225, 137, -1, - 227, 135, 137, -1, 227, 134, 227, -1, 227, 31, + 225, 137, -1, 95, 135, 196, 137, -1, 46, 135, + 196, 137, -1, 139, 226, -1, 133, 226, -1, 129, + 226, -1, 130, 226, -1, 125, 226, -1, 226, 130, + 226, -1, 226, 131, 226, -1, 226, 132, 226, -1, + 226, 128, 226, -1, 226, 129, 226, -1, 226, 123, + 226, -1, 226, 124, 226, -1, 226, 125, 226, -1, + 226, 15, 226, -1, 226, 16, 226, -1, 226, 17, + 226, -1, 226, 18, 226, -1, 226, 19, 226, -1, + 226, 20, 226, -1, 226, 21, 226, -1, 226, 22, + 226, -1, 226, 122, 226, 120, 226, -1, 226, 136, + 227, 140, -1, 226, 135, 225, 137, -1, 226, 135, + 137, -1, 226, 134, 226, -1, 226, 31, 226, -1, + 135, 225, 137, -1, 228, -1, 135, 196, 137, 227, + -1, 98, 126, 196, 127, 135, 225, 137, -1, 62, + 126, 196, 127, 135, 225, 137, -1, 11, 135, 224, + 137, -1, 77, 135, 224, 137, -1, 52, 135, 224, + 137, -1, 112, 135, 224, 137, -1, 53, 135, 224, + 137, -1, 54, 135, 224, 137, -1, 50, 135, 224, + 137, -1, 93, 135, 224, 137, -1, 78, 135, 224, + 137, -1, 107, 135, 224, 137, -1, 94, 135, 224, + 137, -1, 71, 135, 224, 137, -1, 61, 135, 224, + 137, -1, 95, 135, 196, 137, -1, 46, 135, 196, + 137, -1, 84, 195, -1, 84, 195, 135, 224, 137, + -1, 139, 227, -1, 133, 227, -1, 129, 227, -1, + 130, 227, -1, 125, 227, -1, 227, 130, 227, -1, + 227, 131, 227, -1, 227, 132, 227, -1, 227, 128, + 227, -1, 227, 129, 227, -1, 227, 123, 227, -1, + 227, 124, 227, -1, 227, 125, 227, -1, 227, 15, + 227, -1, 227, 16, 227, -1, 227, 17, 227, -1, + 227, 18, 227, -1, 227, 19, 227, -1, 227, 20, + 227, -1, 227, 126, 227, -1, 227, 127, 227, -1, + 227, 21, 227, -1, 227, 22, 227, -1, 227, 122, + 227, 120, 227, -1, 227, 136, 227, 140, -1, 227, + 135, 225, 137, -1, 227, 135, 137, -1, 227, 134, + 227, -1, 227, 31, 227, -1, 135, 225, 137, -1, + 4, -1, 102, -1, 70, -1, 5, -1, 3, -1, + 233, -1, 9, -1, 10, -1, 86, -1, 230, -1, + 135, 196, 137, 227, -1, 98, 126, 196, 127, 135, + 225, 137, -1, 62, 126, 196, 127, 135, 225, 137, + -1, 95, 135, 196, 137, -1, 46, 135, 196, 137, + -1, 84, 195, -1, 84, 195, 135, 224, 137, -1, + 139, 227, -1, 133, 227, -1, 129, 227, -1, 125, + 227, -1, 229, 130, 227, -1, 229, 131, 227, -1, + 229, 132, 227, -1, 229, 128, 227, -1, 229, 129, + 227, -1, 229, 123, 227, -1, 229, 124, 227, -1, + 229, 125, 227, -1, 229, 15, 227, -1, 229, 16, + 227, -1, 229, 17, 227, -1, 229, 18, 227, -1, + 229, 19, 227, -1, 229, 20, 227, -1, 229, 126, + 227, -1, 229, 127, 227, -1, 229, 21, 227, -1, + 229, 22, 227, -1, 229, 122, 227, 120, 227, -1, + 229, 136, 227, 140, -1, 229, 135, 225, 137, -1, + 229, 135, 137, -1, 229, 134, 227, -1, 229, 31, 227, -1, 135, 225, 137, -1, 4, -1, 102, -1, 70, -1, 5, -1, 3, -1, 233, -1, 9, -1, - 10, -1, 86, -1, 230, -1, 135, 196, 137, 227, - -1, 98, 126, 196, 127, 135, 225, 137, -1, 62, - 126, 196, 127, 135, 225, 137, -1, 95, 135, 196, - 137, -1, 46, 135, 196, 137, -1, 84, 195, -1, - 84, 195, 135, 224, 137, -1, 139, 227, -1, 133, - 227, -1, 129, 227, -1, 125, 227, -1, 229, 130, - 227, -1, 229, 131, 227, -1, 229, 132, 227, -1, - 229, 128, 227, -1, 229, 129, 227, -1, 229, 123, - 227, -1, 229, 124, 227, -1, 229, 125, 227, -1, - 229, 15, 227, -1, 229, 16, 227, -1, 229, 17, - 227, -1, 229, 18, 227, -1, 229, 19, 227, -1, - 229, 20, 227, -1, 229, 126, 227, -1, 229, 127, - 227, -1, 229, 21, 227, -1, 229, 22, 227, -1, - 229, 122, 227, 120, 227, -1, 229, 136, 227, 140, - -1, 229, 135, 225, 137, -1, 229, 135, 137, -1, - 229, 134, 227, -1, 229, 31, 227, -1, 135, 225, - 137, -1, 4, -1, 102, -1, 70, -1, 5, -1, - 3, -1, 233, -1, 9, -1, 10, -1, 86, -1, - 232, -1, 210, 232, -1, 105, 232, -1, 10, -1, - 11, -1, 6, -1, 8, -1, 233, 6, -1, 233, - 8, -1, -1 + 10, -1, 86, -1, 232, -1, 210, 232, -1, 105, + 232, -1, 10, -1, 11, -1, 6, -1, 8, -1, + 233, 6, -1, 233, 8, -1, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -1137,43 +1137,43 @@ static const yytype_uint16 yyrline[] = 1521, 1526, 1531, 1536, 1541, 1549, 1553, 1557, 1561, 1566, 1571, 1576, 1581, 1586, 1591, 1596, 1602, 1610, 1614, 1619, 1624, 1629, 1634, 1639, 1644, 1649, 1658, 1662, 1670, 1674, - 1678, 1682, 1686, 1702, 1718, 1730, 1734, 1742, 1746, 1750, - 1754, 1758, 1774, 1790, 1808, 1820, 1824, 1832, 1836, 1852, - 1871, 1877, 1888, 1887, 1912, 1911, 1941, 1942, 1946, 1947, - 1951, 1955, 1959, 1963, 1967, 1971, 1975, 1979, 1983, 1990, - 1998, 2002, 2006, 2010, 2017, 2021, 2028, 2029, 2035, 2043, - 2044, 2050, 2059, 2066, 2070, 2074, 2082, 2081, 2104, 2103, - 2126, 2127, 2131, 2137, 2146, 2147, 2148, 2152, 2156, 2160, - 2164, 2168, 2172, 2177, 2182, 2187, 2192, 2197, 2201, 2206, - 2215, 2220, 2228, 2232, 2237, 2241, 2246, 2254, 2264, 2264, - 2274, 2275, 2279, 2280, 2281, 2282, 2283, 2284, 2285, 2286, - 2287, 2288, 2289, 2289, 2289, 2290, 2290, 2290, 2290, 2291, - 2291, 2291, 2291, 2291, 2292, 2292, 2292, 2293, 2293, 2293, - 2293, 2293, 2294, 2294, 2294, 2294, 2294, 2295, 2295, 2295, - 2295, 2295, 2296, 2296, 2296, 2297, 2297, 2297, 2297, 2297, - 2298, 2298, 2298, 2298, 2298, 2299, 2299, 2299, 2300, 2300, - 2300, 2300, 2301, 2301, 2301, 2301, 2301, 2302, 2302, 2302, - 2302, 2302, 2303, 2303, 2303, 2303, 2304, 2304, 2304, 2304, - 2304, 2305, 2305, 2305, 2305, 2305, 2306, 2306, 2306, 2306, - 2306, 2307, 2307, 2307, 2307, 2310, 2310, 2310, 2310, 2310, - 2310, 2310, 2310, 2310, 2310, 2310, 2311, 2311, 2311, 2311, - 2311, 2311, 2311, 2311, 2311, 2311, 2312, 2312, 2316, 2320, - 2327, 2331, 2338, 2342, 2349, 2353, 2357, 2361, 2365, 2369, + 1678, 1682, 1686, 1702, 1718, 1727, 1734, 1738, 1746, 1750, + 1754, 1758, 1762, 1778, 1794, 1812, 1821, 1828, 1832, 1840, + 1844, 1860, 1879, 1885, 1896, 1895, 1920, 1919, 1949, 1950, + 1954, 1955, 1959, 1963, 1967, 1971, 1975, 1979, 1983, 1987, + 1991, 1998, 2006, 2010, 2014, 2018, 2025, 2029, 2036, 2037, + 2043, 2051, 2052, 2058, 2067, 2074, 2078, 2082, 2090, 2089, + 2112, 2111, 2134, 2135, 2139, 2145, 2154, 2155, 2156, 2160, + 2164, 2168, 2172, 2176, 2180, 2185, 2190, 2195, 2200, 2205, + 2209, 2214, 2223, 2228, 2236, 2240, 2245, 2249, 2254, 2262, + 2272, 2272, 2282, 2283, 2287, 2288, 2289, 2290, 2291, 2292, + 2293, 2294, 2295, 2296, 2297, 2297, 2297, 2298, 2298, 2298, + 2298, 2299, 2299, 2299, 2299, 2299, 2300, 2300, 2300, 2301, + 2301, 2301, 2301, 2301, 2302, 2302, 2302, 2302, 2302, 2303, + 2303, 2303, 2303, 2303, 2304, 2304, 2304, 2305, 2305, 2305, + 2305, 2305, 2306, 2306, 2306, 2306, 2306, 2307, 2307, 2307, + 2308, 2308, 2308, 2308, 2309, 2309, 2309, 2309, 2309, 2310, + 2310, 2310, 2310, 2310, 2311, 2311, 2311, 2311, 2312, 2312, + 2312, 2312, 2312, 2313, 2313, 2313, 2313, 2313, 2314, 2314, + 2314, 2314, 2314, 2315, 2315, 2315, 2315, 2318, 2318, 2318, + 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2318, 2319, 2319, + 2319, 2319, 2319, 2319, 2319, 2319, 2319, 2319, 2320, 2320, + 2324, 2328, 2335, 2339, 2346, 2350, 2357, 2361, 2365, 2369, 2373, 2377, 2381, 2385, 2389, 2393, 2397, 2401, 2405, 2409, 2413, 2417, 2421, 2425, 2429, 2433, 2437, 2441, 2445, 2449, - 2453, 2457, 2461, 2465, 2469, 2473, 2477, 2481, 2489, 2493, - 2497, 2501, 2505, 2515, 2521, 2527, 2533, 2539, 2545, 2551, - 2558, 2565, 2572, 2579, 2585, 2591, 2595, 2599, 2603, 2607, + 2453, 2457, 2461, 2465, 2469, 2473, 2477, 2481, 2485, 2489, + 2497, 2501, 2505, 2509, 2513, 2523, 2529, 2535, 2541, 2547, + 2553, 2559, 2566, 2573, 2580, 2587, 2593, 2599, 2603, 2607, 2611, 2615, 2619, 2623, 2627, 2631, 2635, 2639, 2643, 2647, 2651, 2655, 2659, 2663, 2667, 2671, 2675, 2679, 2683, 2687, - 2691, 2695, 2699, 2703, 2707, 2711, 2715, 2719, 2723, 2730, - 2734, 2738, 2742, 2746, 2750, 2754, 2758, 2762, 2776, 2780, + 2691, 2695, 2699, 2703, 2707, 2711, 2715, 2719, 2723, 2727, + 2731, 2738, 2742, 2746, 2750, 2754, 2758, 2762, 2766, 2770, 2784, 2788, 2792, 2796, 2800, 2804, 2808, 2812, 2816, 2820, 2824, 2828, 2832, 2836, 2840, 2844, 2848, 2852, 2856, 2860, 2864, 2868, 2872, 2876, 2880, 2884, 2888, 2892, 2896, 2900, - 2904, 2908, 2912, 2916, 2920, 2927, 2931, 2935, 2939, 2943, - 2947, 2951, 2955, 2959, 2966, 2974, 2982, 3008, 3012, 3019, - 3023, 3027, 3033, 3044 + 2904, 2908, 2912, 2916, 2920, 2924, 2928, 2935, 2939, 2943, + 2947, 2951, 2955, 2959, 2963, 2967, 2974, 2982, 2990, 3016, + 3020, 3027, 3031, 3035, 3041, 3052 }; #endif @@ -1286,16 +1286,16 @@ static const yytype_uint8 yyr1[] = 190, 190, 190, 190, 190, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, 192, 192, 192, 192, 192, 192, 192, 192, 192, 193, 193, 193, 193, - 193, 193, 193, 193, 193, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 194, 195, 195, 195, 195, 195, - 196, 196, 198, 197, 200, 199, 201, 201, 202, 202, - 203, 203, 203, 203, 203, 203, 203, 203, 203, 204, - 205, 205, 205, 205, 206, 206, 207, 207, 207, 208, - 208, 208, 209, 210, 210, 210, 212, 211, 213, 211, - 211, 211, 214, 214, 215, 215, 215, 216, 216, 216, + 193, 193, 193, 193, 193, 193, 194, 194, 194, 194, + 194, 194, 194, 194, 194, 194, 194, 195, 195, 195, + 195, 195, 196, 196, 198, 197, 200, 199, 201, 201, + 202, 202, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 204, 205, 205, 205, 205, 206, 206, 207, 207, + 207, 208, 208, 208, 209, 210, 210, 210, 212, 211, + 213, 211, 211, 211, 214, 214, 215, 215, 215, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 217, 217, 217, 217, 217, 218, 220, 219, - 221, 221, 222, 222, 222, 222, 222, 222, 222, 222, + 216, 216, 216, 216, 217, 217, 217, 217, 217, 218, + 220, 219, 221, 221, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, @@ -1306,23 +1306,23 @@ static const yytype_uint8 yyr1[] = 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 223, 223, - 224, 224, 225, 225, 226, 226, 226, 226, 226, 226, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 223, 223, 224, 224, 225, 225, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, - 227, 227, 227, 227, 227, 227, 227, 227, 227, 228, - 228, 228, 228, 228, 228, 228, 228, 228, 229, 229, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 227, 228, 228, 228, 228, 228, 228, 228, 228, 228, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 230, 230, 230, 230, 230, - 230, 230, 230, 230, 231, 231, 231, 232, 232, 233, - 233, 233, 233, 234 + 229, 229, 229, 229, 229, 229, 229, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 231, 231, 231, 232, + 232, 233, 233, 233, 233, 234 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1350,16 +1350,16 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 3, 4, 1, 1, 1, 2, 2, 2, 2, 2, 3, 4, 7, 3, 1, 2, 2, 2, 2, 2, 3, 4, 7, 1, 1, 2, 1, - 1, 1, 2, 4, 4, 1, 1, 2, 1, 1, - 1, 2, 4, 2, 4, 1, 1, 2, 2, 2, - 2, 3, 0, 5, 0, 7, 1, 1, 2, 3, - 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, - 4, 2, 3, 1, 1, 1, 1, 3, 5, 1, - 2, 4, 1, 1, 1, 1, 0, 6, 0, 7, - 4, 5, 2, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, - 2, 2, 1, 2, 1, 3, 2, 1, 0, 2, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 4, 4, 1, 1, 1, 2, 1, + 1, 1, 2, 4, 2, 4, 1, 1, 1, 2, + 2, 2, 2, 3, 0, 5, 0, 7, 1, 1, + 2, 3, 2, 2, 2, 3, 3, 3, 3, 3, + 3, 4, 4, 2, 3, 1, 1, 1, 1, 3, + 5, 1, 2, 4, 1, 1, 1, 1, 0, 6, + 0, 7, 4, 5, 2, 3, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 2, 2, 2, 1, 2, 1, 3, 2, 1, + 0, 2, 1, 2, 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, @@ -1370,23 +1370,23 @@ static const yytype_uint8 yyr2[] = 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, 1, 1, - 1, 1, 1, 3, 1, 4, 7, 7, 4, 4, - 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, + 1, 1, 1, 1, 1, 3, 1, 4, 7, 7, + 4, 4, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 5, 4, 4, 3, 3, 3, 3, 1, 4, - 7, 7, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 2, 5, 2, - 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 5, 4, 4, 3, 3, 3, 3, + 1, 4, 7, 7, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, + 5, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 5, 4, 4, 3, 3, 3, 3, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, - 7, 7, 4, 4, 2, 5, 2, 2, 2, 2, + 3, 3, 3, 3, 5, 4, 4, 3, 3, 3, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 4, 7, 7, 4, 4, 2, 5, 2, 2, + 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 5, 4, - 4, 3, 3, 3, 3, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, - 1, 2, 2, 0 + 5, 4, 4, 3, 3, 3, 3, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, + 1, 1, 1, 2, 2, 0 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -1394,1110 +1394,1105 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 0, 583, 0, 0, 0, 583, 5, 523, 519, 522, - 579, 580, 525, 526, 0, 0, 0, 0, 0, 0, - 0, 0, 521, 0, 0, 0, 0, 527, 0, 0, - 0, 0, 520, 0, 0, 0, 0, 0, 0, 0, - 0, 3, 468, 524, 217, 287, 288, 290, 291, 273, - 0, 0, 304, 272, 302, 297, 293, 294, 292, 296, - 274, 0, 275, 295, 307, 289, 583, 4, 219, 220, - 221, 0, 263, 0, 216, 284, 285, 286, 1, 20, - 583, 583, 21, 583, 583, 583, 0, 31, 583, 0, - 0, 583, 0, 0, 0, 0, 583, 583, 0, 583, - 583, 0, 583, 583, 6, 15, 7, 18, 0, 13, - 46, 14, 16, 17, 33, 583, 0, 583, 583, 583, - 583, 583, 0, 583, 583, 583, 236, 0, 487, 0, - 0, 235, 583, 583, 0, 0, 583, 583, 493, 491, - 492, 490, 217, 287, 288, 290, 291, 304, 302, 297, - 293, 292, 296, 295, 289, 0, 0, 432, 489, 0, + 0, 585, 0, 0, 0, 585, 5, 525, 521, 524, + 581, 582, 527, 528, 0, 0, 0, 0, 0, 0, + 0, 0, 523, 0, 0, 0, 0, 529, 0, 0, + 0, 0, 522, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 470, 526, 217, 225, 289, 290, 292, 293, + 275, 0, 0, 306, 274, 304, 299, 295, 296, 294, + 298, 276, 0, 277, 297, 309, 291, 585, 4, 219, + 220, 221, 0, 265, 0, 216, 286, 287, 288, 1, + 20, 585, 585, 21, 585, 585, 585, 0, 31, 585, + 0, 0, 585, 0, 0, 0, 0, 585, 585, 0, + 585, 585, 0, 585, 585, 6, 15, 7, 18, 0, + 13, 46, 14, 16, 17, 33, 585, 0, 585, 585, + 585, 585, 585, 0, 585, 585, 585, 238, 0, 489, + 0, 0, 237, 585, 585, 0, 0, 585, 585, 495, + 493, 494, 492, 217, 289, 290, 292, 293, 306, 304, + 299, 295, 294, 298, 297, 291, 0, 0, 434, 491, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 581, 582, 583, 0, 306, 303, 293, 299, - 293, 298, 301, 577, 578, 218, 300, 0, 583, 583, - 583, 583, 583, 583, 240, 207, 583, 0, 261, 242, - 222, 583, 44, 43, 45, 583, 34, 39, 22, 583, - 0, 37, 0, 0, 42, 583, 0, 25, 24, 23, - 40, 36, 0, 0, 129, 0, 0, 19, 0, 282, - 38, 41, 80, 226, 0, 0, 0, 0, 11, 0, - 0, 49, 228, 229, 230, 263, 0, 225, 0, 431, - 430, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 237, 583, 239, 238, 0, 0, 0, 0, 0, - 0, 0, 0, 518, 502, 503, 504, 505, 506, 507, - 510, 511, 517, 0, 499, 500, 501, 508, 509, 497, - 498, 494, 495, 496, 516, 515, 0, 0, 241, 0, - 305, 583, 212, 208, 209, 211, 210, 0, 583, 269, - 0, 266, 265, 262, 264, 0, 583, 583, 35, 32, - 583, 0, 0, 0, 583, 276, 0, 583, 0, 0, - 57, 283, 66, 68, 51, 0, 0, 583, 227, 583, - 0, 308, 168, 0, 0, 48, 47, 0, 233, 231, - 472, 486, 478, 474, 476, 477, 484, 0, 483, 473, - 480, 0, 479, 482, 485, 0, 481, 475, 469, 433, - 0, 514, 513, 224, 213, 0, 0, 429, 428, 270, - 259, 223, 583, 0, 0, 247, 246, 583, 278, 0, - 0, 280, 583, 0, 30, 141, 142, 0, 0, 0, - 0, 131, 132, 583, 140, 130, 59, 61, 0, 583, - 0, 0, 583, 0, 0, 583, 186, 187, 0, 583, - 583, 583, 583, 583, 0, 185, 583, 70, 0, 583, - 0, 8, 0, 583, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 50, 583, 143, 0, 0, 488, 0, - 512, 583, 214, 267, 0, 243, 0, 0, 0, 0, - 248, 583, 0, 281, 583, 0, 0, 583, 0, 134, - 583, 136, 583, 0, 196, 197, 0, 583, 583, 583, - 583, 583, 583, 583, 195, 0, 58, 583, 569, 565, - 568, 571, 572, 158, 0, 0, 0, 567, 0, 573, - 0, 0, 0, 566, 0, 0, 0, 0, 0, 0, - 159, 162, 583, 184, 528, 570, 157, 0, 0, 0, - 52, 583, 234, 0, 583, 192, 188, 189, 191, 190, - 76, 583, 12, 583, 169, 309, 310, 308, 0, 583, - 583, 0, 174, 176, 173, 171, 0, 150, 146, 0, - 96, 97, 98, 99, 100, 101, 104, 105, 120, 108, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 124, 123, 107, 106, 93, 95, 94, 102, 103, - 91, 92, 88, 89, 90, 87, 0, 0, 86, 144, - 147, 149, 148, 0, 0, 0, 155, 583, 0, 53, - 166, 232, 0, 0, 0, 271, 0, 0, 0, 252, - 574, 0, 251, 0, 250, 0, 0, 0, 583, 249, - 583, 0, 0, 0, 277, 29, 0, 583, 0, 125, - 128, 126, 133, 583, 202, 198, 199, 201, 200, 0, - 0, 583, 138, 164, 60, 583, 0, 62, 0, 0, - 583, 0, 534, 183, 0, 0, 539, 538, 537, 0, - 0, 536, 583, 161, 0, 583, 0, 0, 0, 0, + 0, 0, 0, 583, 584, 585, 0, 308, 305, 295, + 301, 295, 300, 303, 579, 580, 218, 302, 0, 585, + 585, 585, 585, 585, 585, 242, 207, 585, 0, 263, + 244, 222, 585, 44, 43, 45, 585, 34, 39, 22, + 585, 0, 37, 0, 0, 42, 585, 0, 25, 24, + 23, 40, 36, 0, 0, 129, 0, 0, 19, 0, + 284, 38, 41, 80, 227, 236, 0, 0, 0, 0, + 11, 0, 0, 49, 229, 230, 231, 265, 0, 226, + 0, 433, 432, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 239, 585, 241, 240, 0, 0, 0, + 0, 0, 0, 0, 0, 520, 504, 505, 506, 507, + 508, 509, 512, 513, 519, 0, 501, 502, 503, 510, + 511, 499, 500, 496, 497, 498, 518, 517, 0, 0, + 243, 0, 307, 585, 212, 208, 209, 211, 210, 0, + 585, 271, 0, 268, 267, 264, 266, 0, 585, 585, + 35, 32, 585, 0, 0, 0, 585, 278, 0, 585, + 0, 0, 57, 285, 66, 68, 51, 0, 0, 585, + 228, 585, 0, 310, 168, 0, 0, 48, 47, 0, + 234, 232, 474, 488, 480, 476, 478, 479, 486, 0, + 485, 475, 482, 0, 481, 484, 487, 0, 483, 477, + 471, 435, 0, 516, 515, 224, 213, 0, 0, 431, + 430, 272, 261, 223, 585, 0, 0, 249, 248, 585, + 280, 0, 0, 282, 585, 0, 30, 141, 142, 0, + 0, 0, 0, 131, 132, 585, 140, 130, 59, 61, + 0, 585, 0, 0, 585, 0, 0, 585, 186, 187, + 0, 585, 585, 585, 585, 585, 0, 185, 585, 70, + 0, 585, 0, 8, 0, 585, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 585, 143, 0, 0, + 490, 0, 514, 585, 214, 269, 0, 245, 0, 0, + 0, 0, 250, 585, 0, 283, 585, 0, 0, 585, + 0, 134, 585, 136, 585, 0, 196, 197, 0, 585, + 585, 585, 585, 585, 585, 585, 195, 0, 58, 585, + 571, 567, 570, 573, 574, 158, 0, 0, 0, 569, + 0, 575, 0, 0, 0, 568, 0, 0, 0, 0, + 0, 0, 159, 162, 585, 184, 530, 572, 157, 0, + 0, 0, 52, 585, 235, 0, 585, 192, 188, 189, + 191, 190, 76, 585, 12, 585, 169, 311, 312, 310, + 0, 585, 585, 0, 174, 176, 173, 171, 0, 150, + 146, 0, 96, 97, 98, 99, 100, 101, 104, 105, + 120, 108, 109, 110, 111, 112, 113, 114, 115, 116, + 117, 118, 119, 124, 123, 107, 106, 93, 95, 94, + 102, 103, 91, 92, 88, 89, 90, 87, 0, 0, + 86, 144, 147, 149, 148, 0, 0, 0, 155, 585, + 0, 53, 166, 233, 0, 0, 0, 273, 0, 0, + 0, 254, 576, 0, 253, 0, 252, 0, 0, 0, + 585, 251, 585, 0, 0, 0, 279, 29, 0, 585, + 0, 125, 128, 126, 133, 585, 202, 198, 199, 201, + 200, 0, 0, 585, 138, 164, 60, 585, 0, 62, + 0, 0, 585, 0, 536, 183, 0, 0, 541, 540, + 539, 0, 0, 538, 585, 161, 0, 585, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 583, 0, 55, 78, 193, 583, 0, 0, - 312, 313, 317, 314, 321, 315, 316, 318, 319, 320, - 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, + 0, 0, 0, 0, 585, 0, 55, 78, 193, 585, + 0, 0, 314, 315, 319, 316, 323, 317, 318, 320, + 321, 322, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, - 362, 363, 364, 365, 366, 383, 367, 368, 369, 370, + 362, 363, 364, 365, 366, 367, 368, 385, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, - 381, 382, 384, 385, 386, 387, 388, 389, 390, 391, + 381, 382, 383, 384, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, - 402, 403, 404, 583, 421, 422, 423, 414, 426, 410, - 411, 409, 416, 417, 405, 406, 407, 408, 415, 413, - 420, 418, 424, 419, 412, 425, 311, 0, 9, 0, - 0, 172, 175, 151, 145, 122, 121, 154, 153, 167, - 583, 0, 0, 471, 470, 583, 268, 576, 258, 575, - 257, 256, 255, 254, 253, 245, 279, 0, 26, 0, - 135, 139, 137, 203, 206, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 165, 434, 0, 0, 64, - 0, 0, 583, 583, 0, 583, 0, 0, 0, 564, - 82, 67, 81, 160, 163, 0, 180, 548, 549, 550, - 551, 552, 553, 556, 557, 563, 0, 545, 546, 547, - 554, 555, 543, 544, 540, 541, 542, 562, 561, 0, - 0, 0, 72, 69, 0, 583, 0, 194, 583, 0, - 170, 10, 177, 583, 178, 0, 152, 54, 215, 0, - 0, 583, 0, 0, 0, 0, 444, 442, 443, 441, - 0, 0, 440, 0, 0, 0, 0, 0, 0, 0, + 402, 403, 404, 405, 406, 585, 423, 424, 425, 416, + 428, 412, 413, 411, 418, 419, 407, 408, 409, 410, + 417, 415, 422, 420, 426, 421, 414, 427, 313, 0, + 9, 0, 0, 172, 175, 151, 145, 122, 121, 154, + 153, 167, 585, 0, 0, 473, 472, 585, 270, 578, + 260, 577, 259, 258, 257, 256, 255, 247, 281, 0, + 26, 0, 135, 139, 137, 203, 206, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 165, 436, 0, + 0, 64, 0, 0, 585, 585, 0, 585, 0, 0, + 0, 566, 82, 67, 81, 160, 163, 0, 180, 550, + 551, 552, 553, 554, 555, 558, 559, 565, 0, 547, + 548, 549, 556, 557, 545, 546, 542, 543, 544, 564, + 563, 0, 0, 0, 72, 69, 0, 585, 0, 194, + 585, 0, 170, 10, 177, 585, 178, 0, 152, 54, + 215, 0, 0, 585, 0, 0, 0, 0, 446, 444, + 445, 443, 0, 0, 442, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 204, 0, 63, 533, 583, 181, - 0, 0, 532, 0, 529, 83, 0, 167, 0, 560, - 559, 74, 583, 56, 0, 583, 71, 427, 0, 583, - 27, 28, 0, 0, 0, 0, 0, 0, 467, 453, - 454, 455, 456, 457, 458, 459, 460, 466, 0, 450, - 451, 452, 448, 449, 445, 446, 447, 465, 464, 0, - 0, 65, 182, 0, 535, 0, 0, 558, 583, 0, - 583, 77, 179, 156, 583, 439, 0, 438, 0, 435, - 0, 463, 462, 0, 0, 84, 0, 0, 583, 79, - 205, 0, 0, 461, 531, 530, 85, 583, 73, 0, - 0, 75, 437, 436 + 0, 0, 0, 0, 0, 0, 204, 0, 63, 535, + 585, 181, 0, 0, 534, 0, 531, 83, 0, 167, + 0, 562, 561, 74, 585, 56, 0, 585, 71, 429, + 0, 585, 27, 28, 0, 0, 0, 0, 0, 0, + 469, 455, 456, 457, 458, 459, 460, 461, 462, 468, + 0, 452, 453, 454, 450, 451, 447, 448, 449, 467, + 466, 0, 0, 65, 182, 0, 537, 0, 0, 560, + 585, 0, 585, 77, 179, 156, 585, 441, 0, 440, + 0, 437, 0, 465, 464, 0, 0, 84, 0, 0, + 585, 79, 205, 0, 0, 463, 533, 532, 85, 585, + 73, 0, 0, 75, 439, 438 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 4, 5, 440, 441, 105, 349, 106, 107, 219, - 108, 109, 110, 357, 423, 453, 530, 237, 418, 495, - 496, 654, 250, 419, 422, 543, 992, 1038, 707, 925, - 891, 599, 640, 111, 235, 410, 411, 412, 413, 454, - 840, 519, 520, 652, 608, 355, 551, 552, 521, 434, - 493, 204, 66, 251, 128, 67, 68, 326, 69, 327, - 394, 395, 470, 70, 71, 323, 319, 320, 72, 73, - 112, 402, 474, 113, 74, 75, 76, 77, 438, 439, - 545, 826, 386, 258, 259, 875, 157, 42, 523, 524, - 619, 455, 43, 114 + -1, 4, 5, 442, 443, 106, 351, 107, 108, 220, + 109, 110, 111, 359, 425, 455, 532, 238, 420, 497, + 498, 656, 252, 421, 424, 545, 994, 1040, 709, 927, + 893, 601, 642, 112, 236, 412, 413, 414, 415, 456, + 842, 521, 522, 654, 610, 357, 553, 554, 523, 436, + 495, 205, 67, 253, 129, 68, 69, 328, 70, 329, + 396, 397, 472, 71, 72, 325, 321, 322, 73, 74, + 113, 404, 476, 114, 75, 76, 77, 78, 440, 441, + 547, 828, 388, 260, 261, 877, 158, 42, 525, 526, + 621, 457, 43, 115 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -642 +#define YYPACT_NINF -659 static const yytype_int16 yypact[] = { - 204, -642, 2639, 3671, 43, 3382, -642, -642, -642, -642, - -642, -642, -642, -642, -75, -53, -44, -40, -30, -9, - -2, -11, -642, 24, 28, 32, 3867, -642, 40, 52, - 78, 103, -642, 116, 129, 2639, 2639, 2639, 2639, 1819, - 2639, 3105, -642, 217, -642, -642, -642, -642, -642, -642, - 3830, 176, -642, -642, -642, -642, 4325, -642, 3482, 3482, - -642, 61, -642, 3482, -642, -642, 236, -642, -642, -642, - -642, 169, 48, 86, -642, -642, -642, -642, -642, -642, - 2662, 2662, -642, 2662, 741, 2662, 170, -642, 4333, 189, - 195, 2662, 118, 229, 233, 250, 2662, 2662, 200, 2631, - 2662, 30, 2662, 2662, -642, -642, -642, -642, 2863, -642, - -642, -642, -642, -642, -642, 2639, 3671, 2639, 2639, 2639, - 2639, 2639, 3671, 2639, 2639, 2639, -642, 61, 202, 61, - 61, -642, 2639, 2639, 3671, 3671, 2639, 2639, 59, 59, - 59, 59, -75, -44, -40, -30, -9, -2, 24, 28, - 4239, 2028, 3253, 3602, 129, 203, -71, 3105, 59, 2639, - 2639, 2639, 2639, 2639, 2639, 2639, 2639, 2639, 2639, 2639, - 2639, 2639, 2639, 2639, 2639, 2639, 2639, 2639, 2639, 2639, - 2039, 2639, -642, -642, 236, 2639, -642, -642, 909, -642, - 3482, -642, -642, -642, -642, -642, -642, 226, 236, 236, - 236, 236, 236, 236, 237, -642, -642, 2924, 254, -642, - -28, 2662, -642, -642, -642, 2662, -642, -642, -642, 4272, - 133, -642, 366, 61, -642, -642, 265, -642, -642, -642, - -642, -642, 2639, 2776, -642, 257, 2933, -642, 61, -642, - -642, -642, 251, 252, 3830, 256, 3732, 61, -642, 61, - 324, 270, -642, -642, -642, 48, 86, -642, 255, 279, - -642, 261, 271, 276, 277, 282, 283, 280, 288, 296, - 310, -642, 2639, -642, -642, 325, 326, 329, 308, 331, - 335, 2639, 2639, -642, 3277, 3416, 3003, 3003, 320, 320, - 503, 503, -642, 3031, 3477, 3492, 924, 320, 320, 110, - 110, 59, 59, 59, -642, -642, -63, 564, 237, 1617, - -642, 236, 237, 237, 237, 237, 237, 136, 2639, 61, - 323, -642, -642, -642, -642, 2924, -642, 355, -642, -642, - -642, 360, 367, 385, 3914, -642, 1133, 1116, 3830, 324, - -642, -642, -642, 20, -642, 2639, 3830, 353, -642, -642, - 349, -642, -642, 61, 2139, -642, -642, 220, 100, -28, - -642, -642, -642, -642, -642, -642, -642, 370, -642, -642, - -642, 374, -642, -642, -642, 371, -642, -642, 59, 3105, - 2639, -642, -642, -642, 237, 372, 364, 3105, -642, 37, - -642, 400, 3960, 172, 406, 409, -642, 4006, -642, 519, - 61, -642, -642, 289, -642, -642, -642, 61, 3623, 61, - 410, 417, -642, 227, -642, -642, -642, -642, 220, 1599, - 411, 220, 1599, 220, 1837, 353, -642, -642, 416, 353, - 353, 353, 353, 353, 164, -642, 4052, -642, 398, -642, - 215, -642, 403, 2239, 3052, 420, 220, 220, 2775, 220, - 220, 220, 220, -642, 260, -642, 2924, 2639, -642, 2639, - 3105, 1599, -642, -642, 2639, -642, 657, 830, 901, 369, - -642, -642, 172, -642, -642, -54, 421, 4098, 25, 430, - 227, 433, 1108, 1116, -642, -642, 435, 227, 227, 227, - 227, 227, 227, 113, -642, 220, -642, 260, -642, -642, - -642, -642, -642, -642, 428, 3769, 441, -642, 3867, -642, - 1929, 434, 444, -642, 2639, 2639, 2639, 1819, 2639, 436, - 38, -642, 227, 3227, -642, 217, -642, 220, 345, 437, - -642, 260, -642, 208, 353, 439, 439, 439, 439, 439, - -642, 2639, -642, 1599, -642, 1461, -642, -642, 61, 2639, - 2239, 440, 454, 3105, -642, -642, 220, 224, 224, 567, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, 451, 453, -642, -642, - 224, 224, 224, 408, 298, 2139, -642, 2639, 478, -642, - -642, 400, -50, -12, 460, 3071, 61, 317, 61, -642, - -642, 317, -642, 317, -642, 317, 317, 317, 4144, -642, - 4190, 589, 481, 61, -642, -642, 3671, 113, 3671, -642, - -642, -642, -642, 227, 465, 465, 465, 465, 465, 231, - 2650, 2639, -642, -642, -642, 260, 487, -642, 3671, 3830, - 227, 3671, 477, -642, 3671, 3671, 59, 59, 59, 480, - 72, 59, 560, -642, 1709, 185, 2639, 2639, 2639, 2639, - 2639, 2639, 2639, 2639, 2639, 2639, 2639, 2639, 2639, 2639, - 2639, 2639, 2639, 2639, 2639, 2639, 2639, 2339, 2639, 467, - 614, 485, 560, 506, -642, -642, 439, 1599, 486, 491, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, 492, -642, 508, - 509, -642, 2439, 224, -642, -642, -642, -642, -642, 3052, - 1599, 489, 220, -642, -642, 560, -642, -642, -642, -642, - -642, -642, -642, -642, -642, -642, -642, 511, -642, 512, - -642, -642, -642, 465, 516, 517, 520, 518, 529, 2650, - 2650, 2650, 2650, 1819, 2650, 3261, -642, 521, 538, -642, - 220, 523, 227, 185, 530, 2639, 527, 531, 2639, -642, - -642, -16, -642, -642, -642, 2639, -642, 3277, 3416, 3003, - 3003, 320, 320, 503, 503, -642, 3088, 3477, 3492, 924, - 320, 320, 110, 110, 59, 59, 59, -642, -642, 89, - 733, 537, -642, -16, 220, 1599, 539, -642, 560, 1270, - -642, -642, -642, 2239, 3105, 541, -642, -642, -16, 561, - 563, 1599, 3671, 3671, 3671, 3671, 180, 180, 180, 180, - 565, 96, 180, 2650, 2650, 2650, 2650, 2650, 2650, 2650, - 2650, 2650, 2650, 2650, 2650, 2650, 2650, 2650, 2650, 2650, - 2650, 2650, 2539, 2639, -642, 220, -642, -642, 185, -642, - 562, 568, -642, 572, 59, -642, 573, 3105, 2639, -642, - -642, -642, 1599, -642, 574, 560, -16, -642, 571, 560, - -642, -642, 597, 599, 583, 600, 611, 2650, -642, 3293, - 3507, 479, 479, 384, 384, 758, 758, -642, 3244, 3536, - 2052, 900, 123, 123, 180, 180, 180, -642, -642, 151, - 951, -642, -642, 2639, -642, 2639, 14, 3105, 1599, 603, - 560, -16, -642, -16, 560, -642, 606, -642, 607, 180, - 2650, -642, -642, 152, 156, -642, 608, 609, 560, -16, - -16, 2639, 2639, 3261, -642, -642, -642, 560, -16, 159, - 161, -16, -642, -642 + 191, -659, 2440, 3611, 10, 2563, -659, -659, -659, -659, + -659, -659, -659, -659, -100, -91, -86, -78, -65, -60, + -43, -30, -659, -9, 24, 52, 3807, -659, 55, 59, + 62, 86, -659, 88, 95, 2440, 2440, 2440, 2440, 1620, + 2440, 3118, -659, 212, -659, -659, -659, -659, -659, -659, + -659, 3770, 117, -659, -659, -659, -659, 4285, -659, 3661, + 3661, -659, 103, -659, 3661, -659, -659, 524, -659, -659, + -659, -659, 153, -4, 41, -659, -659, -659, -659, -659, + -659, 4341, 4341, -659, 4341, 2455, 4341, 134, -659, 4292, + 156, 175, 4341, 79, 193, 196, 201, 4341, 4341, 205, + 4187, 4341, 44, 4341, 4341, -659, -659, -659, -659, 2655, + -659, -659, -659, -659, -659, -659, 2440, 3611, 2440, 2440, + 2440, 2440, 2440, 3611, 2440, 2440, 2440, -659, 103, 209, + 103, 103, -659, 2440, 2440, 3611, 3611, 2440, 2440, 81, + 81, 81, 81, -100, -86, -78, -65, -60, -43, -9, + 24, 4179, 1829, 3297, 3483, 95, 219, -87, 3118, 81, + 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, + 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, + 2440, 1840, 2440, -659, -659, 524, 2440, -659, -659, 3600, + -659, 3661, -659, -659, -659, -659, -659, -659, 251, 524, + 524, 524, 524, 524, 524, 206, -659, -659, 2716, 229, + -659, 31, 4341, -659, -659, -659, 4341, -659, -659, -659, + 4236, 87, -659, 373, 103, -659, -659, 270, -659, -659, + -659, -659, -659, 2440, 2726, -659, 268, 2790, -659, 103, + -659, -659, -659, 260, 269, -659, 3770, 271, 3672, 103, + -659, 103, -16, 288, -659, -659, -659, -4, 41, -659, + 275, 295, -659, 280, 284, 285, 292, 298, 299, 310, + 301, 305, 306, -659, 2440, -659, -659, 314, 317, 319, + 330, 321, 323, 2440, 2440, -659, 3290, 3321, 2860, 2860, + 892, 892, 644, 644, -659, 2944, 3336, 3351, 3381, 892, + 892, 559, 559, 81, 81, 81, -659, -659, -79, 954, + 206, 2909, -659, 524, 206, 206, 206, 206, 206, -2, + 2440, 103, 287, -659, -659, -659, -659, 2716, -659, 347, + -659, -659, -659, 352, 361, 362, 3854, -659, 2888, 3493, + 3770, -16, -659, -659, -659, 33, -659, 2440, 3770, 585, + -659, -659, 335, -659, -659, 103, 1940, -659, -659, 341, + 66, 31, -659, -659, -659, -659, -659, -659, -659, 349, + -659, -659, -659, 345, -659, -659, -659, 366, -659, -659, + 81, 3118, 2440, -659, -659, -659, 206, 367, 356, 3118, + -659, 67, -659, 370, 3900, 173, 380, 387, -659, 3946, + -659, 502, 103, -659, -659, 220, -659, -659, -659, 103, + 3563, 103, 386, 397, -659, 389, -659, -659, -659, -659, + 341, 1400, 388, 341, 1400, 341, 2926, 585, -659, -659, + 391, 585, 585, 585, 585, 585, 124, -659, 3992, -659, + 379, -659, 171, -659, 390, 2040, 2962, 399, 341, 341, + 2565, 341, 341, 341, 341, -659, 329, -659, 2716, 2440, + -659, 2440, 3118, 1400, -659, -659, 2440, -659, 467, 1477, + 1587, 247, -659, -659, 173, -659, -659, -51, 412, 4038, + 17, 410, 389, 417, 4304, 3493, -659, -659, 411, 389, + 389, 389, 389, 389, 389, -94, -659, 341, -659, 329, + -659, -659, -659, -659, -659, -659, 408, 3709, 419, -659, + 3807, -659, 1730, 413, 420, -659, 2440, 2440, 2440, 1620, + 2440, 423, 12, -659, 389, 3135, -659, 212, -659, 341, + 197, 424, -659, 329, -659, 164, 585, 426, 426, 426, + 426, 426, -659, 2440, -659, 1400, -659, 1261, -659, -659, + 103, 2440, 2040, 409, 431, 3118, -659, -659, 341, 167, + 167, 555, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, 430, 429, + -659, -659, 167, 167, 167, 210, 265, 1940, -659, 2440, + 452, -659, -659, 370, -49, -46, 437, 3084, 103, 847, + 103, -659, -659, 847, -659, 847, -659, 847, 847, 847, + 4084, -659, 4130, 567, 459, 103, -659, -659, 3611, -94, + 3611, -659, -659, -659, -659, 389, 443, 443, 443, 443, + 443, 189, 792, 2440, -659, -659, -659, 329, 463, -659, + 3611, 3770, 389, 3611, 447, -659, 3611, 3611, 81, 81, + 81, 448, -44, 81, 528, -659, 1510, 93, 2440, 2440, + 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, + 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2140, + 2440, 273, 582, 458, 528, 476, -659, -659, 426, 1400, + 460, 461, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, 465, + -659, 462, 468, -659, 2240, 167, -659, -659, -659, -659, + -659, 2962, 1400, 470, 341, -659, -659, 528, -659, -659, + -659, -659, -659, -659, -659, -659, -659, -659, -659, 474, + -659, 478, -659, -659, -659, 443, 472, 481, 479, 484, + 487, 792, 792, 792, 792, 1620, 792, 3169, -659, 485, + 510, -659, 341, 492, 389, 93, 505, 2440, 496, 507, + 2440, -659, -659, -23, -659, -659, -659, 2440, -659, 3290, + 3321, 2860, 2860, 892, 892, 644, 644, -659, 3101, 3336, + 3351, 3381, 892, 892, 559, 559, 81, 81, 81, -659, + -659, -8, 1418, 501, -659, -23, 341, 1400, 503, -659, + 528, 1123, -659, -659, -659, 2040, 3118, 506, -659, -659, + -23, 520, 523, 1400, 3611, 3611, 3611, 3611, 162, 162, + 162, 162, 508, 74, 162, 792, 792, 792, 792, 792, + 792, 792, 792, 792, 792, 792, 792, 792, 792, 792, + 792, 792, 792, 792, 2340, 2440, -659, 341, -659, -659, + 93, -659, 511, 513, -659, 512, 81, -659, 516, 3118, + 2440, -659, -659, -659, 1400, -659, 518, 528, -23, -659, + 519, 528, -659, -659, 521, 525, 533, 526, 537, 792, + -659, 3306, 3366, 678, 678, 935, 935, 657, 657, -659, + 3152, 3501, 1853, 919, 813, 813, 162, 162, 162, -659, + -659, 90, 1638, -659, -659, 2440, -659, 2440, 37, 3118, + 1400, 529, 528, -23, -659, -23, 528, -659, 534, -659, + 536, 162, 792, -659, -659, 137, 140, -659, 531, 545, + 528, -23, -23, 2440, 2440, 3169, -659, -659, -659, 528, + -23, 147, 150, -23, -659, -659 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -642, -642, -196, -642, 196, -642, -642, 524, -642, -642, - -46, -98, -642, -642, -642, -85, -166, -642, -642, -642, - -120, -214, 532, -642, -642, -642, -642, -642, -642, -642, - -641, -642, -642, 285, -642, -642, -642, 286, 357, -348, - -642, -394, -642, 137, -483, -316, -543, -642, -497, 128, - -380, -122, -34, 543, 267, 5, -88, -642, -72, -642, - -642, -642, 305, -45, -642, -310, -642, -642, -15, 58, - -642, -642, -642, -642, -14, 115, -642, -642, 238, -642, - -19, -642, -455, -115, -20, 175, 554, 153, -642, -642, - -441, 155, -373, -1 + -659, -659, -183, -659, 98, -659, -659, 454, -659, -659, + -21, -95, -659, -659, -659, -160, -234, -659, -659, -659, + -181, -275, 469, -659, -659, -659, -659, -659, -659, -659, + -658, -659, -659, 221, -659, -659, -659, 222, 302, -273, + -659, -423, -659, 77, -495, -328, -543, -659, -504, 76, + -351, 354, -39, 480, 203, -36, -81, -659, -77, -659, + -659, -659, 244, -68, -659, -303, -659, -659, -15, 58, + -659, -659, -659, -659, -24, 207, -659, -659, 170, -659, + -85, -659, -507, -104, -20, -140, 71, -593, -659, -659, + -305, 490, -368, -1 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -262 +#define YYTABLE_NINF -264 static const yytype_int16 yytable[] = { - 6, 234, 262, 263, 264, 265, 266, 830, 268, 269, - 270, 129, 131, 663, 656, 391, 184, 275, 276, 156, - 252, 279, 280, 417, 193, 194, 622, 624, 529, 334, - 478, 182, 420, 183, 212, 213, 253, 214, 216, 217, - 193, 194, 221, 78, 155, 224, 525, 282, 703, 525, - 230, 231, 673, 233, 236, 282, 240, 241, 193, 194, - 115, 923, 308, 254, 631, 205, 283, 614, 282, 985, - 497, 193, 194, 528, 381, 531, 312, 313, 314, 315, - 316, 317, 116, 632, 130, 986, 708, 843, 525, -244, - 167, 117, -244, 255, 257, 118, 193, 194, 557, 558, - 637, 600, 601, 602, 603, 119, 282, 644, 645, 646, - 647, 648, 649, 238, 260, 122, 260, 260, 260, 260, - 260, 261, 260, 260, 260, 844, 120, 267, 193, 194, - 392, 260, 260, 121, 397, 260, 260, 525, 609, 277, - 278, 167, 675, 193, 194, 252, 611, 655, 252, 709, - 421, 1055, 841, 436, 961, 463, 674, 371, 464, 123, - 306, 253, 635, 124, 253, 221, 256, 125, 207, 328, - 525, 189, 878, 191, 192, 132, 848, 894, 196, 699, - 850, 657, 851, 205, 852, 853, 854, 133, 254, 384, - 282, 254, 896, 179, 180, 181, 877, 205, 205, 205, - 205, 205, 205, 209, 938, 321, 477, 282, 833, 889, - 344, 961, 347, 134, 282, 704, 195, -261, 255, 257, - 456, 255, 257, 182, 6, 183, 989, 208, 210, 135, - 193, 194, 445, 1008, 650, 225, 446, 484, 485, 486, - 176, 177, 178, 487, 179, 180, 181, 226, 197, 651, - 330, 136, 198, 968, 969, 970, 239, 971, 972, 973, - 466, 467, 468, 863, 137, 189, 191, 192, 196, 282, - 282, 260, 318, 385, 282, 628, 447, 282, 630, 282, - 883, 469, 271, 488, 273, 274, 206, 996, 1051, 1064, - 218, 256, 199, 1065, 256, 10, 1072, 11, 1073, 540, - 541, 525, 838, 189, 416, 189, 895, 448, 193, 194, - 205, 185, 425, 926, 971, 972, 973, 388, 1, 2, - 3, 651, 324, 414, 222, 6, 396, 193, 194, 6, - 223, 449, 547, 548, 525, 232, 415, 272, 489, 879, - 281, 165, 166, 705, 541, 450, 435, 200, 6, 227, - 451, 167, 490, 228, 1041, 452, 311, 491, 1043, 606, - 607, 201, 492, 426, 427, 428, 202, 651, 864, 429, - 229, 203, 49, 318, 325, 331, 332, 351, 333, 352, - 604, 605, 335, 337, 639, 522, 342, 343, 522, 356, - 998, 345, 360, 341, 414, 606, 607, 282, 361, 1059, - 979, 6, 348, 1060, 350, 959, 960, 367, 362, 430, - 358, 359, 494, 363, 364, 961, 60, 1068, 526, 365, - 366, 526, 616, 62, 435, 368, 1071, 522, 435, 435, - 435, 435, 435, 369, 829, 375, 233, 612, 546, 613, - 324, 351, 554, 352, 353, 354, 935, 370, 174, 175, - 176, 177, 178, 610, 179, 180, 181, 625, 626, 627, - 526, 390, 372, 373, 431, 700, 374, 525, 376, 414, - 6, 660, 377, 6, 389, 393, 522, 398, 432, 494, - 606, 607, 701, 433, 437, 399, 494, 494, 494, 494, - 494, 494, 653, 129, 131, 1032, 610, 670, 957, 958, - 959, 960, 978, 400, 462, 457, 459, 461, 442, 522, - 961, 458, 966, 967, 968, 969, 970, -260, 971, 972, - 973, 494, 669, 471, 618, 618, 618, 472, 700, 475, - 610, 994, 497, 435, 167, 483, 544, 482, 549, 633, - 388, 527, 526, 606, 607, 837, 534, 1002, 260, 554, - 556, 636, 525, 533, 638, 476, 41, 535, 536, 537, - 538, 539, 479, 658, 481, 643, 130, 661, 525, 664, - 665, 324, 832, 672, 702, 541, 531, 834, 831, 159, - 160, 161, 162, 163, 164, 165, 166, 700, 835, 138, - 139, 140, 141, 836, 158, 167, 842, 845, 1039, 857, - 858, 651, 606, 607, 921, 880, 388, 966, 967, 968, - 969, 970, 885, 971, 972, 973, 890, 888, 838, 525, - 922, 620, 620, 620, 924, 882, 927, 655, 928, 936, - 930, 174, 175, 176, 177, 178, 653, 179, 180, 181, - 522, 860, 494, 862, 1057, 931, 943, 932, 939, 940, - 388, 941, 942, 944, 610, 945, 975, 980, 983, 494, - 977, 974, 706, 881, 982, 525, 884, 193, 194, 886, - 887, 892, 991, 522, 610, 618, 995, 919, 999, 618, - 1000, 618, 1001, 618, 618, 618, 168, 169, 170, 171, - 172, 173, 174, 175, 176, 177, 178, 1033, 179, 180, - 181, 892, 1007, 442, 382, 1034, 526, 1035, 1036, 1042, - 1046, 1040, 49, 284, 285, 286, 287, 288, 289, 290, - 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, - 301, 302, 303, 304, 1044, 307, 1045, 1047, 1048, 309, - 1058, 1061, 1062, 329, 828, 1066, 1067, 215, 159, 160, - 161, 162, 163, 164, 165, 166, 60, 937, 993, 442, - 976, 1031, 616, 62, 167, 480, 617, 641, 339, 642, - 981, 847, 620, 849, 861, 662, 620, 629, 620, 340, - 620, 620, 620, 0, 929, 827, 336, 0, 859, 961, - 80, 0, 0, 0, 0, 0, 0, 0, 81, 0, - 0, 0, 546, 876, 0, 0, 522, 83, 84, 85, - 0, 0, 0, 0, 0, 0, 0, 211, 0, 0, - 0, 0, 0, 91, 0, 0, 0, 0, 0, 0, - 0, 0, 96, 0, 0, 378, 379, 97, 0, 526, - 193, 194, 0, 0, 892, 0, 0, 0, 0, 0, - 102, 0, 103, 951, 0, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 0, 179, 180, 181, - 0, 0, 387, 990, 0, 0, 0, 0, 950, 0, - 0, 494, 610, 0, 260, 49, 966, 967, 968, 969, - 970, 522, 971, 972, 973, 0, 0, 0, 0, 424, - 0, 0, 0, 0, 0, 0, 0, 522, 444, 0, - 0, 193, 194, 0, 0, 0, 0, 955, 956, 957, - 958, 959, 960, 0, 526, 0, 0, 892, 0, 60, - 0, 961, 554, 0, 460, 616, 62, 0, 0, 621, - 526, 161, 162, 163, 164, 165, 166, 1003, 1004, 1005, - 1006, 0, 1029, 0, 0, 167, 49, 0, 522, 45, - 0, 46, 47, 48, 0, 0, 159, 160, 161, 162, - 163, 164, 165, 166, 0, 0, 0, 610, 0, 0, - 310, 0, 167, 0, 0, 0, 55, 190, 57, 0, - 0, 526, 0, 0, 892, 0, 0, 553, 892, 0, - 60, 0, 58, 59, 522, 0, 616, 62, 0, 0, - 623, 0, 0, 1053, 0, 1054, 63, 0, 615, 0, - 0, 65, 876, 876, 876, 876, 0, 876, 966, 967, - 968, 969, 970, 0, 971, 972, 973, 526, 0, 892, - 0, 1069, 1070, 892, 946, 947, 948, 949, 0, 952, - 172, 173, 174, 175, 176, 177, 178, 892, 179, 180, - 181, 0, 0, 0, 0, 0, 892, 0, 666, 667, - 668, 0, 671, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 0, 179, 180, 181, 0, 0, - 0, 1052, 0, 0, 0, 387, 0, 0, 0, 0, - 0, 0, 0, 0, 553, 0, 876, 876, 876, 876, - 876, 876, 876, 876, 876, 876, 876, 876, 876, 876, - 876, 876, 876, 876, 876, 0, 405, 406, 1009, 1010, - 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, - 1021, 1022, 1023, 1024, 1025, 1026, 1027, 0, 159, 160, - 161, 162, 163, 164, 165, 166, 0, 80, 0, 839, - 876, 387, 0, 0, 167, 81, 45, 0, 46, 47, - 48, 407, 408, 0, 83, 84, 85, 52, 0, 0, - 0, 0, 1049, 0, 211, 0, 0, 54, 0, 0, - 91, 1056, 0, 55, 56, 57, 0, 0, 0, 96, - 0, 0, 0, 876, 97, 387, 0, 0, 99, 58, - 59, 0, 0, 0, 0, 0, 0, 102, 0, 103, - 0, 409, 0, 63, 0, 1063, 64, 0, 65, 0, - 897, 898, 899, 900, 901, 902, 903, 904, 905, 906, - 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, - 917, 403, 920, 0, 0, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 0, 179, 180, 181, - 404, 0, 0, 710, 711, 712, 713, 714, 715, 716, - 717, 718, 719, 0, 720, 721, 722, 723, 724, 725, - 726, 727, 728, 729, 730, 0, 0, 0, 0, 0, - 0, 731, 732, 733, 734, 735, 736, 737, 738, 739, - 740, 741, 742, 743, 744, 745, 746, 747, 0, 0, - 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, - 758, 759, 760, 761, 0, 762, 0, 763, 764, 765, - 766, 767, 768, 769, 770, 771, 772, 773, 774, 0, - 0, 0, 775, 0, 776, 0, 777, 778, 779, 780, - 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, - 0, 791, 792, 793, 794, 795, 796, 797, 0, 798, - 799, 800, 801, 802, 0, 0, 934, 803, 804, 805, - 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, - 816, 817, 818, 819, 820, 821, 822, 823, 997, 824, - 825, 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, - 0, 0, 984, 0, 0, 0, 0, 0, 0, 987, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 710, 711, 712, 713, 714, 715, - 716, 717, 718, 719, 0, 720, 721, 722, 723, 724, - 725, 726, 727, 728, 729, 730, 0, 553, 0, 0, - 0, 0, 731, 732, 733, 734, 735, 736, 737, 738, - 739, 740, 741, 742, 743, 744, 745, 746, 747, 0, - 0, 748, 749, 750, 751, 752, 753, 754, 755, 756, - 757, 758, 759, 760, 761, 0, 762, 1030, 763, 764, + 6, 531, 132, 156, 658, 235, 194, 195, 665, 832, + 79, 130, 185, 419, 264, 265, 266, 267, 268, 157, + 270, 271, 272, 183, 393, 184, 675, 652, 254, 277, + 278, 284, 255, 281, 282, 116, 710, 480, 705, 284, + 616, 256, 653, 336, 117, 422, 925, 194, 195, 118, + 285, 194, 195, 527, 194, 195, 527, 119, 383, 878, + 213, 214, 987, 215, 217, 218, 206, 633, 222, 284, + 120, 225, 284, 41, 284, 121, 231, 232, 988, 234, + 237, 263, 241, 242, 131, 259, 634, 269, 845, 194, + 195, 846, 122, 891, 257, 527, 123, 194, 195, 279, + 280, 353, 843, 354, 355, 356, 139, 140, 141, 142, + 284, 159, 168, 194, 195, 262, 208, 262, 262, 262, + 262, 262, 711, 262, 262, 262, 124, 239, 611, 991, + 676, 639, 262, 262, 320, 387, 262, 262, 646, 647, + 648, 649, 650, 651, 527, 394, 879, 499, -246, 399, + 530, -246, 533, 254, 637, 613, 254, 255, 210, 125, + 255, 308, 880, 423, 624, 626, 256, 258, 438, 256, + 373, 659, 896, 677, 1057, 559, 560, 527, 602, 603, + 604, 605, 898, -263, 206, 465, 458, 126, 466, 940, + 133, 222, 284, 963, 134, 330, 226, 135, 206, 206, + 206, 206, 206, 206, 332, 706, 323, 346, 284, 349, + 259, 1010, 136, 259, 897, 180, 181, 182, 183, 257, + 184, 479, 257, 137, 657, 6, 10, 1053, 11, 653, + 138, 286, 287, 288, 289, 290, 291, 292, 293, 294, + 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, + 305, 306, 186, 309, 219, 284, 701, 311, 284, 542, + 543, 468, 469, 470, 190, 284, 192, 193, 284, 840, + 207, 197, 998, 262, 1066, 194, 195, 1067, 878, 878, + 878, 878, 471, 878, 1074, 835, 928, 1075, 549, 550, + 630, 223, 258, 632, 865, 258, 973, 974, 975, 707, + 543, 418, 608, 609, 338, 1, 2, 3, 527, 427, + 224, 885, 206, 228, 850, 416, 229, 702, 852, 390, + 853, 230, 854, 855, 856, 653, 866, 6, 398, 881, + 702, 6, 608, 609, 703, 627, 628, 629, 417, 1043, + 233, 527, 320, 1045, 274, 608, 609, 839, 437, 327, + 6, 194, 195, 447, 380, 381, 283, 448, 190, 192, + 193, 197, 878, 878, 878, 878, 878, 878, 878, 878, + 878, 878, 878, 878, 878, 878, 878, 878, 878, 878, + 878, 313, 524, 334, 1061, 524, 416, 337, 1062, 641, + 981, 389, 1000, 702, 339, 344, 190, 449, 190, 486, + 487, 488, 1070, 6, 345, 489, 347, 358, 608, 609, + 923, 1073, 362, 284, 496, 326, 878, 363, 426, 937, + 528, 364, 365, 528, 524, 392, 437, 446, 450, 366, + 437, 437, 437, 437, 437, 367, 368, 369, 370, 614, + 548, 615, 371, 372, 556, 490, 353, 831, 354, 606, + 607, 374, 451, 462, 375, 612, 376, 377, 378, 878, + 379, 416, 528, 234, 608, 609, 452, 395, 662, 400, + 439, 453, 6, 524, 527, 6, 454, 194, 195, 401, + 402, 496, 460, 671, 459, 1034, 132, -262, 496, 496, + 496, 496, 496, 496, 655, 130, 464, 473, 612, 672, + 491, 461, 463, 535, 996, 474, 524, 537, 538, 539, + 540, 541, 477, 484, 492, 485, 555, 546, 529, 493, + 1004, 536, 50, 496, 494, 551, 620, 620, 620, 558, + 635, 638, 612, 980, 326, 437, 198, 617, 640, 310, + 199, 645, 390, 660, 528, 663, 667, 833, 666, 834, + 262, 556, 196, 314, 315, 316, 317, 318, 319, 527, + 674, 704, 543, 209, 211, 836, 61, 837, 131, 838, + 844, 1041, 618, 63, 847, 527, 619, 859, 860, 653, + 200, 882, 887, 227, 892, 890, 840, 668, 669, 670, + 168, 673, 240, 924, 926, 428, 429, 430, 930, 933, + 929, 431, 862, 932, 864, 945, 934, 943, 390, 499, + 938, 941, 708, 947, 389, 942, 944, 1059, 273, 946, + 275, 276, 884, 555, 883, 976, 527, 886, 977, 979, + 888, 889, 982, 984, 985, 201, 993, 524, 655, 1002, + 997, 432, 1003, 1001, 496, 1009, 1035, 1037, 830, 202, + 1036, 1038, 390, 533, 203, 1042, 612, 1044, 1046, 204, + 1048, 496, 1047, 1049, 1050, 326, 1060, 386, 1068, 1063, + 524, 1064, 527, 894, 331, 168, 612, 620, 841, 921, + 389, 620, 1069, 620, 939, 620, 620, 620, 963, 177, + 178, 179, 995, 180, 181, 182, 433, 959, 960, 961, + 962, 978, 1033, 894, 657, 643, 341, 644, 528, 963, + 434, 333, 482, 664, 335, 435, 863, 342, 631, 829, + 931, 0, 0, 0, 389, 0, 0, 0, 0, 343, + 0, 948, 949, 950, 951, 0, 954, 0, 0, 350, + 0, 352, 0, 0, 0, 0, 0, 360, 361, 899, + 900, 901, 902, 903, 904, 905, 906, 907, 908, 909, + 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, + 0, 922, 175, 176, 177, 178, 179, 0, 180, 181, + 182, 0, 0, 983, 0, 968, 969, 970, 971, 972, + 0, 973, 974, 975, 0, 7, 8, 9, 10, 0, + 11, 12, 13, 524, 548, 0, 968, 969, 970, 971, + 972, 391, 973, 974, 975, 1011, 1012, 1013, 1014, 1015, + 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, + 1026, 1027, 1028, 1029, 0, 0, 0, 0, 867, 952, + 0, 528, 0, 0, 963, 444, 894, 0, 0, 0, + 0, 0, 0, 0, 868, 953, 0, 194, 195, 0, + 0, 0, 22, 0, 0, 0, 0, 0, 0, 1051, + 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, + 0, 0, 0, 496, 612, 0, 262, 869, 524, 0, + 870, 0, 478, 0, 32, 0, 0, 0, 0, 481, + 0, 483, 50, 0, 524, 936, 0, 0, 1005, 1006, + 1007, 1008, 1065, 166, 167, 0, 0, 871, 0, 0, + 0, 872, 873, 168, 0, 874, 528, 875, 0, 894, + 0, 876, 0, 0, 556, 0, 957, 958, 959, 960, + 961, 962, 528, 970, 971, 972, 61, 973, 974, 975, + 963, 0, 618, 63, 1031, 524, 961, 962, 622, 622, + 622, 986, 0, 0, 0, 0, 963, 0, 989, 160, + 161, 162, 163, 164, 165, 166, 167, 0, 0, 612, + 0, 0, 0, 0, 0, 168, 0, 0, 0, 0, + 0, 0, 0, 528, 0, 0, 894, 0, 0, 0, + 894, 524, 0, 0, 0, 0, 555, 0, 0, 0, + 0, 0, 0, 0, 0, 1055, 0, 1056, 0, 0, + 175, 176, 177, 178, 179, 0, 180, 181, 182, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 528, + 444, 894, 0, 1071, 1072, 894, 1032, 968, 969, 970, + 971, 972, 0, 973, 974, 975, 0, 0, 0, 894, + 0, 1039, 0, 968, 969, 970, 971, 972, 894, 973, + 974, 975, 0, 0, 0, 0, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 0, 180, 181, + 182, 0, 0, 0, 384, 0, 444, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 849, 622, + 851, 0, 0, 622, 0, 622, 0, 622, 622, 622, + 0, 0, 0, 0, 0, 861, 712, 713, 714, 715, + 716, 717, 718, 719, 720, 721, 0, 722, 723, 724, + 725, 726, 727, 728, 729, 730, 731, 732, 0, 0, + 0, 0, 0, 0, 733, 734, 735, 736, 737, 738, + 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, + 749, 0, 0, 750, 751, 752, 753, 754, 755, 756, + 757, 758, 759, 760, 761, 762, 763, 0, 764, 0, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, - 0, 0, 1037, 775, 0, 776, 0, 777, 778, 779, + 775, 776, 0, 0, 0, 777, 0, 778, 0, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, - 790, 0, 791, 792, 793, 794, 795, 796, 797, 0, - 798, 799, 800, 801, 802, 0, 0, 0, 803, 804, + 790, 791, 792, 0, 793, 794, 795, 796, 797, 798, + 799, 0, 800, 801, 802, 803, 804, 0, 0, 0, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, - 815, 816, 817, 818, 819, 820, 821, 822, 823, 0, - 824, 825, 498, 499, 500, 10, 0, 11, 501, 502, - 44, 0, 0, 503, 0, 0, 0, 0, 0, 0, + 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, + 825, 999, 826, 827, 712, 713, 714, 715, 716, 717, + 718, 719, 720, 721, 0, 722, 723, 724, 725, 726, + 727, 728, 729, 730, 731, 732, 0, 0, 0, 0, + 0, 0, 733, 734, 735, 736, 737, 738, 739, 740, + 741, 742, 743, 744, 745, 746, 747, 748, 749, 0, + 0, 750, 751, 752, 753, 754, 755, 756, 757, 758, + 759, 760, 761, 762, 763, 0, 764, 0, 765, 766, + 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, + 0, 0, 0, 777, 0, 778, 0, 779, 780, 781, + 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, + 792, 0, 793, 794, 795, 796, 797, 798, 799, 0, + 800, 801, 802, 803, 804, 0, 0, 0, 805, 806, + 807, 808, 809, 810, 811, 812, 813, 814, 815, 816, + 817, 818, 819, 820, 821, 822, 823, 824, 825, 0, + 826, 827, 0, 500, 501, 502, 10, 0, 11, 503, + 504, 44, 0, 0, 505, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 159, 160, 161, 162, 163, 164, 165, 166, - 0, 0, 0, 0, 0, 504, 0, 0, 167, 45, - 0, 46, 47, 48, 49, 505, 0, 51, 0, 0, - 52, 506, 0, 0, 53, 0, 0, 0, 0, 507, - 54, 0, 0, 0, 0, 0, 55, 56, 57, 0, - 0, 0, 0, 508, 0, 509, 0, 0, 0, 0, - 510, 0, 58, 59, 511, 0, 0, 512, 60, 0, - 0, 513, 0, 0, 61, 62, 63, 0, 0, 64, - 0, 65, 498, 499, 500, 10, 0, 11, 501, 502, - 44, 0, 0, 893, 514, 0, 0, 0, 515, 0, - 0, 0, 516, 0, 517, 0, 0, 0, 518, 168, + 0, 0, 0, 160, 161, 162, 163, 164, 165, 166, + 167, 0, 0, 0, 0, 0, 506, 45, 0, 168, + 46, 0, 47, 48, 49, 50, 507, 0, 52, 0, + 0, 53, 508, 0, 0, 54, 0, 0, 0, 0, + 509, 55, 0, 0, 0, 0, 0, 56, 57, 58, + 0, 0, 0, 0, 510, 0, 511, 194, 195, 0, + 0, 512, 0, 59, 60, 513, 0, 0, 514, 61, + 0, 0, 515, 0, 0, 62, 63, 64, 0, 0, + 65, 0, 66, 500, 501, 502, 10, 0, 11, 503, + 504, 44, 0, 0, 895, 516, 0, 0, 1058, 517, + 0, 0, 50, 518, 0, 519, 0, 0, 0, 520, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 0, 179, 180, 181, 383, 504, 0, 0, 0, 45, - 0, 46, 47, 48, 49, 505, 0, 51, 0, 0, - 52, 506, 0, 0, 53, 0, 0, 0, 0, 507, - 54, 0, 0, 0, 0, 0, 55, 56, 57, 0, - 0, 0, 0, 508, 0, 509, 0, 0, 0, 0, - 510, 0, 58, 59, 511, 0, 0, 512, 60, 0, - 0, 513, 0, 0, 61, 62, 63, 0, 0, 64, - 0, 65, 7, 8, 9, 10, 0, 11, 12, 13, - 142, 0, 0, 0, 514, 0, 0, 0, 515, 0, - 0, 0, 516, 0, 517, 0, 0, 0, 518, 0, - 0, 0, 159, 160, 161, 162, 163, 164, 165, 166, - 0, 0, 0, 0, 0, 15, 0, 0, 167, 143, - 0, 144, 145, 146, 49, 50, 0, 51, 0, 0, - 147, 21, 0, 0, 53, 0, 0, 0, 0, 22, - 148, 0, 0, 0, 0, 0, 149, 150, 57, 0, - 0, 0, 0, 26, 0, 27, 0, 0, 0, 0, - 0, 0, 151, 152, 30, 0, 0, 31, 60, 0, - 0, 32, 0, 0, 61, 62, 153, 0, 0, 64, - 0, 154, 498, 499, 500, 10, 0, 11, 501, 502, - 44, 0, 0, 0, 35, 0, 0, 0, 36, 37, - 0, 0, 38, 0, 39, 0, 0, 0, 40, 168, + 179, 0, 180, 181, 182, 0, 506, 45, 992, 0, + 46, 0, 47, 48, 49, 50, 507, 0, 52, 0, + 0, 53, 508, 0, 0, 54, 61, 0, 0, 0, + 509, 55, 618, 63, 0, 0, 623, 56, 57, 58, + 0, 0, 0, 0, 510, 0, 511, 194, 195, 0, + 0, 512, 0, 59, 60, 513, 0, 0, 514, 61, + 0, 0, 515, 0, 0, 62, 63, 64, 0, 0, + 65, 0, 66, 7, 8, 9, 10, 0, 11, 12, + 13, 143, 0, 0, 0, 516, 0, 0, 0, 517, + 0, 0, 50, 518, 0, 519, 0, 0, 0, 520, + 0, 0, 0, 160, 161, 162, 163, 164, 165, 166, + 167, 0, 0, 0, 0, 0, 15, 45, 0, 168, + 144, 0, 145, 146, 147, 50, 51, 0, 52, 0, + 0, 148, 21, 0, 0, 54, 61, 0, 0, 0, + 22, 149, 618, 63, 0, 0, 625, 150, 151, 58, + 0, 0, 0, 0, 26, 0, 27, 0, 0, 0, + 0, 0, 0, 152, 153, 30, 0, 0, 31, 61, + 0, 0, 32, 0, 0, 62, 63, 154, 0, 0, + 65, 0, 155, 500, 501, 502, 10, 0, 11, 503, + 504, 44, 0, 0, 0, 35, 0, 0, 0, 36, + 37, 0, 0, 38, 0, 39, 0, 0, 0, 40, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 0, 179, 180, 181, 532, 504, 0, 0, 0, 45, - 0, 46, 47, 48, 49, 505, 0, 51, 0, 0, - 52, 506, 0, 0, 53, 0, 0, 0, 0, 507, - 54, 0, 0, 0, 0, 0, 55, 56, 57, 0, - 0, 0, 0, 508, 0, 509, 0, 0, 0, 0, - 510, 0, 58, 59, 511, 0, 0, 512, 60, 0, - 0, 513, 0, 0, 61, 62, 63, 0, 0, 64, - 0, 65, 7, 8, 9, 10, 0, 11, 12, 13, - 14, 0, 0, 0, 514, 0, 0, 0, 515, 0, - 0, 0, 516, 0, 517, 0, 0, 0, 518, 955, - 956, 957, 958, 959, 960, 0, 0, 0, 45, 0, - 46, 47, 48, 961, 0, 15, 0, 0, 0, 16, - 0, 17, 18, 19, 0, 0, 0, 0, 0, 0, - 20, 21, 0, 0, 0, 55, 190, 57, 0, 22, - 23, 0, 0, 0, 0, 0, 24, 25, 0, 0, - 0, 58, 59, 26, 0, 27, 0, 0, 0, 0, - 0, 0, 28, 29, 30, 63, 0, 31, 0, 0, - 65, 32, 7, 8, 9, 10, 33, 11, 12, 13, - 14, 34, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 132, 35, 0, 0, 0, 36, 37, - 0, 0, 38, 0, 39, 0, 305, 965, 40, 0, - 966, 967, 968, 969, 970, 15, 971, 972, 973, 16, - 0, 17, 18, 19, 0, 0, 0, 0, 0, 0, - 20, 21, 0, 0, 0, 0, 0, 0, 0, 22, - 23, 0, 0, 0, 0, 0, 24, 25, 0, 0, - 0, 0, 0, 26, 0, 27, 0, 0, 0, 0, - 0, 0, 28, 29, 30, 0, 0, 31, 0, 0, - 0, 32, 7, 8, 9, 10, 33, 11, 12, 13, - 14, 34, 0, 0, 0, 0, 443, 0, 0, 0, - 0, 0, 0, 0, 35, 0, 0, 0, 36, 37, - 0, 0, 38, 0, 39, 0, 0, 0, 40, 0, - 0, 0, 0, 0, 0, 15, 0, 0, 0, 16, - 0, 17, 18, 19, 0, 0, 0, 0, 0, 0, - 20, 21, 0, 0, 0, 0, 0, 0, 0, 22, - 23, 0, 0, 0, 0, 0, 24, 25, 0, 0, - 0, 0, 0, 26, 0, 27, 0, 0, 0, 0, - 0, 0, 28, 29, 30, 0, 0, 31, 0, 0, - 0, 32, 7, 8, 9, 10, 33, 11, 12, 13, - 14, 34, 0, 0, 0, 0, 550, 0, 0, 0, - 0, 0, 0, 0, 35, 0, 0, 0, 36, 37, - 0, 0, 38, 0, 39, 0, 0, 0, 40, 0, - 0, 0, 0, 0, 0, 15, 0, 0, 0, 16, - 0, 17, 18, 19, 0, 0, 0, 0, 0, 0, - 20, 21, 0, 0, 0, 0, 0, 0, 0, 22, - 23, 0, 0, 0, 0, 0, 24, 25, 0, 0, - 0, 0, 0, 26, 0, 27, 0, 0, 0, 0, - 0, 0, 28, 29, 30, 0, 0, 31, 0, 0, - 0, 32, 7, 8, 9, 10, 33, 11, 12, 13, - 14, 34, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 35, 0, 0, 0, 36, 37, - 0, 0, 38, 0, 39, 0, 918, 0, 40, 0, - 0, 0, 0, 0, 0, 15, 0, 0, 0, 16, - 0, 17, 18, 19, 0, 0, 0, 0, 0, 0, - 20, 21, 0, 0, 0, 0, 0, 0, 0, 22, - 23, 0, 0, 0, 0, 0, 24, 25, 0, 0, - 0, 0, 0, 26, 0, 27, 0, 0, 0, 0, - 0, 0, 28, 29, 30, 0, 0, 31, 0, 0, - 0, 32, 7, 8, 9, 10, 33, 11, 12, 13, - 14, 34, 0, 0, 0, 0, 933, 0, 0, 0, - 0, 0, 0, 0, 35, 0, 0, 0, 36, 37, - 0, 0, 38, 0, 39, 0, 0, 0, 40, 0, - 0, 0, 0, 0, 0, 15, 0, 0, 0, 16, - 0, 17, 18, 19, 0, 0, 0, 0, 0, 0, - 20, 21, 0, 0, 0, 0, 0, 0, 0, 22, - 23, 0, 0, 0, 0, 0, 24, 25, 0, 0, - 0, 0, 0, 26, 0, 27, 0, 0, 0, 0, - 0, 0, 28, 29, 30, 0, 0, 31, 0, 0, - 0, 32, 7, 8, 9, 10, 33, 11, 12, 13, - 14, 34, 0, 7, 8, 9, 10, 0, 11, 12, - 13, 0, 0, 0, 35, 0, 0, 0, 36, 37, - 0, 0, 38, 0, 39, 0, 1028, 0, 40, 0, - 80, 0, 0, 0, 0, 15, 0, 0, 81, 16, - 0, 17, 18, 19, 0, 0, 865, 83, 84, 85, - 20, 21, 0, 0, 0, 0, 0, 211, 0, 22, - 23, 80, 866, 91, 0, 0, 24, 25, 0, 81, - 22, 0, 96, 26, 0, 27, 0, 97, 83, 84, - 85, 0, 28, 29, 30, 0, 27, 31, 211, 0, - 102, 32, 103, 0, 91, 867, 33, 0, 868, 0, - 0, 34, 32, 96, 0, 0, 0, -127, 97, 0, - 0, 0, 0, 0, 35, 0, 0, 0, 36, 37, - 0, 102, 38, 103, 39, 869, 0, 0, 40, 870, - 871, 559, 0, 872, 0, 873, 242, 243, 0, 874, - 560, 561, 562, 563, 564, 565, 566, 567, 0, 0, - 0, 0, 0, 0, 0, 0, 568, 0, 569, 570, - 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, - 0, 0, 0, 0, 0, 0, 45, 0, 46, 47, - 48, 49, 244, 0, 245, 581, 0, 52, 0, 0, - 0, 53, 0, 0, 0, 0, 0, 54, 0, 0, - 0, 0, 0, 55, 56, 57, 0, 0, 0, 582, - 0, 0, 0, 246, 0, 0, 0, 0, 0, 58, - 59, 0, 0, 242, 243, 60, 0, 0, 0, 0, - 0, 247, 62, 63, 0, 0, 64, 0, 65, 0, - 0, 0, 0, 583, 0, 0, 584, 0, 585, 586, - 587, 588, 589, 590, 591, 592, 593, 594, 595, 249, - 596, 597, 0, 45, 598, 46, 47, 48, 49, 244, - 0, 245, 0, 0, 52, 0, 0, 0, 53, 0, - 0, 0, 0, 0, 54, 322, 0, 0, 0, 0, - 55, 56, 57, 242, 243, 0, 0, 0, 0, 0, - 246, 0, 0, 0, 0, 0, 58, 59, 0, 0, - 0, 0, 60, 0, 0, 0, 0, 0, 247, 62, - 63, 0, 0, 64, 45, 65, 46, 47, 48, 0, - 248, 0, 0, 45, 0, 46, 47, 48, 49, 338, - 0, 245, 0, 0, 52, 0, 249, 0, 53, 0, - 0, 55, 190, 57, 54, 0, 0, 0, 0, 0, - 55, 56, 57, 0, 0, 0, 0, 58, 59, 0, - 246, 0, 163, 164, 165, 166, 58, 59, 0, 0, - 0, 63, 60, 0, 167, 0, 65, 0, 247, 62, - 63, 0, 0, 64, 0, 65, 159, 160, 161, 162, - 163, 164, 165, 166, 0, 0, 0, 0, 0, 0, - 0, 0, 167, 0, 0, 0, 249, 159, 160, 161, - 162, 163, 164, 165, 166, 0, 0, 0, 0, 0, - 0, 0, 0, 167, 0, 0, 159, 160, 161, 162, - 163, 164, 165, 166, 0, 0, 0, 0, 0, 0, - 0, 0, 167, 159, 160, 161, 162, 163, 164, 165, - 166, 0, 0, 0, 0, 0, 0, 0, 0, 167, - 159, 160, 161, 162, 163, 164, 165, 166, 0, 172, - 173, 174, 175, 176, 177, 178, 167, 179, 180, 181, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 380, 0, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 0, 179, 180, 181, 0, 0, - 0, 555, 0, 0, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 0, 179, 180, 181, 846, - 0, 0, 0, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 0, 179, 180, 181, 988, 0, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 0, 179, 180, 181, 0, 0, 168, 169, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 0, 179, - 180, 181, 676, 677, 678, 679, 680, 681, 682, 683, - 0, 0, 0, 0, 0, 0, 0, 0, 684, 953, - 954, 955, 956, 957, 958, 959, 960, 0, 0, 0, - 0, 0, 0, 0, 0, 961, 953, 954, 955, 956, - 957, 958, 959, 960, 0, 0, 0, 0, 0, 0, - 0, 0, 961, 160, 161, 162, 163, 164, 165, 166, - 0, 0, 0, 45, 0, 46, 47, 48, 167, 954, - 955, 956, 957, 958, 959, 960, 0, 0, 0, 0, - 0, 0, 0, 0, 961, 0, 0, 0, 0, 0, - 55, 190, 57, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 58, 59, 0, 685, - 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, - 63, 696, 697, 698, 1050, 65, 962, 963, 964, 965, - 0, 0, 966, 967, 968, 969, 970, 0, 971, 972, - 973, 0, -2, 962, 963, 964, 965, 0, 133, 966, - 967, 968, 969, 970, 0, 971, 972, 973, 0, 0, + 179, 0, 180, 181, 182, 0, 506, 45, 1054, 0, + 46, 0, 47, 48, 49, 50, 507, 0, 52, 0, + 0, 53, 508, 0, 0, 54, 0, 0, 0, 0, + 509, 55, 0, 0, 0, 0, 0, 56, 57, 58, + 0, 0, 0, 0, 510, 0, 511, 0, 0, 0, + 0, 512, 0, 59, 60, 513, 0, 0, 514, 61, + 0, 0, 515, 0, 0, 62, 63, 64, 0, 0, + 65, 0, 66, 7, 8, 9, 10, 0, 11, 12, + 13, 14, 0, 0, 0, 516, 0, 0, 0, 517, + 0, 0, 0, 518, 0, 519, 0, 0, 0, 520, + 957, 958, 959, 960, 961, 962, 0, 0, 0, 46, + 0, 47, 48, 49, 963, 0, 15, 0, 0, 0, + 16, 0, 17, 18, 19, 0, 0, 0, 0, 0, + 0, 20, 21, 0, 0, 0, 56, 191, 58, 0, + 22, 23, 0, 0, 0, 0, 0, 24, 25, 0, + 0, 0, 59, 60, 26, 0, 27, 0, 0, 0, + 0, 0, 0, 28, 29, 30, 64, 0, 31, 0, + 0, 66, 32, 7, 8, 9, 10, 33, 11, 12, + 13, 14, 34, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 133, 35, 0, 0, 0, 36, + 37, 0, 0, 38, 0, 39, 0, 307, 967, 40, + 0, 968, 969, 970, 971, 972, 15, 973, 974, 975, + 16, 0, 17, 18, 19, 0, 0, 0, 0, 0, + 0, 20, 21, 0, 0, 0, 0, 0, 0, 0, + 22, 23, 0, 0, 0, 0, 0, 24, 25, 0, + 0, 0, 0, 0, 26, 0, 27, 0, 0, 0, + 0, 0, 0, 28, 29, 30, 0, 0, 31, 0, + 0, 0, 32, 7, 8, 9, 10, 33, 11, 12, + 13, 14, 34, 0, 0, 0, 0, 445, 0, 0, + 0, 0, 0, 0, 0, 35, 0, 0, 0, 36, + 37, 0, 0, 38, 0, 39, 0, 0, 0, 40, + 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, + 16, 0, 17, 18, 19, 0, 0, 0, 0, 0, + 0, 20, 21, 0, 0, 0, 0, 0, 0, 0, + 22, 23, 0, 0, 0, 0, 0, 24, 25, 0, + 0, 0, 0, 0, 26, 0, 27, 0, 0, 0, + 0, 0, 0, 28, 29, 30, 0, 0, 31, 0, + 0, 0, 32, 7, 8, 9, 10, 33, 11, 12, + 13, 14, 34, 0, 0, 0, 0, 552, 0, 0, + 0, 0, 0, 0, 0, 35, 0, 0, 0, 36, + 37, 0, 0, 38, 0, 39, 0, 0, 0, 40, + 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, + 16, 0, 17, 18, 19, 0, 0, 0, 0, 0, + 0, 20, 21, 0, 0, 0, 0, 0, 0, 0, + 22, 23, 0, 0, 0, 0, 0, 24, 25, 0, + 0, 0, 0, 0, 26, 0, 27, 0, 0, 0, + 0, 0, 0, 28, 29, 30, 0, 0, 31, 0, + 0, 0, 32, 7, 8, 9, 10, 33, 11, 12, + 13, 14, 34, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 35, 0, 0, 0, 36, + 37, 0, 0, 38, 0, 39, 0, 920, 0, 40, + 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, + 16, 0, 17, 18, 19, 0, 0, 0, 0, 0, + 0, 20, 21, 0, 0, 0, 0, 0, 0, 0, + 22, 23, 0, 0, 0, 0, 0, 24, 25, 0, + 0, 0, 0, 0, 26, 0, 27, 0, 0, 0, + 0, 0, 0, 28, 29, 30, 0, 0, 31, 0, + 0, 0, 32, 7, 8, 9, 10, 33, 11, 12, + 13, 14, 34, 0, 0, 0, 0, 935, 0, 0, + 0, 0, 0, 0, 0, 35, 0, 0, 0, 36, + 37, 0, 0, 38, 0, 39, 0, 0, 0, 40, + 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, + 16, 0, 17, 18, 19, 0, 0, 0, 0, 0, + 0, 20, 21, 0, 0, 0, 0, 0, 0, 0, + 22, 23, 0, 0, 0, 0, 0, 24, 25, 0, + 0, 0, 0, 0, 26, 0, 27, 0, 0, 0, + 0, 0, 0, 28, 29, 30, 0, 0, 31, 0, + 0, 0, 32, 7, 8, 9, 10, 33, 11, 12, + 13, 14, 34, 0, 0, 0, 0, 0, 0, 0, + 0, 216, 0, 0, 0, 35, 0, 0, 0, 36, + 37, 0, 0, 38, 0, 39, 0, 1030, 0, 40, + 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, + 16, 0, 17, 18, 19, 0, 0, 0, 0, 0, + 0, 20, 21, 0, 81, 0, 0, 0, 0, 0, + 22, 23, 82, 0, 0, 0, 0, 24, 25, 0, + 0, 84, 85, 86, 26, 0, 27, 0, 0, 0, + 0, 212, 0, 28, 29, 30, 0, 92, 31, 0, + 0, 0, 32, 0, 0, 0, 97, 33, 0, 0, + 0, 98, 34, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -2, 103, 35, 104, 0, 0, 36, + 37, 561, 0, 38, 0, 39, 0, 0, 0, 40, + 562, 563, 564, 565, 566, 567, 568, 569, 0, 0, + 0, 0, 0, 0, 0, 0, 570, 0, 571, 572, + 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, + 0, 80, 81, 0, 0, 0, 0, 0, 0, 0, + 82, 0, 0, 0, 0, 583, 0, 83, 0, 84, + 85, 86, 87, 0, 0, 88, 0, 0, 0, 89, + 0, 0, 0, 90, 91, 92, 93, 0, 0, 584, + 0, 94, 95, 96, 97, 0, 0, 0, 0, 98, + 99, 0, 0, 100, 0, 243, 244, 101, 0, 0, + 0, 102, 103, 0, 104, 0, 0, 0, 0, 0, + 0, 0, 105, 585, 0, 0, 586, 0, 587, 588, + 589, 590, 591, 592, 593, 594, 595, 596, 597, 0, + 598, 599, 245, 0, 600, 46, 0, 47, 48, 49, + 50, 246, 0, 247, 0, 0, 53, 0, 0, 0, + 54, 0, 0, 0, 0, 0, 55, 324, 0, 0, + 0, 0, 56, 57, 58, 0, 243, 244, 0, 0, + 0, 0, 248, 0, 0, 0, 0, 0, 59, 60, + 0, 0, 0, 0, 61, 0, 0, 0, 0, 0, + 249, 63, 64, 0, 0, 65, 46, 66, 47, 48, + 49, 0, 250, 245, 0, 0, 46, 0, 47, 48, + 49, 50, 246, 0, 247, 0, 0, 53, 251, 0, + 0, 54, 0, 56, 191, 58, 0, 55, 0, 0, + 243, 244, 0, 56, 57, 58, 0, 0, 0, 59, + 60, 0, 0, 248, 0, 0, 0, 0, 0, 59, + 60, 0, 0, 64, 0, 61, 0, 0, 66, 0, + 0, 249, 63, 64, 0, 0, 65, 245, 66, 0, + 46, 0, 47, 48, 49, 50, 340, 0, 247, 0, + 0, 53, 0, 0, 0, 54, 0, 0, 0, 251, + 0, 55, 0, 0, 0, 0, 0, 56, 57, 58, + 0, 0, 0, 0, 0, 0, 0, 248, 0, 164, + 165, 166, 167, 59, 60, 0, 0, 0, 0, 61, + 0, 168, 0, 0, 0, 249, 63, 64, 0, 0, + 65, 0, 66, 160, 161, 162, 163, 164, 165, 166, + 167, 0, 0, 0, 0, 0, 0, 0, 0, 168, + 0, 0, 0, 251, 160, 161, 162, 163, 164, 165, + 166, 167, 0, 0, 0, 0, 0, 0, 0, 0, + 168, 160, 161, 162, 163, 164, 165, 166, 167, 0, + 0, 0, 0, 0, 0, 0, 0, 168, 0, 160, + 161, 162, 163, 164, 165, 166, 167, 0, 0, 0, + 0, 0, 0, 0, 0, 168, 0, 160, 161, 162, + 163, 164, 165, 166, 167, 0, 173, 174, 175, 176, + 177, 178, 179, 168, 180, 181, 182, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 405, 0, 0, 0, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 0, 179, 180, 181, 0, 0, 963, 964, 965, 0, - 0, 966, 967, 968, 969, 970, 0, 971, 972, 973, - 79, 80, 0, 161, 162, 163, 164, 165, 166, 81, - 0, 0, 0, 0, 0, 0, 82, 167, 83, 84, - 85, 86, 0, 0, 87, 0, 0, 0, 88, 0, - 0, 0, 89, 90, 91, 92, 0, 0, 0, 0, - 93, 94, 95, 96, 0, 0, 0, 0, 97, 98, - 0, 0, 99, 0, 0, 0, 100, 0, 0, 0, - 101, 102, 0, 103, 161, 162, 163, 164, 165, 166, - 0, 104, 0, 0, 0, 0, 0, 0, 167, 161, - 162, 163, 164, 165, 166, 0, 0, 0, 0, 0, - 0, 0, 0, 167, 955, 956, 957, 958, 959, 960, - 0, 0, 45, 0, 46, 47, 48, 0, 961, 169, - 170, 171, 172, 173, 174, 175, 176, 177, 178, 0, - 179, 180, 181, 955, 956, 957, 958, 959, 960, 55, - 190, 57, 0, 0, 0, 0, 0, 961, 0, 0, - 0, 0, 0, 0, 0, 58, 59, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, - 0, 0, 0, 0, 65, 0, 0, 0, 0, 0, - 0, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 0, 179, 180, 181, 0, 0, 0, 171, 172, 173, - 174, 175, 176, 177, 178, 0, 179, 180, 181, 0, - 963, 964, 965, 405, 406, 966, 967, 968, 969, 970, - 0, 971, 972, 973, 0, 0, 0, 0, 0, 0, - 0, 0, 45, 0, 46, 47, 48, 0, 0, 0, - 964, 965, 0, 0, 966, 967, 968, 969, 970, 0, - 971, 972, 973, 45, 0, 46, 47, 48, 0, 55, - 190, 57, 44, 0, 52, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 54, 58, 59, 0, 0, 0, - 55, 56, 57, 0, 0, 0, 0, 0, 0, 63, - 0, 0, 0, 0, 65, 0, 58, 59, 0, 0, - 0, 45, 0, 46, 47, 48, 49, 50, 0, 51, - 63, 0, 52, 64, 0, 65, 53, 136, 0, 0, - 0, 0, 54, 44, 0, 0, 0, 0, 55, 56, - 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 58, 59, 0, 0, 0, 0, - 60, 0, 0, 0, 0, 0, 61, 62, 63, 0, - 44, 64, 45, 65, 46, 47, 48, 49, 346, 0, - 51, 0, 0, 52, 0, 0, 0, 53, 0, 0, - 0, 0, 0, 54, 0, 0, 0, 0, 0, 55, - 56, 57, 0, 0, 0, 0, 0, 0, 0, 45, - 0, 46, 47, 48, 49, 58, 59, 51, 0, 0, - 52, 60, 0, 0, 53, 0, 0, 61, 62, 63, - 54, 44, 64, 0, 65, 0, 55, 56, 57, 0, + 179, 0, 180, 181, 182, 406, 0, 0, 0, 0, + 0, 169, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 0, 180, 181, 182, 385, 0, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 0, + 180, 181, 182, 534, 382, 0, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 0, 180, 181, + 182, 557, 0, 0, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 0, 180, 181, 182, 160, + 161, 162, 163, 164, 165, 166, 167, 0, 0, 0, + 0, 0, 0, 0, 0, 168, 160, 161, 162, 163, + 164, 165, 166, 167, 0, 0, 0, 0, 0, 0, + 0, 0, 168, 160, 161, 162, 163, 164, 165, 166, + 167, 0, 0, 0, 0, 0, 0, 0, 0, 168, + 678, 679, 680, 681, 682, 683, 684, 685, 0, 0, + 0, 0, 0, 0, 0, 0, 686, 955, 956, 957, + 958, 959, 960, 961, 962, 0, 0, 0, 0, 0, + 0, 0, 0, 963, 955, 956, 957, 958, 959, 960, + 961, 962, 0, 0, 0, 0, 0, 0, 0, 0, + 963, 0, 848, 0, 0, 0, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 0, 180, 181, + 182, 990, 0, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 0, 180, 181, 182, 0, 0, + 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 0, 180, 181, 182, 0, 0, 687, 688, 689, + 690, 691, 692, 693, 694, 695, 696, 697, 0, 698, + 699, 700, 1052, 0, 964, 965, 966, 967, 0, 0, + 968, 969, 970, 971, 972, 0, 973, 974, 975, 0, + 0, 964, 965, 966, 967, 0, 0, 968, 969, 970, + 971, 972, 0, 973, 974, 975, 161, 162, 163, 164, + 165, 166, 167, 0, 0, 0, 0, 0, 0, 0, + 0, 168, 956, 957, 958, 959, 960, 961, 962, 0, + 0, 0, 0, 0, 0, 0, 0, 963, 162, 163, + 164, 165, 166, 167, 0, 0, 0, 46, 0, 47, + 48, 49, 168, 162, 163, 164, 165, 166, 167, 0, + 0, 0, 0, 0, 0, 0, 0, 168, 162, 163, + 164, 165, 166, 167, 56, 191, 58, 0, 0, 0, + 0, 0, 168, 957, 958, 959, 960, 961, 962, 0, + 59, 60, 0, 0, 0, 0, 0, 963, 162, 163, + 164, 165, 166, 167, 64, 0, 0, 0, 0, 66, + 0, 0, 168, 170, 171, 172, 173, 174, 175, 176, + 177, 178, 179, 0, 180, 181, 182, 0, 0, 965, + 966, 967, 134, 0, 968, 969, 970, 971, 972, 0, + 973, 974, 975, 0, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 0, 180, 181, 182, 0, 0, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 0, + 180, 181, 182, 0, 0, 0, 172, 173, 174, 175, + 176, 177, 178, 179, 0, 180, 181, 182, 0, 965, + 966, 967, 0, 0, 968, 969, 970, 971, 972, 0, + 973, 974, 975, 407, 408, 0, 0, 173, 174, 175, + 176, 177, 178, 179, 0, 180, 181, 182, 957, 958, + 959, 960, 961, 962, 0, 0, 0, 0, 0, 0, + 0, 0, 963, 46, 0, 47, 48, 49, 0, 0, + 0, 0, 0, 46, 0, 47, 48, 49, 409, 410, + 0, 0, 0, 0, 53, 0, 0, 0, 0, 0, + 56, 191, 58, 0, 55, 0, 0, 0, 0, 0, + 56, 57, 58, 407, 408, 0, 59, 60, 0, 0, + 0, 0, 0, 0, 0, 0, 59, 60, 0, 0, + 64, 0, 0, 0, 0, 66, 0, 0, 411, 0, + 64, 0, 0, 65, 0, 66, 0, 0, 0, 0, + 0, 0, 0, 46, 0, 47, 48, 49, 137, 0, + 0, 0, 44, 0, 53, 966, 967, 0, 0, 968, + 969, 970, 971, 972, 55, 973, 974, 975, 0, 0, + 56, 57, 58, 0, 0, 0, 0, 0, 0, 0, + 46, 0, 47, 48, 49, 0, 59, 60, 45, 0, + 0, 46, 0, 47, 48, 49, 50, 51, 0, 52, + 64, 312, 53, 65, 0, 66, 54, 56, 191, 58, + 0, 0, 55, 44, 0, 0, 0, 0, 56, 57, + 58, 0, 0, 59, 60, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 59, 60, 0, 64, 0, 0, + 61, 46, 66, 47, 48, 49, 62, 63, 64, 45, + 44, 65, 46, 66, 47, 48, 49, 50, 348, 0, + 52, 0, 0, 53, 0, 0, 0, 54, 56, 191, + 58, 0, 0, 55, 0, 0, 0, 0, 0, 56, + 57, 58, 0, 0, 59, 60, 45, 0, 0, 46, + 0, 47, 48, 49, 50, 59, 60, 52, 64, 0, + 53, 61, 0, 66, 54, 0, 0, 62, 63, 64, + 55, 44, 65, 0, 66, 0, 56, 57, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 659, 0, 58, 59, 0, 0, 0, 0, 60, 0, - 0, 0, 0, 0, 61, 62, 63, 0, 126, 64, - 45, 65, 46, 47, 48, 49, 0, 0, 51, 0, - 0, 52, 0, 0, 0, 53, 0, 0, 0, 0, - 0, 54, 0, 0, 0, 0, 0, 55, 56, 57, - 0, 0, 0, 0, 0, 0, 0, 45, 0, 46, - 47, 48, 49, 58, 59, 0, 0, 0, 52, 60, - 0, 0, 53, 0, 0, 61, 62, 63, 54, 0, - 64, 0, 65, 0, 55, 56, 57, 0, 0, 0, + 661, 0, 59, 60, 0, 0, 0, 0, 61, 0, + 0, 0, 0, 0, 62, 63, 64, 45, 127, 65, + 46, 66, 47, 48, 49, 50, 0, 0, 52, 0, + 0, 53, 0, 0, 0, 54, 0, 0, 0, 0, + 0, 55, 0, 0, 0, 0, 0, 56, 57, 58, + 0, 0, 0, 0, 0, 0, 0, 46, 0, 47, + 48, 49, 50, 59, 60, 0, 0, 0, 53, 61, + 0, 0, 54, 0, 0, 62, 63, 64, 55, 0, + 65, 0, 66, 0, 56, 57, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 58, 59, 79, 80, 0, 0, 60, 0, 0, 0, - 0, 81, 127, 62, 63, 0, 0, 64, 82, 65, - 83, 84, 85, 86, 0, 0, 87, 0, 0, 0, - 88, 0, 0, 0, 89, 90, 91, 92, 0, 0, - 0, 0, 93, 94, 95, 96, 0, 0, 79, 80, - 97, 98, 0, 0, 99, 0, 0, 81, 100, 0, - 0, 0, 101, 102, 82, 103, 83, 84, 85, 86, - 0, 0, 87, 104, 0, 0, 88, 0, 0, 0, - 89, 90, 91, 92, 0, 0, 0, 0, 93, 94, - 95, 96, 401, 0, 79, 80, 97, 98, 0, 0, - 99, 0, 0, 81, 100, 0, 0, 0, 101, 102, - 82, 103, 83, 84, 85, 86, 0, 0, 87, 104, - 0, 0, 88, 0, 0, 0, 89, 90, 91, 92, - 0, 0, 0, 0, 93, 94, 95, 96, 465, 0, - 79, 80, 97, 98, 0, 0, 99, 0, 0, 81, - 100, 0, 0, 0, 101, 102, 82, 103, 83, 84, - 85, 86, 0, 0, 87, 104, 0, 0, 88, 0, - 0, 0, 89, 90, 91, 92, 0, 0, 0, 0, - 93, 94, 95, 96, 473, 0, 79, 80, 97, 98, - 0, 0, 99, 0, 0, 81, 100, 0, 0, 0, - 101, 102, 82, 103, 83, 84, 85, 86, 0, 0, - 87, 104, 0, 0, 88, 0, 0, 0, 89, 90, - 91, 92, 0, 0, 0, 0, 93, 94, 95, 96, - 542, 0, 79, 80, 97, 98, 0, 0, 99, 0, - 0, 81, 100, 0, 0, 0, 101, 102, 82, 103, - 83, 84, 85, 86, 0, 0, 87, 104, 0, 0, - 88, 0, 0, 0, 89, 90, 91, 92, 0, 0, - 0, 0, 93, 94, 95, 96, 634, 0, 79, 80, - 97, 98, 0, 0, 99, 0, 0, 81, 100, 0, - 0, 0, 101, 102, 82, 103, 83, 84, 85, 86, - 0, 0, 87, 104, 0, 0, 88, 0, 0, 0, - 89, 90, 91, 92, 0, 0, 0, 0, 93, 94, - 95, 96, 855, 0, 0, 0, 97, 98, 0, 45, - 99, 46, 47, 48, 100, 0, 0, 0, 101, 102, - 186, 103, 0, 0, 0, 0, 0, 0, 0, 104, - 187, 0, 0, 0, 0, 0, 55, 188, 57, 0, - 79, 80, 0, 0, 0, 0, 0, 0, 856, 81, - 0, 0, 58, 59, 0, 0, 82, 0, 83, 84, - 85, 86, 0, 0, 87, 0, 63, 0, 88, 0, - 0, 65, 89, 90, 91, 92, 0, 0, 0, 0, - 93, 94, 95, 96, 0, 0, 0, 0, 97, 98, - 0, 0, 99, 0, 125, 45, 100, 46, 47, 48, - 101, 102, 80, 103, 0, 0, 186, 0, 0, 0, - 81, 0, 0, 0, 0, 0, 187, 0, 0, 83, - 84, 85, 55, 188, 57, 0, 0, 0, 0, 211, - 0, 0, 0, 0, 0, 91, 220, 0, 58, 59, - 0, 0, 0, 0, 96, 0, 0, 0, 0, 97, - 0, 0, 63, 0, 0, 0, 0, 65, 0, 0, - 0, 0, 102, 0, 103 + 59, 60, 80, 81, 0, 0, 61, 0, 0, 0, + 0, 82, 128, 63, 64, 0, 0, 65, 83, 66, + 84, 85, 86, 87, 0, 0, 88, 0, 0, 0, + 89, 0, 0, 0, 90, 91, 92, 93, 0, 0, + 0, 0, 94, 95, 96, 97, 0, 0, 80, 81, + 98, 99, 0, 0, 100, 0, 0, 82, 101, 0, + 0, 0, 102, 103, 83, 104, 84, 85, 86, 87, + 0, 0, 88, 105, 0, 0, 89, 0, 0, 0, + 90, 91, 92, 93, 0, 0, 0, 0, 94, 95, + 96, 97, 403, 0, 80, 81, 98, 99, 0, 0, + 100, 0, 0, 82, 101, 0, 0, 0, 102, 103, + 83, 104, 84, 85, 86, 87, 0, 0, 88, 105, + 0, 0, 89, 0, 0, 0, 90, 91, 92, 93, + 0, 0, 0, 0, 94, 95, 96, 97, 467, 0, + 80, 81, 98, 99, 0, 0, 100, 0, 0, 82, + 101, 0, 0, 0, 102, 103, 83, 104, 84, 85, + 86, 87, 0, 0, 88, 105, 0, 0, 89, 0, + 0, 0, 90, 91, 92, 93, 0, 0, 0, 0, + 94, 95, 96, 97, 475, 0, 80, 81, 98, 99, + 0, 0, 100, 0, 0, 82, 101, 0, 0, 0, + 102, 103, 83, 104, 84, 85, 86, 87, 0, 0, + 88, 105, 0, 0, 89, 0, 0, 0, 90, 91, + 92, 93, 0, 0, 0, 0, 94, 95, 96, 97, + 544, 0, 80, 81, 98, 99, 0, 0, 100, 0, + 0, 82, 101, 0, 0, 0, 102, 103, 83, 104, + 84, 85, 86, 87, 0, 0, 88, 105, 0, 0, + 89, 0, 0, 0, 90, 91, 92, 93, 0, 0, + 0, 0, 94, 95, 96, 97, 636, 0, 80, 81, + 98, 99, 0, 0, 100, 0, 0, 82, 101, 0, + 0, 0, 102, 103, 83, 104, 84, 85, 86, 87, + 0, 0, 88, 105, 0, 0, 89, 0, 0, 0, + 90, 91, 92, 93, 0, 0, 0, 0, 94, 95, + 96, 97, 857, 0, 0, 0, 98, 99, 0, 46, + 100, 47, 48, 49, 101, 0, 81, 0, 102, 103, + 187, 104, 0, 0, 82, 0, 0, 0, 0, 105, + 188, 0, 0, 84, 85, 86, 56, 189, 58, 0, + 0, 0, 0, 212, 0, 0, 0, 0, 858, 92, + 0, 0, 59, 60, 0, 0, 0, 0, 97, 0, + 0, 0, 0, 98, 80, 81, 64, 0, 0, 0, + 0, 66, 0, 82, 0, 0, 103, 0, 104, 0, + 83, 0, 84, 85, 86, 87, 0, 0, 88, 0, + 0, 0, 89, -127, 126, 0, 90, 91, 92, 93, + 0, 0, 0, 0, 94, 95, 96, 97, 0, 0, + 0, 0, 98, 99, 0, 46, 100, 47, 48, 49, + 101, 81, 0, 0, 102, 103, 187, 104, 0, 82, + 0, 0, 0, 81, 0, 0, 188, 0, 84, 85, + 86, 82, 56, 189, 58, 0, 0, 0, 212, 0, + 84, 85, 86, 0, 92, 221, 0, 0, 59, 60, + 212, 0, 0, 97, 0, 0, 92, 0, 98, 0, + 81, 0, 64, 0, 0, 97, 0, 66, 82, 0, + 98, 103, 0, 104, 100, 0, 0, 84, 85, 86, + 0, 0, 0, 103, 0, 104, 0, 212, 0, 0, + 0, 0, 0, 92, 0, 0, 0, 0, 0, 0, + 0, 0, 97, 0, 0, 0, 0, 98, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 103, 0, 104 }; #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-642))) + (!!((Yystate) == (-659))) #define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int16 yycheck[] = { - 1, 99, 117, 118, 119, 120, 121, 550, 123, 124, - 125, 26, 26, 510, 497, 325, 50, 132, 133, 39, - 108, 136, 137, 339, 10, 11, 467, 468, 422, 225, - 403, 6, 12, 8, 80, 81, 108, 83, 84, 85, - 10, 11, 88, 0, 39, 91, 419, 118, 531, 422, - 96, 97, 14, 99, 100, 118, 102, 103, 10, 11, - 135, 702, 184, 108, 118, 66, 137, 461, 118, 85, - 418, 10, 11, 421, 137, 423, 198, 199, 200, 201, - 202, 203, 135, 137, 26, 101, 541, 137, 461, 117, - 31, 135, 120, 108, 108, 135, 10, 11, 446, 447, - 480, 449, 450, 451, 452, 135, 118, 487, 488, 489, - 490, 491, 492, 83, 115, 126, 117, 118, 119, 120, - 121, 116, 123, 124, 125, 137, 135, 122, 10, 11, - 326, 132, 133, 135, 330, 136, 137, 510, 454, 134, - 135, 31, 522, 10, 11, 233, 456, 495, 236, 543, - 130, 137, 607, 349, 31, 118, 118, 272, 121, 135, - 180, 233, 137, 135, 236, 211, 108, 135, 120, 215, - 543, 56, 655, 58, 59, 135, 617, 674, 63, 527, - 621, 497, 623, 184, 625, 626, 627, 135, 233, 311, - 118, 236, 675, 134, 135, 136, 651, 198, 199, 200, - 201, 202, 203, 117, 845, 206, 402, 118, 556, 137, - 244, 31, 246, 135, 118, 531, 61, 117, 233, 233, - 120, 236, 236, 6, 225, 8, 137, 72, 73, 126, - 10, 11, 12, 137, 121, 117, 16, 10, 11, 12, - 130, 131, 132, 16, 134, 135, 136, 92, 12, 136, - 117, 135, 16, 130, 131, 132, 101, 134, 135, 136, - 88, 89, 90, 643, 135, 150, 151, 152, 153, 118, - 118, 272, 136, 137, 118, 471, 56, 118, 474, 118, - 660, 109, 127, 56, 129, 130, 117, 928, 137, 137, - 120, 233, 56, 137, 236, 6, 137, 8, 137, 135, - 136, 674, 4, 188, 338, 190, 121, 87, 10, 11, - 311, 135, 346, 707, 134, 135, 136, 318, 114, 115, - 116, 136, 207, 337, 135, 326, 327, 10, 11, 330, - 135, 111, 117, 118, 707, 135, 337, 135, 111, 655, - 137, 21, 22, 135, 136, 125, 347, 111, 349, 120, - 130, 31, 125, 120, 995, 135, 130, 130, 999, 135, - 136, 125, 135, 10, 11, 12, 130, 136, 137, 16, - 120, 135, 55, 136, 120, 220, 10, 117, 223, 119, - 120, 121, 117, 126, 482, 419, 135, 135, 422, 119, - 933, 135, 137, 238, 408, 135, 136, 118, 137, 1040, - 883, 402, 247, 1044, 249, 21, 22, 127, 137, 56, - 255, 256, 413, 137, 137, 31, 99, 1058, 419, 137, - 137, 422, 105, 106, 425, 137, 1067, 461, 429, 430, - 431, 432, 433, 137, 549, 127, 482, 457, 439, 459, - 325, 117, 443, 119, 120, 121, 840, 137, 128, 129, - 130, 131, 132, 454, 134, 135, 136, 88, 89, 90, - 461, 138, 137, 137, 111, 120, 137, 840, 137, 483, - 471, 505, 137, 474, 319, 120, 510, 117, 125, 480, - 135, 136, 137, 130, 135, 118, 487, 488, 489, 490, - 491, 492, 493, 508, 508, 978, 497, 517, 19, 20, - 21, 22, 882, 118, 140, 135, 135, 135, 353, 543, - 31, 137, 128, 129, 130, 131, 132, 117, 134, 135, - 136, 522, 517, 117, 466, 467, 468, 118, 120, 10, - 531, 925, 880, 534, 31, 118, 138, 127, 135, 118, - 541, 130, 543, 135, 136, 137, 130, 941, 549, 550, - 130, 121, 925, 425, 121, 400, 2, 429, 430, 431, - 432, 433, 407, 135, 409, 130, 508, 126, 941, 135, - 126, 456, 118, 137, 137, 136, 924, 10, 138, 15, - 16, 17, 18, 19, 20, 21, 22, 120, 137, 35, - 36, 37, 38, 140, 40, 31, 118, 137, 992, 10, - 119, 136, 135, 136, 137, 118, 607, 128, 129, 130, - 131, 132, 135, 134, 135, 136, 56, 137, 4, 992, - 135, 466, 467, 468, 118, 659, 140, 975, 137, 140, - 138, 128, 129, 130, 131, 132, 637, 134, 135, 136, - 674, 636, 643, 638, 1038, 137, 126, 138, 137, 137, - 651, 135, 135, 135, 655, 126, 118, 127, 127, 660, - 137, 140, 534, 658, 137, 1038, 661, 10, 11, 664, - 665, 672, 135, 707, 675, 617, 137, 697, 137, 621, - 119, 623, 119, 625, 626, 627, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 135, 134, 135, - 136, 702, 137, 548, 140, 137, 707, 135, 135, 138, - 127, 137, 55, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 178, 179, 137, 181, 137, 137, 127, 185, - 137, 135, 135, 219, 548, 137, 137, 6, 15, 16, - 17, 18, 19, 20, 21, 22, 99, 842, 924, 604, - 880, 975, 105, 106, 31, 408, 109, 482, 236, 483, - 885, 616, 617, 618, 637, 508, 621, 472, 623, 236, - 625, 626, 627, -1, 803, 547, 232, -1, 633, 31, - 49, -1, -1, -1, -1, -1, -1, -1, 57, -1, - -1, -1, 803, 650, -1, -1, 840, 66, 67, 68, - -1, -1, -1, -1, -1, -1, -1, 76, -1, -1, - -1, -1, -1, 82, -1, -1, -1, -1, -1, -1, - -1, -1, 91, -1, -1, 281, 282, 96, -1, 840, - 10, 11, -1, -1, 845, -1, -1, -1, -1, -1, - 109, -1, 111, 873, -1, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 131, 132, -1, 134, 135, 136, - -1, -1, 318, 140, -1, -1, -1, -1, 873, -1, - -1, 882, 883, -1, 885, 55, 128, 129, 130, 131, - 132, 925, 134, 135, 136, -1, -1, -1, -1, 345, - -1, -1, -1, -1, -1, -1, -1, 941, 354, -1, - -1, 10, 11, -1, -1, -1, -1, 17, 18, 19, - 20, 21, 22, -1, 925, -1, -1, 928, -1, 99, - -1, 31, 933, -1, 380, 105, 106, -1, -1, 109, - 941, 17, 18, 19, 20, 21, 22, 942, 943, 944, - 945, -1, 972, -1, -1, 31, 55, -1, 992, 50, - -1, 52, 53, 54, -1, -1, 15, 16, 17, 18, - 19, 20, 21, 22, -1, -1, -1, 978, -1, -1, - 71, -1, 31, -1, -1, -1, 77, 78, 79, -1, - -1, 992, -1, -1, 995, -1, -1, 443, 999, -1, - 99, -1, 93, 94, 1038, -1, 105, 106, -1, -1, - 109, -1, -1, 1033, -1, 1035, 107, -1, 464, -1, - -1, 112, 869, 870, 871, 872, -1, 874, 128, 129, - 130, 131, 132, -1, 134, 135, 136, 1038, -1, 1040, - -1, 1061, 1062, 1044, 869, 870, 871, 872, -1, 874, - 126, 127, 128, 129, 130, 131, 132, 1058, 134, 135, - 136, -1, -1, -1, -1, -1, 1067, -1, 514, 515, - 516, -1, 518, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 132, -1, 134, 135, 136, -1, -1, - -1, 140, -1, -1, -1, 541, -1, -1, -1, -1, - -1, -1, -1, -1, 550, -1, 953, 954, 955, 956, - 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, - 967, 968, 969, 970, 971, -1, 10, 11, 953, 954, - 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, - 965, 966, 967, 968, 969, 970, 971, -1, 15, 16, - 17, 18, 19, 20, 21, 22, -1, 49, -1, 605, - 1007, 607, -1, -1, 31, 57, 50, -1, 52, 53, - 54, 55, 56, -1, 66, 67, 68, 61, -1, -1, - -1, -1, 1007, -1, 76, -1, -1, 71, -1, -1, - 82, 1036, -1, 77, 78, 79, -1, -1, -1, 91, - -1, -1, -1, 1050, 96, 651, -1, -1, 100, 93, - 94, -1, -1, -1, -1, -1, -1, 109, -1, 111, - -1, 105, -1, 107, -1, 1050, 110, -1, 112, -1, - 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, - 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, - 696, 118, 698, -1, -1, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 131, 132, -1, 134, 135, 136, - 137, -1, -1, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, -1, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, - -1, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, -1, -1, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, -1, 65, -1, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, -1, - -1, -1, 82, -1, 84, -1, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, - -1, 101, 102, 103, 104, 105, 106, 107, -1, 109, - 110, 111, 112, 113, -1, -1, 832, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, -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, 888, -1, -1, -1, -1, -1, -1, 895, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 3, 4, 5, 6, 7, 8, + 1, 424, 26, 39, 499, 100, 10, 11, 512, 552, + 0, 26, 51, 341, 118, 119, 120, 121, 122, 39, + 124, 125, 126, 6, 327, 8, 14, 121, 109, 133, + 134, 118, 109, 137, 138, 135, 543, 405, 533, 118, + 463, 109, 136, 226, 135, 12, 704, 10, 11, 135, + 137, 10, 11, 421, 10, 11, 424, 135, 137, 652, + 81, 82, 85, 84, 85, 86, 67, 118, 89, 118, + 135, 92, 118, 2, 118, 135, 97, 98, 101, 100, + 101, 117, 103, 104, 26, 109, 137, 123, 137, 10, + 11, 137, 135, 137, 109, 463, 126, 10, 11, 135, + 136, 117, 609, 119, 120, 121, 35, 36, 37, 38, + 118, 40, 31, 10, 11, 116, 120, 118, 119, 120, + 121, 122, 545, 124, 125, 126, 135, 83, 456, 137, + 118, 482, 133, 134, 136, 137, 137, 138, 489, 490, + 491, 492, 493, 494, 512, 328, 653, 420, 117, 332, + 423, 120, 425, 234, 137, 458, 237, 234, 117, 135, + 237, 181, 657, 130, 469, 470, 234, 109, 351, 237, + 274, 499, 676, 524, 137, 448, 449, 545, 451, 452, + 453, 454, 677, 117, 185, 118, 120, 135, 121, 847, + 135, 212, 118, 31, 135, 216, 117, 135, 199, 200, + 201, 202, 203, 204, 117, 533, 207, 246, 118, 248, + 234, 137, 126, 237, 121, 134, 135, 136, 6, 234, + 8, 404, 237, 135, 497, 226, 6, 137, 8, 136, + 135, 160, 161, 162, 163, 164, 165, 166, 167, 168, + 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 180, 135, 182, 120, 118, 529, 186, 118, 135, + 136, 88, 89, 90, 57, 118, 59, 60, 118, 4, + 117, 64, 930, 274, 137, 10, 11, 137, 871, 872, + 873, 874, 109, 876, 137, 558, 709, 137, 117, 118, + 473, 135, 234, 476, 645, 237, 134, 135, 136, 135, + 136, 340, 135, 136, 233, 114, 115, 116, 676, 348, + 135, 662, 313, 120, 619, 339, 120, 120, 623, 320, + 625, 120, 627, 628, 629, 136, 137, 328, 329, 657, + 120, 332, 135, 136, 137, 88, 89, 90, 339, 997, + 135, 709, 136, 1001, 135, 135, 136, 137, 349, 120, + 351, 10, 11, 12, 283, 284, 137, 16, 151, 152, + 153, 154, 955, 956, 957, 958, 959, 960, 961, 962, + 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, + 973, 130, 421, 10, 1042, 424, 410, 117, 1046, 484, + 885, 320, 935, 120, 126, 135, 189, 56, 191, 10, + 11, 12, 1060, 404, 135, 16, 135, 119, 135, 136, + 137, 1069, 137, 118, 415, 208, 1009, 137, 347, 842, + 421, 137, 137, 424, 463, 138, 427, 356, 87, 137, + 431, 432, 433, 434, 435, 137, 137, 127, 137, 459, + 441, 461, 137, 137, 445, 56, 117, 551, 119, 120, + 121, 137, 111, 382, 137, 456, 137, 127, 137, 1052, + 137, 485, 463, 484, 135, 136, 125, 120, 507, 117, + 135, 130, 473, 512, 842, 476, 135, 10, 11, 118, + 118, 482, 137, 519, 135, 980, 510, 117, 489, 490, + 491, 492, 493, 494, 495, 510, 140, 117, 499, 519, + 111, 135, 135, 427, 927, 118, 545, 431, 432, 433, + 434, 435, 10, 127, 125, 118, 445, 138, 130, 130, + 943, 130, 55, 524, 135, 135, 468, 469, 470, 130, + 118, 121, 533, 884, 327, 536, 12, 466, 121, 185, + 16, 130, 543, 135, 545, 126, 126, 138, 135, 118, + 551, 552, 62, 199, 200, 201, 202, 203, 204, 927, + 137, 137, 136, 73, 74, 10, 99, 137, 510, 140, + 118, 994, 105, 106, 137, 943, 109, 10, 119, 136, + 56, 118, 135, 93, 56, 137, 4, 516, 517, 518, + 31, 520, 102, 135, 118, 10, 11, 12, 137, 137, + 140, 16, 638, 138, 640, 126, 138, 135, 609, 882, + 140, 137, 536, 126, 543, 137, 135, 1040, 128, 135, + 130, 131, 661, 552, 660, 140, 994, 663, 118, 137, + 666, 667, 127, 137, 127, 111, 135, 676, 639, 119, + 137, 56, 119, 137, 645, 137, 135, 135, 550, 125, + 137, 135, 653, 926, 130, 137, 657, 138, 137, 135, + 127, 662, 137, 137, 127, 458, 137, 313, 137, 135, + 709, 135, 1040, 674, 220, 31, 677, 619, 607, 699, + 609, 623, 137, 625, 844, 627, 628, 629, 31, 130, + 131, 132, 926, 134, 135, 136, 111, 19, 20, 21, + 22, 882, 977, 704, 977, 484, 237, 485, 709, 31, + 125, 221, 410, 510, 224, 130, 639, 237, 474, 549, + 805, -1, -1, -1, 653, -1, -1, -1, -1, 239, + -1, 871, 872, 873, 874, -1, 876, -1, -1, 249, + -1, 251, -1, -1, -1, -1, -1, 257, 258, 678, + 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, + 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, + -1, 700, 128, 129, 130, 131, 132, -1, 134, 135, + 136, -1, -1, 887, -1, 128, 129, 130, 131, 132, + -1, 134, 135, 136, -1, 3, 4, 5, 6, -1, + 8, 9, 10, 842, 805, -1, 128, 129, 130, 131, + 132, 321, 134, 135, 136, 955, 956, 957, 958, 959, + 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, + 970, 971, 972, 973, -1, -1, -1, -1, 46, 875, + -1, 842, -1, -1, 31, 355, 847, -1, -1, -1, + -1, -1, -1, -1, 62, 875, -1, 10, 11, -1, + -1, -1, 70, -1, -1, -1, -1, -1, -1, 1009, + -1, -1, -1, -1, -1, -1, -1, -1, 86, -1, + -1, -1, -1, 884, 885, -1, 887, 95, 927, -1, + 98, -1, 402, -1, 102, -1, -1, -1, -1, 409, + -1, 411, 55, -1, 943, 834, -1, -1, 944, 945, + 946, 947, 1052, 21, 22, -1, -1, 125, -1, -1, + -1, 129, 130, 31, -1, 133, 927, 135, -1, 930, + -1, 139, -1, -1, 935, -1, 17, 18, 19, 20, + 21, 22, 943, 130, 131, 132, 99, 134, 135, 136, + 31, -1, 105, 106, 974, 994, 21, 22, 468, 469, + 470, 890, -1, -1, -1, -1, 31, -1, 897, 15, + 16, 17, 18, 19, 20, 21, 22, -1, -1, 980, + -1, -1, -1, -1, -1, 31, -1, -1, -1, -1, + -1, -1, -1, 994, -1, -1, 997, -1, -1, -1, + 1001, 1040, -1, -1, -1, -1, 935, -1, -1, -1, + -1, -1, -1, -1, -1, 1035, -1, 1037, -1, -1, + 128, 129, 130, 131, 132, -1, 134, 135, 136, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 1040, + 550, 1042, -1, 1063, 1064, 1046, 975, 128, 129, 130, + 131, 132, -1, 134, 135, 136, -1, -1, -1, 1060, + -1, 990, -1, 128, 129, 130, 131, 132, 1069, 134, + 135, 136, -1, -1, -1, -1, 122, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 132, -1, 134, 135, + 136, -1, -1, -1, 140, -1, 606, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 618, 619, + 620, -1, -1, 623, -1, 625, -1, 627, 628, 629, + -1, -1, -1, -1, -1, 635, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, -1, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, -1, -1, + -1, -1, -1, -1, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, + 47, -1, -1, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, -1, 65, -1, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 77, 78, -1, -1, -1, 82, -1, 84, -1, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, -1, 101, 102, 103, 104, 105, 106, + 107, -1, 109, 110, 111, 112, 113, -1, -1, -1, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 138, 139, 140, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, -1, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, -1, 933, -1, -1, + 19, 20, 21, 22, 23, 24, -1, -1, -1, -1, -1, -1, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, -1, -1, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, -1, 65, 973, 67, 68, + 59, 60, 61, 62, 63, -1, 65, -1, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - -1, -1, 988, 82, -1, 84, -1, 86, 87, 88, + -1, -1, -1, 82, -1, 84, -1, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, -1, 101, 102, 103, 104, 105, 106, 107, -1, 109, 110, 111, 112, 113, -1, -1, -1, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, -1, - 139, 140, 3, 4, 5, 6, -1, 8, 9, 10, - 11, -1, -1, 14, -1, -1, -1, -1, -1, -1, + 139, 140, -1, 3, 4, 5, 6, -1, 8, 9, + 10, 11, -1, -1, 14, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 15, 16, 17, 18, 19, 20, 21, 22, - -1, -1, -1, -1, -1, 46, -1, -1, 31, 50, - -1, 52, 53, 54, 55, 56, -1, 58, -1, -1, - 61, 62, -1, -1, 65, -1, -1, -1, -1, 70, - 71, -1, -1, -1, -1, -1, 77, 78, 79, -1, - -1, -1, -1, 84, -1, 86, -1, -1, -1, -1, - 91, -1, 93, 94, 95, -1, -1, 98, 99, -1, - -1, 102, -1, -1, 105, 106, 107, -1, -1, 110, - -1, 112, 3, 4, 5, 6, -1, 8, 9, 10, - 11, -1, -1, 14, 125, -1, -1, -1, 129, -1, - -1, -1, 133, -1, 135, -1, -1, -1, 139, 122, - 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, - -1, 134, 135, 136, 137, 46, -1, -1, -1, 50, - -1, 52, 53, 54, 55, 56, -1, 58, -1, -1, - 61, 62, -1, -1, 65, -1, -1, -1, -1, 70, - 71, -1, -1, -1, -1, -1, 77, 78, 79, -1, - -1, -1, -1, 84, -1, 86, -1, -1, -1, -1, - 91, -1, 93, 94, 95, -1, -1, 98, 99, -1, - -1, 102, -1, -1, 105, 106, 107, -1, -1, 110, - -1, 112, 3, 4, 5, 6, -1, 8, 9, 10, - 11, -1, -1, -1, 125, -1, -1, -1, 129, -1, - -1, -1, 133, -1, 135, -1, -1, -1, 139, -1, - -1, -1, 15, 16, 17, 18, 19, 20, 21, 22, - -1, -1, -1, -1, -1, 46, -1, -1, 31, 50, - -1, 52, 53, 54, 55, 56, -1, 58, -1, -1, - 61, 62, -1, -1, 65, -1, -1, -1, -1, 70, - 71, -1, -1, -1, -1, -1, 77, 78, 79, -1, - -1, -1, -1, 84, -1, 86, -1, -1, -1, -1, - -1, -1, 93, 94, 95, -1, -1, 98, 99, -1, - -1, 102, -1, -1, 105, 106, 107, -1, -1, 110, - -1, 112, 3, 4, 5, 6, -1, 8, 9, 10, - 11, -1, -1, -1, 125, -1, -1, -1, 129, 130, - -1, -1, 133, -1, 135, -1, -1, -1, 139, 122, - 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, - -1, 134, 135, 136, 137, 46, -1, -1, -1, 50, - -1, 52, 53, 54, 55, 56, -1, 58, -1, -1, - 61, 62, -1, -1, 65, -1, -1, -1, -1, 70, - 71, -1, -1, -1, -1, -1, 77, 78, 79, -1, - -1, -1, -1, 84, -1, 86, -1, -1, -1, -1, - 91, -1, 93, 94, 95, -1, -1, 98, 99, -1, - -1, 102, -1, -1, 105, 106, 107, -1, -1, 110, - -1, 112, 3, 4, 5, 6, -1, 8, 9, 10, - 11, -1, -1, -1, 125, -1, -1, -1, 129, -1, - -1, -1, 133, -1, 135, -1, -1, -1, 139, 17, - 18, 19, 20, 21, 22, -1, -1, -1, 50, -1, - 52, 53, 54, 31, -1, 46, -1, -1, -1, 50, - -1, 52, 53, 54, -1, -1, -1, -1, -1, -1, - 61, 62, -1, -1, -1, 77, 78, 79, -1, 70, - 71, -1, -1, -1, -1, -1, 77, 78, -1, -1, - -1, 93, 94, 84, -1, 86, -1, -1, -1, -1, - -1, -1, 93, 94, 95, 107, -1, 98, -1, -1, - 112, 102, 3, 4, 5, 6, 107, 8, 9, 10, - 11, 112, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 135, 125, -1, -1, -1, 129, 130, - -1, -1, 133, -1, 135, -1, 137, 125, 139, -1, - 128, 129, 130, 131, 132, 46, 134, 135, 136, 50, - -1, 52, 53, 54, -1, -1, -1, -1, -1, -1, - 61, 62, -1, -1, -1, -1, -1, -1, -1, 70, - 71, -1, -1, -1, -1, -1, 77, 78, -1, -1, - -1, -1, -1, 84, -1, 86, -1, -1, -1, -1, - -1, -1, 93, 94, 95, -1, -1, 98, -1, -1, - -1, 102, 3, 4, 5, 6, 107, 8, 9, 10, - 11, 112, -1, -1, -1, -1, 117, -1, -1, -1, - -1, -1, -1, -1, 125, -1, -1, -1, 129, 130, - -1, -1, 133, -1, 135, -1, -1, -1, 139, -1, - -1, -1, -1, -1, -1, 46, -1, -1, -1, 50, - -1, 52, 53, 54, -1, -1, -1, -1, -1, -1, - 61, 62, -1, -1, -1, -1, -1, -1, -1, 70, - 71, -1, -1, -1, -1, -1, 77, 78, -1, -1, - -1, -1, -1, 84, -1, 86, -1, -1, -1, -1, - -1, -1, 93, 94, 95, -1, -1, 98, -1, -1, - -1, 102, 3, 4, 5, 6, 107, 8, 9, 10, - 11, 112, -1, -1, -1, -1, 117, -1, -1, -1, - -1, -1, -1, -1, 125, -1, -1, -1, 129, 130, - -1, -1, 133, -1, 135, -1, -1, -1, 139, -1, - -1, -1, -1, -1, -1, 46, -1, -1, -1, 50, - -1, 52, 53, 54, -1, -1, -1, -1, -1, -1, - 61, 62, -1, -1, -1, -1, -1, -1, -1, 70, - 71, -1, -1, -1, -1, -1, 77, 78, -1, -1, - -1, -1, -1, 84, -1, 86, -1, -1, -1, -1, - -1, -1, 93, 94, 95, -1, -1, 98, -1, -1, - -1, 102, 3, 4, 5, 6, 107, 8, 9, 10, - 11, 112, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 125, -1, -1, -1, 129, 130, - -1, -1, 133, -1, 135, -1, 137, -1, 139, -1, - -1, -1, -1, -1, -1, 46, -1, -1, -1, 50, - -1, 52, 53, 54, -1, -1, -1, -1, -1, -1, - 61, 62, -1, -1, -1, -1, -1, -1, -1, 70, - 71, -1, -1, -1, -1, -1, 77, 78, -1, -1, - -1, -1, -1, 84, -1, 86, -1, -1, -1, -1, - -1, -1, 93, 94, 95, -1, -1, 98, -1, -1, - -1, 102, 3, 4, 5, 6, 107, 8, 9, 10, - 11, 112, -1, -1, -1, -1, 117, -1, -1, -1, - -1, -1, -1, -1, 125, -1, -1, -1, 129, 130, - -1, -1, 133, -1, 135, -1, -1, -1, 139, -1, - -1, -1, -1, -1, -1, 46, -1, -1, -1, 50, - -1, 52, 53, 54, -1, -1, -1, -1, -1, -1, - 61, 62, -1, -1, -1, -1, -1, -1, -1, 70, - 71, -1, -1, -1, -1, -1, 77, 78, -1, -1, - -1, -1, -1, 84, -1, 86, -1, -1, -1, -1, - -1, -1, 93, 94, 95, -1, -1, 98, -1, -1, - -1, 102, 3, 4, 5, 6, 107, 8, 9, 10, - 11, 112, -1, 3, 4, 5, 6, -1, 8, 9, - 10, -1, -1, -1, 125, -1, -1, -1, 129, 130, - -1, -1, 133, -1, 135, -1, 137, -1, 139, -1, - 49, -1, -1, -1, -1, 46, -1, -1, 57, 50, - -1, 52, 53, 54, -1, -1, 46, 66, 67, 68, - 61, 62, -1, -1, -1, -1, -1, 76, -1, 70, - 71, 49, 62, 82, -1, -1, 77, 78, -1, 57, - 70, -1, 91, 84, -1, 86, -1, 96, 66, 67, - 68, -1, 93, 94, 95, -1, 86, 98, 76, -1, - 109, 102, 111, -1, 82, 95, 107, -1, 98, -1, - -1, 112, 102, 91, -1, -1, -1, 126, 96, -1, - -1, -1, -1, -1, 125, -1, -1, -1, 129, 130, - -1, 109, 133, 111, 135, 125, -1, -1, 139, 129, - 130, 6, -1, 133, -1, 135, 10, 11, -1, 139, + -1, -1, -1, 15, 16, 17, 18, 19, 20, 21, + 22, -1, -1, -1, -1, -1, 46, 47, -1, 31, + 50, -1, 52, 53, 54, 55, 56, -1, 58, -1, + -1, 61, 62, -1, -1, 65, -1, -1, -1, -1, + 70, 71, -1, -1, -1, -1, -1, 77, 78, 79, + -1, -1, -1, -1, 84, -1, 86, 10, 11, -1, + -1, 91, -1, 93, 94, 95, -1, -1, 98, 99, + -1, -1, 102, -1, -1, 105, 106, 107, -1, -1, + 110, -1, 112, 3, 4, 5, 6, -1, 8, 9, + 10, 11, -1, -1, 14, 125, -1, -1, 1038, 129, + -1, -1, 55, 133, -1, 135, -1, -1, -1, 139, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, + 132, -1, 134, 135, 136, -1, 46, 47, 140, -1, + 50, -1, 52, 53, 54, 55, 56, -1, 58, -1, + -1, 61, 62, -1, -1, 65, 99, -1, -1, -1, + 70, 71, 105, 106, -1, -1, 109, 77, 78, 79, + -1, -1, -1, -1, 84, -1, 86, 10, 11, -1, + -1, 91, -1, 93, 94, 95, -1, -1, 98, 99, + -1, -1, 102, -1, -1, 105, 106, 107, -1, -1, + 110, -1, 112, 3, 4, 5, 6, -1, 8, 9, + 10, 11, -1, -1, -1, 125, -1, -1, -1, 129, + -1, -1, 55, 133, -1, 135, -1, -1, -1, 139, + -1, -1, -1, 15, 16, 17, 18, 19, 20, 21, + 22, -1, -1, -1, -1, -1, 46, 47, -1, 31, + 50, -1, 52, 53, 54, 55, 56, -1, 58, -1, + -1, 61, 62, -1, -1, 65, 99, -1, -1, -1, + 70, 71, 105, 106, -1, -1, 109, 77, 78, 79, + -1, -1, -1, -1, 84, -1, 86, -1, -1, -1, + -1, -1, -1, 93, 94, 95, -1, -1, 98, 99, + -1, -1, 102, -1, -1, 105, 106, 107, -1, -1, + 110, -1, 112, 3, 4, 5, 6, -1, 8, 9, + 10, 11, -1, -1, -1, 125, -1, -1, -1, 129, + 130, -1, -1, 133, -1, 135, -1, -1, -1, 139, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, + 132, -1, 134, 135, 136, -1, 46, 47, 140, -1, + 50, -1, 52, 53, 54, 55, 56, -1, 58, -1, + -1, 61, 62, -1, -1, 65, -1, -1, -1, -1, + 70, 71, -1, -1, -1, -1, -1, 77, 78, 79, + -1, -1, -1, -1, 84, -1, 86, -1, -1, -1, + -1, 91, -1, 93, 94, 95, -1, -1, 98, 99, + -1, -1, 102, -1, -1, 105, 106, 107, -1, -1, + 110, -1, 112, 3, 4, 5, 6, -1, 8, 9, + 10, 11, -1, -1, -1, 125, -1, -1, -1, 129, + -1, -1, -1, 133, -1, 135, -1, -1, -1, 139, + 17, 18, 19, 20, 21, 22, -1, -1, -1, 50, + -1, 52, 53, 54, 31, -1, 46, -1, -1, -1, + 50, -1, 52, 53, 54, -1, -1, -1, -1, -1, + -1, 61, 62, -1, -1, -1, 77, 78, 79, -1, + 70, 71, -1, -1, -1, -1, -1, 77, 78, -1, + -1, -1, 93, 94, 84, -1, 86, -1, -1, -1, + -1, -1, -1, 93, 94, 95, 107, -1, 98, -1, + -1, 112, 102, 3, 4, 5, 6, 107, 8, 9, + 10, 11, 112, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 135, 125, -1, -1, -1, 129, + 130, -1, -1, 133, -1, 135, -1, 137, 125, 139, + -1, 128, 129, 130, 131, 132, 46, 134, 135, 136, + 50, -1, 52, 53, 54, -1, -1, -1, -1, -1, + -1, 61, 62, -1, -1, -1, -1, -1, -1, -1, + 70, 71, -1, -1, -1, -1, -1, 77, 78, -1, + -1, -1, -1, -1, 84, -1, 86, -1, -1, -1, + -1, -1, -1, 93, 94, 95, -1, -1, 98, -1, + -1, -1, 102, 3, 4, 5, 6, 107, 8, 9, + 10, 11, 112, -1, -1, -1, -1, 117, -1, -1, + -1, -1, -1, -1, -1, 125, -1, -1, -1, 129, + 130, -1, -1, 133, -1, 135, -1, -1, -1, 139, + -1, -1, -1, -1, -1, -1, 46, -1, -1, -1, + 50, -1, 52, 53, 54, -1, -1, -1, -1, -1, + -1, 61, 62, -1, -1, -1, -1, -1, -1, -1, + 70, 71, -1, -1, -1, -1, -1, 77, 78, -1, + -1, -1, -1, -1, 84, -1, 86, -1, -1, -1, + -1, -1, -1, 93, 94, 95, -1, -1, 98, -1, + -1, -1, 102, 3, 4, 5, 6, 107, 8, 9, + 10, 11, 112, -1, -1, -1, -1, 117, -1, -1, + -1, -1, -1, -1, -1, 125, -1, -1, -1, 129, + 130, -1, -1, 133, -1, 135, -1, -1, -1, 139, + -1, -1, -1, -1, -1, -1, 46, -1, -1, -1, + 50, -1, 52, 53, 54, -1, -1, -1, -1, -1, + -1, 61, 62, -1, -1, -1, -1, -1, -1, -1, + 70, 71, -1, -1, -1, -1, -1, 77, 78, -1, + -1, -1, -1, -1, 84, -1, 86, -1, -1, -1, + -1, -1, -1, 93, 94, 95, -1, -1, 98, -1, + -1, -1, 102, 3, 4, 5, 6, 107, 8, 9, + 10, 11, 112, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 125, -1, -1, -1, 129, + 130, -1, -1, 133, -1, 135, -1, 137, -1, 139, + -1, -1, -1, -1, -1, -1, 46, -1, -1, -1, + 50, -1, 52, 53, 54, -1, -1, -1, -1, -1, + -1, 61, 62, -1, -1, -1, -1, -1, -1, -1, + 70, 71, -1, -1, -1, -1, -1, 77, 78, -1, + -1, -1, -1, -1, 84, -1, 86, -1, -1, -1, + -1, -1, -1, 93, 94, 95, -1, -1, 98, -1, + -1, -1, 102, 3, 4, 5, 6, 107, 8, 9, + 10, 11, 112, -1, -1, -1, -1, 117, -1, -1, + -1, -1, -1, -1, -1, 125, -1, -1, -1, 129, + 130, -1, -1, 133, -1, 135, -1, -1, -1, 139, + -1, -1, -1, -1, -1, -1, 46, -1, -1, -1, + 50, -1, 52, 53, 54, -1, -1, -1, -1, -1, + -1, 61, 62, -1, -1, -1, -1, -1, -1, -1, + 70, 71, -1, -1, -1, -1, -1, 77, 78, -1, + -1, -1, -1, -1, 84, -1, 86, -1, -1, -1, + -1, -1, -1, 93, 94, 95, -1, -1, 98, -1, + -1, -1, 102, 3, 4, 5, 6, 107, 8, 9, + 10, 11, 112, -1, -1, -1, -1, -1, -1, -1, + -1, 6, -1, -1, -1, 125, -1, -1, -1, 129, + 130, -1, -1, 133, -1, 135, -1, 137, -1, 139, + -1, -1, -1, -1, -1, -1, 46, -1, -1, -1, + 50, -1, 52, 53, 54, -1, -1, -1, -1, -1, + -1, 61, 62, -1, 49, -1, -1, -1, -1, -1, + 70, 71, 57, -1, -1, -1, -1, 77, 78, -1, + -1, 66, 67, 68, 84, -1, 86, -1, -1, -1, + -1, 76, -1, 93, 94, 95, -1, 82, 98, -1, + -1, -1, 102, -1, -1, -1, 91, 107, -1, -1, + -1, 96, 112, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 0, 109, 125, 111, -1, -1, 129, + 130, 6, -1, 133, -1, 135, -1, -1, -1, 139, 15, 16, 17, 18, 19, 20, 21, 22, -1, -1, -1, -1, -1, -1, -1, -1, 31, -1, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - -1, -1, -1, -1, -1, -1, 50, -1, 52, 53, - 54, 55, 56, -1, 58, 60, -1, 61, -1, -1, - -1, 65, -1, -1, -1, -1, -1, 71, -1, -1, - -1, -1, -1, 77, 78, 79, -1, -1, -1, 84, - -1, -1, -1, 87, -1, -1, -1, -1, -1, 93, - 94, -1, -1, 10, 11, 99, -1, -1, -1, -1, - -1, 105, 106, 107, -1, -1, 110, -1, 112, -1, - -1, -1, -1, 118, -1, -1, 121, -1, 123, 124, - 125, 126, 127, 128, 129, 130, 131, 132, 133, 133, - 135, 136, -1, 50, 139, 52, 53, 54, 55, 56, - -1, 58, -1, -1, 61, -1, -1, -1, 65, -1, - -1, -1, -1, -1, 71, 11, -1, -1, -1, -1, - 77, 78, 79, 10, 11, -1, -1, -1, -1, -1, - 87, -1, -1, -1, -1, -1, 93, 94, -1, -1, - -1, -1, 99, -1, -1, -1, -1, -1, 105, 106, - 107, -1, -1, 110, 50, 112, 52, 53, 54, -1, - 117, -1, -1, 50, -1, 52, 53, 54, 55, 56, - -1, 58, -1, -1, 61, -1, 133, -1, 65, -1, - -1, 77, 78, 79, 71, -1, -1, -1, -1, -1, - 77, 78, 79, -1, -1, -1, -1, 93, 94, -1, - 87, -1, 19, 20, 21, 22, 93, 94, -1, -1, - -1, 107, 99, -1, 31, -1, 112, -1, 105, 106, - 107, -1, -1, 110, -1, 112, 15, 16, 17, 18, - 19, 20, 21, 22, -1, -1, -1, -1, -1, -1, - -1, -1, 31, -1, -1, -1, 133, 15, 16, 17, - 18, 19, 20, 21, 22, -1, -1, -1, -1, -1, - -1, -1, -1, 31, -1, -1, 15, 16, 17, 18, - 19, 20, 21, 22, -1, -1, -1, -1, -1, -1, - -1, -1, 31, 15, 16, 17, 18, 19, 20, 21, + -1, 48, 49, -1, -1, -1, -1, -1, -1, -1, + 57, -1, -1, -1, -1, 60, -1, 64, -1, 66, + 67, 68, 69, -1, -1, 72, -1, -1, -1, 76, + -1, -1, -1, 80, 81, 82, 83, -1, -1, 84, + -1, 88, 89, 90, 91, -1, -1, -1, -1, 96, + 97, -1, -1, 100, -1, 10, 11, 104, -1, -1, + -1, 108, 109, -1, 111, -1, -1, -1, -1, -1, + -1, -1, 119, 118, -1, -1, 121, -1, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, 133, -1, + 135, 136, 47, -1, 139, 50, -1, 52, 53, 54, + 55, 56, -1, 58, -1, -1, 61, -1, -1, -1, + 65, -1, -1, -1, -1, -1, 71, 11, -1, -1, + -1, -1, 77, 78, 79, -1, 10, 11, -1, -1, + -1, -1, 87, -1, -1, -1, -1, -1, 93, 94, + -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, + 105, 106, 107, -1, -1, 110, 50, 112, 52, 53, + 54, -1, 117, 47, -1, -1, 50, -1, 52, 53, + 54, 55, 56, -1, 58, -1, -1, 61, 133, -1, + -1, 65, -1, 77, 78, 79, -1, 71, -1, -1, + 10, 11, -1, 77, 78, 79, -1, -1, -1, 93, + 94, -1, -1, 87, -1, -1, -1, -1, -1, 93, + 94, -1, -1, 107, -1, 99, -1, -1, 112, -1, + -1, 105, 106, 107, -1, -1, 110, 47, 112, -1, + 50, -1, 52, 53, 54, 55, 56, -1, 58, -1, + -1, 61, -1, -1, -1, 65, -1, -1, -1, 133, + -1, 71, -1, -1, -1, -1, -1, 77, 78, 79, + -1, -1, -1, -1, -1, -1, -1, 87, -1, 19, + 20, 21, 22, 93, 94, -1, -1, -1, -1, 99, + -1, 31, -1, -1, -1, 105, 106, 107, -1, -1, + 110, -1, 112, 15, 16, 17, 18, 19, 20, 21, 22, -1, -1, -1, -1, -1, -1, -1, -1, 31, - 15, 16, 17, 18, 19, 20, 21, 22, -1, 126, - 127, 128, 129, 130, 131, 132, 31, 134, 135, 136, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 120, -1, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 132, -1, 134, 135, 136, -1, -1, - -1, 119, -1, -1, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, -1, 134, 135, 136, 118, - -1, -1, -1, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 132, -1, 134, 135, 136, 120, -1, + -1, -1, -1, 133, 15, 16, 17, 18, 19, 20, + 21, 22, -1, -1, -1, -1, -1, -1, -1, -1, + 31, 15, 16, 17, 18, 19, 20, 21, 22, -1, + -1, -1, -1, -1, -1, -1, -1, 31, -1, 15, + 16, 17, 18, 19, 20, 21, 22, -1, -1, -1, + -1, -1, -1, -1, -1, 31, -1, 15, 16, 17, + 18, 19, 20, 21, 22, -1, 126, 127, 128, 129, + 130, 131, 132, 31, 134, 135, 136, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 118, -1, -1, -1, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 132, -1, 134, 135, 136, -1, -1, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131, 132, -1, 134, - 135, 136, 15, 16, 17, 18, 19, 20, 21, 22, - -1, -1, -1, -1, -1, -1, -1, -1, 31, 15, + 132, -1, 134, 135, 136, 137, -1, -1, -1, -1, + -1, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 132, -1, 134, 135, 136, 137, -1, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 132, -1, + 134, 135, 136, 137, 120, -1, 122, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 132, -1, 134, 135, + 136, 119, -1, -1, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 131, 132, -1, 134, 135, 136, 15, 16, 17, 18, 19, 20, 21, 22, -1, -1, -1, -1, -1, -1, -1, -1, 31, 15, 16, 17, 18, 19, 20, 21, 22, -1, -1, -1, -1, -1, -1, - -1, -1, 31, 16, 17, 18, 19, 20, 21, 22, - -1, -1, -1, 50, -1, 52, 53, 54, 31, 16, - 17, 18, 19, 20, 21, 22, -1, -1, -1, -1, - -1, -1, -1, -1, 31, -1, -1, -1, -1, -1, - 77, 78, 79, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 93, 94, -1, 122, - 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, - 107, 134, 135, 136, 120, 112, 122, 123, 124, 125, - -1, -1, 128, 129, 130, 131, 132, -1, 134, 135, - 136, -1, 0, 122, 123, 124, 125, -1, 135, 128, - 129, 130, 131, 132, -1, 134, 135, 136, -1, -1, - 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, - -1, 134, 135, 136, -1, -1, 123, 124, 125, -1, - -1, 128, 129, 130, 131, 132, -1, 134, 135, 136, - 48, 49, -1, 17, 18, 19, 20, 21, 22, 57, - -1, -1, -1, -1, -1, -1, 64, 31, 66, 67, - 68, 69, -1, -1, 72, -1, -1, -1, 76, -1, - -1, -1, 80, 81, 82, 83, -1, -1, -1, -1, - 88, 89, 90, 91, -1, -1, -1, -1, 96, 97, - -1, -1, 100, -1, -1, -1, 104, -1, -1, -1, - 108, 109, -1, 111, 17, 18, 19, 20, 21, 22, - -1, 119, -1, -1, -1, -1, -1, -1, 31, 17, + -1, -1, 31, 15, 16, 17, 18, 19, 20, 21, + 22, -1, -1, -1, -1, -1, -1, -1, -1, 31, + 15, 16, 17, 18, 19, 20, 21, 22, -1, -1, + -1, -1, -1, -1, -1, -1, 31, 15, 16, 17, 18, 19, 20, 21, 22, -1, -1, -1, -1, -1, - -1, -1, -1, 31, 17, 18, 19, 20, 21, 22, - -1, -1, 50, -1, 52, 53, 54, -1, 31, 123, - 124, 125, 126, 127, 128, 129, 130, 131, 132, -1, - 134, 135, 136, 17, 18, 19, 20, 21, 22, 77, - 78, 79, -1, -1, -1, -1, -1, 31, -1, -1, - -1, -1, -1, -1, -1, 93, 94, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 107, - -1, -1, -1, -1, 112, -1, -1, -1, -1, -1, - -1, 124, 125, 126, 127, 128, 129, 130, 131, 132, - -1, 134, 135, 136, -1, -1, -1, 125, 126, 127, + -1, -1, -1, 31, 15, 16, 17, 18, 19, 20, + 21, 22, -1, -1, -1, -1, -1, -1, -1, -1, + 31, -1, 118, -1, -1, -1, 122, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 132, -1, 134, 135, + 136, 120, -1, 122, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 132, -1, 134, 135, 136, -1, -1, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, + 132, -1, 134, 135, 136, -1, -1, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, -1, 134, + 135, 136, 120, -1, 122, 123, 124, 125, -1, -1, 128, 129, 130, 131, 132, -1, 134, 135, 136, -1, - 123, 124, 125, 10, 11, 128, 129, 130, 131, 132, - -1, 134, 135, 136, -1, -1, -1, -1, -1, -1, - -1, -1, 50, -1, 52, 53, 54, -1, -1, -1, + -1, 122, 123, 124, 125, -1, -1, 128, 129, 130, + 131, 132, -1, 134, 135, 136, 16, 17, 18, 19, + 20, 21, 22, -1, -1, -1, -1, -1, -1, -1, + -1, 31, 16, 17, 18, 19, 20, 21, 22, -1, + -1, -1, -1, -1, -1, -1, -1, 31, 17, 18, + 19, 20, 21, 22, -1, -1, -1, 50, -1, 52, + 53, 54, 31, 17, 18, 19, 20, 21, 22, -1, + -1, -1, -1, -1, -1, -1, -1, 31, 17, 18, + 19, 20, 21, 22, 77, 78, 79, -1, -1, -1, + -1, -1, 31, 17, 18, 19, 20, 21, 22, -1, + 93, 94, -1, -1, -1, -1, -1, 31, 17, 18, + 19, 20, 21, 22, 107, -1, -1, -1, -1, 112, + -1, -1, 31, 123, 124, 125, 126, 127, 128, 129, + 130, 131, 132, -1, 134, 135, 136, -1, -1, 123, + 124, 125, 135, -1, 128, 129, 130, 131, 132, -1, + 134, 135, 136, -1, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 132, -1, 134, 135, 136, -1, -1, + 124, 125, 126, 127, 128, 129, 130, 131, 132, -1, + 134, 135, 136, -1, -1, -1, 125, 126, 127, 128, + 129, 130, 131, 132, -1, 134, 135, 136, -1, 123, 124, 125, -1, -1, 128, 129, 130, 131, 132, -1, - 134, 135, 136, 50, -1, 52, 53, 54, -1, 77, - 78, 79, 11, -1, 61, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 71, 93, 94, -1, -1, -1, - 77, 78, 79, -1, -1, -1, -1, -1, -1, 107, - -1, -1, -1, -1, 112, -1, 93, 94, -1, -1, + 134, 135, 136, 10, 11, -1, -1, 126, 127, 128, + 129, 130, 131, 132, -1, 134, 135, 136, 17, 18, + 19, 20, 21, 22, -1, -1, -1, -1, -1, -1, + -1, -1, 31, 50, -1, 52, 53, 54, -1, -1, + -1, -1, -1, 50, -1, 52, 53, 54, 55, 56, + -1, -1, -1, -1, 61, -1, -1, -1, -1, -1, + 77, 78, 79, -1, 71, -1, -1, -1, -1, -1, + 77, 78, 79, 10, 11, -1, 93, 94, -1, -1, + -1, -1, -1, -1, -1, -1, 93, 94, -1, -1, + 107, -1, -1, -1, -1, 112, -1, -1, 105, -1, + 107, -1, -1, 110, -1, 112, -1, -1, -1, -1, + -1, -1, -1, 50, -1, 52, 53, 54, 135, -1, + -1, -1, 11, -1, 61, 124, 125, -1, -1, 128, + 129, 130, 131, 132, 71, 134, 135, 136, -1, -1, + 77, 78, 79, -1, -1, -1, -1, -1, -1, -1, + 50, -1, 52, 53, 54, -1, 93, 94, 47, -1, -1, 50, -1, 52, 53, 54, 55, 56, -1, 58, - 107, -1, 61, 110, -1, 112, 65, 135, -1, -1, + 107, 71, 61, 110, -1, 112, 65, 77, 78, 79, -1, -1, 71, 11, -1, -1, -1, -1, 77, 78, - 79, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 93, 94, -1, -1, -1, -1, - 99, -1, -1, -1, -1, -1, 105, 106, 107, -1, + 79, -1, -1, 93, 94, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 93, 94, -1, 107, -1, -1, + 99, 50, 112, 52, 53, 54, 105, 106, 107, 47, 11, 110, 50, 112, 52, 53, 54, 55, 56, -1, - 58, -1, -1, 61, -1, -1, -1, 65, -1, -1, - -1, -1, -1, 71, -1, -1, -1, -1, -1, 77, - 78, 79, -1, -1, -1, -1, -1, -1, -1, 50, - -1, 52, 53, 54, 55, 93, 94, 58, -1, -1, - 61, 99, -1, -1, 65, -1, -1, 105, 106, 107, + 58, -1, -1, 61, -1, -1, -1, 65, 77, 78, + 79, -1, -1, 71, -1, -1, -1, -1, -1, 77, + 78, 79, -1, -1, 93, 94, 47, -1, -1, 50, + -1, 52, 53, 54, 55, 93, 94, 58, 107, -1, + 61, 99, -1, 112, 65, -1, -1, 105, 106, 107, 71, 11, 110, -1, 112, -1, 77, 78, 79, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 91, -1, 93, 94, -1, -1, -1, -1, 99, -1, - -1, -1, -1, -1, 105, 106, 107, -1, 11, 110, + -1, -1, -1, -1, 105, 106, 107, 47, 11, 110, 50, 112, 52, 53, 54, 55, -1, -1, 58, -1, -1, 61, -1, -1, -1, 65, -1, -1, -1, -1, -1, 71, -1, -1, -1, -1, -1, 77, 78, 79, @@ -2539,22 +2534,29 @@ static const yytype_int16 yycheck[] = -1, -1, 72, 119, -1, -1, 76, -1, -1, -1, 80, 81, 82, 83, -1, -1, -1, -1, 88, 89, 90, 91, 138, -1, -1, -1, 96, 97, -1, 50, - 100, 52, 53, 54, 104, -1, -1, -1, 108, 109, - 61, 111, -1, -1, -1, -1, -1, -1, -1, 119, - 71, -1, -1, -1, -1, -1, 77, 78, 79, -1, - 48, 49, -1, -1, -1, -1, -1, -1, 138, 57, - -1, -1, 93, 94, -1, -1, 64, -1, 66, 67, - 68, 69, -1, -1, 72, -1, 107, -1, 76, -1, - -1, 112, 80, 81, 82, 83, -1, -1, -1, -1, - 88, 89, 90, 91, -1, -1, -1, -1, 96, 97, - -1, -1, 100, -1, 135, 50, 104, 52, 53, 54, - 108, 109, 49, 111, -1, -1, 61, -1, -1, -1, - 57, -1, -1, -1, -1, -1, 71, -1, -1, 66, - 67, 68, 77, 78, 79, -1, -1, -1, -1, 76, - -1, -1, -1, -1, -1, 82, 83, -1, 93, 94, - -1, -1, -1, -1, 91, -1, -1, -1, -1, 96, - -1, -1, 107, -1, -1, -1, -1, 112, -1, -1, - -1, -1, 109, -1, 111 + 100, 52, 53, 54, 104, -1, 49, -1, 108, 109, + 61, 111, -1, -1, 57, -1, -1, -1, -1, 119, + 71, -1, -1, 66, 67, 68, 77, 78, 79, -1, + -1, -1, -1, 76, -1, -1, -1, -1, 138, 82, + -1, -1, 93, 94, -1, -1, -1, -1, 91, -1, + -1, -1, -1, 96, 48, 49, 107, -1, -1, -1, + -1, 112, -1, 57, -1, -1, 109, -1, 111, -1, + 64, -1, 66, 67, 68, 69, -1, -1, 72, -1, + -1, -1, 76, 126, 135, -1, 80, 81, 82, 83, + -1, -1, -1, -1, 88, 89, 90, 91, -1, -1, + -1, -1, 96, 97, -1, 50, 100, 52, 53, 54, + 104, 49, -1, -1, 108, 109, 61, 111, -1, 57, + -1, -1, -1, 49, -1, -1, 71, -1, 66, 67, + 68, 57, 77, 78, 79, -1, -1, -1, 76, -1, + 66, 67, 68, -1, 82, 83, -1, -1, 93, 94, + 76, -1, -1, 91, -1, -1, 82, -1, 96, -1, + 49, -1, 107, -1, -1, 91, -1, 112, 57, -1, + 96, 109, -1, 111, 100, -1, -1, 66, 67, 68, + -1, -1, -1, 109, -1, 111, -1, 76, -1, -1, + -1, -1, -1, 82, -1, -1, -1, -1, -1, -1, + -1, -1, 91, -1, -1, -1, -1, 96, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 109, -1, 111 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -2565,110 +2567,110 @@ static const yytype_uint8 yystos[] = 6, 8, 9, 10, 11, 46, 50, 52, 53, 54, 61, 62, 70, 71, 77, 78, 84, 86, 93, 94, 95, 98, 102, 107, 112, 125, 129, 130, 133, 135, - 139, 227, 228, 233, 11, 50, 52, 53, 54, 55, - 56, 58, 61, 65, 71, 77, 78, 79, 93, 94, - 99, 105, 106, 107, 110, 112, 193, 196, 197, 199, - 204, 205, 209, 210, 215, 216, 217, 218, 0, 48, - 49, 57, 64, 66, 67, 68, 69, 72, 76, 80, - 81, 82, 83, 88, 89, 90, 91, 96, 97, 100, - 104, 108, 109, 111, 119, 146, 148, 149, 151, 152, - 153, 174, 211, 214, 234, 135, 135, 135, 135, 135, - 135, 135, 126, 135, 135, 135, 11, 105, 195, 209, - 210, 215, 135, 135, 135, 126, 135, 135, 227, 227, - 227, 227, 11, 50, 52, 53, 54, 61, 71, 77, - 78, 93, 94, 107, 112, 196, 225, 227, 227, 15, - 16, 17, 18, 19, 20, 21, 22, 31, 122, 123, - 124, 125, 126, 127, 128, 129, 130, 131, 132, 134, - 135, 136, 6, 8, 193, 135, 61, 71, 78, 216, - 78, 216, 216, 10, 11, 232, 216, 12, 16, 56, - 111, 125, 130, 135, 192, 234, 117, 120, 232, 117, - 232, 76, 151, 151, 151, 6, 151, 151, 120, 150, - 83, 151, 135, 135, 151, 117, 232, 120, 120, 120, - 151, 151, 135, 151, 152, 175, 151, 158, 83, 232, - 151, 151, 10, 11, 56, 58, 87, 105, 117, 133, - 163, 194, 197, 199, 204, 209, 210, 215, 224, 225, - 234, 196, 224, 224, 224, 224, 224, 196, 224, 224, - 224, 232, 135, 232, 232, 224, 224, 196, 196, 224, - 224, 137, 118, 137, 227, 227, 227, 227, 227, 227, + 139, 227, 228, 233, 11, 47, 50, 52, 53, 54, + 55, 56, 58, 61, 65, 71, 77, 78, 79, 93, + 94, 99, 105, 106, 107, 110, 112, 193, 196, 197, + 199, 204, 205, 209, 210, 215, 216, 217, 218, 0, + 48, 49, 57, 64, 66, 67, 68, 69, 72, 76, + 80, 81, 82, 83, 88, 89, 90, 91, 96, 97, + 100, 104, 108, 109, 111, 119, 146, 148, 149, 151, + 152, 153, 174, 211, 214, 234, 135, 135, 135, 135, + 135, 135, 135, 126, 135, 135, 135, 11, 105, 195, + 209, 210, 215, 135, 135, 135, 126, 135, 135, 227, + 227, 227, 227, 11, 50, 52, 53, 54, 61, 71, + 77, 78, 93, 94, 107, 112, 196, 225, 227, 227, + 15, 16, 17, 18, 19, 20, 21, 22, 31, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, + 134, 135, 136, 6, 8, 193, 135, 61, 71, 78, + 216, 78, 216, 216, 10, 11, 232, 216, 12, 16, + 56, 111, 125, 130, 135, 192, 234, 117, 120, 232, + 117, 232, 76, 151, 151, 151, 6, 151, 151, 120, + 150, 83, 151, 135, 135, 151, 117, 232, 120, 120, + 120, 151, 151, 135, 151, 152, 175, 151, 158, 83, + 232, 151, 151, 10, 11, 47, 56, 58, 87, 105, + 117, 133, 163, 194, 197, 199, 204, 209, 210, 215, + 224, 225, 234, 196, 224, 224, 224, 224, 224, 196, + 224, 224, 224, 232, 135, 232, 232, 224, 224, 196, + 196, 224, 224, 137, 118, 137, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, - 227, 227, 227, 227, 227, 137, 225, 227, 192, 227, - 71, 130, 192, 192, 192, 192, 192, 192, 136, 207, - 208, 234, 11, 206, 216, 120, 198, 200, 151, 148, - 117, 232, 10, 232, 143, 117, 227, 126, 56, 163, - 194, 232, 135, 135, 193, 135, 56, 193, 232, 147, - 232, 117, 119, 120, 121, 186, 119, 154, 232, 232, - 137, 137, 137, 137, 137, 137, 137, 127, 137, 137, - 137, 224, 137, 137, 137, 127, 137, 137, 227, 227, - 120, 137, 140, 137, 192, 137, 223, 227, 234, 232, - 138, 206, 143, 120, 201, 202, 234, 143, 117, 118, - 118, 138, 212, 118, 137, 10, 11, 55, 56, 105, - 176, 177, 178, 179, 215, 234, 193, 186, 159, 164, - 12, 130, 165, 155, 227, 193, 10, 11, 12, 16, - 56, 111, 125, 130, 190, 234, 143, 135, 219, 220, - 144, 145, 232, 117, 227, 12, 16, 56, 87, 111, - 125, 130, 135, 156, 180, 232, 120, 135, 137, 135, - 227, 135, 140, 118, 121, 138, 88, 89, 90, 109, - 203, 117, 118, 138, 213, 10, 232, 143, 233, 232, - 179, 232, 127, 118, 10, 11, 12, 16, 56, 111, - 125, 130, 135, 191, 234, 160, 161, 180, 3, 4, - 5, 9, 10, 14, 46, 56, 62, 70, 84, 86, - 91, 95, 98, 102, 125, 129, 133, 135, 139, 182, - 183, 189, 193, 229, 230, 233, 234, 130, 180, 182, - 157, 180, 137, 190, 130, 190, 190, 190, 190, 190, - 135, 136, 138, 166, 138, 221, 234, 117, 118, 135, - 117, 187, 188, 227, 234, 119, 130, 180, 180, 6, - 15, 16, 17, 18, 19, 20, 21, 22, 31, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, 60, 84, 118, 121, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 135, 136, 139, 172, - 180, 180, 180, 180, 120, 121, 135, 136, 185, 186, - 234, 206, 225, 225, 182, 227, 105, 109, 210, 231, - 232, 109, 231, 109, 231, 88, 89, 90, 143, 203, - 143, 118, 137, 118, 138, 137, 121, 191, 121, 152, - 173, 174, 178, 130, 191, 191, 191, 191, 191, 191, - 121, 136, 184, 234, 162, 180, 185, 186, 135, 91, - 193, 126, 195, 189, 135, 126, 227, 227, 227, 196, - 225, 227, 137, 14, 118, 191, 15, 16, 17, 18, - 19, 20, 21, 22, 31, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 131, 132, 134, 135, 136, 180, - 120, 137, 137, 185, 186, 135, 190, 169, 223, 182, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 65, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 82, 84, 86, 87, 88, - 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - 99, 101, 102, 103, 104, 105, 106, 107, 109, 110, - 111, 112, 113, 117, 118, 119, 120, 121, 122, 123, - 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 137, 139, 140, 222, 219, 145, 224, - 187, 138, 118, 180, 10, 137, 140, 137, 4, 227, - 181, 223, 118, 137, 137, 137, 118, 232, 231, 232, - 231, 231, 231, 231, 231, 138, 138, 10, 119, 232, - 196, 184, 196, 191, 137, 46, 62, 95, 98, 125, - 129, 130, 133, 135, 139, 226, 228, 223, 185, 186, - 118, 196, 193, 191, 196, 135, 196, 196, 137, 137, - 56, 171, 234, 14, 189, 121, 185, 227, 227, 227, + 227, 227, 227, 227, 227, 227, 227, 137, 225, 227, + 192, 227, 71, 130, 192, 192, 192, 192, 192, 192, + 136, 207, 208, 234, 11, 206, 216, 120, 198, 200, + 151, 148, 117, 232, 10, 232, 143, 117, 227, 126, + 56, 163, 194, 232, 135, 135, 193, 135, 56, 193, + 232, 147, 232, 117, 119, 120, 121, 186, 119, 154, + 232, 232, 137, 137, 137, 137, 137, 137, 137, 127, + 137, 137, 137, 224, 137, 137, 137, 127, 137, 137, + 227, 227, 120, 137, 140, 137, 192, 137, 223, 227, + 234, 232, 138, 206, 143, 120, 201, 202, 234, 143, + 117, 118, 118, 138, 212, 118, 137, 10, 11, 55, + 56, 105, 176, 177, 178, 179, 215, 234, 193, 186, + 159, 164, 12, 130, 165, 155, 227, 193, 10, 11, + 12, 16, 56, 111, 125, 130, 190, 234, 143, 135, + 219, 220, 144, 145, 232, 117, 227, 12, 16, 56, + 87, 111, 125, 130, 135, 156, 180, 232, 120, 135, + 137, 135, 227, 135, 140, 118, 121, 138, 88, 89, + 90, 109, 203, 117, 118, 138, 213, 10, 232, 143, + 233, 232, 179, 232, 127, 118, 10, 11, 12, 16, + 56, 111, 125, 130, 135, 191, 234, 160, 161, 180, + 3, 4, 5, 9, 10, 14, 46, 56, 62, 70, + 84, 86, 91, 95, 98, 102, 125, 129, 133, 135, + 139, 182, 183, 189, 193, 229, 230, 233, 234, 130, + 180, 182, 157, 180, 137, 190, 130, 190, 190, 190, + 190, 190, 135, 136, 138, 166, 138, 221, 234, 117, + 118, 135, 117, 187, 188, 227, 234, 119, 130, 180, + 180, 6, 15, 16, 17, 18, 19, 20, 21, 22, + 31, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 60, 84, 118, 121, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 132, 133, 135, 136, + 139, 172, 180, 180, 180, 180, 120, 121, 135, 136, + 185, 186, 234, 206, 225, 225, 182, 227, 105, 109, + 210, 231, 232, 109, 231, 109, 231, 88, 89, 90, + 143, 203, 143, 118, 137, 118, 138, 137, 121, 191, + 121, 152, 173, 174, 178, 130, 191, 191, 191, 191, + 191, 191, 121, 136, 184, 234, 162, 180, 185, 186, + 135, 91, 193, 126, 195, 189, 135, 126, 227, 227, + 227, 196, 225, 227, 137, 14, 118, 191, 15, 16, + 17, 18, 19, 20, 21, 22, 31, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, 134, 135, + 136, 180, 120, 137, 137, 185, 186, 135, 190, 169, + 223, 182, 3, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, + 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 65, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 82, 84, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 101, 102, 103, 104, 105, 106, 107, + 109, 110, 111, 112, 113, 117, 118, 119, 120, 121, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, + 132, 133, 134, 135, 136, 137, 139, 140, 222, 219, + 145, 224, 187, 138, 118, 180, 10, 137, 140, 137, + 4, 227, 181, 223, 118, 137, 137, 137, 118, 232, + 231, 232, 231, 231, 231, 231, 231, 138, 138, 10, + 119, 232, 196, 184, 196, 191, 137, 46, 62, 95, + 98, 125, 129, 130, 133, 135, 139, 226, 228, 223, + 185, 186, 118, 196, 193, 191, 196, 135, 196, 196, + 137, 137, 56, 171, 234, 14, 189, 121, 185, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, - 227, 227, 227, 227, 227, 227, 227, 227, 137, 225, - 227, 137, 135, 171, 118, 170, 182, 140, 137, 221, - 138, 137, 138, 117, 227, 182, 140, 156, 171, 137, - 137, 135, 135, 126, 135, 126, 226, 226, 226, 226, - 196, 225, 226, 15, 16, 17, 18, 19, 20, 21, - 22, 31, 122, 123, 124, 125, 128, 129, 130, 131, - 132, 134, 135, 136, 140, 118, 161, 137, 191, 185, - 127, 224, 137, 127, 227, 85, 101, 227, 120, 137, - 140, 135, 167, 157, 182, 137, 171, 138, 187, 137, - 119, 119, 182, 196, 196, 196, 196, 137, 137, 226, + 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, + 137, 225, 227, 137, 135, 171, 118, 170, 182, 140, + 137, 221, 138, 137, 138, 117, 227, 182, 140, 156, + 171, 137, 137, 135, 135, 126, 135, 126, 226, 226, + 226, 226, 196, 225, 226, 15, 16, 17, 18, 19, + 20, 21, 22, 31, 122, 123, 124, 125, 128, 129, + 130, 131, 132, 134, 135, 136, 140, 118, 161, 137, + 191, 185, 127, 224, 137, 127, 227, 85, 101, 227, + 120, 137, 140, 135, 167, 157, 182, 137, 171, 138, + 187, 137, 119, 119, 182, 196, 196, 196, 196, 137, + 137, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 137, 225, - 227, 162, 185, 135, 137, 135, 135, 227, 168, 182, - 137, 171, 138, 171, 137, 137, 127, 137, 127, 226, - 120, 137, 140, 225, 225, 137, 232, 182, 137, 171, - 171, 135, 135, 226, 137, 137, 137, 137, 171, 225, - 225, 171, 137, 137 + 137, 225, 227, 162, 185, 135, 137, 135, 135, 227, + 168, 182, 137, 171, 138, 171, 137, 137, 127, 137, + 127, 226, 120, 137, 140, 225, 225, 137, 232, 182, + 137, 171, 171, 135, 135, 226, 137, 137, 137, 137, + 171, 225, 225, 171, 137, 137 }; #define yyerrok (yyerrstatus = 0) @@ -5548,9 +5550,9 @@ yyreduce: case 225: /* Line 1792 of yacc.c */ -#line 1731 "dtool/src/cppparser/cppBison.yxx" +#line 1728 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.decl) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type)); + (yyval.u.type) = new CPPSimpleType(CPPSimpleType::T_auto); } break; @@ -5558,6 +5560,14 @@ yyreduce: /* Line 1792 of yacc.c */ #line 1735 "dtool/src/cppparser/cppBison.yxx" { + (yyval.u.decl) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type)); +} + break; + + case 227: +/* Line 1792 of yacc.c */ +#line 1739 "dtool/src/cppparser/cppBison.yxx" + { (yyval.u.decl) = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); if ((yyval.u.decl) == NULL) { yyerror(string("internal error resolving type ") + (yyvsp[(1) - (1)].u.identifier)->get_fully_scoped_name(), (yylsp[(1) - (1)])); @@ -5566,19 +5576,11 @@ yyreduce: } break; - case 227: -/* Line 1792 of yacc.c */ -#line 1743 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.decl) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier))); -} - break; - case 228: /* Line 1792 of yacc.c */ #line 1747 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.decl) = CPPType::new_type((yyvsp[(1) - (1)].u.struct_type)); + (yyval.u.decl) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier))); } break; @@ -5586,7 +5588,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 1751 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.decl) = new CPPTypeDeclaration(CPPType::new_type((yyvsp[(1) - (1)].u.struct_type))); + (yyval.u.decl) = CPPType::new_type((yyvsp[(1) - (1)].u.struct_type)); } break; @@ -5594,7 +5596,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 1755 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.decl) = new CPPTypeDeclaration(CPPType::new_type((yyvsp[(1) - (1)].u.enum_type))); + (yyval.u.decl) = new CPPTypeDeclaration(CPPType::new_type((yyvsp[(1) - (1)].u.struct_type))); } break; @@ -5602,6 +5604,14 @@ yyreduce: /* Line 1792 of yacc.c */ #line 1759 "dtool/src/cppparser/cppBison.yxx" { + (yyval.u.decl) = new CPPTypeDeclaration(CPPType::new_type((yyvsp[(1) - (1)].u.enum_type))); +} + break; + + case 232: +/* Line 1792 of yacc.c */ +#line 1763 "dtool/src/cppparser/cppBison.yxx" + { CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { (yyval.u.decl) = type; @@ -5618,9 +5628,9 @@ yyreduce: } break; - case 232: + case 233: /* Line 1792 of yacc.c */ -#line 1775 "dtool/src/cppparser/cppBison.yxx" +#line 1779 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = (yyvsp[(2) - (4)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { @@ -5638,9 +5648,9 @@ yyreduce: } break; - case 233: + case 234: /* Line 1792 of yacc.c */ -#line 1791 "dtool/src/cppparser/cppBison.yxx" +#line 1795 "dtool/src/cppparser/cppBison.yxx" { yywarning(string("C++ does not permit forward declaration of untyped enum ") + (yyvsp[(2) - (2)].u.identifier)->get_fully_scoped_name(), (yylsp[(1) - (2)])); @@ -5660,9 +5670,9 @@ yyreduce: } break; - case 234: + case 235: /* Line 1792 of yacc.c */ -#line 1809 "dtool/src/cppparser/cppBison.yxx" +#line 1813 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.decl) = (yyvsp[(3) - (4)].u.expr)->determine_type(); if ((yyval.u.decl) == (CPPType *)NULL) { @@ -5673,17 +5683,25 @@ yyreduce: } break; - case 235: + case 236: /* Line 1792 of yacc.c */ -#line 1821 "dtool/src/cppparser/cppBison.yxx" +#line 1822 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.decl) = new CPPSimpleType(CPPSimpleType::T_auto); +} + break; + + case 237: +/* Line 1792 of yacc.c */ +#line 1829 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type)); } break; - case 236: + case 238: /* Line 1792 of yacc.c */ -#line 1825 "dtool/src/cppparser/cppBison.yxx" +#line 1833 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); if ((yyval.u.type) == NULL) { @@ -5693,57 +5711,57 @@ yyreduce: } break; - case 237: + case 239: /* Line 1792 of yacc.c */ -#line 1833 "dtool/src/cppparser/cppBison.yxx" +#line 1841 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier))); } break; - case 238: -/* Line 1792 of yacc.c */ -#line 1837 "dtool/src/cppparser/cppBison.yxx" - { - CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); - if (type != NULL) { - (yyval.u.type) = type; - } else { - CPPExtensionType *et = - CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file)) - ->as_extension_type(); - CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope); - if (scope != NULL) { - scope->define_extension_type(et); - } - (yyval.u.type) = et; - } -} - break; - - case 239: -/* Line 1792 of yacc.c */ -#line 1853 "dtool/src/cppparser/cppBison.yxx" - { - CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); - if (type != NULL) { - (yyval.u.type) = type; - } else { - CPPExtensionType *et = - CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file)) - ->as_extension_type(); - CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope); - if (scope != NULL) { - scope->define_extension_type(et); - } - (yyval.u.type) = et; - } -} - break; - case 240: /* Line 1792 of yacc.c */ -#line 1872 "dtool/src/cppparser/cppBison.yxx" +#line 1845 "dtool/src/cppparser/cppBison.yxx" + { + CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); + if (type != NULL) { + (yyval.u.type) = type; + } else { + CPPExtensionType *et = + CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file)) + ->as_extension_type(); + CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope); + if (scope != NULL) { + scope->define_extension_type(et); + } + (yyval.u.type) = et; + } +} + break; + + case 241: +/* Line 1792 of yacc.c */ +#line 1861 "dtool/src/cppparser/cppBison.yxx" + { + CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); + if (type != NULL) { + (yyval.u.type) = type; + } else { + CPPExtensionType *et = + CPPType::new_type(new CPPExtensionType((yyvsp[(1) - (2)].u.extension_enum), (yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file)) + ->as_extension_type(); + CPPScope *scope = (yyvsp[(2) - (2)].u.identifier)->get_scope(current_scope, global_scope); + if (scope != NULL) { + scope->define_extension_type(et); + } + (yyval.u.type) = et; + } +} + break; + + case 242: +/* Line 1792 of yacc.c */ +#line 1880 "dtool/src/cppparser/cppBison.yxx" { CPPInstance *inst = new CPPInstance((yyvsp[(1) - (2)].u.type), (yyvsp[(2) - (2)].u.inst_ident), 0, (yylsp[(1) - (2)]).file); (yyval.u.type) = inst->_type; @@ -5751,9 +5769,9 @@ yyreduce: } break; - case 241: + case 243: /* Line 1792 of yacc.c */ -#line 1878 "dtool/src/cppparser/cppBison.yxx" +#line 1886 "dtool/src/cppparser/cppBison.yxx" { (yyvsp[(3) - (3)].u.inst_ident)->add_modifier(IIT_const); CPPInstance *inst = new CPPInstance((yyvsp[(2) - (3)].u.type), (yyvsp[(3) - (3)].u.inst_ident), 0, (yylsp[(1) - (3)]).file); @@ -5762,9 +5780,9 @@ yyreduce: } break; - case 242: + case 244: /* Line 1792 of yacc.c */ -#line 1888 "dtool/src/cppparser/cppBison.yxx" +#line 1896 "dtool/src/cppparser/cppBison.yxx" { CPPVisibility starting_vis = ((yyvsp[(1) - (2)].u.extension_enum) == CPPExtensionType::T_class) ? V_private : V_public; @@ -5780,9 +5798,9 @@ yyreduce: } break; - case 243: + case 245: /* Line 1792 of yacc.c */ -#line 1902 "dtool/src/cppparser/cppBison.yxx" +#line 1910 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.struct_type) = current_struct; current_struct->_incomplete = false; @@ -5791,9 +5809,9 @@ yyreduce: } break; - case 244: + case 246: /* Line 1792 of yacc.c */ -#line 1912 "dtool/src/cppparser/cppBison.yxx" +#line 1920 "dtool/src/cppparser/cppBison.yxx" { CPPVisibility starting_vis = ((yyvsp[(1) - (2)].u.extension_enum) == CPPExtensionType::T_class) ? V_private : V_public; @@ -5815,9 +5833,9 @@ yyreduce: } break; - case 245: + case 247: /* Line 1792 of yacc.c */ -#line 1932 "dtool/src/cppparser/cppBison.yxx" +#line 1940 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.struct_type) = current_struct; current_struct->_incomplete = false; @@ -5826,27 +5844,11 @@ yyreduce: } break; - case 250: -/* Line 1792 of yacc.c */ -#line 1952 "dtool/src/cppparser/cppBison.yxx" - { - current_struct->append_derivation((yyvsp[(2) - (2)].u.type), V_public, false); -} - break; - - case 251: -/* Line 1792 of yacc.c */ -#line 1956 "dtool/src/cppparser/cppBison.yxx" - { - current_struct->append_derivation((yyvsp[(2) - (2)].u.type), V_protected, false); -} - break; - case 252: /* Line 1792 of yacc.c */ #line 1960 "dtool/src/cppparser/cppBison.yxx" { - current_struct->append_derivation((yyvsp[(2) - (2)].u.type), V_private, false); + current_struct->append_derivation((yyvsp[(2) - (2)].u.type), V_public, false); } break; @@ -5854,7 +5856,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 1964 "dtool/src/cppparser/cppBison.yxx" { - current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_public, true); + current_struct->append_derivation((yyvsp[(2) - (2)].u.type), V_protected, false); } break; @@ -5862,7 +5864,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 1968 "dtool/src/cppparser/cppBison.yxx" { - current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_protected, true); + current_struct->append_derivation((yyvsp[(2) - (2)].u.type), V_private, false); } break; @@ -5870,7 +5872,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 1972 "dtool/src/cppparser/cppBison.yxx" { - current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_private, true); + current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_public, true); } break; @@ -5878,7 +5880,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 1976 "dtool/src/cppparser/cppBison.yxx" { - current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_public, true); + current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_protected, true); } break; @@ -5886,7 +5888,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 1980 "dtool/src/cppparser/cppBison.yxx" { - current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_protected, true); + current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_private, true); } break; @@ -5894,32 +5896,32 @@ yyreduce: /* Line 1792 of yacc.c */ #line 1984 "dtool/src/cppparser/cppBison.yxx" { - current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_private, true); + current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_public, true); } break; case 259: /* Line 1792 of yacc.c */ -#line 1991 "dtool/src/cppparser/cppBison.yxx" +#line 1988 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.enum_type) = current_enum; - current_enum = NULL; + current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_protected, true); } break; case 260: /* Line 1792 of yacc.c */ -#line 1999 "dtool/src/cppparser/cppBison.yxx" +#line 1992 "dtool/src/cppparser/cppBison.yxx" { - current_enum = new CPPEnumType((yyvsp[(2) - (4)].u.identifier), (yyvsp[(4) - (4)].u.type), current_scope, (yylsp[(1) - (4)]).file); + current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_private, true); } break; case 261: /* Line 1792 of yacc.c */ -#line 2003 "dtool/src/cppparser/cppBison.yxx" +#line 1999 "dtool/src/cppparser/cppBison.yxx" { - current_enum = new CPPEnumType((yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file); + (yyval.u.enum_type) = current_enum; + current_enum = NULL; } break; @@ -5927,7 +5929,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2007 "dtool/src/cppparser/cppBison.yxx" { - current_enum = new CPPEnumType(NULL, (yyvsp[(3) - (3)].u.type), current_scope, (yylsp[(1) - (3)]).file); + current_enum = new CPPEnumType((yyvsp[(2) - (4)].u.identifier), (yyvsp[(4) - (4)].u.type), current_scope, (yylsp[(1) - (4)]).file); } break; @@ -5935,23 +5937,31 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2011 "dtool/src/cppparser/cppBison.yxx" { - current_enum = new CPPEnumType(NULL, current_scope, (yylsp[(1) - (1)]).file); + current_enum = new CPPEnumType((yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file); } break; case 264: /* Line 1792 of yacc.c */ -#line 2018 "dtool/src/cppparser/cppBison.yxx" +#line 2015 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type)); + current_enum = new CPPEnumType(NULL, (yyvsp[(3) - (3)].u.type), current_scope, (yylsp[(1) - (3)]).file); } break; case 265: /* Line 1792 of yacc.c */ -#line 2022 "dtool/src/cppparser/cppBison.yxx" +#line 2019 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.type) = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); + current_enum = new CPPEnumType(NULL, current_scope, (yylsp[(1) - (1)]).file); +} + break; + + case 266: +/* Line 1792 of yacc.c */ +#line 2026 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type)); } break; @@ -5959,15 +5969,23 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2030 "dtool/src/cppparser/cppBison.yxx" { + (yyval.u.type) = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); +} + break; + + case 269: +/* Line 1792 of yacc.c */ +#line 2038 "dtool/src/cppparser/cppBison.yxx" + { assert(current_enum != NULL); CPPInstance *inst = current_enum->add_element((yyvsp[(2) - (3)].u.identifier)->get_simple_name()); current_scope->add_enum_value(inst, current_lexer, (yylsp[(2) - (3)])); } break; - case 268: + case 270: /* Line 1792 of yacc.c */ -#line 2036 "dtool/src/cppparser/cppBison.yxx" +#line 2044 "dtool/src/cppparser/cppBison.yxx" { assert(current_enum != NULL); CPPInstance *inst = current_enum->add_element((yyvsp[(2) - (5)].u.identifier)->get_simple_name(), (yyvsp[(4) - (5)].u.expr)); @@ -5975,9 +5993,9 @@ yyreduce: } break; - case 270: + case 272: /* Line 1792 of yacc.c */ -#line 2045 "dtool/src/cppparser/cppBison.yxx" +#line 2053 "dtool/src/cppparser/cppBison.yxx" { assert(current_enum != NULL); CPPInstance *inst = current_enum->add_element((yyvsp[(2) - (2)].u.identifier)->get_simple_name()); @@ -5985,9 +6003,9 @@ yyreduce: } break; - case 271: + case 273: /* Line 1792 of yacc.c */ -#line 2051 "dtool/src/cppparser/cppBison.yxx" +#line 2059 "dtool/src/cppparser/cppBison.yxx" { assert(current_enum != NULL); CPPInstance *inst = current_enum->add_element((yyvsp[(2) - (4)].u.identifier)->get_simple_name(), (yyvsp[(4) - (4)].u.expr)); @@ -5995,27 +6013,11 @@ yyreduce: } break; - case 272: -/* Line 1792 of yacc.c */ -#line 2060 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.extension_enum) = CPPExtensionType::T_enum; -} - break; - - case 273: -/* Line 1792 of yacc.c */ -#line 2067 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.extension_enum) = CPPExtensionType::T_class; -} - break; - case 274: /* Line 1792 of yacc.c */ -#line 2071 "dtool/src/cppparser/cppBison.yxx" +#line 2068 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.extension_enum) = CPPExtensionType::T_struct; + (yyval.u.extension_enum) = CPPExtensionType::T_enum; } break; @@ -6023,13 +6025,29 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2075 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.extension_enum) = CPPExtensionType::T_union; + (yyval.u.extension_enum) = CPPExtensionType::T_class; } break; case 276: /* Line 1792 of yacc.c */ -#line 2082 "dtool/src/cppparser/cppBison.yxx" +#line 2079 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.extension_enum) = CPPExtensionType::T_struct; +} + break; + + case 277: +/* Line 1792 of yacc.c */ +#line 2083 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.extension_enum) = CPPExtensionType::T_union; +} + break; + + case 278: +/* Line 1792 of yacc.c */ +#line 2090 "dtool/src/cppparser/cppBison.yxx" { CPPScope *scope = (yyvsp[(2) - (3)].u.identifier)->find_scope(current_scope, global_scope, current_lexer); if (scope == NULL) { @@ -6049,17 +6067,17 @@ yyreduce: } break; - case 277: + case 279: /* Line 1792 of yacc.c */ -#line 2100 "dtool/src/cppparser/cppBison.yxx" +#line 2108 "dtool/src/cppparser/cppBison.yxx" { pop_scope(); } break; - case 278: + case 280: /* Line 1792 of yacc.c */ -#line 2104 "dtool/src/cppparser/cppBison.yxx" +#line 2112 "dtool/src/cppparser/cppBison.yxx" { CPPScope *scope = (yyvsp[(3) - (4)].u.identifier)->find_scope(current_scope, global_scope, current_lexer); if (scope == NULL) { @@ -6073,24 +6091,24 @@ yyreduce: } CPPNamespace *nspace = new CPPNamespace((yyvsp[(3) - (4)].u.identifier), scope, (yylsp[(2) - (4)]).file); - nspace->_inline = true; + nspace->_is_inline = true; current_scope->add_declaration(nspace, global_scope, current_lexer, (yylsp[(2) - (4)])); current_scope->define_namespace(nspace); push_scope(scope); } break; - case 279: + case 281: /* Line 1792 of yacc.c */ -#line 2123 "dtool/src/cppparser/cppBison.yxx" +#line 2131 "dtool/src/cppparser/cppBison.yxx" { pop_scope(); } break; - case 282: + case 284: /* Line 1792 of yacc.c */ -#line 2132 "dtool/src/cppparser/cppBison.yxx" +#line 2140 "dtool/src/cppparser/cppBison.yxx" { CPPUsing *using_decl = new CPPUsing((yyvsp[(2) - (2)].u.identifier), false, (yylsp[(1) - (2)]).file); current_scope->add_declaration(using_decl, global_scope, current_lexer, (yylsp[(1) - (2)])); @@ -6098,9 +6116,9 @@ yyreduce: } break; - case 283: + case 285: /* Line 1792 of yacc.c */ -#line 2138 "dtool/src/cppparser/cppBison.yxx" +#line 2146 "dtool/src/cppparser/cppBison.yxx" { CPPUsing *using_decl = new CPPUsing((yyvsp[(3) - (3)].u.identifier), true, (yylsp[(1) - (3)]).file); current_scope->add_declaration(using_decl, global_scope, current_lexer, (yylsp[(1) - (3)])); @@ -6108,27 +6126,11 @@ yyreduce: } break; - case 287: -/* Line 1792 of yacc.c */ -#line 2153 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_bool); -} - break; - - case 288: -/* Line 1792 of yacc.c */ -#line 2157 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char); -} - break; - case 289: /* Line 1792 of yacc.c */ #line 2161 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_wchar_t); + (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_bool); } break; @@ -6136,7 +6138,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2165 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char16_t); + (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char); } break; @@ -6144,7 +6146,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2169 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char32_t); + (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_wchar_t); } break; @@ -6152,67 +6154,83 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2173 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int, - CPPSimpleType::F_short); + (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char16_t); } break; case 293: /* Line 1792 of yacc.c */ -#line 2178 "dtool/src/cppparser/cppBison.yxx" +#line 2177 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char32_t); +} + break; + + case 294: +/* Line 1792 of yacc.c */ +#line 2181 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int, + CPPSimpleType::F_short); +} + break; + + case 295: +/* Line 1792 of yacc.c */ +#line 2186 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_long); } break; - case 294: + case 296: /* Line 1792 of yacc.c */ -#line 2183 "dtool/src/cppparser/cppBison.yxx" +#line 2191 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_longlong); } break; - case 295: + case 297: /* Line 1792 of yacc.c */ -#line 2188 "dtool/src/cppparser/cppBison.yxx" +#line 2196 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_unsigned); } break; - case 296: + case 298: /* Line 1792 of yacc.c */ -#line 2193 "dtool/src/cppparser/cppBison.yxx" +#line 2201 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_signed); } break; - case 297: + case 299: /* Line 1792 of yacc.c */ -#line 2198 "dtool/src/cppparser/cppBison.yxx" +#line 2206 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int); } break; - case 298: + case 300: /* Line 1792 of yacc.c */ -#line 2202 "dtool/src/cppparser/cppBison.yxx" +#line 2210 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = (yyvsp[(2) - (2)].u.simple_type); (yyval.u.simple_type)->_flags |= CPPSimpleType::F_short; } break; - case 299: + case 301: /* Line 1792 of yacc.c */ -#line 2207 "dtool/src/cppparser/cppBison.yxx" +#line 2215 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = (yyvsp[(2) - (2)].u.simple_type); if ((yyval.u.simple_type)->_flags & CPPSimpleType::F_long) { @@ -6223,117 +6241,101 @@ yyreduce: } break; - case 300: + case 302: /* Line 1792 of yacc.c */ -#line 2216 "dtool/src/cppparser/cppBison.yxx" +#line 2224 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = (yyvsp[(2) - (2)].u.simple_type); (yyval.u.simple_type)->_flags |= CPPSimpleType::F_unsigned; } break; - case 301: + case 303: /* Line 1792 of yacc.c */ -#line 2221 "dtool/src/cppparser/cppBison.yxx" +#line 2229 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = (yyvsp[(2) - (2)].u.simple_type); (yyval.u.simple_type)->_flags |= CPPSimpleType::F_signed; } break; - case 302: + case 304: /* Line 1792 of yacc.c */ -#line 2229 "dtool/src/cppparser/cppBison.yxx" +#line 2237 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_float); } break; - case 303: + case 305: /* Line 1792 of yacc.c */ -#line 2233 "dtool/src/cppparser/cppBison.yxx" +#line 2241 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_float, CPPSimpleType::F_long); } break; - case 304: + case 306: /* Line 1792 of yacc.c */ -#line 2238 "dtool/src/cppparser/cppBison.yxx" +#line 2246 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_double); } break; - case 305: + case 307: /* Line 1792 of yacc.c */ -#line 2242 "dtool/src/cppparser/cppBison.yxx" +#line 2250 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_float, CPPSimpleType::F_longlong); } break; - case 306: + case 308: /* Line 1792 of yacc.c */ -#line 2247 "dtool/src/cppparser/cppBison.yxx" +#line 2255 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_double, CPPSimpleType::F_long); } break; - case 307: + case 309: /* Line 1792 of yacc.c */ -#line 2255 "dtool/src/cppparser/cppBison.yxx" +#line 2263 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_void); } break; - case 308: + case 310: /* Line 1792 of yacc.c */ -#line 2264 "dtool/src/cppparser/cppBison.yxx" +#line 2272 "dtool/src/cppparser/cppBison.yxx" { current_lexer->_resolve_identifiers = false; } break; - case 309: + case 311: /* Line 1792 of yacc.c */ -#line 2268 "dtool/src/cppparser/cppBison.yxx" +#line 2276 "dtool/src/cppparser/cppBison.yxx" { current_lexer->_resolve_identifiers = true; } break; - case 404: + case 406: /* Line 1792 of yacc.c */ -#line 2308 "dtool/src/cppparser/cppBison.yxx" +#line 2316 "dtool/src/cppparser/cppBison.yxx" { } break; - case 428: -/* Line 1792 of yacc.c */ -#line 2317 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = (CPPExpression *)NULL; -} - break; - - case 429: -/* Line 1792 of yacc.c */ -#line 2321 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); -} - break; - case 430: /* Line 1792 of yacc.c */ -#line 2328 "dtool/src/cppparser/cppBison.yxx" +#line 2325 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (CPPExpression *)NULL; } @@ -6341,7 +6343,7 @@ yyreduce: case 431: /* Line 1792 of yacc.c */ -#line 2332 "dtool/src/cppparser/cppBison.yxx" +#line 2329 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } @@ -6349,23 +6351,23 @@ yyreduce: case 432: /* Line 1792 of yacc.c */ -#line 2339 "dtool/src/cppparser/cppBison.yxx" +#line 2336 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); + (yyval.u.expr) = (CPPExpression *)NULL; } break; case 433: /* Line 1792 of yacc.c */ -#line 2343 "dtool/src/cppparser/cppBison.yxx" +#line 2340 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(',', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } break; case 434: /* Line 1792 of yacc.c */ -#line 2350 "dtool/src/cppparser/cppBison.yxx" +#line 2347 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } @@ -6373,9 +6375,9 @@ yyreduce: case 435: /* Line 1792 of yacc.c */ -#line 2354 "dtool/src/cppparser/cppBison.yxx" +#line 2351 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr))); + (yyval.u.expr) = new CPPExpression(',', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6383,7 +6385,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2358 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr))); + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } break; @@ -6391,7 +6393,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2362 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr))); + (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr))); } break; @@ -6399,7 +6401,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2366 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type))); + (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr))); } break; @@ -6407,7 +6409,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2370 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[(3) - (4)].u.type))); + (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr))); } break; @@ -6415,7 +6417,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2374 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type))); } break; @@ -6423,7 +6425,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2378 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[(3) - (4)].u.type))); } break; @@ -6431,7 +6433,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2382 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr)); } break; @@ -6439,7 +6441,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2386 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr)); } break; @@ -6447,7 +6449,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2390 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr)); } break; @@ -6455,7 +6457,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2394 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[(2) - (2)].u.expr)); } break; @@ -6463,7 +6465,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2398 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr)); } break; @@ -6471,7 +6473,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2402 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6479,7 +6481,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2406 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6487,7 +6489,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2410 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6495,7 +6497,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2414 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6503,7 +6505,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2418 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6511,7 +6513,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2422 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6519,7 +6521,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2426 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6527,7 +6529,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2430 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6535,7 +6537,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2434 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6543,7 +6545,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2438 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6551,7 +6553,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2442 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6559,7 +6561,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2446 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6567,7 +6569,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2450 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6575,7 +6577,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2454 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6583,7 +6585,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2458 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('?', (yyvsp[(1) - (5)].u.expr), (yyvsp[(3) - (5)].u.expr), (yyvsp[(5) - (5)].u.expr)); + (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6591,7 +6593,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2462 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); + (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6599,7 +6601,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2466 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); + (yyval.u.expr) = new CPPExpression('?', (yyvsp[(1) - (5)].u.expr), (yyvsp[(3) - (5)].u.expr), (yyvsp[(5) - (5)].u.expr)); } break; @@ -6607,7 +6609,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2470 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); } break; @@ -6615,7 +6617,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2474 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); } break; @@ -6623,7 +6625,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2478 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr)); } break; @@ -6631,23 +6633,23 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2482 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr); + (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; case 468: /* Line 1792 of yacc.c */ -#line 2490 "dtool/src/cppparser/cppBison.yxx" +#line 2486 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); + (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; case 469: /* Line 1792 of yacc.c */ -#line 2494 "dtool/src/cppparser/cppBison.yxx" +#line 2490 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr))); + (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr); } break; @@ -6655,7 +6657,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2498 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr))); + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } break; @@ -6663,7 +6665,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2502 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr))); + (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr))); } break; @@ -6671,6 +6673,22 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2506 "dtool/src/cppparser/cppBison.yxx" { + (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr))); +} + break; + + case 473: +/* Line 1792 of yacc.c */ +#line 2510 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr))); +} + break; + + case 474: +/* Line 1792 of yacc.c */ +#line 2514 "dtool/src/cppparser/cppBison.yxx" + { // A constructor call. CPPType *type = (yyvsp[(1) - (4)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); if (type == NULL) { @@ -6681,9 +6699,9 @@ yyreduce: } break; - case 473: + case 475: /* Line 1792 of yacc.c */ -#line 2516 "dtool/src/cppparser/cppBison.yxx" +#line 2524 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int)); @@ -6691,9 +6709,9 @@ yyreduce: } break; - case 474: + case 476: /* Line 1792 of yacc.c */ -#line 2522 "dtool/src/cppparser/cppBison.yxx" +#line 2530 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char)); @@ -6701,9 +6719,9 @@ yyreduce: } break; - case 475: + case 477: /* Line 1792 of yacc.c */ -#line 2528 "dtool/src/cppparser/cppBison.yxx" +#line 2536 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_wchar_t)); @@ -6711,9 +6729,9 @@ yyreduce: } break; - case 476: + case 478: /* Line 1792 of yacc.c */ -#line 2534 "dtool/src/cppparser/cppBison.yxx" +#line 2542 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char16_t)); @@ -6721,9 +6739,9 @@ yyreduce: } break; - case 477: + case 479: /* Line 1792 of yacc.c */ -#line 2540 "dtool/src/cppparser/cppBison.yxx" +#line 2548 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char32_t)); @@ -6731,9 +6749,9 @@ yyreduce: } break; - case 478: + case 480: /* Line 1792 of yacc.c */ -#line 2546 "dtool/src/cppparser/cppBison.yxx" +#line 2554 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_bool)); @@ -6741,9 +6759,9 @@ yyreduce: } break; - case 479: + case 481: /* Line 1792 of yacc.c */ -#line 2552 "dtool/src/cppparser/cppBison.yxx" +#line 2560 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, @@ -6752,9 +6770,9 @@ yyreduce: } break; - case 480: + case 482: /* Line 1792 of yacc.c */ -#line 2559 "dtool/src/cppparser/cppBison.yxx" +#line 2567 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, @@ -6763,9 +6781,9 @@ yyreduce: } break; - case 481: + case 483: /* Line 1792 of yacc.c */ -#line 2566 "dtool/src/cppparser/cppBison.yxx" +#line 2574 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, @@ -6774,9 +6792,9 @@ yyreduce: } break; - case 482: + case 484: /* Line 1792 of yacc.c */ -#line 2573 "dtool/src/cppparser/cppBison.yxx" +#line 2581 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, @@ -6785,9 +6803,9 @@ yyreduce: } break; - case 483: + case 485: /* Line 1792 of yacc.c */ -#line 2580 "dtool/src/cppparser/cppBison.yxx" +#line 2588 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_float)); @@ -6795,9 +6813,9 @@ yyreduce: } break; - case 484: + case 486: /* Line 1792 of yacc.c */ -#line 2586 "dtool/src/cppparser/cppBison.yxx" +#line 2594 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_double)); @@ -6805,27 +6823,11 @@ yyreduce: } break; - case 485: -/* Line 1792 of yacc.c */ -#line 2592 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type))); -} - break; - - case 486: -/* Line 1792 of yacc.c */ -#line 2596 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[(3) - (4)].u.type))); -} - break; - case 487: /* Line 1792 of yacc.c */ #line 2600 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (2)].u.type))); + (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type))); } break; @@ -6833,7 +6835,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2604 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (5)].u.type), (yyvsp[(4) - (5)].u.expr))); + (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[(3) - (4)].u.type))); } break; @@ -6841,7 +6843,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2608 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (2)].u.type))); } break; @@ -6849,7 +6851,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2612 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (5)].u.type), (yyvsp[(4) - (5)].u.expr))); } break; @@ -6857,7 +6859,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2616 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr)); } break; @@ -6865,7 +6867,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2620 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr)); } break; @@ -6873,7 +6875,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2624 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr)); } break; @@ -6881,7 +6883,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2628 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[(2) - (2)].u.expr)); } break; @@ -6889,7 +6891,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2632 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr)); } break; @@ -6897,7 +6899,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2636 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6905,7 +6907,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2640 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6913,7 +6915,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2644 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6921,7 +6923,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2648 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6929,7 +6931,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2652 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6937,7 +6939,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2656 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6945,7 +6947,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2660 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6953,7 +6955,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2664 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6961,7 +6963,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2668 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6969,7 +6971,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2672 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6977,7 +6979,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2676 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6985,7 +6987,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2680 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -6993,7 +6995,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2684 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('<', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7001,7 +7003,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2688 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('>', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7009,7 +7011,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2692 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('<', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7017,7 +7019,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2696 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('>', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7025,7 +7027,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2700 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('?', (yyvsp[(1) - (5)].u.expr), (yyvsp[(3) - (5)].u.expr), (yyvsp[(5) - (5)].u.expr)); + (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7033,7 +7035,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2704 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); + (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7041,7 +7043,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2708 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); + (yyval.u.expr) = new CPPExpression('?', (yyvsp[(1) - (5)].u.expr), (yyvsp[(3) - (5)].u.expr), (yyvsp[(5) - (5)].u.expr)); } break; @@ -7049,7 +7051,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2712 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); } break; @@ -7057,7 +7059,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2716 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); } break; @@ -7065,7 +7067,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2720 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr)); } break; @@ -7073,23 +7075,23 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2724 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr); + (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; case 519: /* Line 1792 of yacc.c */ -#line 2731 "dtool/src/cppparser/cppBison.yxx" +#line 2728 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); + (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; case 520: /* Line 1792 of yacc.c */ -#line 2735 "dtool/src/cppparser/cppBison.yxx" +#line 2732 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(true); + (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr); } break; @@ -7097,7 +7099,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2739 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(false); + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); } break; @@ -7105,7 +7107,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2743 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); + (yyval.u.expr) = new CPPExpression(true); } break; @@ -7113,7 +7115,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2747 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.real)); + (yyval.u.expr) = new CPPExpression(false); } break; @@ -7121,7 +7123,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2751 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); } break; @@ -7129,7 +7131,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2755 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.real)); } break; @@ -7137,7 +7139,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2759 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.identifier), current_scope, global_scope, current_lexer); + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } break; @@ -7145,23 +7147,23 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2763 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::get_nullptr()); + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } break; case 528: /* Line 1792 of yacc.c */ -#line 2777 "dtool/src/cppparser/cppBison.yxx" +#line 2767 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.identifier), current_scope, global_scope, current_lexer); } break; case 529: /* Line 1792 of yacc.c */ -#line 2781 "dtool/src/cppparser/cppBison.yxx" +#line 2771 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr))); + (yyval.u.expr) = new CPPExpression(CPPExpression::get_nullptr()); } break; @@ -7169,7 +7171,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2785 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr))); + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } break; @@ -7177,7 +7179,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2789 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr))); + (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr))); } break; @@ -7185,7 +7187,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2793 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type))); + (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr))); } break; @@ -7193,7 +7195,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2797 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[(3) - (4)].u.type))); + (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(3) - (7)].u.type), (yyvsp[(6) - (7)].u.expr))); } break; @@ -7201,7 +7203,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2801 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (2)].u.type))); + (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type))); } break; @@ -7209,7 +7211,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2805 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (5)].u.type), (yyvsp[(4) - (5)].u.expr))); + (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[(3) - (4)].u.type))); } break; @@ -7217,7 +7219,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2809 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (2)].u.type))); } break; @@ -7225,7 +7227,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2813 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (5)].u.type), (yyvsp[(4) - (5)].u.expr))); } break; @@ -7233,7 +7235,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2817 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr)); } break; @@ -7241,7 +7243,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2821 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr)); } break; @@ -7249,7 +7251,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2825 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr)); } break; @@ -7257,7 +7259,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2829 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr)); } break; @@ -7265,7 +7267,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2833 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7273,7 +7275,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2837 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7281,7 +7283,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2841 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7289,7 +7291,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2845 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7297,7 +7299,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2849 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7305,7 +7307,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2853 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7313,7 +7315,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2857 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7321,7 +7323,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2861 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7329,7 +7331,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2865 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7337,7 +7339,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2869 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7345,7 +7347,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2873 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7353,7 +7355,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2877 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7361,7 +7363,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2881 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('<', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7369,7 +7371,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2885 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('>', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7377,7 +7379,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2889 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('<', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7385,7 +7387,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2893 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('>', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7393,7 +7395,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2897 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('?', (yyvsp[(1) - (5)].u.expr), (yyvsp[(3) - (5)].u.expr), (yyvsp[(5) - (5)].u.expr)); + (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7401,7 +7403,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2901 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); + (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; @@ -7409,7 +7411,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2905 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); + (yyval.u.expr) = new CPPExpression('?', (yyvsp[(1) - (5)].u.expr), (yyvsp[(3) - (5)].u.expr), (yyvsp[(5) - (5)].u.expr)); } break; @@ -7417,7 +7419,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2909 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); } break; @@ -7425,7 +7427,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2913 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); } break; @@ -7433,7 +7435,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2917 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); + (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr)); } break; @@ -7441,23 +7443,23 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2921 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr); + (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; case 565: /* Line 1792 of yacc.c */ -#line 2928 "dtool/src/cppparser/cppBison.yxx" +#line 2925 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); + (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; case 566: /* Line 1792 of yacc.c */ -#line 2932 "dtool/src/cppparser/cppBison.yxx" +#line 2929 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(true); + (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr); } break; @@ -7465,7 +7467,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2936 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(false); + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); } break; @@ -7473,7 +7475,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2940 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); + (yyval.u.expr) = new CPPExpression(true); } break; @@ -7481,7 +7483,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2944 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.real)); + (yyval.u.expr) = new CPPExpression(false); } break; @@ -7489,7 +7491,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2948 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); } break; @@ -7497,7 +7499,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2952 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.real)); } break; @@ -7505,7 +7507,7 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2956 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.identifier), current_scope, global_scope, current_lexer); + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } break; @@ -7513,13 +7515,29 @@ yyreduce: /* Line 1792 of yacc.c */ #line 2960 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression(CPPExpression::get_nullptr()); + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } break; case 574: /* Line 1792 of yacc.c */ -#line 2967 "dtool/src/cppparser/cppBison.yxx" +#line 2964 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.identifier), current_scope, global_scope, current_lexer); +} + break; + + case 575: +/* Line 1792 of yacc.c */ +#line 2968 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(CPPExpression::get_nullptr()); +} + break; + + case 576: +/* Line 1792 of yacc.c */ +#line 2975 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, true); if (type == NULL) { @@ -7529,9 +7547,9 @@ yyreduce: } break; - case 575: + case 577: /* Line 1792 of yacc.c */ -#line 2975 "dtool/src/cppparser/cppBison.yxx" +#line 2983 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, true, current_lexer); if (type == NULL) { @@ -7541,43 +7559,27 @@ yyreduce: } break; - case 576: + case 578: /* Line 1792 of yacc.c */ -#line 2983 "dtool/src/cppparser/cppBison.yxx" +#line 2991 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier))); } break; - case 577: -/* Line 1792 of yacc.c */ -#line 3009 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.identifier) = (yyvsp[(1) - (1)].u.identifier); -} - break; - - case 578: -/* Line 1792 of yacc.c */ -#line 3013 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.identifier) = (yyvsp[(1) - (1)].u.identifier); -} - break; - case 579: /* Line 1792 of yacc.c */ -#line 3020 "dtool/src/cppparser/cppBison.yxx" +#line 3017 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].str)); + (yyval.u.identifier) = (yyvsp[(1) - (1)].u.identifier); } break; case 580: /* Line 1792 of yacc.c */ -#line 3024 "dtool/src/cppparser/cppBison.yxx" +#line 3021 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); + (yyval.u.identifier) = (yyvsp[(1) - (1)].u.identifier); } break; @@ -7585,15 +7587,31 @@ yyreduce: /* Line 1792 of yacc.c */ #line 3028 "dtool/src/cppparser/cppBison.yxx" { + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].str)); +} + break; + + case 582: +/* Line 1792 of yacc.c */ +#line 3032 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); +} + break; + + case 583: +/* Line 1792 of yacc.c */ +#line 3036 "dtool/src/cppparser/cppBison.yxx" + { // The right string takes on the literal type of the left. (yyval.u.expr) = (yyvsp[(1) - (2)].u.expr); (yyval.u.expr)->_str += (yyvsp[(2) - (2)].str); } break; - case 582: + case 584: /* Line 1792 of yacc.c */ -#line 3034 "dtool/src/cppparser/cppBison.yxx" +#line 3042 "dtool/src/cppparser/cppBison.yxx" { // We have to check that the two literal types match up. (yyval.u.expr) = (yyvsp[(1) - (2)].u.expr); @@ -7606,7 +7624,7 @@ yyreduce: /* Line 1792 of yacc.c */ -#line 7610 "built/tmp/cppBison.yxx.c" +#line 7628 "built/tmp/cppBison.yxx.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires diff --git a/dtool/src/cppparser/cppBison.yxx b/dtool/src/cppparser/cppBison.yxx index 0cca93bef7..d98f4f71e8 100644 --- a/dtool/src/cppparser/cppBison.yxx +++ b/dtool/src/cppparser/cppBison.yxx @@ -1723,6 +1723,10 @@ type: str << *$3; yyerror("could not determine type of " + str.str(), @3); } +} + | KW_AUTO +{ + $$ = new CPPSimpleType(CPPSimpleType::T_auto); } ; @@ -1813,6 +1817,10 @@ type_decl: str << *$3; yyerror("could not determine type of " + str.str(), @3); } +} + | KW_AUTO +{ + $$ = new CPPSimpleType(CPPSimpleType::T_auto); } ; @@ -2114,7 +2122,7 @@ namespace_declaration: } CPPNamespace *nspace = new CPPNamespace($3, scope, @2.file); - nspace->_inline = true; + nspace->_is_inline = true; current_scope->add_declaration(nspace, global_scope, current_lexer, @2); current_scope->define_namespace(nspace); push_scope(scope); diff --git a/dtool/src/cppparser/cppIdentifier.cxx b/dtool/src/cppparser/cppIdentifier.cxx index f3c5985ed9..678bea56b8 100644 --- a/dtool/src/cppparser/cppIdentifier.cxx +++ b/dtool/src/cppparser/cppIdentifier.cxx @@ -189,7 +189,7 @@ get_local_name(CPPScope *scope) const { // Strip off template scopes, since they don't add anything // particularly meaningful to the local name. - while (my_scope->as_template_scope() != NULL) { + while (my_scope != NULL && my_scope->as_template_scope() != NULL) { my_scope = my_scope->get_parent_scope(); } diff --git a/dtool/src/cppparser/cppNamespace.cxx b/dtool/src/cppparser/cppNamespace.cxx index dc7871d8ea..ca91a86b63 100644 --- a/dtool/src/cppparser/cppNamespace.cxx +++ b/dtool/src/cppparser/cppNamespace.cxx @@ -28,7 +28,7 @@ CPPNamespace(CPPIdentifier *ident, CPPScope *scope, const CPPFile &file) : CPPDeclaration(file), _ident(ident), _scope(scope), - _inline(false) + _is_inline(false) { } @@ -88,7 +88,7 @@ get_scope() const { //////////////////////////////////////////////////////////////////// void CPPNamespace:: output(ostream &out, int indent_level, CPPScope *scope, bool complete) const { - if (_inline) { + if (_is_inline) { out << "inline "; } if (!complete && _ident != NULL) { diff --git a/dtool/src/cppparser/cppNamespace.h b/dtool/src/cppparser/cppNamespace.h index 9791194419..16a6f3d304 100644 --- a/dtool/src/cppparser/cppNamespace.h +++ b/dtool/src/cppparser/cppNamespace.h @@ -42,7 +42,9 @@ public: virtual CPPNamespace *as_namespace(); - bool _inline; + // We can't call this _inline since that would clash with an MSVC + // built-in keyword declaration. + bool _is_inline; private: CPPIdentifier *_ident; diff --git a/dtool/src/cppparser/cppParser.cxx b/dtool/src/cppparser/cppParser.cxx index 443bbf9e0e..d47a0db5ca 100644 --- a/dtool/src/cppparser/cppParser.cxx +++ b/dtool/src/cppparser/cppParser.cxx @@ -72,7 +72,8 @@ parse_file(const Filename &filename) { //////////////////////////////////////////////////////////////////// CPPExpression *CPPParser:: parse_expr(const string &expr) { - return CPPPreprocessor::parse_expr(expr, this, this); + YYLTYPE loc = {}; + return CPPPreprocessor::parse_expr(expr, this, this, loc); } //////////////////////////////////////////////////////////////////// diff --git a/dtool/src/cppparser/cppPreprocessor.cxx b/dtool/src/cppparser/cppPreprocessor.cxx index 4def9695ae..a13fad4c11 100644 --- a/dtool/src/cppparser/cppPreprocessor.cxx +++ b/dtool/src/cppparser/cppPreprocessor.cxx @@ -774,6 +774,7 @@ push_file(const CPPFile &file) { indent(cerr, _files.size() * 2) << "Reading " << file << "\n"; } + assert(_last_c == 0); _files.push_back(InputFile()); InputFile &infile = _files.back(); @@ -841,7 +842,8 @@ push_string(const string &input, bool lock_position) { // string and return the new string. //////////////////////////////////////////////////////////////////// string CPPPreprocessor:: -expand_manifests(const string &input_expr, bool expand_undefined) { +expand_manifests(const string &input_expr, bool expand_undefined, + const YYLTYPE &loc) { // Get a copy of the expression string we can modify. string expr = input_expr; @@ -872,11 +874,28 @@ expand_manifests(const string &input_expr, bool expand_undefined) { manifest_found = true; } else if (expand_undefined && ident != "true" && ident != "false") { - // It is not found. Expand it to 0. + // It is not found. Expand it to 0, but only if we are currently + // parsing an #if expression. expr = expr.substr(0, q) + "0" + expr.substr(p); p = q + 1; } } + } else if (expr[p] == '\'' || expr[p] == '"') { + // Skip the next part until we find a closing quotation mark. + char quote = expr[p]; + p++; + while (p < expr.size() && expr[p] != quote) { + if (expr[p] == '\\') { + // This might be an escaped quote. Skip an extra char. + p++; + } + p++; + } + if (p >= expr.size()) { + // Unclosed string. + warning("missing terminating " + string(1, quote) + " character", loc); + } + p++; } else { p++; } @@ -903,8 +922,8 @@ expand_manifests(const string &input_expr, bool expand_undefined) { //////////////////////////////////////////////////////////////////// CPPExpression *CPPPreprocessor:: parse_expr(const string &input_expr, CPPScope *current_scope, - CPPScope *global_scope) { - string expr = expand_manifests(input_expr, false); + CPPScope *global_scope, const YYLTYPE &loc) { + string expr = expand_manifests(input_expr, false, loc); CPPExpressionParser ep(current_scope, global_scope); ep._verbose = 0; @@ -1475,7 +1494,7 @@ handle_define_directive(const string &args, const YYLTYPE &loc) { if (!manifest->_has_parameters) { string expr_string = manifest->expand(); if (!expr_string.empty()) { - manifest->_expr = parse_expr(expr_string, global_scope, global_scope); + manifest->_expr = parse_expr(expr_string, global_scope, global_scope, loc); } } @@ -1554,7 +1573,7 @@ void CPPPreprocessor:: handle_if_directive(const string &args, const YYLTYPE &loc) { // When expanding manifests, we should replace unknown macros // with 0. - string expr = expand_manifests(args, true); + string expr = expand_manifests(args, true, loc); int expression_result = 0; CPPExpressionParser ep(current_scope, global_scope); @@ -1602,7 +1621,7 @@ handle_include_directive(const string &args, const YYLTYPE &loc) { // might not filter out quotes and angle brackets properly, we'll // only expand manifests if we don't begin with a quote or bracket. if (!expr.empty() && (expr[0] != '"' && expr[0] != '<')) { - expr = expand_manifests(expr, false); + expr = expand_manifests(expr, false, loc); } if (!expr.empty()) { @@ -2727,14 +2746,11 @@ get() { indent(cerr, _files.size() * 2) << "End of input stream, restoring to previous input\n"; #endif - int last_c = _files.back()._prev_last_c; _files.pop_back(); - if (last_c != '\0') { - c = last_c; - } else if (!_files.empty()) { - c = _files.back().get(); - } + // Synthesize a newline, just in case the file doesn't already + // end with one. + c = '\n'; } if (c == '\n') { diff --git a/dtool/src/cppparser/cppPreprocessor.h b/dtool/src/cppparser/cppPreprocessor.h index 6e9ef54f7d..189de37650 100644 --- a/dtool/src/cppparser/cppPreprocessor.h +++ b/dtool/src/cppparser/cppPreprocessor.h @@ -111,9 +111,10 @@ protected: bool push_file(const CPPFile &file); bool push_string(const string &input, bool lock_position); - string expand_manifests(const string &input_expr, bool expand_undefined); + string expand_manifests(const string &input_expr, bool expand_undefined, + const YYLTYPE &loc); CPPExpression *parse_expr(const string &expr, CPPScope *current_scope, - CPPScope *global_scope); + CPPScope *global_scope, const YYLTYPE &loc); private: CPPToken internal_get_next_token(); diff --git a/dtool/src/cppparser/cppScope.cxx b/dtool/src/cppparser/cppScope.cxx index ded976708d..4118668ed4 100644 --- a/dtool/src/cppparser/cppScope.cxx +++ b/dtool/src/cppparser/cppScope.cxx @@ -297,7 +297,7 @@ define_namespace(CPPNamespace *ns) { _namespaces[name] = ns; - if (ns->_inline) { + if (ns->_is_inline) { // Add an implicit using declaration for an inline namespace. _using.insert(ns->get_scope()); } diff --git a/dtool/src/cppparser/cppSimpleType.cxx b/dtool/src/cppparser/cppSimpleType.cxx index d104c98881..a6e4db1a59 100644 --- a/dtool/src/cppparser/cppSimpleType.cxx +++ b/dtool/src/cppparser/cppSimpleType.cxx @@ -158,6 +158,10 @@ output(ostream &out, int, CPPScope *, bool) const { out << "parameter"; break; + case T_auto: + out << "auto"; + break; + default: out << "***invalid type***"; } diff --git a/dtool/src/cppparser/cppSimpleType.h b/dtool/src/cppparser/cppSimpleType.h index eceb8afe26..9acfdafbd9 100644 --- a/dtool/src/cppparser/cppSimpleType.h +++ b/dtool/src/cppparser/cppSimpleType.h @@ -55,6 +55,13 @@ public: // but it initially looks like a function prototype. // T_parameter, + + // T_auto is also a special type that corresponds to the "auto" + // keyword used in a variable assignment. The type of it is + // automatically determined at a later stage based on the type + // of the expression that is assigned to it. + // + T_auto, }; enum Flags {