From 909856c75d53c9964c39ecf5b0f88a8d8efdef48 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 19 Nov 2015 13:07:28 +0100 Subject: [PATCH] Improve interrogate diagnostics when encountering unknown types --- dtool/src/cppparser/cppBison.cxx.prebuilt | 4996 +++++++++++---------- dtool/src/cppparser/cppBison.yxx | 33 +- dtool/src/cppparser/cppScope.cxx | 2 +- 3 files changed, 2553 insertions(+), 2478 deletions(-) diff --git a/dtool/src/cppparser/cppBison.cxx.prebuilt b/dtool/src/cppparser/cppBison.cxx.prebuilt index 90f0cec6f9..894e643bca 100644 --- a/dtool/src/cppparser/cppBison.cxx.prebuilt +++ b/dtool/src/cppparser/cppBison.cxx.prebuilt @@ -797,16 +797,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 79 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 4493 +#define YYLAST 4624 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 141 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 94 +#define YYNNTS 95 /* YYNRULES -- Number of rules. */ -#define YYNRULES 585 +#define YYNRULES 587 /* YYNRULES -- Number of states. */ -#define YYNSTATES 1076 +#define YYNSTATES 1080 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -887,14 +887,14 @@ static const yytype_uint16 yyprhs[] = 674, 677, 680, 683, 687, 692, 700, 702, 704, 707, 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, + 766, 769, 772, 774, 776, 779, 783, 784, 790, 791, + 799, 801, 803, 806, 810, 813, 816, 819, 823, 827, + 831, 835, 839, 843, 848, 853, 856, 860, 862, 864, + 866, 868, 872, 878, 880, 883, 888, 890, 892, 894, + 896, 897, 904, 905, 913, 918, 924, 927, 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, + 955, 957, 959, 962, 965, 968, 971, 973, 976, 978, + 982, 985, 987, 988, 991, 993, 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, @@ -906,59 +906,59 @@ static const yytype_uint16 yyprhs[] = 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, 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 + 1224, 1226, 1230, 1232, 1234, 1236, 1238, 1240, 1244, 1246, + 1251, 1259, 1267, 1272, 1277, 1280, 1283, 1286, 1289, 1292, + 1296, 1300, 1304, 1308, 1312, 1316, 1320, 1324, 1328, 1332, + 1336, 1340, 1344, 1348, 1352, 1356, 1362, 1367, 1372, 1376, + 1380, 1384, 1388, 1390, 1395, 1403, 1411, 1416, 1421, 1426, + 1431, 1436, 1441, 1446, 1451, 1456, 1461, 1466, 1471, 1476, + 1481, 1486, 1489, 1495, 1498, 1501, 1504, 1507, 1510, 1514, + 1518, 1522, 1526, 1530, 1534, 1538, 1542, 1546, 1550, 1554, + 1558, 1562, 1566, 1570, 1574, 1578, 1582, 1588, 1593, 1598, + 1602, 1606, 1610, 1614, 1616, 1618, 1620, 1622, 1624, 1626, + 1628, 1630, 1632, 1634, 1639, 1647, 1655, 1660, 1665, 1668, + 1674, 1677, 1680, 1683, 1686, 1690, 1694, 1698, 1702, 1706, + 1710, 1714, 1718, 1722, 1726, 1730, 1734, 1738, 1742, 1746, + 1750, 1754, 1758, 1764, 1769, 1774, 1778, 1782, 1786, 1790, + 1792, 1794, 1796, 1798, 1800, 1802, 1804, 1806, 1808, 1810, + 1813, 1816, 1818, 1820, 1822, 1824, 1827, 1830 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 142, 0, -1, 114, 143, -1, 115, 227, -1, 116, - 196, -1, 234, -1, 143, 119, -1, 143, 148, -1, - 145, -1, 144, 118, 145, -1, 232, 135, 224, 137, + 142, 0, -1, 114, 143, -1, 115, 228, -1, 116, + 197, -1, 235, -1, 143, 119, -1, 143, 148, -1, + 145, -1, 144, 118, 145, -1, 233, 135, 225, 137, -1, -1, 151, 117, 147, 143, 138, -1, 152, -1, - 174, -1, 146, -1, 211, -1, 214, -1, 149, -1, + 174, -1, 146, -1, 212, -1, 215, -1, 149, -1, 104, 158, -1, 48, -1, 64, -1, 69, 120, -1, 90, 120, -1, 89, 120, -1, 88, 120, -1, 80, 135, 10, 118, 10, 137, 119, -1, 80, 135, 10, 118, 10, 118, 10, 137, 119, -1, 81, 135, 10, - 118, 10, 118, 10, 137, 119, -1, 97, 135, 227, - 118, 233, 137, -1, 97, 135, 227, 137, -1, -1, - 72, 150, 148, -1, 234, -1, 67, 151, -1, 67, + 118, 10, 118, 10, 137, 119, -1, 97, 135, 228, + 118, 234, 137, -1, 97, 135, 228, 137, -1, -1, + 72, 150, 148, -1, 235, -1, 67, 151, -1, 67, 6, 151, -1, 96, 151, -1, 76, 151, -1, 109, 151, -1, 68, 151, -1, 91, 151, -1, 111, 151, -1, 82, 151, -1, 57, 151, -1, 49, 151, -1, 66, 151, -1, 153, -1, 151, 194, 119, -1, 151, - 163, 186, -1, -1, 151, 194, 154, 156, -1, -1, - 151, 56, 193, 155, 157, -1, 180, 186, -1, 180, + 163, 186, -1, -1, 151, 196, 154, 156, -1, -1, + 151, 56, 196, 155, 157, -1, 180, 186, -1, 180, 185, 118, 156, -1, 180, 186, -1, 180, 185, 118, - 157, -1, -1, 151, 194, 159, 161, -1, -1, 151, - 56, 193, 160, 162, -1, 151, 163, 186, -1, 180, + 157, -1, -1, 151, 196, 159, 161, -1, -1, 151, + 56, 196, 160, 162, -1, 151, 163, 186, -1, 180, 186, -1, 180, 185, 118, 161, -1, 180, 186, -1, 180, 185, 118, 162, -1, -1, 10, 135, 164, 182, 137, 171, -1, -1, 11, 135, 165, 182, 137, 171, - -1, -1, 133, 232, 135, 166, 182, 137, 171, -1, + -1, -1, 133, 233, 135, 166, 182, 137, 171, -1, -1, 11, 135, 130, 180, 137, 135, 167, 182, 137, 171, -1, -1, 11, 135, 12, 130, 180, 137, 135, 168, 182, 137, 171, -1, -1, 87, 193, 190, 135, 169, 182, 137, 171, -1, -1, 87, 56, 193, 190, - 135, 170, 182, 137, 171, -1, 10, -1, 234, -1, + 135, 170, 182, 137, 171, -1, 10, -1, 235, -1, 56, -1, 171, 85, -1, 171, 101, 135, 137, -1, - 171, 101, 135, 232, 137, -1, 139, -1, 133, -1, + 171, 101, 135, 233, 137, -1, 139, -1, 133, -1, 130, -1, 131, -1, 132, -1, 128, -1, 129, -1, 123, -1, 125, -1, 124, -1, 15, -1, 16, -1, 17, -1, 18, -1, 19, -1, 20, -1, 126, -1, @@ -968,212 +968,213 @@ static const yytype_int16 yyrhs[] = 43, -1, 44, -1, 31, -1, 136, 140, -1, 135, 137, -1, 84, -1, 60, -1, 152, -1, 174, -1, -1, 100, 175, 126, 176, 127, 173, -1, 100, 152, - -1, 234, -1, 177, -1, 178, -1, 177, 118, 178, - -1, 55, 232, -1, 55, 232, 121, 196, -1, 105, - 232, -1, 105, 232, 121, 196, -1, 179, 191, 184, - -1, 56, 179, 191, 184, -1, 215, -1, 10, -1, - 11, -1, 232, -1, 87, 172, -1, 87, 6, 10, + -1, 235, -1, 177, -1, 178, -1, 177, 118, 178, + -1, 55, 233, -1, 55, 233, 121, 197, -1, 105, + 233, -1, 105, 233, 121, 197, -1, 179, 191, 184, + -1, 56, 179, 191, 184, -1, 216, -1, 10, -1, + 11, -1, 233, -1, 87, 172, -1, 87, 6, 10, -1, 56, 180, -1, 111, 180, -1, 130, 180, -1, 125, 180, -1, 16, 180, -1, 12, 130, 180, -1, - 180, 136, 223, 140, -1, 180, 120, 4, -1, 135, + 180, 136, 224, 140, -1, 180, 120, 4, -1, 135, 180, 137, -1, -1, 180, 135, 181, 182, 137, 171, - -1, 234, -1, 14, -1, 183, -1, 183, 118, 14, + -1, 235, -1, 14, -1, 183, -1, 183, 118, 14, -1, 183, 14, -1, 189, -1, 183, 118, 189, -1, - 234, -1, 121, 226, -1, 234, -1, 121, 227, -1, - 119, -1, 117, 219, 138, -1, 120, 144, 117, 219, - 138, -1, 121, 227, 119, -1, 121, 117, 187, 138, - -1, 234, -1, 188, -1, 188, 118, -1, 227, -1, - 117, 187, 138, -1, 188, 118, 227, -1, 188, 118, + 235, -1, 121, 227, -1, 235, -1, 121, 228, -1, + 119, -1, 117, 220, 138, -1, 120, 144, 117, 220, + 138, -1, 121, 228, 119, -1, 121, 117, 187, 138, + -1, 235, -1, 188, -1, 188, 118, -1, 228, -1, + 117, 187, 138, -1, 188, 118, 228, -1, 188, 118, 117, 187, 138, -1, 193, 191, 185, -1, 56, 193, 191, 185, -1, 56, 91, 193, 191, 185, -1, 91, - 189, -1, 229, -1, 234, -1, 10, -1, 11, -1, + 189, -1, 230, -1, 235, -1, 10, -1, 11, -1, 56, 190, -1, 111, 190, -1, 130, 190, -1, 125, 190, -1, 16, 190, -1, 12, 130, 190, -1, 190, - 136, 223, 140, -1, 234, -1, 10, -1, 11, -1, + 136, 224, 140, -1, 235, -1, 10, -1, 11, -1, 56, 191, -1, 111, 191, -1, 130, 191, -1, 125, 191, -1, 16, 191, -1, 12, 130, 191, -1, 191, - 136, 223, 140, -1, 135, 191, 137, 135, 182, 137, - 171, -1, 135, 191, 137, -1, 234, -1, 56, 192, + 136, 224, 140, -1, 135, 191, 137, 135, 182, 137, + 171, -1, 135, 191, 137, -1, 235, -1, 56, 192, -1, 111, 192, -1, 130, 192, -1, 125, 192, -1, - 16, 192, -1, 12, 130, 192, -1, 192, 136, 223, + 16, 192, -1, 12, 130, 192, -1, 192, 136, 224, 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, 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, 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, + 216, -1, 11, -1, 105, 233, -1, 198, -1, 200, + -1, 205, -1, 211, 233, -1, 210, 233, 120, 207, + -1, 58, 135, 228, 137, -1, 47, -1, 216, -1, + 11, -1, 105, 233, -1, 198, -1, 200, -1, 205, + -1, 211, 233, -1, 210, 233, 120, 207, -1, 210, + 233, -1, 58, 135, 228, 137, -1, 47, -1, 216, + -1, 11, -1, 105, 233, -1, 211, 233, -1, 210, + 233, -1, 194, -1, 10, -1, 193, 192, -1, 56, + 193, 192, -1, -1, 211, 117, 199, 143, 138, -1, + -1, 211, 233, 201, 202, 117, 143, 138, -1, 235, + -1, 203, -1, 120, 204, -1, 203, 118, 204, -1, + 90, 232, -1, 89, 232, -1, 88, 232, -1, 109, + 90, 232, -1, 109, 89, 232, -1, 109, 88, 232, + -1, 90, 109, 232, -1, 89, 109, 232, -1, 88, + 109, 232, -1, 206, 117, 209, 138, -1, 210, 233, + 120, 207, -1, 210, 233, -1, 210, 120, 207, -1, + 210, -1, 217, -1, 11, -1, 235, -1, 208, 233, + 118, -1, 208, 233, 121, 228, 118, -1, 208, -1, + 208, 233, -1, 208, 233, 121, 228, -1, 65, -1, + 55, -1, 99, -1, 106, -1, -1, 83, 233, 117, + 213, 143, 138, -1, -1, 76, 83, 233, 117, 214, + 143, 138, -1, 83, 117, 143, 138, -1, 76, 83, + 117, 143, 138, -1, 108, 233, -1, 108, 83, 233, + -1, 217, -1, 218, -1, 219, -1, 50, -1, 52, + -1, 112, -1, 53, -1, 54, -1, 93, -1, 78, + -1, 79, -1, 107, -1, 94, -1, 77, -1, 93, + 217, -1, 78, 217, -1, 107, 217, -1, 94, 217, + -1, 71, -1, 78, 71, -1, 61, -1, 78, 78, + 71, -1, 78, 61, -1, 110, -1, -1, 221, 222, + -1, 235, -1, 222, 223, -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, 222, 138, -1, + 235, -1, 228, -1, 235, -1, 226, -1, 228, -1, + 226, 118, 228, -1, 229, -1, 135, 197, 137, 227, + -1, 98, 126, 197, 127, 135, 226, 137, -1, 62, + 126, 197, 127, 135, 226, 137, -1, 95, 135, 197, + 137, -1, 46, 135, 197, 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, 21, + 227, -1, 227, 22, 227, -1, 227, 122, 227, 120, + 227, -1, 227, 136, 228, 140, -1, 227, 135, 226, + 137, -1, 227, 135, 137, -1, 227, 134, 227, -1, + 227, 31, 227, -1, 135, 226, 137, -1, 229, -1, + 135, 197, 137, 228, -1, 98, 126, 197, 127, 135, + 226, 137, -1, 62, 126, 197, 127, 135, 226, 137, + -1, 11, 135, 225, 137, -1, 77, 135, 225, 137, + -1, 52, 135, 225, 137, -1, 112, 135, 225, 137, + -1, 53, 135, 225, 137, -1, 54, 135, 225, 137, + -1, 50, 135, 225, 137, -1, 93, 135, 225, 137, + -1, 78, 135, 225, 137, -1, 107, 135, 225, 137, + -1, 94, 135, 225, 137, -1, 71, 135, 225, 137, + -1, 61, 135, 225, 137, -1, 95, 135, 197, 137, + -1, 46, 135, 197, 137, -1, 84, 195, -1, 84, + 195, 135, 225, 137, -1, 139, 228, -1, 133, 228, + -1, 129, 228, -1, 130, 228, -1, 125, 228, -1, + 228, 130, 228, -1, 228, 131, 228, -1, 228, 132, + 228, -1, 228, 128, 228, -1, 228, 129, 228, -1, + 228, 123, 228, -1, 228, 124, 228, -1, 228, 125, + 228, -1, 228, 15, 228, -1, 228, 16, 228, -1, + 228, 17, 228, -1, 228, 18, 228, -1, 228, 19, + 228, -1, 228, 20, 228, -1, 228, 126, 228, -1, + 228, 127, 228, -1, 228, 21, 228, -1, 228, 22, + 228, -1, 228, 122, 228, 120, 228, -1, 228, 136, + 228, 140, -1, 228, 135, 226, 137, -1, 228, 135, + 137, -1, 228, 134, 228, -1, 228, 31, 228, -1, + 135, 226, 137, -1, 4, -1, 102, -1, 70, -1, + 5, -1, 3, -1, 234, -1, 9, -1, 10, -1, + 86, -1, 231, -1, 135, 197, 137, 228, -1, 98, + 126, 197, 127, 135, 226, 137, -1, 62, 126, 197, + 127, 135, 226, 137, -1, 95, 135, 197, 137, -1, + 46, 135, 197, 137, -1, 84, 195, -1, 84, 195, + 135, 225, 137, -1, 139, 228, -1, 133, 228, -1, + 129, 228, -1, 125, 228, -1, 230, 130, 228, -1, + 230, 131, 228, -1, 230, 132, 228, -1, 230, 128, + 228, -1, 230, 129, 228, -1, 230, 123, 228, -1, + 230, 124, 228, -1, 230, 125, 228, -1, 230, 15, + 228, -1, 230, 16, 228, -1, 230, 17, 228, -1, + 230, 18, 228, -1, 230, 19, 228, -1, 230, 20, + 228, -1, 230, 126, 228, -1, 230, 127, 228, -1, + 230, 21, 228, -1, 230, 22, 228, -1, 230, 122, + 228, 120, 228, -1, 230, 136, 228, 140, -1, 230, + 135, 226, 137, -1, 230, 135, 137, -1, 230, 134, + 228, -1, 230, 31, 228, -1, 135, 226, 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 + 234, -1, 9, -1, 10, -1, 86, -1, 233, -1, + 211, 233, -1, 105, 233, -1, 10, -1, 11, -1, + 6, -1, 8, -1, 234, 6, -1, 234, 8, -1, + -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 404, 404, 405, 409, 416, 417, 418, 422, 423, - 427, 440, 439, 451, 452, 453, 454, 455, 456, 457, - 458, 471, 480, 484, 492, 496, 500, 511, 532, 554, - 565, 579, 578, 593, 597, 601, 612, 616, 620, 624, - 628, 632, 636, 640, 644, 648, 655, 659, 668, 680, - 679, 695, 694, 712, 720, 731, 740, 754, 753, 769, - 768, 779, 794, 800, 809, 816, 829, 828, 853, 852, - 877, 876, 907, 906, 925, 924, 945, 944, 976, 975, - 1001, 1014, 1018, 1022, 1026, 1030, 1037, 1041, 1045, 1049, - 1053, 1057, 1061, 1065, 1069, 1073, 1077, 1081, 1085, 1089, - 1093, 1097, 1101, 1105, 1109, 1113, 1117, 1121, 1125, 1129, - 1133, 1137, 1141, 1145, 1149, 1153, 1157, 1161, 1165, 1169, - 1173, 1177, 1181, 1185, 1189, 1196, 1197, 1202, 1201, 1209, - 1213, 1214, 1218, 1224, 1233, 1237, 1241, 1245, 1249, 1255, - 1265, 1269, 1274, 1286, 1290, 1304, 1319, 1324, 1329, 1334, - 1339, 1344, 1349, 1354, 1359, 1365, 1364, 1386, 1390, 1395, - 1399, 1404, 1412, 1417, 1425, 1429, 1436, 1440, 1447, 1451, - 1455, 1459, 1463, 1470, 1471, 1472, 1476, 1479, 1480, 1481, - 1485, 1490, 1496, 1502, 1506, 1516, 1520, 1524, 1528, 1533, - 1538, 1543, 1548, 1553, 1558, 1566, 1570, 1574, 1578, 1583, - 1588, 1593, 1598, 1603, 1608, 1613, 1619, 1627, 1631, 1636, - 1641, 1646, 1651, 1656, 1661, 1666, 1675, 1679, 1687, 1691, - 1695, 1699, 1703, 1719, 1735, 1744, 1751, 1755, 1763, 1767, - 1771, 1775, 1779, 1795, 1811, 1829, 1838, 1845, 1849, 1857, - 1861, 1877, 1896, 1902, 1913, 1912, 1937, 1936, 1966, 1967, - 1971, 1972, 1976, 1980, 1984, 1988, 1992, 1996, 2000, 2004, - 2008, 2015, 2023, 2027, 2031, 2035, 2042, 2046, 2053, 2054, - 2060, 2068, 2069, 2075, 2084, 2091, 2095, 2099, 2107, 2106, - 2129, 2128, 2151, 2152, 2156, 2162, 2171, 2172, 2173, 2177, - 2181, 2185, 2189, 2193, 2197, 2202, 2207, 2212, 2217, 2222, - 2226, 2231, 2240, 2245, 2253, 2257, 2262, 2266, 2271, 2279, - 2289, 2289, 2299, 2300, 2304, 2305, 2306, 2307, 2308, 2309, - 2310, 2311, 2312, 2313, 2314, 2314, 2314, 2315, 2315, 2315, - 2315, 2316, 2316, 2316, 2316, 2316, 2317, 2317, 2317, 2318, - 2318, 2318, 2318, 2318, 2319, 2319, 2319, 2319, 2319, 2320, - 2320, 2320, 2320, 2320, 2321, 2321, 2321, 2322, 2322, 2322, - 2322, 2322, 2323, 2323, 2323, 2323, 2323, 2324, 2324, 2324, - 2325, 2325, 2325, 2325, 2326, 2326, 2326, 2326, 2326, 2327, - 2327, 2327, 2327, 2327, 2328, 2328, 2328, 2328, 2329, 2329, - 2329, 2329, 2329, 2330, 2330, 2330, 2330, 2330, 2331, 2331, - 2331, 2331, 2331, 2332, 2332, 2332, 2332, 2335, 2335, 2335, - 2335, 2335, 2335, 2335, 2335, 2335, 2335, 2335, 2336, 2336, - 2336, 2336, 2336, 2336, 2336, 2336, 2336, 2336, 2337, 2337, - 2341, 2345, 2352, 2356, 2363, 2367, 2374, 2378, 2382, 2386, - 2390, 2394, 2398, 2402, 2406, 2410, 2414, 2418, 2422, 2426, - 2430, 2434, 2438, 2442, 2446, 2450, 2454, 2458, 2462, 2466, - 2470, 2474, 2478, 2482, 2486, 2490, 2494, 2498, 2502, 2506, - 2514, 2518, 2522, 2526, 2530, 2540, 2546, 2552, 2558, 2564, - 2570, 2576, 2583, 2590, 2597, 2604, 2610, 2616, 2620, 2624, - 2628, 2632, 2636, 2640, 2644, 2648, 2652, 2656, 2660, 2664, - 2668, 2672, 2676, 2680, 2684, 2688, 2692, 2696, 2700, 2704, - 2708, 2712, 2716, 2720, 2724, 2728, 2732, 2736, 2740, 2744, - 2748, 2755, 2759, 2763, 2767, 2771, 2775, 2779, 2783, 2787, - 2801, 2805, 2809, 2813, 2817, 2821, 2825, 2829, 2833, 2837, - 2841, 2845, 2849, 2853, 2857, 2861, 2865, 2869, 2873, 2877, - 2881, 2885, 2889, 2893, 2897, 2901, 2905, 2909, 2913, 2917, - 2921, 2925, 2929, 2933, 2937, 2941, 2945, 2952, 2956, 2960, - 2964, 2968, 2972, 2976, 2980, 2984, 2991, 2999, 3007, 3033, - 3037, 3044, 3048, 3052, 3058, 3069 + 0, 405, 405, 406, 410, 417, 418, 419, 423, 424, + 428, 441, 440, 452, 453, 454, 455, 456, 457, 458, + 459, 472, 481, 485, 493, 497, 501, 512, 533, 555, + 566, 580, 579, 594, 598, 602, 613, 617, 621, 625, + 629, 633, 637, 641, 645, 649, 656, 660, 669, 681, + 680, 696, 695, 717, 725, 736, 745, 759, 758, 774, + 773, 788, 803, 809, 818, 825, 838, 837, 862, 861, + 886, 885, 916, 915, 934, 933, 954, 953, 985, 984, + 1010, 1023, 1027, 1031, 1035, 1039, 1046, 1050, 1054, 1058, + 1062, 1066, 1070, 1074, 1078, 1082, 1086, 1090, 1094, 1098, + 1102, 1106, 1110, 1114, 1118, 1122, 1126, 1130, 1134, 1138, + 1142, 1146, 1150, 1154, 1158, 1162, 1166, 1170, 1174, 1178, + 1182, 1186, 1190, 1194, 1198, 1205, 1206, 1211, 1210, 1218, + 1222, 1223, 1227, 1233, 1242, 1246, 1250, 1254, 1258, 1264, + 1274, 1278, 1283, 1295, 1299, 1313, 1328, 1333, 1338, 1343, + 1348, 1353, 1358, 1363, 1368, 1374, 1373, 1395, 1399, 1404, + 1408, 1413, 1421, 1426, 1434, 1438, 1445, 1449, 1456, 1460, + 1464, 1468, 1472, 1479, 1480, 1481, 1485, 1488, 1489, 1490, + 1494, 1499, 1505, 1511, 1515, 1525, 1529, 1533, 1537, 1542, + 1547, 1552, 1557, 1562, 1567, 1575, 1579, 1583, 1587, 1592, + 1597, 1602, 1607, 1612, 1617, 1622, 1628, 1636, 1640, 1645, + 1650, 1655, 1660, 1665, 1670, 1675, 1684, 1688, 1696, 1700, + 1704, 1708, 1712, 1728, 1744, 1753, 1760, 1764, 1772, 1776, + 1780, 1784, 1788, 1804, 1820, 1838, 1847, 1854, 1858, 1866, + 1870, 1886, 1905, 1909, 1917, 1923, 1934, 1933, 1958, 1957, + 1987, 1988, 1992, 1993, 1997, 2001, 2005, 2009, 2013, 2017, + 2021, 2025, 2029, 2036, 2044, 2048, 2052, 2056, 2063, 2067, + 2074, 2075, 2081, 2089, 2090, 2096, 2105, 2112, 2116, 2120, + 2128, 2127, 2150, 2149, 2172, 2173, 2177, 2183, 2192, 2193, + 2194, 2198, 2202, 2206, 2210, 2214, 2218, 2223, 2228, 2233, + 2238, 2243, 2247, 2252, 2261, 2266, 2274, 2278, 2283, 2287, + 2292, 2300, 2310, 2310, 2320, 2321, 2325, 2326, 2327, 2328, + 2329, 2330, 2331, 2332, 2333, 2334, 2335, 2335, 2335, 2336, + 2336, 2336, 2336, 2337, 2337, 2337, 2337, 2337, 2338, 2338, + 2338, 2339, 2339, 2339, 2339, 2339, 2340, 2340, 2340, 2340, + 2340, 2341, 2341, 2341, 2341, 2341, 2342, 2342, 2342, 2343, + 2343, 2343, 2343, 2343, 2344, 2344, 2344, 2344, 2344, 2345, + 2345, 2345, 2346, 2346, 2346, 2346, 2347, 2347, 2347, 2347, + 2347, 2348, 2348, 2348, 2348, 2348, 2349, 2349, 2349, 2349, + 2350, 2350, 2350, 2350, 2350, 2351, 2351, 2351, 2351, 2351, + 2352, 2352, 2352, 2352, 2352, 2353, 2353, 2353, 2353, 2356, + 2356, 2356, 2356, 2356, 2356, 2356, 2356, 2356, 2356, 2356, + 2357, 2357, 2357, 2357, 2357, 2357, 2357, 2357, 2357, 2357, + 2358, 2358, 2362, 2366, 2373, 2377, 2384, 2388, 2395, 2399, + 2403, 2407, 2411, 2415, 2419, 2423, 2427, 2431, 2435, 2439, + 2443, 2447, 2451, 2455, 2459, 2463, 2467, 2471, 2475, 2479, + 2483, 2487, 2491, 2495, 2499, 2503, 2507, 2511, 2515, 2519, + 2523, 2527, 2535, 2539, 2543, 2547, 2551, 2561, 2567, 2573, + 2579, 2585, 2591, 2597, 2604, 2611, 2618, 2625, 2631, 2637, + 2641, 2645, 2649, 2653, 2657, 2661, 2665, 2669, 2673, 2677, + 2681, 2685, 2689, 2693, 2697, 2701, 2705, 2709, 2713, 2717, + 2721, 2725, 2729, 2733, 2737, 2741, 2745, 2749, 2753, 2757, + 2761, 2765, 2769, 2776, 2780, 2784, 2788, 2792, 2796, 2800, + 2804, 2808, 2822, 2826, 2830, 2834, 2838, 2842, 2846, 2850, + 2854, 2858, 2862, 2866, 2870, 2874, 2878, 2882, 2886, 2890, + 2894, 2898, 2902, 2906, 2910, 2914, 2918, 2922, 2926, 2930, + 2934, 2938, 2942, 2946, 2950, 2954, 2958, 2962, 2966, 2973, + 2977, 2981, 2985, 2989, 2993, 2997, 3001, 3005, 3012, 3020, + 3028, 3054, 3058, 3065, 3069, 3073, 3079, 3090 }; #endif @@ -1225,11 +1226,12 @@ static const char *const yytname[] = "structure_init_body", "formal_parameter", "not_paren_formal_parameter_identifier", "formal_parameter_identifier", "empty_instance_identifier", "type", "type_decl", "predefined_type", - "full_type", "anonymous_struct", "$@16", "named_struct", "$@17", - "maybe_class_derivation", "class_derivation", "base_specification", - "enum", "enum_decl", "enum_element_type", "enum_body_trailing_comma", - "enum_body", "enum_keyword", "struct_keyword", "namespace_declaration", - "$@18", "$@19", "using_declaration", "simple_type", "simple_int_type", + "var_type_decl", "full_type", "anonymous_struct", "$@16", "named_struct", + "$@17", "maybe_class_derivation", "class_derivation", + "base_specification", "enum", "enum_decl", "enum_element_type", + "enum_body_trailing_comma", "enum_body", "enum_keyword", + "struct_keyword", "namespace_declaration", "$@18", "$@19", + "using_declaration", "simple_type", "simple_int_type", "simple_float_type", "simple_void_type", "code", "$@20", "code_block", "element", "optional_const_expr", "optional_const_expr_comma", "const_expr_comma", "no_angle_bracket_const_expr", "const_expr", @@ -1288,41 +1290,41 @@ static const yytype_uint8 yyr1[] = 192, 192, 192, 192, 192, 192, 193, 193, 193, 193, 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, 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, - 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, 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, 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, + 195, 195, 196, 196, 197, 197, 199, 198, 201, 200, + 202, 202, 203, 203, 204, 204, 204, 204, 204, 204, + 204, 204, 204, 205, 206, 206, 206, 206, 207, 207, + 208, 208, 208, 209, 209, 209, 210, 211, 211, 211, + 213, 212, 214, 212, 212, 212, 215, 215, 216, 216, + 216, 217, 217, 217, 217, 217, 217, 217, 217, 217, + 217, 217, 217, 217, 217, 217, 218, 218, 218, 218, + 218, 219, 221, 220, 222, 222, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, + 223, 223, 224, 224, 225, 225, 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, 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, 229, 229, 230, 230, 230, - 230, 230, 230, 230, 230, 230, 231, 231, 231, 232, - 232, 233, 233, 233, 233, 234 + 227, 227, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 229, 229, 229, 229, 229, 229, 229, + 229, 229, 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 230, 230, 230, 231, + 231, 231, 231, 231, 231, 231, 231, 231, 232, 232, + 232, 233, 233, 234, 234, 234, 234, 235 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1352,14 +1354,14 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 3, 4, 7, 1, 1, 2, 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, + 2, 2, 1, 1, 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, - 2, 2, 2, 2, 1, 2, 1, 3, 2, 1, - 0, 2, 1, 2, 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, @@ -1370,23 +1372,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, 1, 1, 3, - 1, 1, 1, 1, 1, 3, 1, 4, 7, 7, - 4, 4, 2, 2, 2, 2, 2, 3, 3, 3, + 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, 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, 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, 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 + 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 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -1394,438 +1396,453 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 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, 587, 0, 0, 0, 587, 5, 527, 523, 526, + 583, 584, 529, 530, 0, 0, 0, 0, 0, 0, + 0, 0, 525, 0, 0, 0, 0, 531, 0, 0, + 0, 0, 524, 0, 0, 0, 0, 0, 0, 0, + 0, 3, 472, 528, 217, 225, 291, 292, 294, 295, + 277, 0, 0, 308, 276, 306, 301, 297, 298, 296, + 300, 278, 0, 279, 299, 311, 293, 587, 4, 219, + 220, 221, 0, 267, 0, 216, 288, 289, 290, 1, + 20, 587, 587, 21, 587, 587, 587, 0, 31, 587, + 0, 0, 587, 0, 0, 0, 0, 587, 587, 0, + 587, 587, 0, 587, 587, 6, 15, 7, 18, 0, + 13, 46, 14, 16, 17, 33, 587, 0, 587, 587, + 587, 587, 587, 0, 587, 587, 587, 238, 0, 491, + 0, 0, 237, 587, 587, 0, 0, 587, 587, 497, + 495, 496, 494, 217, 291, 292, 294, 295, 308, 306, + 301, 297, 296, 300, 299, 293, 0, 0, 436, 493, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, + 0, 0, 0, 585, 586, 587, 0, 310, 307, 297, + 303, 297, 302, 305, 581, 582, 218, 304, 0, 587, + 587, 587, 587, 587, 587, 244, 207, 587, 0, 265, + 246, 222, 587, 44, 43, 45, 587, 34, 39, 22, + 587, 0, 37, 0, 0, 42, 587, 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, + 286, 38, 41, 243, 227, 236, 0, 0, 0, 0, + 11, 0, 0, 242, 49, 229, 230, 231, 267, 0, + 226, 0, 435, 434, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 239, 587, 241, 240, 0, 0, + 0, 0, 0, 0, 0, 0, 522, 506, 507, 508, + 509, 510, 511, 514, 515, 521, 0, 503, 504, 505, + 512, 513, 501, 502, 498, 499, 500, 520, 519, 0, + 0, 245, 0, 309, 587, 212, 208, 209, 211, 210, + 0, 587, 273, 0, 270, 269, 266, 268, 0, 587, + 587, 35, 32, 587, 0, 0, 0, 587, 280, 0, + 587, 0, 0, 242, 57, 287, 66, 68, 243, 227, + 51, 0, 0, 587, 228, 587, 0, 312, 168, 0, + 0, 48, 47, 0, 234, 232, 476, 490, 482, 478, + 480, 481, 488, 0, 487, 477, 484, 0, 483, 486, + 489, 0, 485, 479, 473, 437, 0, 518, 517, 224, + 213, 0, 0, 433, 432, 274, 263, 223, 587, 0, + 0, 251, 250, 587, 282, 0, 0, 284, 587, 0, + 30, 141, 142, 0, 0, 0, 0, 131, 132, 587, + 140, 130, 59, 61, 0, 587, 0, 0, 587, 0, + 0, 587, 186, 187, 0, 587, 587, 587, 587, 587, + 0, 185, 587, 70, 0, 587, 0, 8, 0, 587, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, + 587, 143, 0, 0, 492, 0, 516, 587, 214, 271, + 0, 247, 0, 0, 0, 0, 252, 587, 0, 285, + 587, 0, 0, 587, 0, 134, 587, 136, 587, 0, + 196, 197, 0, 587, 587, 587, 587, 587, 587, 587, + 195, 0, 58, 587, 573, 569, 572, 575, 576, 158, + 0, 0, 0, 571, 0, 577, 0, 0, 0, 570, + 0, 0, 0, 0, 0, 0, 159, 162, 587, 184, + 532, 574, 157, 0, 0, 0, 52, 587, 235, 0, + 587, 192, 188, 189, 191, 190, 76, 587, 12, 587, + 169, 313, 314, 312, 0, 587, 587, 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, 587, 0, 53, 166, 233, 0, 0, + 0, 275, 0, 0, 0, 256, 578, 0, 255, 0, + 254, 0, 0, 0, 587, 253, 587, 0, 0, 0, + 281, 29, 0, 587, 0, 125, 128, 126, 133, 587, + 202, 198, 199, 201, 200, 0, 0, 587, 138, 164, + 60, 587, 0, 62, 0, 0, 587, 0, 538, 183, + 0, 0, 543, 542, 541, 0, 0, 540, 587, 161, + 0, 587, 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, 587, 0, + 55, 78, 193, 587, 0, 0, 316, 317, 321, 318, + 325, 319, 320, 322, 323, 324, 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, 367, 368, 369, + 370, 387, 371, 372, 373, 374, 375, 376, 377, 378, + 379, 380, 381, 382, 383, 384, 385, 386, 388, 389, + 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, + 400, 401, 402, 403, 404, 405, 406, 407, 408, 587, + 425, 426, 427, 418, 430, 414, 415, 413, 420, 421, + 409, 410, 411, 412, 419, 417, 424, 422, 428, 423, + 416, 429, 315, 0, 9, 0, 0, 172, 175, 151, + 145, 122, 121, 154, 153, 167, 587, 0, 0, 475, + 474, 587, 272, 580, 262, 579, 261, 260, 259, 258, + 257, 249, 283, 0, 26, 0, 135, 139, 137, 203, + 206, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 165, 438, 0, 0, 64, 0, 0, 587, 587, + 0, 587, 0, 0, 0, 568, 82, 67, 81, 160, + 163, 0, 180, 552, 553, 554, 555, 556, 557, 560, + 561, 567, 0, 549, 550, 551, 558, 559, 547, 548, + 544, 545, 546, 566, 565, 0, 0, 0, 72, 69, + 0, 587, 0, 194, 587, 0, 170, 10, 177, 587, + 178, 0, 152, 54, 215, 0, 0, 587, 0, 0, + 0, 0, 448, 446, 447, 445, 0, 0, 444, 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, 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, 367, 368, 385, 369, 370, - 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, - 381, 382, 383, 384, 386, 387, 388, 389, 390, 391, - 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, - 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, 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 + 204, 0, 63, 537, 587, 181, 0, 0, 536, 0, + 533, 83, 0, 167, 0, 564, 563, 74, 587, 56, + 0, 587, 71, 431, 0, 587, 27, 28, 0, 0, + 0, 0, 0, 0, 471, 457, 458, 459, 460, 461, + 462, 463, 464, 470, 0, 454, 455, 456, 452, 453, + 449, 450, 451, 469, 468, 0, 0, 65, 182, 0, + 539, 0, 0, 562, 587, 0, 587, 77, 179, 156, + 587, 443, 0, 442, 0, 439, 0, 467, 466, 0, + 0, 84, 0, 0, 587, 79, 205, 0, 0, 465, + 535, 534, 85, 587, 73, 0, 0, 75, 441, 440 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -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 + -1, 4, 5, 446, 447, 106, 355, 107, 108, 220, + 109, 110, 111, 363, 429, 459, 536, 238, 424, 501, + 502, 660, 252, 425, 428, 549, 998, 1044, 713, 931, + 897, 605, 646, 112, 236, 416, 417, 418, 419, 460, + 846, 525, 526, 658, 614, 361, 557, 558, 527, 440, + 499, 205, 67, 343, 129, 254, 68, 69, 329, 70, + 330, 400, 401, 476, 71, 72, 326, 322, 323, 73, + 74, 113, 408, 480, 114, 75, 76, 77, 78, 444, + 445, 551, 832, 392, 261, 262, 881, 158, 42, 529, + 530, 625, 461, 43, 115 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -677 +#define YYPACT_NINF -703 static const yytype_int16 yypact[] = { - 243, -677, 2495, 3659, 39, 2629, -677, -677, -677, -677, - -677, -677, -677, -677, -90, -85, -47, -38, 8, 23, - 28, 57, -677, 30, 54, 73, 3855, -677, 85, 91, - 137, 158, -677, 167, 172, 2495, 2495, 2495, 2495, 1675, - 2495, 3169, -677, 66, -677, -677, -677, -677, -677, -677, - -677, 3818, 176, -677, -677, -677, -677, 4313, -677, 3709, - 3709, -677, 186, -677, 3709, -677, -677, 331, -677, -677, - -677, -677, 17, -4, 36, -677, -677, -677, -677, -677, - -677, 4382, 4382, -677, 4382, 3529, 4382, 173, -677, 4321, - 187, 189, 4382, 47, 206, 212, 215, 4382, 4382, 205, - 2487, 4382, 92, 4382, 4382, -677, -677, -677, -677, 2721, - -677, -677, -677, -677, -677, -677, 2495, 3659, 2495, 2495, - 2495, 2495, 2495, 3659, 2495, 2495, 2495, -677, 186, 214, - 186, 186, -677, 2495, 2495, 3659, 3659, 2495, 2495, 44, - 44, 44, 44, -90, -47, -38, 8, 23, 28, 30, - 54, 4227, 1884, 3333, 3564, 172, 226, -82, 3169, 44, - 2495, 2495, 2495, 2495, 2495, 2495, 2495, 2495, 2495, 2495, - 2495, 2495, 2495, 2495, 2495, 2495, 2495, 2495, 2495, 2495, - 2495, 1895, 2495, -677, -677, 331, 2495, -677, -677, 3648, - -677, 3709, -677, -677, -677, -677, -677, -677, 232, 331, - 331, 331, 331, 331, 331, 238, -677, -677, 2782, 256, - -677, -66, 4382, -677, -677, -677, 4382, -677, -677, -677, - 4260, 59, -677, 367, 373, -677, -677, 275, -677, -677, - -677, -677, -677, 2495, 2792, -677, 269, 2856, -677, 186, - -677, -677, -677, 261, 266, -677, 3818, 267, 3720, 186, - -677, 186, 296, 288, -677, -677, -677, -4, 36, -677, - 271, 293, -677, 306, 308, 309, 311, 312, 314, 285, - 315, 321, 322, -677, 2495, -677, -677, 327, 328, 330, - 298, 332, 333, 2495, 2495, -677, 3236, 3372, 3445, 3445, - 465, 465, 582, 582, -677, 2993, 3387, 3402, 767, 465, - 465, 378, 378, 44, 44, 44, -677, -677, -75, 954, - 238, 2954, -677, 331, 238, 238, 238, 238, 238, 119, - 2495, 186, 338, -677, -677, -677, -677, 2782, -677, 340, - -677, -677, -677, 354, 359, 360, 3902, -677, 1693, 3574, - 3818, 296, -677, -677, -677, 12, -677, 2495, 3818, 264, - -677, -677, 344, -677, -677, 186, 1995, -677, -677, 529, - -16, -66, -677, -677, -677, -677, -677, -677, -677, 345, - -677, -677, -677, 347, -677, -677, -677, 365, -677, -677, - 44, 3169, 2495, -677, -677, -677, 238, 366, 342, 3169, - -677, 143, -677, 385, 3948, 228, 386, 377, -677, 3994, - -677, 505, 507, -677, -677, 120, -677, -677, -677, 186, - 3611, 186, 391, 403, -677, 394, -677, -677, -677, -677, - 529, 1455, 392, 529, 1455, 529, 2975, 264, -677, -677, - 395, 264, 264, 264, 264, 264, 142, -677, 4040, -677, - 393, -677, 164, -677, 398, 2095, 3011, 400, 529, 529, - 2631, 529, 529, 529, 529, -677, 225, -677, 2782, 2495, - -677, 2495, 3169, 1455, -677, -677, 2495, -677, 537, 638, - 819, 279, -677, -677, 228, -677, -677, -70, 416, 4086, - 3, 417, 394, 425, 4361, 3574, -677, -677, 419, 394, - 394, 394, 394, 394, 394, -94, -677, 529, -677, 225, - -677, -677, -677, -677, -677, -677, 418, 3757, 437, -677, - 3855, -677, 1785, 429, 439, -677, 2495, 2495, 2495, 1675, - 2495, 415, 21, -677, 394, 3186, -677, 66, -677, 529, - 216, 430, -677, 225, -677, 155, 264, 433, 433, 433, - 433, 433, -677, 2495, -677, 1455, -677, 1316, -677, -677, - 186, 2495, 2095, 428, 452, 3169, -677, -677, 529, 162, - 162, 562, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, 440, 436, - -677, -677, 162, 162, 162, 236, 218, 1995, -677, 2495, - 460, -677, -677, 385, -59, -32, 442, 3030, 186, 323, - 186, -677, -677, 323, -677, 323, -677, 323, 323, 323, - 4132, -677, 4178, 570, 462, 572, -677, -677, 3659, -94, - 3659, -677, -677, -677, -677, 394, 448, 448, 448, 448, - 448, 193, 2506, 2495, -677, -677, -677, 225, 468, -677, - 3659, 3818, 394, 3659, 455, -677, 3659, 3659, 44, 44, - 44, 461, -24, 44, 547, -677, 1565, -9, 2495, 2495, - 2495, 2495, 2495, 2495, 2495, 2495, 2495, 2495, 2495, 2495, - 2495, 2495, 2495, 2495, 2495, 2495, 2495, 2495, 2495, 2195, - 2495, 244, 601, 471, 547, 489, -677, -677, 433, 1455, - 470, 478, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, 480, - -677, 482, 483, -677, 2295, 162, -677, -677, -677, -677, - -677, 3011, 1455, 485, 529, -677, -677, 547, -677, -677, - -677, -677, -677, -677, -677, -677, -677, -677, -677, 491, - -677, 492, -677, -677, -677, 448, 497, 498, 494, 499, - 509, 2506, 2506, 2506, 2506, 1675, 2506, 3220, -677, 501, - 521, -677, 529, 508, 394, -9, 523, 2495, 514, 526, - 2495, -677, -677, 13, -677, -677, -677, 2495, -677, 3236, - 3372, 3445, 3445, 465, 465, 582, 582, -677, 3152, 3387, - 3402, 767, 465, 465, 378, 378, 44, 44, 44, -677, - -677, 50, 1032, 520, -677, 13, 529, 1455, 525, -677, - 547, 1178, -677, -677, -677, 2095, 3169, 530, -677, -677, - 13, 538, 539, 1455, 3659, 3659, 3659, 3659, 179, 179, - 179, 179, 531, 55, 179, 2506, 2506, 2506, 2506, 2506, - 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, - 2506, 2506, 2506, 2506, 2395, 2495, -677, 529, -677, -677, - -9, -677, 528, 532, -677, 536, 44, -677, 549, 3169, - 2495, -677, -677, -677, 1455, -677, 545, 547, 13, -677, - 550, 547, -677, -677, 552, 553, 565, 557, 568, 2506, - -677, 3357, 3417, 828, 828, 644, 644, 665, 665, -677, - 3203, 3432, 1908, 1002, 426, 426, 179, 179, 179, -677, - -677, 68, 1473, -677, -677, 2495, -677, 2495, 15, 3169, - 1455, 560, 547, 13, -677, 13, 547, -677, 563, -677, - 564, 179, 2506, -677, -677, 75, 86, -677, 569, 578, - 547, 13, 13, 2495, 2495, 3220, -677, -677, -677, 547, - 13, 93, 134, 13, -677, -677 + 182, -703, 2645, 3790, 8, 2768, -703, -703, -703, -703, + -703, -703, -703, -703, -120, -81, -72, -65, -59, -35, + -27, -76, -703, -5, 0, 13, 3986, -703, 33, 77, + 104, -12, -703, 122, 128, 2645, 2645, 2645, 2645, 1825, + 2645, 3167, -703, 188, -703, -703, -703, -703, -703, -703, + -703, 3949, 130, -703, -703, -703, -703, 4444, -703, 3840, + 3840, -703, 278, -703, 3840, -703, -703, 226, -703, -703, + -703, -703, 166, 37, 54, -703, -703, -703, -703, -703, + -703, 4513, 4513, -703, 4513, 2660, 4513, 159, -703, 4452, + 156, 158, 4513, 57, 184, 195, 201, 4513, 4513, 203, + 3501, 4513, 62, 4513, 4513, -703, -703, -703, -703, 2860, + -703, -703, -703, -703, -703, -703, 2645, 3790, 2645, 2645, + 2645, 2645, 2645, 3790, 2645, 2645, 2645, -703, 278, 205, + 278, 278, -703, 2645, 2645, 3790, 3790, 2645, 2645, 199, + 199, 199, 199, -120, -72, -65, -59, -35, -27, -5, + 0, 4358, 2034, 3466, 3622, 128, 111, -105, 3167, 199, + 2645, 2645, 2645, 2645, 2645, 2645, 2645, 2645, 2645, 2645, + 2645, 2645, 2645, 2645, 2645, 2645, 2645, 2645, 2645, 2645, + 2645, 2045, 2645, -703, -703, 226, 2645, -703, -703, 3779, + -703, 3840, -703, -703, -703, -703, -703, -703, 189, 226, + 226, 226, 226, 226, 226, 200, -703, -703, 2921, 225, + -703, -75, 4513, -703, -703, -703, 4513, -703, -703, -703, + 4391, 94, -703, 339, 345, -703, -703, 243, -703, -703, + -703, -703, -703, 2645, 2931, -703, 256, 2995, -703, 278, + -703, -703, -703, 124, 240, -703, 3632, 257, 3851, 278, + -703, 278, 253, 269, -703, -703, -703, -703, 37, 54, + -703, 258, 290, -703, 260, 267, 276, 280, 283, 289, + 302, 294, 295, 309, -703, 2645, -703, -703, 310, 315, + 321, 312, 323, 325, 2645, 2645, -703, 3339, 619, 3065, + 3065, 249, 249, 388, 388, -703, 3093, 3370, 3490, 3520, + 249, 249, 319, 319, 199, 199, 199, -703, -703, -100, + 845, 200, 1049, -703, 226, 200, 200, 200, 200, 200, + 164, 2645, 278, 329, -703, -703, -703, -703, 2921, -703, + 343, -703, -703, -703, 351, 352, 354, 4033, -703, 1623, + 3695, 3632, 253, -703, -703, -703, -703, 17, -703, -703, + -703, 2645, 3949, 353, -703, -703, 336, -703, -703, 278, + 2145, -703, -703, 400, -46, -75, -703, -703, -703, -703, + -703, -703, -703, 340, -703, -703, -703, 337, -703, -703, + -703, 346, -703, -703, 199, 3167, 2645, -703, -703, -703, + 200, 349, 360, 3167, -703, 155, -703, 372, 4079, 237, + 374, 383, -703, 4125, -703, 495, 500, -703, -703, 247, + -703, -703, -703, 278, 3742, 278, 385, 396, -703, 559, + -703, -703, -703, -703, 400, 1605, 391, 400, 1605, 400, + 1843, 353, -703, -703, 401, 353, 353, 353, 353, 353, + 207, -703, 4171, -703, 394, -703, 285, -703, 398, 2245, + 3114, 404, 400, 400, 2770, 400, 400, 400, 400, -703, + 508, -703, 2921, 2645, -703, 2645, 3167, 1605, -703, -703, + 2645, -703, 597, 599, 773, 311, -703, -703, 237, -703, + -703, -85, 419, 4217, 49, 417, 559, 423, 4492, 3695, + -703, -703, 415, 559, 559, 559, 559, 559, 559, -83, + -703, 400, -703, 508, -703, -703, -703, -703, -703, -703, + 412, 3888, 424, -703, 3986, -703, 1935, 416, 426, -703, + 2645, 2645, 2645, 1825, 2645, 420, 11, -703, 559, 3289, + -703, 188, -703, 400, 131, 421, -703, 508, -703, 231, + 353, 425, 425, 425, 425, 425, -703, 2645, -703, 1605, + -703, 1467, -703, -703, 278, 2645, 2245, 429, 435, 3167, + -703, -703, 400, 279, 279, 549, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, 427, 428, -703, -703, 279, 279, 279, 305, + 162, 2145, -703, 2645, 445, -703, -703, 372, -62, -60, + 446, 3133, 278, 793, 278, -703, -703, 793, -703, 793, + -703, 793, 793, 793, 4263, -703, 4309, 569, 463, 575, + -703, -703, 3790, -83, 3790, -703, -703, -703, -703, 559, + 450, 450, 450, 450, 450, 286, 756, 2645, -703, -703, + -703, 508, 469, -703, 3790, 3949, 559, 3790, 453, -703, + 3790, 3790, 199, 199, 199, 456, -58, 199, 545, -703, + 1715, 68, 2645, 2645, 2645, 2645, 2645, 2645, 2645, 2645, + 2645, 2645, 2645, 2645, 2645, 2645, 2645, 2645, 2645, 2645, + 2645, 2645, 2645, 2345, 2645, 406, 601, 471, 545, 493, + -703, -703, 425, 1605, 473, 477, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, 478, -703, 480, 484, -703, 2445, 279, + -703, -703, -703, -703, -703, 3114, 1605, 483, 400, -703, + -703, 545, -703, -703, -703, -703, -703, -703, -703, -703, + -703, -703, -703, 481, -703, 487, -703, -703, -703, 450, + 498, 499, 504, 510, 525, 756, 756, 756, 756, 1825, + 756, 3323, -703, 513, 537, -703, 400, 520, 559, 68, + 532, 2645, 524, 536, 2645, -703, -703, -55, -703, -703, + -703, 2645, -703, 3339, 619, 3065, 3065, 249, 249, 388, + 388, -703, 3150, 3370, 3490, 3520, 249, 249, 319, 319, + 199, 199, 199, -703, -703, -21, 1068, 538, -703, -55, + 400, 1605, 534, -703, 545, 1276, -703, -703, -703, 2245, + 3167, 548, -703, -703, -55, 555, 567, 1605, 3790, 3790, + 3790, 3790, 223, 223, 223, 223, 550, 9, 223, 756, + 756, 756, 756, 756, 756, 756, 756, 756, 756, 756, + 756, 756, 756, 756, 756, 756, 756, 756, 2545, 2645, + -703, 400, -703, -703, 68, -703, 553, 556, -703, 557, + 199, -703, 560, 3167, 2645, -703, -703, -703, 1605, -703, + 562, 545, -55, -703, 552, 545, -703, -703, 563, 572, + 570, 573, 584, 756, -703, 3355, 3505, 906, 906, 660, + 660, 468, 468, -703, 3306, 3535, 2058, 813, 442, 442, + 223, 223, 223, -703, -703, 16, 1138, -703, -703, 2645, + -703, 2645, 1, 3167, 1605, 576, 545, -55, -703, -55, + 545, -703, 600, -703, 602, 223, 756, -703, -703, 70, + 97, -703, 604, 615, 545, -55, -55, 2645, 2645, 3323, + -703, -703, -703, 545, -55, 100, 113, -55, -703, -703 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -677, -677, -177, -677, 124, -677, -677, 487, -677, -677, - -21, -98, -677, -677, -677, -144, -225, -677, -677, -677, - -173, -272, 484, -677, -677, -677, -677, -677, -677, -677, - -676, -677, -677, 235, -677, -677, -677, 237, 313, -235, - -677, -423, -677, 94, -495, -318, -547, -677, -504, -342, - -224, -54, -39, 488, 224, -36, -78, -677, -77, -677, - -677, -677, 262, -68, -677, -317, -677, -677, -13, 58, - -677, -677, -677, -677, 26, 246, -677, -677, 191, -677, - -64, -677, -499, -104, -20, 156, 71, -145, -677, -677, - -340, 481, -368, -1 + -703, -703, -175, -703, 185, -703, -703, 518, -703, -703, + 78, -99, -703, -703, -703, -92, -172, -703, -703, -703, + -123, -214, 531, -703, -703, -703, -703, -703, -703, -703, + -702, -703, -703, 284, -703, -703, -703, 288, 359, -346, + -703, -418, -703, 132, -496, -308, -552, -703, -511, -349, + -402, 107, -34, -78, 268, -18, 5, -95, -703, -29, + -703, -703, -703, 303, -11, -703, -319, -703, -703, -10, + 35, -703, -703, -703, -703, -24, 133, -703, -703, 232, + -703, -23, -703, -544, -98, -20, 175, 554, 153, -703, + -703, -371, 147, -366, -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 -264 +#define YYTABLE_NINF -266 static const yytype_int16 yytable[] = { - 6, 531, 235, 156, 658, 832, 194, 195, 665, 183, - 393, 184, 185, 130, 264, 265, 266, 267, 268, 157, - 270, 271, 272, 419, 422, 194, 195, 652, 925, 277, - 278, 254, 255, 281, 282, 675, 284, 480, 705, 79, - 616, 256, 653, 284, 710, 116, 194, 195, 633, 336, - 117, -246, 132, 527, -246, 285, 527, 194, 195, 284, - 213, 214, 383, 215, 217, 218, 206, 634, 222, 194, - 195, 225, 183, 41, 184, 168, 231, 232, 845, 234, - 237, 263, 241, 242, 131, 535, 284, 269, 118, 537, - 538, 539, 540, 541, 284, 527, 257, 119, 987, 279, - 280, -263, 194, 195, 458, 846, 139, 140, 141, 142, - 843, 159, 897, 891, 988, 262, 208, 262, 262, 262, - 262, 262, 711, 262, 262, 262, 10, 653, 11, 624, - 626, 310, 262, 262, 207, 259, 262, 262, 611, 676, - 637, 613, 423, 120, 527, 314, 315, 316, 317, 318, - 319, 394, 1057, 210, 879, 399, 254, 255, 121, 254, - 255, 308, 880, 122, 226, 124, 256, 258, 284, 256, - 373, 940, 896, 284, 438, 239, 332, 527, 180, 181, - 182, 659, 898, 123, 206, 499, 284, 991, 530, 125, - 533, 222, 1010, 284, 708, 330, 194, 195, 206, 206, - 206, 206, 206, 206, 284, 1053, 323, 346, 126, 349, - 963, 284, 1066, 559, 560, 706, 602, 603, 604, 605, - 133, 257, 840, 1067, 257, 6, 134, 479, 194, 195, - 1074, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 284, 309, 998, 320, 387, 311, 639, 386, - 259, 465, 657, 259, 466, 646, 647, 648, 649, 650, - 651, 1075, 135, 262, 428, 429, 430, 542, 543, 850, - 431, 549, 550, 852, 136, 853, 928, 854, 855, 856, - 707, 543, 258, 219, 701, 258, 630, 608, 609, 632, - 677, 418, 137, 190, 338, 192, 193, 138, 527, 427, - 197, 186, 206, 973, 974, 975, 468, 469, 470, 390, - 432, 1043, 223, 835, 224, 1045, 228, 6, 398, 653, - 866, 6, 229, 194, 195, 230, 702, 471, 417, 881, - 233, 527, 353, 198, 354, 606, 607, 199, 437, 274, - 6, 608, 609, 703, 380, 381, 702, 1, 2, 3, - 608, 609, 313, 283, 702, 416, 1061, 627, 628, 629, - 1062, 608, 609, 839, 320, 433, 327, 334, 50, 608, - 609, 923, 524, 335, 1070, 524, 641, 200, 1000, 434, - 981, 389, 337, 1073, 435, 339, 344, 190, 192, 193, - 197, 345, 347, 6, 486, 487, 488, 358, 362, 168, - 489, 284, 369, 353, 496, 354, 355, 356, 426, 937, - 528, 865, 61, 528, 524, 377, 437, 446, 618, 63, - 437, 437, 437, 437, 437, 190, 416, 190, 885, 614, - 548, 615, 201, 363, 556, 364, 365, 831, 366, 367, - 490, 368, 370, 462, 326, 612, 202, 963, 371, 372, - 395, 203, 528, 234, 374, 375, 204, 376, 662, 378, - 379, 400, 6, 524, 527, 6, 392, 401, 402, 439, - 459, 496, 464, 671, 460, 1034, 166, 167, 496, 496, - 496, 496, 496, 496, 655, 474, 168, 130, 612, 672, - 461, 463, -262, 473, 996, 491, 524, 878, 177, 178, - 179, 416, 180, 181, 182, 477, 555, 478, 484, 492, - 1004, 485, 529, 496, 493, 536, 620, 620, 620, 494, - 558, 546, 612, 551, 635, 437, 132, 617, 638, 194, - 195, 447, 390, 196, 528, 448, 640, 194, 195, 645, - 262, 556, 674, 660, 209, 211, 970, 971, 972, 527, - 973, 974, 975, 663, 666, 667, 833, 704, 131, 543, - 834, 1041, 836, 326, 227, 527, 838, 837, 844, 847, - 859, 860, 861, 240, 653, 449, 882, 668, 669, 670, - 887, 673, 50, 175, 176, 177, 178, 179, 890, 180, - 181, 182, 862, 892, 864, 840, 924, 926, 390, 273, - 929, 275, 276, 168, 389, 930, 450, 1059, 932, 933, - 945, 934, 884, 555, 883, 938, 527, 886, 941, 942, - 888, 889, 943, 944, 946, 947, 61, 524, 655, 977, - 451, 976, 618, 63, 496, 979, 619, 499, 194, 195, - 982, 984, 390, 985, 452, 993, 612, 1002, 1003, 453, - 980, 496, 997, 1035, 454, 961, 962, 1001, 1009, 1036, - 524, 1037, 527, 894, 830, 963, 612, 620, 841, 921, - 389, 620, 1042, 620, 1038, 620, 620, 620, 1044, 1046, - 1047, 533, 1048, 50, 1049, 1050, 963, 1060, 1063, 1064, - 939, 995, 333, 894, 326, 1033, 1068, 331, 528, 978, - 175, 176, 177, 178, 179, 1069, 180, 181, 182, 643, - 343, 341, 644, 482, 389, 342, 878, 878, 878, 878, - 350, 878, 352, 863, 664, 0, 631, 61, 360, 361, - 829, 931, 657, 618, 63, 0, 0, 623, 0, 899, - 900, 901, 902, 903, 904, 905, 906, 907, 908, 909, - 910, 911, 912, 913, 914, 915, 916, 917, 918, 919, - 0, 922, 968, 969, 970, 971, 972, 0, 973, 974, - 975, 0, 0, 983, 162, 163, 164, 165, 166, 167, - 0, 0, 0, 968, 969, 970, 971, 972, 168, 973, - 974, 975, 391, 524, 548, 0, 0, 0, 0, 0, - 878, 878, 878, 878, 878, 878, 878, 878, 878, 878, - 878, 878, 878, 878, 878, 878, 878, 878, 878, 194, - 195, 0, 0, 0, 0, 0, 444, 0, 0, 952, - 0, 528, 0, 0, 0, 0, 894, 959, 960, 961, - 962, 0, 0, 0, 0, 953, 0, 0, 0, 963, - 0, 0, 0, 0, 878, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, - 0, 0, 0, 496, 612, 0, 262, 0, 524, 0, - 481, 0, 483, 173, 174, 175, 176, 177, 178, 179, - 0, 180, 181, 182, 524, 936, 0, 878, 1005, 1006, - 1007, 1008, 0, 0, 0, 0, 0, 0, 61, 0, - 0, 0, 0, 0, 618, 63, 528, 0, 625, 894, - 0, 0, 0, 0, 556, 0, 0, 0, 0, 0, - 0, 0, 528, 0, 0, 0, 0, 0, 0, 622, - 622, 622, 0, 0, 1031, 524, 968, 969, 970, 971, - 972, 986, 973, 974, 975, 0, 0, 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, 957, - 958, 959, 960, 961, 962, 0, 0, 948, 949, 950, - 951, 444, 954, 963, 0, 0, 0, 0, 0, 528, - 0, 894, 0, 1071, 1072, 894, 1032, 160, 161, 162, - 163, 164, 165, 166, 167, 0, 0, 0, 0, 894, - 0, 1039, 0, 168, 0, 0, 0, 0, 894, 0, - 0, 0, 0, 0, 0, 0, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 444, 180, 181, - 182, 0, 0, 0, 384, 0, 0, 0, 0, 849, - 622, 851, 0, 0, 622, 0, 622, 0, 622, 622, - 622, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, - 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, - 968, 969, 970, 971, 972, 0, 973, 974, 975, 0, + 6, 235, 132, 714, 836, 669, 929, 662, 79, 397, + 535, 194, 195, 285, 255, 116, 130, 185, 285, 157, + 265, 266, 267, 268, 269, 679, 271, 272, 273, 426, + 991, 253, 286, 637, 423, 278, 279, 387, 656, 282, + 283, 709, -248, 484, 156, -248, 992, 194, 195, 620, + 123, 337, 638, 657, 117, 183, 285, 184, 285, 531, + 285, 131, 531, 118, 194, 195, 206, 194, 195, 847, + 119, -265, 194, 195, 462, 849, 120, 850, 503, 895, + 256, 534, 539, 537, 643, 260, 541, 542, 543, 544, + 545, 650, 651, 652, 653, 654, 655, 285, 257, 258, + 121, 531, 628, 630, 194, 195, 563, 564, 122, 606, + 607, 608, 609, 883, 136, 263, 995, 263, 263, 263, + 263, 263, 264, 263, 263, 263, 681, 285, 270, 680, + 124, 715, 263, 263, 285, 125, 263, 263, 1061, 255, + 280, 281, 255, 617, 259, 239, 1014, 427, 126, 944, + 531, 255, 615, 1057, 398, 661, 253, 208, 403, 213, + 214, 309, 215, 217, 218, 884, 844, 222, 133, 900, + 225, 210, 194, 195, 226, 231, 232, 377, 234, 237, + 442, 241, 242, 531, 206, 902, 641, 705, 285, 901, + 190, 712, 192, 193, 183, 663, 184, 197, 206, 206, + 206, 206, 206, 206, 657, 256, 324, 1070, 256, 196, + 260, 333, 134, 260, 353, 285, 839, 256, 285, 344, + 209, 211, 260, 257, 258, 6, 257, 258, 350, 710, + 168, 285, 1002, 483, 1071, 257, 258, 1078, 198, 135, + 227, -80, 199, -80, -80, -80, 255, 869, 284, 240, + 1079, 706, 854, 10, 967, 11, 856, 137, 857, 346, + 858, 859, 860, 138, 889, 186, 612, 613, 707, 259, + 166, 167, 259, 469, 263, 274, 470, 276, 277, 219, + 168, 259, 200, 207, 190, 192, 193, 197, 194, 195, + 222, 223, 311, 224, 331, 932, 1, 2, 3, 1047, + 321, 391, 634, 1049, 228, 636, 315, 316, 317, 318, + 319, 320, 256, 206, 531, 229, 420, 260, 431, 314, + 394, 230, 190, 422, 190, 472, 473, 474, 6, 402, + 257, 258, 6, 180, 181, 182, 321, 201, 233, 421, + 275, 327, 546, 547, 1065, 328, 475, 531, 1066, 335, + 168, 202, 441, 885, 6, 336, 203, 977, 978, 979, + 338, 204, 1074, 432, 433, 434, 711, 547, 334, 435, + 357, 1077, 358, 359, 360, 347, 259, 175, 176, 177, + 178, 179, 340, 180, 181, 182, 345, 1004, 362, 645, + 420, 528, 351, 985, 528, 366, 354, 367, 356, 631, + 632, 633, 553, 554, 368, 364, 365, 6, 285, 436, + 194, 195, 451, 369, 612, 613, 452, 370, 500, 168, + 371, 390, 657, 870, 532, 706, 372, 532, 941, 373, + 441, 374, 375, 528, 441, 441, 441, 441, 441, 381, + 612, 613, 843, 618, 552, 619, 376, 378, 560, 177, + 178, 179, 379, 180, 181, 182, 453, 835, 380, 616, + 382, 327, 383, 399, 437, 420, 532, 396, 404, 395, + 405, 443, 406, 967, 464, 463, 6, 666, 438, 6, + 531, 465, 528, 439, 467, 500, 984, 454, 1038, -264, + 132, 477, 500, 500, 500, 500, 500, 500, 659, 967, + 468, 478, 616, 676, 130, 481, 448, 624, 624, 624, + 482, 455, 488, 1000, 489, 528, 175, 176, 177, 178, + 179, 533, 180, 181, 182, 456, 706, 500, 675, 1008, + 457, 540, 550, 555, 562, 458, 616, 639, 642, 441, + 503, 612, 613, 927, 644, 649, 394, 664, 532, 131, + 667, 670, 671, 838, 263, 560, 41, 678, 708, 840, + 485, 547, 487, 848, 841, 531, 234, 837, 842, 490, + 491, 492, 974, 975, 976, 493, 977, 978, 979, 863, + 1045, 531, 864, 851, 537, 865, 657, 886, 891, 139, + 140, 141, 142, 894, 159, 327, 972, 973, 974, 975, + 976, 896, 977, 978, 979, 844, 928, 194, 195, 194, + 195, 930, 394, 933, 934, 494, 936, 937, 945, 626, + 626, 626, 938, 942, 946, 357, 1063, 358, 610, 611, + 949, 888, 531, 947, 948, 661, 162, 163, 164, 165, + 166, 167, 659, 612, 613, 950, 528, 866, 500, 868, + 168, 951, 50, 980, 50, 981, 394, 983, 624, 986, + 616, 988, 624, 989, 624, 500, 624, 624, 624, 887, + 495, 1001, 890, 997, 1006, 892, 893, 898, 531, 528, + 616, 965, 966, 925, 496, 1005, 1007, 1013, 1039, 497, + 1048, 967, 1041, 1040, 498, 1042, 61, 1052, 61, 1046, + 1050, 448, 622, 63, 622, 63, 623, 898, 627, 1051, + 1053, 1054, 532, 1064, 287, 288, 289, 290, 291, 292, + 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, + 303, 304, 305, 306, 307, 1067, 310, 1068, 332, 834, + 312, 1072, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 1073, 180, 181, 182, 943, 448, 999, 7, + 8, 9, 10, 982, 11, 12, 13, 1037, 342, 853, + 626, 855, 647, 486, 626, 867, 626, 648, 626, 626, + 626, 635, 668, 194, 195, 833, 935, 339, 972, 973, + 974, 975, 976, 987, 977, 978, 979, 0, 0, 0, + 0, 0, 871, 194, 195, 0, 0, 0, 552, 882, + 0, 0, 528, 0, 0, 0, 0, 0, 872, 0, + 0, 0, 0, 0, 0, 0, 22, 0, 50, 0, + 961, 962, 963, 964, 965, 966, 0, 0, 384, 385, + 0, 0, 27, 0, 967, 532, 0, 0, 50, 0, + 898, 873, 0, 0, 874, 0, 0, 0, 32, 957, + 160, 161, 162, 163, 164, 165, 166, 167, 0, 0, + 0, 0, 61, 0, 0, 393, 168, 0, 622, 63, + 0, 875, 629, 0, 956, 876, 877, 500, 616, 878, + 263, 879, 61, 0, 0, 880, 0, 528, 622, 63, + 0, 0, 0, 0, 0, 430, 0, 0, 0, 0, + 0, 0, 0, 528, 450, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 963, 964, 965, 966, 0, + 532, 0, 0, 898, 0, 0, 0, 967, 560, 0, + 466, 972, 973, 974, 975, 976, 532, 977, 978, 979, + 0, 0, 0, 1009, 1010, 1011, 1012, 0, 1035, 0, + 0, 0, 0, 0, 528, 0, 0, 169, 170, 171, + 172, 173, 174, 175, 176, 177, 178, 179, 0, 180, + 181, 182, 0, 616, 0, 388, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 532, 0, 0, + 898, 0, 0, 559, 898, 0, 0, 0, 0, 0, + 528, 0, 0, 0, 0, 0, 0, 0, 0, 1059, + 0, 1060, 0, 0, 621, 0, 0, 0, 882, 882, + 882, 882, 0, 882, 972, 973, 974, 975, 976, 0, + 977, 978, 979, 532, 0, 898, 0, 1075, 1076, 898, + 952, 953, 954, 955, 0, 958, 0, 0, 0, 0, + 0, 0, 0, 898, 160, 161, 162, 163, 164, 165, + 166, 167, 898, 0, 672, 673, 674, 0, 677, 0, + 168, 0, 0, 160, 161, 162, 163, 164, 165, 166, + 167, 0, 0, 0, 0, 0, 0, 0, 0, 168, + 0, 393, 0, 0, 0, 0, 0, 0, 0, 0, + 559, 0, 882, 882, 882, 882, 882, 882, 882, 882, + 882, 882, 882, 882, 882, 882, 882, 882, 882, 882, + 882, 0, 0, 0, 1015, 1016, 1017, 1018, 1019, 1020, + 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, + 1031, 1032, 1033, 160, 161, 162, 163, 164, 165, 166, + 167, 0, 0, 0, 0, 845, 882, 393, 0, 168, + 0, 169, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 0, 180, 181, 182, 389, 0, 1055, 1062, + 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 0, 180, 181, 182, 0, 0, 0, 996, 882, + 0, 393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 1051, 180, 181, 182, 0, - 0, 0, 992, 0, 0, 0, 0, 0, 0, 0, - 0, 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, 1065, 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, 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, 1069, 0, 0, 0, 0, 903, 904, 905, 906, + 907, 908, 909, 910, 911, 912, 913, 914, 915, 916, + 917, 918, 919, 920, 921, 922, 923, 0, 926, 0, + 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 0, 180, 181, 182, 0, 0, 0, 1058, 716, + 717, 718, 719, 720, 721, 722, 723, 724, 725, 0, + 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, + 736, 0, 0, 0, 0, 0, 0, 737, 738, 739, + 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, + 750, 751, 752, 753, 0, 0, 754, 755, 756, 757, + 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, + 0, 768, 0, 769, 770, 771, 772, 773, 774, 775, + 776, 777, 778, 779, 780, 0, 0, 0, 781, 0, + 782, 0, 783, 784, 785, 786, 787, 788, 789, 790, + 791, 792, 793, 794, 795, 796, 0, 797, 798, 799, + 800, 801, 802, 803, 0, 804, 805, 806, 807, 808, + 0, 0, 940, 809, 810, 811, 812, 813, 814, 815, + 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, + 826, 827, 828, 829, 1003, 830, 831, 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, 990, 0, + 0, 0, 0, 0, 0, 993, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, + 0, 726, 727, 728, 729, 730, 731, 732, 733, 734, + 735, 736, 0, 559, 0, 0, 0, 0, 737, 738, + 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, + 749, 750, 751, 752, 753, 0, 0, 754, 755, 756, + 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, + 767, 0, 768, 1036, 769, 770, 771, 772, 773, 774, + 775, 776, 777, 778, 779, 780, 0, 0, 1043, 781, + 0, 782, 0, 783, 784, 785, 786, 787, 788, 789, + 790, 791, 792, 793, 794, 795, 796, 0, 797, 798, + 799, 800, 801, 802, 803, 0, 804, 805, 806, 807, + 808, 0, 0, 0, 809, 810, 811, 812, 813, 814, + 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, + 825, 826, 827, 828, 829, 0, 830, 831, 504, 505, + 506, 10, 0, 11, 507, 508, 44, 0, 0, 509, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 1058, - 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, 500, 501, - 502, 10, 0, 11, 503, 504, 44, 0, 0, 895, - 516, 0, 0, 0, 517, 0, 0, 0, 518, 0, - 519, 0, 0, 0, 520, 169, 170, 171, 172, 173, + 0, 510, 45, 0, 168, 46, 0, 47, 48, 49, + 50, 511, 0, 52, 0, 0, 53, 512, 0, 0, + 54, 0, 0, 0, 0, 513, 55, 0, 0, 0, + 0, 0, 56, 57, 58, 0, 0, 0, 0, 514, + 0, 515, 0, 0, 0, 0, 516, 0, 59, 60, + 517, 0, 0, 518, 61, 0, 0, 519, 0, 0, + 62, 63, 64, 0, 0, 65, 0, 66, 504, 505, + 506, 10, 0, 11, 507, 508, 44, 0, 0, 899, + 520, 0, 0, 0, 521, 0, 0, 0, 522, 0, + 523, 409, 0, 0, 524, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 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, + 410, 510, 45, 0, 0, 46, 0, 47, 48, 49, + 50, 511, 0, 52, 0, 0, 53, 512, 0, 0, + 54, 0, 0, 0, 0, 513, 55, 0, 0, 0, + 0, 0, 56, 57, 58, 0, 0, 0, 0, 514, + 0, 515, 0, 0, 0, 0, 516, 0, 59, 60, + 517, 0, 0, 518, 61, 0, 0, 519, 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, 0, 518, 0, - 519, 0, 0, 0, 520, 0, 0, 0, 160, 161, + 520, 0, 0, 0, 521, 0, 0, 0, 522, 0, + 523, 0, 0, 0, 524, 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, @@ -1833,22 +1850,22 @@ static const yytype_int16 yytable[] = 0, 0, 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, + 62, 63, 154, 0, 0, 65, 0, 155, 504, 505, + 506, 10, 0, 11, 507, 508, 44, 0, 0, 0, 35, 0, 0, 0, 36, 37, 0, 0, 38, 0, - 39, 405, 0, 0, 40, 169, 170, 171, 172, 173, + 39, 0, 0, 0, 40, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 0, 180, 181, 182, - 406, 506, 45, 0, 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, + 538, 510, 45, 0, 0, 46, 0, 47, 48, 49, + 50, 511, 0, 52, 0, 0, 53, 512, 0, 0, + 54, 0, 0, 0, 0, 513, 55, 0, 0, 0, + 0, 0, 56, 57, 58, 0, 0, 0, 0, 514, + 0, 515, 0, 0, 0, 0, 516, 0, 59, 60, + 517, 0, 0, 518, 61, 0, 0, 519, 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, + 520, 0, 0, 0, 521, 0, 0, 0, 522, 0, + 523, 0, 0, 0, 524, 961, 962, 963, 964, 965, + 966, 0, 0, 0, 46, 0, 47, 48, 49, 967, 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, @@ -1858,15 +1875,15 @@ static const yytype_int16 yytable[] = 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, + 39, 0, 308, 971, 40, 0, 972, 973, 974, 975, + 976, 15, 977, 978, 979, 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, + 0, 0, 449, 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, @@ -1876,7 +1893,7 @@ static const yytype_int16 yytable[] = 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, + 0, 0, 556, 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, @@ -1888,7 +1905,7 @@ static const yytype_int16 yytable[] = 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, + 39, 0, 924, 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, @@ -1896,7 +1913,7 @@ static const yytype_int16 yytable[] = 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, + 0, 0, 939, 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, @@ -1905,348 +1922,342 @@ static const yytype_int16 yytable[] = 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, + 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, 81, 0, 0, 0, - 0, 15, 0, 0, 82, 16, 0, 17, 18, 19, - 0, 0, 867, 84, 85, 86, 20, 21, 0, 0, - 0, 0, 0, 212, 0, 22, 23, 0, 868, 92, - 0, 0, 24, 25, 0, 0, 22, 0, 97, 26, - 0, 27, 0, 98, 0, 0, 0, 0, 28, 29, - 30, 0, 27, 31, 0, 0, 103, 32, 104, 0, - 0, 869, 33, 0, 870, 0, 0, 34, 32, 0, - 0, 0, 0, -127, 0, 0, 0, 0, 0, 0, - 35, 0, 0, 0, 36, 37, 0, 0, 38, -2, - 39, 871, 0, 0, 40, 872, 873, 561, 0, 874, - 0, 875, 0, 0, 0, 876, 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, 0, 0, 0, 0, 59, - 60, 0, 0, 0, 0, 61, 0, 0, 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, 0, 160, 161, + 39, 0, 1034, 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, 565, 0, 38, 0, + 39, 0, 0, 0, 40, 566, 567, 568, 569, 570, + 571, 572, 573, 0, 0, 0, 0, 0, 0, 0, + 0, 574, 0, 575, 576, 577, 578, 579, 580, 581, + 582, 583, 584, 585, 586, 0, 80, 81, 0, 0, + 0, 0, 0, 0, 0, 82, 0, 0, 0, 0, + 587, 0, 83, 0, 84, 85, 86, 87, 0, 0, + 88, 0, 0, 0, 89, 0, 0, 0, 90, 91, + 92, 93, 0, 0, 588, 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, 589, 0, + 0, 590, 0, 591, 592, 593, 594, 595, 596, 597, + 598, 599, 600, 601, 0, 602, 603, 245, 0, 604, + 46, 0, 47, 48, 49, 50, 246, 0, 247, 0, + 0, 53, 0, 0, 0, 54, 0, 0, 0, 0, + 0, 55, 325, 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, 341, 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, 160, 161, 162, 163, - 164, 165, 166, 167, 0, 0, 0, 0, 0, 0, - 0, 0, 168, 0, 0, 160, 161, 162, 163, 164, + 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, 0, 0, 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, 173, 174, 175, 176, 177, 178, 179, 168, 180, + 181, 182, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 386, 0, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 0, 180, 181, 182, + 0, 0, 0, 561, 0, 0, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 0, 180, 181, + 182, 852, 0, 0, 0, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 0, 180, 181, 182, + 994, 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, 682, 683, 684, 685, 686, 687, + 688, 689, 0, 0, 0, 0, 0, 0, 0, 0, + 690, 959, 960, 961, 962, 963, 964, 965, 966, 0, + 0, 0, 0, 0, 0, 0, 0, 967, 959, 960, + 961, 962, 963, 964, 965, 966, 0, 0, 0, 0, + 0, 0, 0, 0, 967, 161, 162, 163, 164, 165, + 166, 167, 0, 0, 0, 0, 0, 0, 0, 0, + 168, 960, 961, 962, 963, 964, 965, 966, 0, 0, + 0, 0, 0, 0, 0, 0, 967, 162, 163, 164, 165, 166, 167, 0, 0, 0, 0, 0, 0, 0, 0, 168, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 0, 180, 181, - 182, 385, 0, 0, 0, 0, 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, 848, 0, - 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, 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, 161, 162, 163, 164, 165, 166, 167, 0, - 0, 0, 0, 0, 0, 0, 0, 168, 0, 0, - 0, 0, 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, 0, 0, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 0, - 180, 181, 182, 956, 957, 958, 959, 960, 961, 962, - 0, 0, 0, 46, 0, 47, 48, 49, 963, 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, 162, - 163, 164, 165, 166, 167, 0, 59, 60, 0, 0, - 0, 0, 0, 168, 957, 958, 959, 960, 961, 962, - 64, 0, 0, 0, 0, 66, 0, 0, 963, 957, - 958, 959, 960, 961, 962, 0, 0, 0, 0, 0, - 0, 0, 0, 963, 164, 165, 166, 167, 134, 0, - 0, 0, 0, 0, 0, 0, 168, 0, 0, 0, - 965, 966, 967, 0, 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, 216, 180, 181, 182, 0, - 965, 966, 967, 0, 0, 968, 969, 970, 971, 972, - 0, 973, 974, 975, 0, 0, 966, 967, 0, 0, - 968, 969, 970, 971, 972, 0, 973, 974, 975, 0, - 0, 173, 174, 175, 176, 177, 178, 179, 81, 180, - 181, 182, 0, 0, 407, 408, 82, 0, 0, 0, - 0, 0, 0, 0, 0, 84, 85, 86, 0, 0, - 0, 0, 0, 0, 0, 212, 0, 0, 0, 0, - 0, 92, 0, 0, 46, 0, 47, 48, 49, 0, - 97, 407, 408, 0, 46, 98, 47, 48, 49, 409, - 410, 0, 0, 0, 0, 53, 0, 0, 103, 0, - 104, 56, 191, 58, 0, 55, 0, 0, 0, 0, - 0, 56, 57, 58, 0, 0, 0, 59, 60, 0, - 0, 46, 0, 47, 48, 49, 0, 59, 60, 0, - 44, 64, 53, 0, 0, 0, 66, 0, 0, 411, - 0, 64, 55, 0, 65, 0, 66, 0, 56, 57, - 58, 0, 0, 0, 0, 0, 0, 0, 46, 137, - 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, 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, 691, 692, 693, 694, 695, 696, 697, 698, 699, + 700, 701, 0, 702, 703, 704, 1056, 0, 968, 969, + 970, 971, 0, 0, 972, 973, 974, 975, 976, 0, + 977, 978, 979, 0, 0, 968, 969, 970, 971, 0, + 0, 972, 973, 974, 975, 976, 0, 977, 978, 979, + 0, 0, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 0, 180, 181, 182, 0, 0, 969, 970, + 971, 0, 0, 972, 973, 974, 975, 976, 0, 977, + 978, 979, 0, 0, 171, 172, 173, 174, 175, 176, + 177, 178, 179, 0, 180, 181, 182, 162, 163, 164, + 165, 166, 167, 0, 0, 0, 46, 0, 47, 48, + 49, 168, 961, 962, 963, 964, 965, 966, 0, 0, + 0, 0, 0, 0, 0, 0, 967, 162, 163, 164, + 165, 166, 167, 56, 191, 58, 0, 0, 0, 0, + 81, 168, 961, 962, 963, 964, 965, 966, 82, 59, + 60, 0, 0, 0, 0, 0, 967, 84, 85, 86, + 0, 0, 0, 64, 0, 0, 0, 212, 66, 0, + 0, 0, 0, 92, 0, 0, 0, 0, 0, 0, + 0, 0, 97, 0, 0, 0, 0, 98, 0, 0, + 0, 134, 0, 0, 0, 0, 0, 0, 0, 0, + 103, 0, 104, 0, 0, 172, 173, 174, 175, 176, + 177, 178, 179, 0, 180, 181, 182, -127, 969, 970, + 971, 0, 0, 972, 973, 974, 975, 976, 0, 977, + 978, 979, 348, 349, 0, 0, 173, 174, 175, 176, + 177, 178, 179, 0, 180, 181, 182, 0, 0, 970, + 971, 0, 0, 972, 973, 974, 975, 976, 0, 977, + 978, 979, 46, 0, 47, 48, 49, 0, 0, 245, + 0, 0, 46, 0, 47, 48, 49, 50, 0, 0, + 247, 0, 0, 53, 0, 0, 0, 54, 0, 56, + 191, 58, 0, 55, 0, 411, 412, 0, 0, 56, + 57, 58, 0, 0, 0, 59, 60, 0, 0, 0, + 0, 0, 0, 0, 0, 59, 60, 0, 0, 64, + 0, 61, 0, 0, 66, 0, 0, 249, 63, 64, + 0, 0, 65, 0, 66, 46, 0, 47, 48, 49, + 413, 414, 411, 412, 0, 0, 53, 137, 0, 0, + 0, 0, 0, 0, 0, 0, 55, 0, 0, 0, + 0, 0, 56, 57, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 0, 102, 103, 187, 104, - 0, 0, 0, 0, 0, 0, 0, 105, 188, 0, - 0, 0, 0, 0, 56, 189, 58, 0, 80, 81, - 0, 0, 0, 0, 0, 0, 858, 82, 0, 0, - 59, 60, 0, 0, 83, 0, 84, 85, 86, 87, - 0, 0, 88, 0, 64, 0, 89, 0, 0, 66, - 90, 91, 92, 93, 0, 0, 0, 0, 94, 95, - 96, 97, 0, 0, 0, 0, 98, 99, 0, 0, - 100, 0, 126, 46, 101, 47, 48, 49, 102, 103, - 81, 104, 0, 0, 187, 0, 0, 0, 82, 0, - 0, 0, 0, 0, 188, 0, 0, 84, 85, 86, - 56, 189, 58, 0, 0, 0, 0, 212, 0, 0, - 0, 0, 0, 92, 221, 0, 59, 60, 0, 0, - 81, 0, 97, 0, 0, 0, 0, 98, 82, 0, - 64, 0, 0, 0, 0, 66, 0, 84, 85, 86, - 103, 81, 104, 0, 0, 0, 0, 212, 0, 82, - 0, 0, 0, 92, 0, 0, 0, 0, 84, 85, - 86, 0, 97, 0, 0, 0, 0, 98, 212, 0, - 0, 100, 0, 0, 92, 0, 0, 0, 0, 0, - 103, 0, 104, 97, 0, 0, 0, 0, 98, 0, + 0, 0, 46, 0, 47, 48, 49, 0, 0, 0, + 415, 44, 64, 53, 0, 65, 0, 66, 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, 0, 59, 60, 45, 0, 0, + 46, 0, 47, 48, 49, 50, 51, 0, 52, 64, + 313, 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, 352, 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, 665, + 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, 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, 407, 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, 471, 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, 479, 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, 548, + 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, 640, 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, 861, 0, 0, 0, 98, 99, 0, 46, 100, + 47, 48, 49, 101, 0, 0, 0, 102, 103, 187, + 104, 0, 0, 0, 0, 0, 0, 0, 105, 188, + 0, 0, 0, 0, 0, 56, 189, 58, 0, 80, + 81, 0, 0, 0, 0, 0, 0, 862, 82, 0, + 0, 59, 60, 0, 0, 83, 0, 84, 85, 86, + 87, 0, 0, 88, 0, 64, 0, 89, 0, 0, + 66, 90, 91, 92, 93, 0, 0, 0, 0, 94, + 95, 96, 97, 0, 0, 0, 0, 98, 99, 0, + 0, 100, 0, 126, 46, 101, 47, 48, 49, 102, + 103, 81, 104, 0, 0, 187, 0, 0, 0, 82, + 0, 0, 0, 0, 0, 188, 0, 0, 84, 85, + 86, 56, 189, 58, 0, 0, 0, 0, 212, 0, + 0, 0, 0, 0, 92, 221, 0, 59, 60, 0, + 0, 81, 0, 97, 0, 0, 0, 0, 98, 82, + 0, 64, 0, 0, 0, 0, 66, 0, 84, 85, + 86, 103, 81, 104, 0, 0, 0, 0, 212, 0, + 82, 0, 0, 0, 92, 0, 0, 0, 0, 84, + 85, 86, 0, 97, 0, 0, 0, 0, 98, 212, + 0, 0, 100, 0, 0, 92, 0, 0, 0, 0, + 0, 103, 0, 104, 97, 0, 0, 0, 0, 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 103, 0, 104 + 0, 0, 103, 0, 104 }; #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-677))) + (!!((Yystate) == (-703))) #define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int16 yycheck[] = { - 1, 424, 100, 39, 499, 552, 10, 11, 512, 6, - 327, 8, 51, 26, 118, 119, 120, 121, 122, 39, - 124, 125, 126, 341, 12, 10, 11, 121, 704, 133, - 134, 109, 109, 137, 138, 14, 118, 405, 533, 0, - 463, 109, 136, 118, 543, 135, 10, 11, 118, 226, - 135, 117, 26, 421, 120, 137, 424, 10, 11, 118, - 81, 82, 137, 84, 85, 86, 67, 137, 89, 10, - 11, 92, 6, 2, 8, 31, 97, 98, 137, 100, - 101, 117, 103, 104, 26, 427, 118, 123, 135, 431, - 432, 433, 434, 435, 118, 463, 109, 135, 85, 135, - 136, 117, 10, 11, 120, 137, 35, 36, 37, 38, - 609, 40, 121, 137, 101, 116, 120, 118, 119, 120, - 121, 122, 545, 124, 125, 126, 6, 136, 8, 469, - 470, 185, 133, 134, 117, 109, 137, 138, 456, 118, - 137, 458, 130, 135, 512, 199, 200, 201, 202, 203, - 204, 328, 137, 117, 653, 332, 234, 234, 135, 237, - 237, 181, 657, 135, 117, 135, 234, 109, 118, 237, - 274, 847, 676, 118, 351, 83, 117, 545, 134, 135, - 136, 499, 677, 126, 185, 420, 118, 137, 423, 135, - 425, 212, 137, 118, 536, 216, 10, 11, 199, 200, - 201, 202, 203, 204, 118, 137, 207, 246, 135, 248, - 31, 118, 137, 448, 449, 533, 451, 452, 453, 454, - 135, 234, 4, 137, 237, 226, 135, 404, 10, 11, - 137, 160, 161, 162, 163, 164, 165, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 118, 182, 930, 136, 137, 186, 482, 313, - 234, 118, 497, 237, 121, 489, 490, 491, 492, 493, - 494, 137, 135, 274, 10, 11, 12, 135, 136, 619, - 16, 117, 118, 623, 126, 625, 709, 627, 628, 629, - 135, 136, 234, 120, 529, 237, 473, 135, 136, 476, - 524, 340, 135, 57, 233, 59, 60, 135, 676, 348, - 64, 135, 313, 134, 135, 136, 88, 89, 90, 320, - 56, 997, 135, 558, 135, 1001, 120, 328, 329, 136, - 137, 332, 120, 10, 11, 120, 120, 109, 339, 657, - 135, 709, 117, 12, 119, 120, 121, 16, 349, 135, - 351, 135, 136, 137, 283, 284, 120, 114, 115, 116, - 135, 136, 130, 137, 120, 339, 1042, 88, 89, 90, - 1046, 135, 136, 137, 136, 111, 120, 10, 55, 135, - 136, 137, 421, 10, 1060, 424, 484, 56, 935, 125, - 885, 320, 117, 1069, 130, 126, 135, 151, 152, 153, - 154, 135, 135, 404, 10, 11, 12, 119, 137, 31, - 16, 118, 127, 117, 415, 119, 120, 121, 347, 842, - 421, 645, 99, 424, 463, 127, 427, 356, 105, 106, - 431, 432, 433, 434, 435, 189, 410, 191, 662, 459, - 441, 461, 111, 137, 445, 137, 137, 551, 137, 137, - 56, 137, 137, 382, 208, 456, 125, 31, 137, 137, - 120, 130, 463, 484, 137, 137, 135, 137, 507, 137, - 137, 117, 473, 512, 842, 476, 138, 118, 118, 135, - 135, 482, 140, 519, 137, 980, 21, 22, 489, 490, - 491, 492, 493, 494, 495, 118, 31, 510, 499, 519, - 135, 135, 117, 117, 927, 111, 545, 652, 130, 131, - 132, 485, 134, 135, 136, 10, 445, 10, 127, 125, - 943, 118, 130, 524, 130, 130, 468, 469, 470, 135, - 130, 138, 533, 135, 118, 536, 510, 466, 121, 10, - 11, 12, 543, 62, 545, 16, 121, 10, 11, 130, - 551, 552, 137, 135, 73, 74, 130, 131, 132, 927, - 134, 135, 136, 126, 135, 126, 138, 137, 510, 136, - 118, 994, 10, 327, 93, 943, 140, 137, 118, 137, - 10, 119, 10, 102, 136, 56, 118, 516, 517, 518, - 135, 520, 55, 128, 129, 130, 131, 132, 137, 134, - 135, 136, 638, 56, 640, 4, 135, 118, 609, 128, - 140, 130, 131, 31, 543, 137, 87, 1040, 138, 137, - 126, 138, 661, 552, 660, 140, 994, 663, 137, 137, - 666, 667, 135, 135, 135, 126, 99, 676, 639, 118, - 111, 140, 105, 106, 645, 137, 109, 882, 10, 11, - 127, 137, 653, 127, 125, 135, 657, 119, 119, 130, - 884, 662, 137, 135, 135, 21, 22, 137, 137, 137, - 709, 135, 1040, 674, 550, 31, 677, 619, 607, 699, - 609, 623, 137, 625, 135, 627, 628, 629, 138, 137, - 137, 926, 127, 55, 137, 127, 31, 137, 135, 135, - 844, 926, 221, 704, 458, 977, 137, 220, 709, 882, - 128, 129, 130, 131, 132, 137, 134, 135, 136, 484, - 239, 237, 485, 410, 653, 237, 871, 872, 873, 874, - 249, 876, 251, 639, 510, -1, 474, 99, 257, 258, - 549, 805, 977, 105, 106, -1, -1, 109, -1, 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, 17, 18, 19, 20, 21, 22, - -1, -1, -1, 128, 129, 130, 131, 132, 31, 134, - 135, 136, 321, 842, 805, -1, -1, -1, -1, -1, - 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, - 965, 966, 967, 968, 969, 970, 971, 972, 973, 10, - 11, -1, -1, -1, -1, -1, 355, -1, -1, 875, - -1, 842, -1, -1, -1, -1, 847, 19, 20, 21, - 22, -1, -1, -1, -1, 875, -1, -1, -1, 31, - -1, -1, -1, -1, 1009, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 55, -1, -1, -1, -1, -1, - -1, -1, -1, 884, 885, -1, 887, -1, 927, -1, - 409, -1, 411, 126, 127, 128, 129, 130, 131, 132, - -1, 134, 135, 136, 943, 834, -1, 1052, 944, 945, - 946, 947, -1, -1, -1, -1, -1, -1, 99, -1, - -1, -1, -1, -1, 105, 106, 927, -1, 109, 930, - -1, -1, -1, -1, 935, -1, -1, -1, -1, -1, - -1, -1, 943, -1, -1, -1, -1, -1, -1, 468, - 469, 470, -1, -1, 974, 994, 128, 129, 130, 131, - 132, 890, 134, 135, 136, -1, -1, -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, 17, - 18, 19, 20, 21, 22, -1, -1, 871, 872, 873, - 874, 550, 876, 31, -1, -1, -1, -1, -1, 1040, - -1, 1042, -1, 1063, 1064, 1046, 975, 15, 16, 17, - 18, 19, 20, 21, 22, -1, -1, -1, -1, 1060, - -1, 990, -1, 31, -1, -1, -1, -1, 1069, -1, - -1, -1, -1, -1, -1, -1, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 606, 134, 135, - 136, -1, -1, -1, 140, -1, -1, -1, -1, 618, - 619, 620, -1, -1, 623, -1, 625, -1, 627, 628, - 629, 955, 956, 957, 958, 959, 960, 961, 962, 963, - 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, - 128, 129, 130, 131, 132, -1, 134, 135, 136, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 1009, 134, 135, 136, -1, - -1, -1, 140, -1, -1, -1, -1, -1, -1, -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, 1052, 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, + 1, 100, 26, 547, 556, 516, 708, 503, 0, 328, + 428, 10, 11, 118, 109, 135, 26, 51, 118, 39, + 118, 119, 120, 121, 122, 14, 124, 125, 126, 12, + 85, 109, 137, 118, 342, 133, 134, 137, 121, 137, + 138, 537, 117, 409, 39, 120, 101, 10, 11, 467, + 126, 226, 137, 136, 135, 6, 118, 8, 118, 425, + 118, 26, 428, 135, 10, 11, 67, 10, 11, 613, + 135, 117, 10, 11, 120, 137, 135, 137, 424, 137, + 109, 427, 431, 429, 486, 109, 435, 436, 437, 438, + 439, 493, 494, 495, 496, 497, 498, 118, 109, 109, + 135, 467, 473, 474, 10, 11, 452, 453, 135, 455, + 456, 457, 458, 657, 126, 116, 137, 118, 119, 120, + 121, 122, 117, 124, 125, 126, 528, 118, 123, 118, + 135, 549, 133, 134, 118, 135, 137, 138, 137, 234, + 135, 136, 237, 462, 109, 83, 137, 130, 135, 851, + 516, 246, 460, 137, 329, 501, 234, 120, 333, 81, + 82, 181, 84, 85, 86, 661, 4, 89, 135, 680, + 92, 117, 10, 11, 117, 97, 98, 275, 100, 101, + 355, 103, 104, 549, 185, 681, 137, 533, 118, 121, + 57, 540, 59, 60, 6, 503, 8, 64, 199, 200, + 201, 202, 203, 204, 136, 234, 207, 137, 237, 62, + 234, 117, 135, 237, 248, 118, 562, 246, 118, 237, + 73, 74, 246, 234, 234, 226, 237, 237, 246, 537, + 31, 118, 934, 408, 137, 246, 246, 137, 12, 135, + 93, 117, 16, 119, 120, 121, 341, 649, 137, 102, + 137, 120, 623, 6, 31, 8, 627, 135, 629, 135, + 631, 632, 633, 135, 666, 135, 135, 136, 137, 234, + 21, 22, 237, 118, 275, 128, 121, 130, 131, 120, + 31, 246, 56, 117, 151, 152, 153, 154, 10, 11, + 212, 135, 185, 135, 216, 713, 114, 115, 116, 1001, + 136, 137, 477, 1005, 120, 480, 199, 200, 201, 202, + 203, 204, 341, 314, 680, 120, 340, 341, 352, 130, + 321, 120, 189, 341, 191, 88, 89, 90, 329, 330, + 341, 341, 333, 134, 135, 136, 136, 111, 135, 340, + 135, 208, 135, 136, 1046, 120, 109, 713, 1050, 10, + 31, 125, 353, 661, 355, 10, 130, 134, 135, 136, + 117, 135, 1064, 10, 11, 12, 135, 136, 221, 16, + 117, 1073, 119, 120, 121, 135, 341, 128, 129, 130, + 131, 132, 126, 134, 135, 136, 239, 939, 119, 488, + 414, 425, 135, 889, 428, 137, 249, 137, 251, 88, + 89, 90, 117, 118, 137, 258, 259, 408, 118, 56, + 10, 11, 12, 137, 135, 136, 16, 137, 419, 31, + 137, 314, 136, 137, 425, 120, 137, 428, 846, 127, + 431, 137, 137, 467, 435, 436, 437, 438, 439, 127, + 135, 136, 137, 463, 445, 465, 137, 137, 449, 130, + 131, 132, 137, 134, 135, 136, 56, 555, 137, 460, + 137, 328, 137, 120, 111, 489, 467, 138, 117, 322, + 118, 135, 118, 31, 137, 135, 477, 511, 125, 480, + 846, 135, 516, 130, 135, 486, 888, 87, 984, 117, + 514, 117, 493, 494, 495, 496, 497, 498, 499, 31, + 140, 118, 503, 523, 514, 10, 359, 472, 473, 474, + 10, 111, 127, 931, 118, 549, 128, 129, 130, 131, + 132, 130, 134, 135, 136, 125, 120, 528, 523, 947, + 130, 130, 138, 135, 130, 135, 537, 118, 121, 540, + 886, 135, 136, 137, 121, 130, 547, 135, 549, 514, + 126, 135, 126, 118, 555, 556, 2, 137, 137, 10, + 413, 136, 415, 118, 137, 931, 488, 138, 140, 10, + 11, 12, 130, 131, 132, 16, 134, 135, 136, 10, + 998, 947, 119, 137, 930, 10, 136, 118, 135, 35, + 36, 37, 38, 137, 40, 462, 128, 129, 130, 131, + 132, 56, 134, 135, 136, 4, 135, 10, 11, 10, + 11, 118, 613, 140, 137, 56, 138, 137, 137, 472, + 473, 474, 138, 140, 137, 117, 1044, 119, 120, 121, + 126, 665, 998, 135, 135, 981, 17, 18, 19, 20, + 21, 22, 643, 135, 136, 135, 680, 642, 649, 644, + 31, 126, 55, 140, 55, 118, 657, 137, 623, 127, + 661, 137, 627, 127, 629, 666, 631, 632, 633, 664, + 111, 137, 667, 135, 119, 670, 671, 678, 1044, 713, + 681, 21, 22, 703, 125, 137, 119, 137, 135, 130, + 138, 31, 135, 137, 135, 135, 99, 127, 99, 137, + 137, 554, 105, 106, 105, 106, 109, 708, 109, 137, + 137, 127, 713, 137, 160, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 135, 182, 135, 220, 554, + 186, 137, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 132, 137, 134, 135, 136, 848, 610, 930, 3, + 4, 5, 6, 886, 8, 9, 10, 981, 237, 622, + 623, 624, 488, 414, 627, 643, 629, 489, 631, 632, + 633, 478, 514, 10, 11, 553, 809, 233, 128, 129, + 130, 131, 132, 891, 134, 135, 136, -1, -1, -1, + -1, -1, 46, 10, 11, -1, -1, -1, 809, 656, + -1, -1, 846, -1, -1, -1, -1, -1, 62, -1, + -1, -1, -1, -1, -1, -1, 70, -1, 55, -1, + 17, 18, 19, 20, 21, 22, -1, -1, 284, 285, + -1, -1, 86, -1, 31, 846, -1, -1, 55, -1, + 851, 95, -1, -1, 98, -1, -1, -1, 102, 879, + 15, 16, 17, 18, 19, 20, 21, 22, -1, -1, + -1, -1, 99, -1, -1, 321, 31, -1, 105, 106, + -1, 125, 109, -1, 879, 129, 130, 888, 889, 133, + 891, 135, 99, -1, -1, 139, -1, 931, 105, 106, + -1, -1, -1, -1, -1, 351, -1, -1, -1, -1, + -1, -1, -1, 947, 360, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 19, 20, 21, 22, -1, + 931, -1, -1, 934, -1, -1, -1, 31, 939, -1, + 386, 128, 129, 130, 131, 132, 947, 134, 135, 136, + -1, -1, -1, 948, 949, 950, 951, -1, 978, -1, + -1, -1, -1, -1, 998, -1, -1, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, -1, 134, + 135, 136, -1, 984, -1, 140, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 998, -1, -1, + 1001, -1, -1, 449, 1005, -1, -1, -1, -1, -1, + 1044, -1, -1, -1, -1, -1, -1, -1, -1, 1039, + -1, 1041, -1, -1, 470, -1, -1, -1, 875, 876, + 877, 878, -1, 880, 128, 129, 130, 131, 132, -1, + 134, 135, 136, 1044, -1, 1046, -1, 1067, 1068, 1050, + 875, 876, 877, 878, -1, 880, -1, -1, -1, -1, + -1, -1, -1, 1064, 15, 16, 17, 18, 19, 20, + 21, 22, 1073, -1, 520, 521, 522, -1, 524, -1, + 31, -1, -1, 15, 16, 17, 18, 19, 20, 21, + 22, -1, -1, -1, -1, -1, -1, -1, -1, 31, + -1, 547, -1, -1, -1, -1, -1, -1, -1, -1, + 556, -1, 959, 960, 961, 962, 963, 964, 965, 966, + 967, 968, 969, 970, 971, 972, 973, 974, 975, 976, + 977, -1, -1, -1, 959, 960, 961, 962, 963, 964, + 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, + 975, 976, 977, 15, 16, 17, 18, 19, 20, 21, + 22, -1, -1, -1, -1, 611, 1013, 613, -1, 31, + -1, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 132, -1, 134, 135, 136, 137, -1, 1013, 1042, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 139, 140, 3, + 132, -1, 134, 135, 136, -1, -1, -1, 140, 1056, + -1, 657, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 1056, -1, -1, -1, -1, 682, 683, 684, 685, + 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, + 696, 697, 698, 699, 700, 701, 702, -1, 704, -1, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, + 132, -1, 134, 135, 136, -1, -1, -1, 140, 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, @@ -2258,15 +2269,34 @@ static const yytype_int16 yycheck[] = 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, + -1, -1, 838, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 137, -1, 139, 140, -1, 3, 4, + 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, 894, -1, + -1, -1, -1, -1, -1, 901, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -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, 939, -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, 979, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 77, 78, -1, -1, 994, 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, -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, 47, -1, 31, 50, -1, 52, 53, 54, - 55, 56, -1, 58, -1, -1, 61, 62, -1, 1038, + 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, @@ -2274,9 +2304,9 @@ static const yytype_int16 yycheck[] = 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, + 135, 118, -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, + 137, 46, 47, -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, @@ -2296,7 +2326,7 @@ static const yytype_int16 yycheck[] = 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, 118, -1, -1, 139, 122, 123, 124, 125, 126, + 135, -1, -1, -1, 139, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, -1, 134, 135, 136, 137, 46, 47, -1, -1, 50, -1, 52, 53, 54, 55, 56, -1, 58, -1, -1, 61, 62, -1, -1, @@ -2365,320 +2395,318 @@ static const yytype_int16 yycheck[] = -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, + 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, 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, -1, 62, 82, - -1, -1, 77, 78, -1, -1, 70, -1, 91, 84, - -1, 86, -1, 96, -1, -1, -1, -1, 93, 94, - 95, -1, 86, 98, -1, -1, 109, 102, 111, -1, - -1, 95, 107, -1, 98, -1, -1, 112, 102, -1, - -1, -1, -1, 126, -1, -1, -1, -1, -1, -1, - 125, -1, -1, -1, 129, 130, -1, -1, 133, 0, - 135, 125, -1, -1, 139, 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, 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, -1, -1, -1, -1, 93, - 94, -1, -1, -1, -1, 99, -1, -1, -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, -1, -1, -1, 133, - 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, -1, -1, -1, -1, -1, - -1, -1, 31, -1, -1, 15, 16, 17, 18, 19, + 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, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 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, 120, -1, 122, 123, 124, 125, 126, + -1, 31, -1, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, -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, -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, 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, - 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, 15, 16, 17, - 18, 19, 20, 21, 22, -1, -1, -1, -1, -1, - -1, -1, -1, 31, 15, 16, 17, 18, 19, 20, + -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, 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, 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, + -1, -1, -1, -1, 31, 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, -1, -1, -1, -1, - -1, 31, 16, 17, 18, 19, 20, 21, 22, -1, - -1, -1, -1, -1, -1, -1, -1, 31, -1, -1, - -1, -1, 120, -1, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, -1, 134, 135, 136, -1, + -1, 31, -1, -1, -1, -1, -1, -1, -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, 120, -1, 122, 123, 124, 125, -1, + 131, 132, -1, 134, 135, 136, 120, -1, 122, 123, + 124, 125, -1, -1, 128, 129, 130, 131, 132, -1, + 134, 135, 136, -1, -1, 122, 123, 124, 125, -1, -1, 128, 129, 130, 131, 132, -1, 134, 135, 136, - -1, -1, 122, 123, 124, 125, -1, -1, 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, 16, 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, 17, - 18, 19, 20, 21, 22, -1, -1, -1, -1, -1, - -1, -1, -1, 31, 19, 20, 21, 22, 135, -1, - -1, -1, -1, -1, -1, -1, 31, -1, -1, -1, - 123, 124, 125, -1, -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, 6, 134, 135, 136, -1, - 123, 124, 125, -1, -1, 128, 129, 130, 131, 132, - -1, 134, 135, 136, -1, -1, 124, 125, -1, -1, - 128, 129, 130, 131, 132, -1, 134, 135, 136, -1, - -1, 126, 127, 128, 129, 130, 131, 132, 49, 134, - 135, 136, -1, -1, 10, 11, 57, -1, -1, -1, - -1, -1, -1, -1, -1, 66, 67, 68, -1, -1, - -1, -1, -1, -1, -1, 76, -1, -1, -1, -1, - -1, 82, -1, -1, 50, -1, 52, 53, 54, -1, - 91, 10, 11, -1, 50, 96, 52, 53, 54, 55, - 56, -1, -1, -1, -1, 61, -1, -1, 109, -1, - 111, 77, 78, 79, -1, 71, -1, -1, -1, -1, - -1, 77, 78, 79, -1, -1, -1, 93, 94, -1, - -1, 50, -1, 52, 53, 54, -1, 93, 94, -1, - 11, 107, 61, -1, -1, -1, 112, -1, -1, 105, - -1, 107, 71, -1, 110, -1, 112, -1, 77, 78, - 79, -1, -1, -1, -1, -1, -1, -1, 50, 135, - 52, 53, 54, -1, 93, 94, 47, -1, -1, 50, - -1, 52, 53, 54, 55, 56, -1, 58, 107, 71, - 61, 110, -1, 112, 65, 77, 78, 79, -1, -1, - 71, 11, -1, -1, -1, -1, 77, 78, 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, 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, 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, -1, -1, - -1, -1, -1, -1, -1, 50, -1, 52, 53, 54, - 55, 93, 94, -1, -1, -1, 61, 99, -1, -1, - 65, -1, -1, 105, 106, 107, 71, -1, 110, -1, - 112, -1, 77, 78, 79, -1, -1, -1, -1, -1, + -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, -1, -1, 124, 125, 126, 127, 128, 129, + 130, 131, 132, -1, 134, 135, 136, 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, + 49, 31, 17, 18, 19, 20, 21, 22, 57, 93, + 94, -1, -1, -1, -1, -1, 31, 66, 67, 68, + -1, -1, -1, 107, -1, -1, -1, 76, 112, -1, + -1, -1, -1, 82, -1, -1, -1, -1, -1, -1, + -1, -1, 91, -1, -1, -1, -1, 96, -1, -1, + -1, 135, -1, -1, -1, -1, -1, -1, -1, -1, + 109, -1, 111, -1, -1, 125, 126, 127, 128, 129, + 130, 131, 132, -1, 134, 135, 136, 126, 123, 124, + 125, -1, -1, 128, 129, 130, 131, 132, -1, 134, + 135, 136, 10, 11, -1, -1, 126, 127, 128, 129, + 130, 131, 132, -1, 134, 135, 136, -1, -1, 124, + 125, -1, -1, 128, 129, 130, 131, 132, -1, 134, + 135, 136, 50, -1, 52, 53, 54, -1, -1, 47, + -1, -1, 50, -1, 52, 53, 54, 55, -1, -1, + 58, -1, -1, 61, -1, -1, -1, 65, -1, 77, + 78, 79, -1, 71, -1, 10, 11, -1, -1, 77, + 78, 79, -1, -1, -1, 93, 94, -1, -1, -1, + -1, -1, -1, -1, -1, 93, 94, -1, -1, 107, + -1, 99, -1, -1, 112, -1, -1, 105, 106, 107, + -1, -1, 110, -1, 112, 50, -1, 52, 53, 54, + 55, 56, 10, 11, -1, -1, 61, 135, -1, -1, + -1, -1, -1, -1, -1, -1, 71, -1, -1, -1, + -1, -1, 77, 78, 79, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 93, 94, - 48, 49, -1, -1, 99, -1, -1, -1, -1, 57, - 105, 106, 107, -1, -1, 110, 64, 112, 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, 48, 49, 96, 97, - -1, -1, 100, -1, -1, 57, 104, -1, -1, -1, - 108, 109, 64, 111, 66, 67, 68, 69, -1, -1, - 72, 119, -1, -1, 76, -1, -1, -1, 80, 81, - 82, 83, -1, -1, -1, -1, 88, 89, 90, 91, - 138, -1, 48, 49, 96, 97, -1, -1, 100, -1, - -1, 57, 104, -1, -1, -1, 108, 109, 64, 111, - 66, 67, 68, 69, -1, -1, 72, 119, -1, -1, - 76, -1, -1, -1, 80, 81, 82, 83, -1, -1, - -1, -1, 88, 89, 90, 91, 138, -1, 48, 49, - 96, 97, -1, -1, 100, -1, -1, 57, 104, -1, - -1, -1, 108, 109, 64, 111, 66, 67, 68, 69, - -1, -1, 72, 119, -1, -1, 76, -1, -1, -1, - 80, 81, 82, 83, -1, -1, -1, -1, 88, 89, - 90, 91, 138, -1, 48, 49, 96, 97, -1, -1, - 100, -1, -1, 57, 104, -1, -1, -1, 108, 109, - 64, 111, 66, 67, 68, 69, -1, -1, 72, 119, - -1, -1, 76, -1, -1, -1, 80, 81, 82, 83, - -1, -1, -1, -1, 88, 89, 90, 91, 138, -1, - 48, 49, 96, 97, -1, -1, 100, -1, -1, 57, - 104, -1, -1, -1, 108, 109, 64, 111, 66, 67, - 68, 69, -1, -1, 72, 119, -1, -1, 76, -1, - -1, -1, 80, 81, 82, 83, -1, -1, -1, -1, - 88, 89, 90, 91, 138, -1, 48, 49, 96, 97, - -1, -1, 100, -1, -1, 57, 104, -1, -1, -1, - 108, 109, 64, 111, 66, 67, 68, 69, -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, - 49, -1, 91, -1, -1, -1, -1, 96, 57, -1, - 107, -1, -1, -1, -1, 112, -1, 66, 67, 68, - 109, 49, 111, -1, -1, -1, -1, 76, -1, 57, - -1, -1, -1, 82, -1, -1, -1, -1, 66, 67, - 68, -1, 91, -1, -1, -1, -1, 96, 76, -1, - -1, 100, -1, -1, 82, -1, -1, -1, -1, -1, - 109, -1, 111, 91, -1, -1, -1, -1, 96, -1, + -1, -1, 50, -1, 52, 53, 54, -1, -1, -1, + 105, 11, 107, 61, -1, 110, -1, 112, -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, -1, 93, 94, 47, -1, -1, + 50, -1, 52, 53, 54, 55, 56, -1, 58, 107, + 71, 61, 110, -1, 112, 65, 77, 78, 79, -1, + -1, 71, 11, -1, -1, -1, -1, 77, 78, 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, 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, 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, -1, + -1, -1, -1, -1, -1, -1, 50, -1, 52, 53, + 54, 55, 93, 94, -1, -1, -1, 61, 99, -1, + -1, 65, -1, -1, 105, 106, 107, 71, -1, 110, + -1, 112, -1, 77, 78, 79, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 93, + 94, 48, 49, -1, -1, 99, -1, -1, -1, -1, + 57, 105, 106, 107, -1, -1, 110, 64, 112, 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, 48, 49, 96, + 97, -1, -1, 100, -1, -1, 57, 104, -1, -1, + -1, 108, 109, 64, 111, 66, 67, 68, 69, -1, + -1, 72, 119, -1, -1, 76, -1, -1, -1, 80, + 81, 82, 83, -1, -1, -1, -1, 88, 89, 90, + 91, 138, -1, 48, 49, 96, 97, -1, -1, 100, + -1, -1, 57, 104, -1, -1, -1, 108, 109, 64, + 111, 66, 67, 68, 69, -1, -1, 72, 119, -1, + -1, 76, -1, -1, -1, 80, 81, 82, 83, -1, + -1, -1, -1, 88, 89, 90, 91, 138, -1, 48, + 49, 96, 97, -1, -1, 100, -1, -1, 57, 104, + -1, -1, -1, 108, 109, 64, 111, 66, 67, 68, + 69, -1, -1, 72, 119, -1, -1, 76, -1, -1, + -1, 80, 81, 82, 83, -1, -1, -1, -1, 88, + 89, 90, 91, 138, -1, 48, 49, 96, 97, -1, + -1, 100, -1, -1, 57, 104, -1, -1, -1, 108, + 109, 64, 111, 66, 67, 68, 69, -1, -1, 72, + 119, -1, -1, 76, -1, -1, -1, 80, 81, 82, + 83, -1, -1, -1, -1, 88, 89, 90, 91, 138, + -1, 48, 49, 96, 97, -1, -1, 100, -1, -1, + 57, 104, -1, -1, -1, 108, 109, 64, 111, 66, + 67, 68, 69, -1, -1, 72, 119, -1, -1, 76, + -1, -1, -1, 80, 81, 82, 83, -1, -1, -1, + -1, 88, 89, 90, 91, 138, -1, 48, 49, 96, + 97, -1, -1, 100, -1, -1, 57, 104, -1, -1, + -1, 108, 109, 64, 111, 66, 67, 68, 69, -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, 49, -1, 91, -1, -1, -1, -1, 96, 57, + -1, 107, -1, -1, -1, -1, 112, -1, 66, 67, + 68, 109, 49, 111, -1, -1, -1, -1, 76, -1, + 57, -1, -1, -1, 82, -1, -1, -1, -1, 66, + 67, 68, -1, 91, -1, -1, -1, -1, 96, 76, + -1, -1, 100, -1, -1, 82, -1, -1, -1, -1, + -1, 109, -1, 111, 91, -1, -1, -1, -1, 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 109, -1, 111 + -1, -1, 109, -1, 111 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 114, 115, 116, 142, 143, 234, 3, 4, 5, + 0, 114, 115, 116, 142, 143, 235, 3, 4, 5, 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, 47, 50, 52, 53, 54, + 139, 228, 229, 234, 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, + 94, 99, 105, 106, 107, 110, 112, 193, 197, 198, + 200, 205, 206, 210, 211, 216, 217, 218, 219, 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, + 152, 153, 174, 212, 215, 235, 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, + 210, 211, 216, 135, 135, 135, 126, 135, 135, 228, + 228, 228, 228, 11, 50, 52, 53, 54, 61, 71, + 77, 78, 93, 94, 107, 112, 197, 226, 228, 228, 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, + 217, 78, 217, 217, 10, 11, 233, 217, 12, 16, + 56, 111, 125, 130, 135, 192, 235, 117, 120, 233, + 117, 233, 76, 151, 151, 151, 6, 151, 151, 120, + 150, 83, 151, 135, 135, 151, 117, 233, 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, + 233, 151, 151, 10, 11, 47, 56, 58, 87, 105, + 117, 133, 163, 194, 196, 198, 200, 205, 210, 211, + 216, 225, 226, 235, 197, 225, 225, 225, 225, 225, + 197, 225, 225, 225, 233, 135, 233, 233, 225, 225, + 197, 197, 225, 225, 137, 118, 137, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 137, 226, + 228, 192, 228, 71, 130, 192, 192, 192, 192, 192, + 192, 136, 208, 209, 235, 11, 207, 217, 120, 199, + 201, 151, 148, 117, 233, 10, 10, 143, 117, 228, + 126, 56, 163, 194, 196, 233, 135, 135, 10, 11, + 196, 135, 56, 193, 233, 147, 233, 117, 119, 120, + 121, 186, 119, 154, 233, 233, 137, 137, 137, 137, + 137, 137, 137, 127, 137, 137, 137, 225, 137, 137, + 137, 127, 137, 137, 228, 228, 120, 137, 140, 137, + 192, 137, 224, 228, 235, 233, 138, 207, 143, 120, + 202, 203, 235, 143, 117, 118, 118, 138, 213, 118, + 137, 10, 11, 55, 56, 105, 176, 177, 178, 179, + 216, 235, 196, 186, 159, 164, 12, 130, 165, 155, + 228, 193, 10, 11, 12, 16, 56, 111, 125, 130, + 190, 235, 143, 135, 220, 221, 144, 145, 233, 117, + 228, 12, 16, 56, 87, 111, 125, 130, 135, 156, + 180, 233, 120, 135, 137, 135, 228, 135, 140, 118, + 121, 138, 88, 89, 90, 109, 204, 117, 118, 138, + 214, 10, 10, 143, 234, 233, 179, 233, 127, 118, + 10, 11, 12, 16, 56, 111, 125, 130, 135, 191, + 235, 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, 230, + 231, 234, 235, 130, 180, 182, 157, 180, 137, 190, + 130, 190, 190, 190, 190, 190, 135, 136, 138, 166, + 138, 222, 235, 117, 118, 135, 117, 187, 188, 228, + 235, 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, 235, 207, 226, 226, + 182, 228, 105, 109, 211, 232, 233, 109, 232, 109, + 232, 88, 89, 90, 143, 204, 143, 118, 137, 118, + 138, 137, 121, 191, 121, 152, 173, 174, 178, 130, + 191, 191, 191, 191, 191, 191, 121, 136, 184, 235, + 162, 180, 185, 186, 135, 91, 193, 126, 195, 189, + 135, 126, 228, 228, 228, 197, 226, 228, 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, 224, 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, 223, 220, 145, 225, 187, 138, 118, 180, + 10, 137, 140, 137, 4, 228, 181, 224, 118, 137, + 137, 137, 118, 233, 232, 233, 232, 232, 232, 232, + 232, 138, 138, 10, 119, 10, 197, 184, 197, 191, + 137, 46, 62, 95, 98, 125, 129, 130, 133, 135, + 139, 227, 229, 224, 185, 186, 118, 197, 193, 191, + 197, 135, 197, 197, 137, 137, 56, 171, 235, 14, + 189, 121, 185, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, + 228, 228, 228, 228, 137, 226, 228, 137, 135, 171, + 118, 170, 182, 140, 137, 222, 138, 137, 138, 117, + 228, 182, 140, 156, 171, 137, 137, 135, 135, 126, + 135, 126, 227, 227, 227, 227, 197, 226, 227, 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, 225, 137, 127, + 228, 85, 101, 228, 120, 137, 140, 135, 167, 157, + 182, 137, 171, 138, 187, 137, 119, 119, 182, 197, + 197, 197, 197, 137, 137, 227, 227, 227, 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, 10, 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, 10, 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, 10, 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, 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, - 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 + 227, 227, 227, 227, 137, 226, 228, 162, 185, 135, + 137, 135, 135, 228, 168, 182, 137, 171, 138, 171, + 137, 137, 127, 137, 127, 227, 120, 137, 140, 226, + 226, 137, 233, 182, 137, 171, 171, 135, 135, 227, + 137, 137, 137, 137, 171, 226, 226, 171, 137, 137 }; #define yyerrok (yyerrstatus = 0) @@ -3601,7 +3629,7 @@ yyreduce: { case 3: /* Line 1792 of yacc.c */ -#line 406 "dtool/src/cppparser/cppBison.yxx" +#line 407 "dtool/src/cppparser/cppBison.yxx" { current_expr = (yyvsp[(2) - (2)].u.expr); } @@ -3609,7 +3637,7 @@ yyreduce: case 4: /* Line 1792 of yacc.c */ -#line 410 "dtool/src/cppparser/cppBison.yxx" +#line 411 "dtool/src/cppparser/cppBison.yxx" { current_type = (yyvsp[(2) - (2)].u.type); } @@ -3617,7 +3645,7 @@ yyreduce: case 10: /* Line 1792 of yacc.c */ -#line 428 "dtool/src/cppparser/cppBison.yxx" +#line 429 "dtool/src/cppparser/cppBison.yxx" { delete (yyvsp[(3) - (4)].u.expr); } @@ -3625,7 +3653,7 @@ yyreduce: case 11: /* Line 1792 of yacc.c */ -#line 440 "dtool/src/cppparser/cppBison.yxx" +#line 441 "dtool/src/cppparser/cppBison.yxx" { push_storage_class((current_storage_class & ~CPPInstance::SC_c_binding) | ((yyvsp[(1) - (2)].u.integer) & CPPInstance::SC_c_binding)); @@ -3634,7 +3662,7 @@ yyreduce: case 12: /* Line 1792 of yacc.c */ -#line 445 "dtool/src/cppparser/cppBison.yxx" +#line 446 "dtool/src/cppparser/cppBison.yxx" { pop_storage_class(); } @@ -3642,7 +3670,7 @@ yyreduce: case 20: /* Line 1792 of yacc.c */ -#line 459 "dtool/src/cppparser/cppBison.yxx" +#line 460 "dtool/src/cppparser/cppBison.yxx" { if (publish_nest_level != 0) { yyerror("Unclosed __begin_publish", publish_loc); @@ -3659,7 +3687,7 @@ yyreduce: case 21: /* Line 1792 of yacc.c */ -#line 472 "dtool/src/cppparser/cppBison.yxx" +#line 473 "dtool/src/cppparser/cppBison.yxx" { if (publish_nest_level != 1) { yyerror("Unmatched __end_publish", (yylsp[(1) - (1)])); @@ -3672,7 +3700,7 @@ yyreduce: case 22: /* Line 1792 of yacc.c */ -#line 481 "dtool/src/cppparser/cppBison.yxx" +#line 482 "dtool/src/cppparser/cppBison.yxx" { current_scope->set_current_vis(V_published); } @@ -3680,7 +3708,7 @@ yyreduce: case 23: /* Line 1792 of yacc.c */ -#line 485 "dtool/src/cppparser/cppBison.yxx" +#line 486 "dtool/src/cppparser/cppBison.yxx" { if (publish_nest_level > 0) { current_scope->set_current_vis(V_published); @@ -3692,7 +3720,7 @@ yyreduce: case 24: /* Line 1792 of yacc.c */ -#line 493 "dtool/src/cppparser/cppBison.yxx" +#line 494 "dtool/src/cppparser/cppBison.yxx" { current_scope->set_current_vis(V_protected); } @@ -3700,7 +3728,7 @@ yyreduce: case 25: /* Line 1792 of yacc.c */ -#line 497 "dtool/src/cppparser/cppBison.yxx" +#line 498 "dtool/src/cppparser/cppBison.yxx" { current_scope->set_current_vis(V_private); } @@ -3708,7 +3736,7 @@ yyreduce: case 26: /* Line 1792 of yacc.c */ -#line 501 "dtool/src/cppparser/cppBison.yxx" +#line 502 "dtool/src/cppparser/cppBison.yxx" { CPPDeclaration *getter = (yyvsp[(5) - (7)].u.identifier)->find_symbol(current_scope, global_scope, current_lexer); @@ -3723,7 +3751,7 @@ yyreduce: case 27: /* Line 1792 of yacc.c */ -#line 512 "dtool/src/cppparser/cppBison.yxx" +#line 513 "dtool/src/cppparser/cppBison.yxx" { CPPDeclaration *getter = (yyvsp[(5) - (9)].u.identifier)->find_symbol(current_scope, global_scope, current_lexer); if (getter == (CPPDeclaration *)NULL || getter->get_subtype() != CPPDeclaration::ST_function_group) { @@ -3748,7 +3776,7 @@ yyreduce: case 28: /* Line 1792 of yacc.c */ -#line 533 "dtool/src/cppparser/cppBison.yxx" +#line 534 "dtool/src/cppparser/cppBison.yxx" { CPPDeclaration *length_getter = (yyvsp[(5) - (9)].u.identifier)->find_symbol(current_scope, global_scope, current_lexer); if (length_getter == (CPPDeclaration *)NULL || length_getter->get_subtype() != CPPDeclaration::ST_function_group) { @@ -3774,7 +3802,7 @@ yyreduce: case 29: /* Line 1792 of yacc.c */ -#line 555 "dtool/src/cppparser/cppBison.yxx" +#line 556 "dtool/src/cppparser/cppBison.yxx" { CPPExpression::Result result = (yyvsp[(3) - (6)].u.expr)->evaluate(); if (result._type == CPPExpression::RT_error) { @@ -3789,7 +3817,7 @@ yyreduce: case 30: /* Line 1792 of yacc.c */ -#line 566 "dtool/src/cppparser/cppBison.yxx" +#line 567 "dtool/src/cppparser/cppBison.yxx" { // This alternative version of static_assert was introduced in C++17. CPPExpression::Result result = (yyvsp[(3) - (4)].u.expr)->evaluate(); @@ -3803,7 +3831,7 @@ yyreduce: case 31: /* Line 1792 of yacc.c */ -#line 579 "dtool/src/cppparser/cppBison.yxx" +#line 580 "dtool/src/cppparser/cppBison.yxx" { CPPScope *new_scope = new CPPScope(current_scope, CPPNameComponent("temp"), V_public); @@ -3813,7 +3841,7 @@ yyreduce: case 32: /* Line 1792 of yacc.c */ -#line 585 "dtool/src/cppparser/cppBison.yxx" +#line 586 "dtool/src/cppparser/cppBison.yxx" { delete current_scope; pop_scope(); @@ -3822,7 +3850,7 @@ yyreduce: case 33: /* Line 1792 of yacc.c */ -#line 594 "dtool/src/cppparser/cppBison.yxx" +#line 595 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = 0; } @@ -3830,7 +3858,7 @@ yyreduce: case 34: /* Line 1792 of yacc.c */ -#line 598 "dtool/src/cppparser/cppBison.yxx" +#line 599 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(2) - (2)].u.integer) | (int)CPPInstance::SC_extern; } @@ -3838,7 +3866,7 @@ yyreduce: case 35: /* Line 1792 of yacc.c */ -#line 602 "dtool/src/cppparser/cppBison.yxx" +#line 603 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(3) - (3)].u.integer) | (int)CPPInstance::SC_extern; if ((yyvsp[(2) - (3)].str) == "C") { @@ -3853,7 +3881,7 @@ yyreduce: case 36: /* Line 1792 of yacc.c */ -#line 613 "dtool/src/cppparser/cppBison.yxx" +#line 614 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(2) - (2)].u.integer) | (int)CPPInstance::SC_static; } @@ -3861,7 +3889,7 @@ yyreduce: case 37: /* Line 1792 of yacc.c */ -#line 617 "dtool/src/cppparser/cppBison.yxx" +#line 618 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(2) - (2)].u.integer) | (int)CPPInstance::SC_inline; } @@ -3869,7 +3897,7 @@ yyreduce: case 38: /* Line 1792 of yacc.c */ -#line 621 "dtool/src/cppparser/cppBison.yxx" +#line 622 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(2) - (2)].u.integer) | (int)CPPInstance::SC_virtual; } @@ -3877,7 +3905,7 @@ yyreduce: case 39: /* Line 1792 of yacc.c */ -#line 625 "dtool/src/cppparser/cppBison.yxx" +#line 626 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(2) - (2)].u.integer) | (int)CPPInstance::SC_explicit; } @@ -3885,7 +3913,7 @@ yyreduce: case 40: /* Line 1792 of yacc.c */ -#line 629 "dtool/src/cppparser/cppBison.yxx" +#line 630 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(2) - (2)].u.integer) | (int)CPPInstance::SC_register; } @@ -3893,7 +3921,7 @@ yyreduce: case 41: /* Line 1792 of yacc.c */ -#line 633 "dtool/src/cppparser/cppBison.yxx" +#line 634 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(2) - (2)].u.integer) | (int)CPPInstance::SC_volatile; } @@ -3901,7 +3929,7 @@ yyreduce: case 42: /* Line 1792 of yacc.c */ -#line 637 "dtool/src/cppparser/cppBison.yxx" +#line 638 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(2) - (2)].u.integer) | (int)CPPInstance::SC_mutable; } @@ -3909,7 +3937,7 @@ yyreduce: case 43: /* Line 1792 of yacc.c */ -#line 641 "dtool/src/cppparser/cppBison.yxx" +#line 642 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(2) - (2)].u.integer) | (int)CPPInstance::SC_constexpr; } @@ -3917,7 +3945,7 @@ yyreduce: case 44: /* Line 1792 of yacc.c */ -#line 645 "dtool/src/cppparser/cppBison.yxx" +#line 646 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(2) - (2)].u.integer) | (int)CPPInstance::SC_blocking; } @@ -3925,7 +3953,7 @@ yyreduce: case 45: /* Line 1792 of yacc.c */ -#line 649 "dtool/src/cppparser/cppBison.yxx" +#line 650 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(2) - (2)].u.integer) | (int)CPPInstance::SC_extension; } @@ -3933,7 +3961,7 @@ yyreduce: case 46: /* Line 1792 of yacc.c */ -#line 656 "dtool/src/cppparser/cppBison.yxx" +#line 657 "dtool/src/cppparser/cppBison.yxx" { /* multiple_var_declaration adds itself to the scope. */ } @@ -3941,7 +3969,7 @@ yyreduce: case 47: /* Line 1792 of yacc.c */ -#line 660 "dtool/src/cppparser/cppBison.yxx" +#line 661 "dtool/src/cppparser/cppBison.yxx" { // We don't really care about the storage class here. In fact, it's // not actually legal to define a class or struct using a particular @@ -3954,7 +3982,7 @@ yyreduce: case 48: /* Line 1792 of yacc.c */ -#line 669 "dtool/src/cppparser/cppBison.yxx" +#line 670 "dtool/src/cppparser/cppBison.yxx" { if ((yyvsp[(2) - (3)].u.instance) != (CPPInstance *)NULL) { (yyvsp[(2) - (3)].u.instance)->_storage_class |= (current_storage_class | (yyvsp[(1) - (3)].u.integer)); @@ -3966,7 +3994,7 @@ yyreduce: case 49: /* Line 1792 of yacc.c */ -#line 680 "dtool/src/cppparser/cppBison.yxx" +#line 681 "dtool/src/cppparser/cppBison.yxx" { // We don't need to push/pop type, because we can't nest // multiple_var_declarations. @@ -3981,7 +4009,7 @@ yyreduce: case 50: /* Line 1792 of yacc.c */ -#line 691 "dtool/src/cppparser/cppBison.yxx" +#line 692 "dtool/src/cppparser/cppBison.yxx" { pop_storage_class(); } @@ -3989,18 +4017,22 @@ yyreduce: case 51: /* Line 1792 of yacc.c */ -#line 695 "dtool/src/cppparser/cppBison.yxx" +#line 696 "dtool/src/cppparser/cppBison.yxx" { // We don't need to push/pop type, because we can't nest // multiple_var_declarations. - current_type = (yyvsp[(3) - (3)].u.type); + if ((yyvsp[(3) - (3)].u.decl)->as_type_declaration()) { + current_type = (yyvsp[(3) - (3)].u.decl)->as_type_declaration()->_type; + } else { + current_type = (yyvsp[(3) - (3)].u.decl)->as_type(); + } push_storage_class((yyvsp[(1) - (3)].u.integer)); } break; case 52: /* Line 1792 of yacc.c */ -#line 702 "dtool/src/cppparser/cppBison.yxx" +#line 707 "dtool/src/cppparser/cppBison.yxx" { pop_storage_class(); } @@ -4008,7 +4040,7 @@ yyreduce: case 53: /* Line 1792 of yacc.c */ -#line 713 "dtool/src/cppparser/cppBison.yxx" +#line 718 "dtool/src/cppparser/cppBison.yxx" { CPPInstance *inst = new CPPInstance(current_type, (yyvsp[(1) - (2)].u.inst_ident), current_storage_class, @@ -4020,7 +4052,7 @@ yyreduce: case 54: /* Line 1792 of yacc.c */ -#line 721 "dtool/src/cppparser/cppBison.yxx" +#line 726 "dtool/src/cppparser/cppBison.yxx" { CPPInstance *inst = new CPPInstance(current_type, (yyvsp[(1) - (4)].u.inst_ident), current_storage_class, @@ -4032,7 +4064,7 @@ yyreduce: case 55: /* Line 1792 of yacc.c */ -#line 732 "dtool/src/cppparser/cppBison.yxx" +#line 737 "dtool/src/cppparser/cppBison.yxx" { (yyvsp[(1) - (2)].u.inst_ident)->add_modifier(IIT_const); CPPInstance *inst = new CPPInstance(current_type, (yyvsp[(1) - (2)].u.inst_ident), @@ -4045,7 +4077,7 @@ yyreduce: case 56: /* Line 1792 of yacc.c */ -#line 741 "dtool/src/cppparser/cppBison.yxx" +#line 746 "dtool/src/cppparser/cppBison.yxx" { (yyvsp[(1) - (4)].u.inst_ident)->add_modifier(IIT_const); CPPInstance *inst = new CPPInstance(current_type, (yyvsp[(1) - (4)].u.inst_ident), @@ -4058,7 +4090,7 @@ yyreduce: case 57: /* Line 1792 of yacc.c */ -#line 754 "dtool/src/cppparser/cppBison.yxx" +#line 759 "dtool/src/cppparser/cppBison.yxx" { // We don't need to push/pop type, because we can't nest // multiple_var_declarations. @@ -4073,7 +4105,7 @@ yyreduce: case 58: /* Line 1792 of yacc.c */ -#line 765 "dtool/src/cppparser/cppBison.yxx" +#line 770 "dtool/src/cppparser/cppBison.yxx" { pop_storage_class(); } @@ -4081,18 +4113,22 @@ yyreduce: case 59: /* Line 1792 of yacc.c */ -#line 769 "dtool/src/cppparser/cppBison.yxx" +#line 774 "dtool/src/cppparser/cppBison.yxx" { // We don't need to push/pop type, because we can't nest // multiple_var_declarations. - current_type = (yyvsp[(3) - (3)].u.type); + if ((yyvsp[(3) - (3)].u.decl)->as_type_declaration()) { + current_type = (yyvsp[(3) - (3)].u.decl)->as_type_declaration()->_type; + } else { + current_type = (yyvsp[(3) - (3)].u.decl)->as_type(); + } push_storage_class((yyvsp[(1) - (3)].u.integer)); } break; case 60: /* Line 1792 of yacc.c */ -#line 776 "dtool/src/cppparser/cppBison.yxx" +#line 785 "dtool/src/cppparser/cppBison.yxx" { pop_storage_class(); } @@ -4100,7 +4136,7 @@ yyreduce: case 61: /* Line 1792 of yacc.c */ -#line 780 "dtool/src/cppparser/cppBison.yxx" +#line 789 "dtool/src/cppparser/cppBison.yxx" { if ((yyvsp[(2) - (3)].u.instance) != (CPPDeclaration *)NULL) { CPPInstance *inst = (yyvsp[(2) - (3)].u.instance)->as_instance(); @@ -4116,7 +4152,7 @@ yyreduce: case 62: /* Line 1792 of yacc.c */ -#line 795 "dtool/src/cppparser/cppBison.yxx" +#line 804 "dtool/src/cppparser/cppBison.yxx" { CPPType *target_type = current_type; CPPTypedefType *typedef_type = new CPPTypedefType(target_type, (yyvsp[(1) - (2)].u.inst_ident), current_scope, (yylsp[(1) - (2)]).file); @@ -4126,7 +4162,7 @@ yyreduce: case 63: /* Line 1792 of yacc.c */ -#line 801 "dtool/src/cppparser/cppBison.yxx" +#line 810 "dtool/src/cppparser/cppBison.yxx" { CPPType *target_type = current_type; CPPTypedefType *typedef_type = new CPPTypedefType(target_type, (yyvsp[(1) - (4)].u.inst_ident), current_scope, (yylsp[(1) - (4)]).file); @@ -4136,7 +4172,7 @@ yyreduce: case 64: /* Line 1792 of yacc.c */ -#line 810 "dtool/src/cppparser/cppBison.yxx" +#line 819 "dtool/src/cppparser/cppBison.yxx" { (yyvsp[(1) - (2)].u.inst_ident)->add_modifier(IIT_const); CPPType *target_type = current_type; @@ -4147,7 +4183,7 @@ yyreduce: case 65: /* Line 1792 of yacc.c */ -#line 817 "dtool/src/cppparser/cppBison.yxx" +#line 826 "dtool/src/cppparser/cppBison.yxx" { (yyvsp[(1) - (4)].u.inst_ident)->add_modifier(IIT_const); CPPType *target_type = current_type; @@ -4158,7 +4194,7 @@ yyreduce: case 66: /* Line 1792 of yacc.c */ -#line 829 "dtool/src/cppparser/cppBison.yxx" +#line 838 "dtool/src/cppparser/cppBison.yxx" { push_scope((yyvsp[(1) - (2)].u.identifier)->get_scope(current_scope, global_scope)); } @@ -4166,7 +4202,7 @@ yyreduce: case 67: /* Line 1792 of yacc.c */ -#line 833 "dtool/src/cppparser/cppBison.yxx" +#line 842 "dtool/src/cppparser/cppBison.yxx" { CPPType *type; if ((yyvsp[(1) - (6)].u.identifier)->get_simple_name() == current_scope->get_simple_name() || @@ -4190,7 +4226,7 @@ yyreduce: case 68: /* Line 1792 of yacc.c */ -#line 853 "dtool/src/cppparser/cppBison.yxx" +#line 862 "dtool/src/cppparser/cppBison.yxx" { push_scope((yyvsp[(1) - (2)].u.identifier)->get_scope(current_scope, global_scope)); } @@ -4198,7 +4234,7 @@ yyreduce: case 69: /* Line 1792 of yacc.c */ -#line 857 "dtool/src/cppparser/cppBison.yxx" +#line 866 "dtool/src/cppparser/cppBison.yxx" { pop_scope(); CPPType *type; @@ -4220,7 +4256,7 @@ yyreduce: case 70: /* Line 1792 of yacc.c */ -#line 877 "dtool/src/cppparser/cppBison.yxx" +#line 886 "dtool/src/cppparser/cppBison.yxx" { push_scope((yyvsp[(2) - (3)].u.identifier)->get_scope(current_scope, global_scope)); } @@ -4228,7 +4264,7 @@ yyreduce: case 71: /* Line 1792 of yacc.c */ -#line 881 "dtool/src/cppparser/cppBison.yxx" +#line 890 "dtool/src/cppparser/cppBison.yxx" { pop_scope(); if ((yyvsp[(2) - (7)].u.identifier)->is_scoped()) { @@ -4251,7 +4287,7 @@ yyreduce: case 72: /* Line 1792 of yacc.c */ -#line 907 "dtool/src/cppparser/cppBison.yxx" +#line 916 "dtool/src/cppparser/cppBison.yxx" { push_scope((yyvsp[(4) - (6)].u.inst_ident)->get_scope(current_scope, global_scope)); } @@ -4259,7 +4295,7 @@ yyreduce: case 73: /* Line 1792 of yacc.c */ -#line 911 "dtool/src/cppparser/cppBison.yxx" +#line 920 "dtool/src/cppparser/cppBison.yxx" { pop_scope(); CPPType *type = (yyvsp[(1) - (10)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); @@ -4277,7 +4313,7 @@ yyreduce: case 74: /* Line 1792 of yacc.c */ -#line 925 "dtool/src/cppparser/cppBison.yxx" +#line 934 "dtool/src/cppparser/cppBison.yxx" { push_scope((yyvsp[(5) - (7)].u.inst_ident)->get_scope(current_scope, global_scope)); } @@ -4285,7 +4321,7 @@ yyreduce: case 75: /* Line 1792 of yacc.c */ -#line 929 "dtool/src/cppparser/cppBison.yxx" +#line 938 "dtool/src/cppparser/cppBison.yxx" { pop_scope(); CPPType *type = (yyvsp[(1) - (11)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); @@ -4303,7 +4339,7 @@ yyreduce: case 76: /* Line 1792 of yacc.c */ -#line 945 "dtool/src/cppparser/cppBison.yxx" +#line 954 "dtool/src/cppparser/cppBison.yxx" { if ((yyvsp[(1) - (4)].u.identifier) != NULL) { push_scope((yyvsp[(1) - (4)].u.identifier)->get_scope(current_scope, global_scope)); @@ -4313,7 +4349,7 @@ yyreduce: case 77: /* Line 1792 of yacc.c */ -#line 951 "dtool/src/cppparser/cppBison.yxx" +#line 960 "dtool/src/cppparser/cppBison.yxx" { if ((yyvsp[(1) - (8)].u.identifier) != NULL) { pop_scope(); @@ -4342,7 +4378,7 @@ yyreduce: case 78: /* Line 1792 of yacc.c */ -#line 976 "dtool/src/cppparser/cppBison.yxx" +#line 985 "dtool/src/cppparser/cppBison.yxx" { if ((yyvsp[(1) - (5)].u.identifier) != NULL) { push_scope((yyvsp[(1) - (5)].u.identifier)->get_scope(current_scope, global_scope)); @@ -4352,7 +4388,7 @@ yyreduce: case 79: /* Line 1792 of yacc.c */ -#line 982 "dtool/src/cppparser/cppBison.yxx" +#line 991 "dtool/src/cppparser/cppBison.yxx" { if ((yyvsp[(1) - (9)].u.identifier) != NULL) { pop_scope(); @@ -4372,7 +4408,7 @@ yyreduce: case 80: /* Line 1792 of yacc.c */ -#line 1002 "dtool/src/cppparser/cppBison.yxx" +#line 1011 "dtool/src/cppparser/cppBison.yxx" { CPPDeclaration *decl = (yyvsp[(1) - (1)].u.identifier)->find_symbol(current_scope, global_scope, current_lexer); @@ -4386,7 +4422,7 @@ yyreduce: case 81: /* Line 1792 of yacc.c */ -#line 1015 "dtool/src/cppparser/cppBison.yxx" +#line 1024 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = 0; } @@ -4394,7 +4430,7 @@ yyreduce: case 82: /* Line 1792 of yacc.c */ -#line 1019 "dtool/src/cppparser/cppBison.yxx" +#line 1028 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (int)CPPFunctionType::F_const_method; } @@ -4402,7 +4438,7 @@ yyreduce: case 83: /* Line 1792 of yacc.c */ -#line 1023 "dtool/src/cppparser/cppBison.yxx" +#line 1032 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (int)CPPFunctionType::F_noexcept; } @@ -4410,7 +4446,7 @@ yyreduce: case 84: /* Line 1792 of yacc.c */ -#line 1027 "dtool/src/cppparser/cppBison.yxx" +#line 1036 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(1) - (4)].u.integer); } @@ -4418,7 +4454,7 @@ yyreduce: case 85: /* Line 1792 of yacc.c */ -#line 1031 "dtool/src/cppparser/cppBison.yxx" +#line 1040 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.integer) = (yyvsp[(1) - (5)].u.integer); } @@ -4426,7 +4462,7 @@ yyreduce: case 86: /* Line 1792 of yacc.c */ -#line 1038 "dtool/src/cppparser/cppBison.yxx" +#line 1047 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "!"; } @@ -4434,7 +4470,7 @@ yyreduce: case 87: /* Line 1792 of yacc.c */ -#line 1042 "dtool/src/cppparser/cppBison.yxx" +#line 1051 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "~"; } @@ -4442,7 +4478,7 @@ yyreduce: case 88: /* Line 1792 of yacc.c */ -#line 1046 "dtool/src/cppparser/cppBison.yxx" +#line 1055 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "*"; } @@ -4450,7 +4486,7 @@ yyreduce: case 89: /* Line 1792 of yacc.c */ -#line 1050 "dtool/src/cppparser/cppBison.yxx" +#line 1059 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "/"; } @@ -4458,7 +4494,7 @@ yyreduce: case 90: /* Line 1792 of yacc.c */ -#line 1054 "dtool/src/cppparser/cppBison.yxx" +#line 1063 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "%"; } @@ -4466,7 +4502,7 @@ yyreduce: case 91: /* Line 1792 of yacc.c */ -#line 1058 "dtool/src/cppparser/cppBison.yxx" +#line 1067 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "+"; } @@ -4474,7 +4510,7 @@ yyreduce: case 92: /* Line 1792 of yacc.c */ -#line 1062 "dtool/src/cppparser/cppBison.yxx" +#line 1071 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "-"; } @@ -4482,7 +4518,7 @@ yyreduce: case 93: /* Line 1792 of yacc.c */ -#line 1066 "dtool/src/cppparser/cppBison.yxx" +#line 1075 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "|"; } @@ -4490,7 +4526,7 @@ yyreduce: case 94: /* Line 1792 of yacc.c */ -#line 1070 "dtool/src/cppparser/cppBison.yxx" +#line 1079 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "&"; } @@ -4498,7 +4534,7 @@ yyreduce: case 95: /* Line 1792 of yacc.c */ -#line 1074 "dtool/src/cppparser/cppBison.yxx" +#line 1083 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "^"; } @@ -4506,7 +4542,7 @@ yyreduce: case 96: /* Line 1792 of yacc.c */ -#line 1078 "dtool/src/cppparser/cppBison.yxx" +#line 1087 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "||"; } @@ -4514,7 +4550,7 @@ yyreduce: case 97: /* Line 1792 of yacc.c */ -#line 1082 "dtool/src/cppparser/cppBison.yxx" +#line 1091 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "&&"; } @@ -4522,7 +4558,7 @@ yyreduce: case 98: /* Line 1792 of yacc.c */ -#line 1086 "dtool/src/cppparser/cppBison.yxx" +#line 1095 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "=="; } @@ -4530,7 +4566,7 @@ yyreduce: case 99: /* Line 1792 of yacc.c */ -#line 1090 "dtool/src/cppparser/cppBison.yxx" +#line 1099 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "!="; } @@ -4538,7 +4574,7 @@ yyreduce: case 100: /* Line 1792 of yacc.c */ -#line 1094 "dtool/src/cppparser/cppBison.yxx" +#line 1103 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "<="; } @@ -4546,7 +4582,7 @@ yyreduce: case 101: /* Line 1792 of yacc.c */ -#line 1098 "dtool/src/cppparser/cppBison.yxx" +#line 1107 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = ">="; } @@ -4554,7 +4590,7 @@ yyreduce: case 102: /* Line 1792 of yacc.c */ -#line 1102 "dtool/src/cppparser/cppBison.yxx" +#line 1111 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "<"; } @@ -4562,7 +4598,7 @@ yyreduce: case 103: /* Line 1792 of yacc.c */ -#line 1106 "dtool/src/cppparser/cppBison.yxx" +#line 1115 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = ">"; } @@ -4570,7 +4606,7 @@ yyreduce: case 104: /* Line 1792 of yacc.c */ -#line 1110 "dtool/src/cppparser/cppBison.yxx" +#line 1119 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "<<"; } @@ -4578,7 +4614,7 @@ yyreduce: case 105: /* Line 1792 of yacc.c */ -#line 1114 "dtool/src/cppparser/cppBison.yxx" +#line 1123 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = ">>"; } @@ -4586,7 +4622,7 @@ yyreduce: case 106: /* Line 1792 of yacc.c */ -#line 1118 "dtool/src/cppparser/cppBison.yxx" +#line 1127 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "="; } @@ -4594,7 +4630,7 @@ yyreduce: case 107: /* Line 1792 of yacc.c */ -#line 1122 "dtool/src/cppparser/cppBison.yxx" +#line 1131 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = ","; } @@ -4602,7 +4638,7 @@ yyreduce: case 108: /* Line 1792 of yacc.c */ -#line 1126 "dtool/src/cppparser/cppBison.yxx" +#line 1135 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "++"; } @@ -4610,7 +4646,7 @@ yyreduce: case 109: /* Line 1792 of yacc.c */ -#line 1130 "dtool/src/cppparser/cppBison.yxx" +#line 1139 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "--"; } @@ -4618,7 +4654,7 @@ yyreduce: case 110: /* Line 1792 of yacc.c */ -#line 1134 "dtool/src/cppparser/cppBison.yxx" +#line 1143 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "*="; } @@ -4626,7 +4662,7 @@ yyreduce: case 111: /* Line 1792 of yacc.c */ -#line 1138 "dtool/src/cppparser/cppBison.yxx" +#line 1147 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "/="; } @@ -4634,7 +4670,7 @@ yyreduce: case 112: /* Line 1792 of yacc.c */ -#line 1142 "dtool/src/cppparser/cppBison.yxx" +#line 1151 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "%="; } @@ -4642,7 +4678,7 @@ yyreduce: case 113: /* Line 1792 of yacc.c */ -#line 1146 "dtool/src/cppparser/cppBison.yxx" +#line 1155 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "+="; } @@ -4650,7 +4686,7 @@ yyreduce: case 114: /* Line 1792 of yacc.c */ -#line 1150 "dtool/src/cppparser/cppBison.yxx" +#line 1159 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "-="; } @@ -4658,7 +4694,7 @@ yyreduce: case 115: /* Line 1792 of yacc.c */ -#line 1154 "dtool/src/cppparser/cppBison.yxx" +#line 1163 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "|="; } @@ -4666,7 +4702,7 @@ yyreduce: case 116: /* Line 1792 of yacc.c */ -#line 1158 "dtool/src/cppparser/cppBison.yxx" +#line 1167 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "&="; } @@ -4674,7 +4710,7 @@ yyreduce: case 117: /* Line 1792 of yacc.c */ -#line 1162 "dtool/src/cppparser/cppBison.yxx" +#line 1171 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "^="; } @@ -4682,7 +4718,7 @@ yyreduce: case 118: /* Line 1792 of yacc.c */ -#line 1166 "dtool/src/cppparser/cppBison.yxx" +#line 1175 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "<<="; } @@ -4690,7 +4726,7 @@ yyreduce: case 119: /* Line 1792 of yacc.c */ -#line 1170 "dtool/src/cppparser/cppBison.yxx" +#line 1179 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = ">>="; } @@ -4698,7 +4734,7 @@ yyreduce: case 120: /* Line 1792 of yacc.c */ -#line 1174 "dtool/src/cppparser/cppBison.yxx" +#line 1183 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "->"; } @@ -4706,7 +4742,7 @@ yyreduce: case 121: /* Line 1792 of yacc.c */ -#line 1178 "dtool/src/cppparser/cppBison.yxx" +#line 1187 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "[]"; } @@ -4714,7 +4750,7 @@ yyreduce: case 122: /* Line 1792 of yacc.c */ -#line 1182 "dtool/src/cppparser/cppBison.yxx" +#line 1191 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "()"; } @@ -4722,7 +4758,7 @@ yyreduce: case 123: /* Line 1792 of yacc.c */ -#line 1186 "dtool/src/cppparser/cppBison.yxx" +#line 1195 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "new"; } @@ -4730,7 +4766,7 @@ yyreduce: case 124: /* Line 1792 of yacc.c */ -#line 1190 "dtool/src/cppparser/cppBison.yxx" +#line 1199 "dtool/src/cppparser/cppBison.yxx" { (yyval.str) = "delete"; } @@ -4738,7 +4774,7 @@ yyreduce: case 127: /* Line 1792 of yacc.c */ -#line 1202 "dtool/src/cppparser/cppBison.yxx" +#line 1211 "dtool/src/cppparser/cppBison.yxx" { push_scope(new CPPTemplateScope(current_scope)); } @@ -4746,7 +4782,7 @@ yyreduce: case 128: /* Line 1792 of yacc.c */ -#line 1206 "dtool/src/cppparser/cppBison.yxx" +#line 1215 "dtool/src/cppparser/cppBison.yxx" { pop_scope(); } @@ -4754,7 +4790,7 @@ yyreduce: case 132: /* Line 1792 of yacc.c */ -#line 1219 "dtool/src/cppparser/cppBison.yxx" +#line 1228 "dtool/src/cppparser/cppBison.yxx" { CPPTemplateScope *ts = current_scope->as_template_scope(); assert(ts != NULL); @@ -4764,7 +4800,7 @@ yyreduce: case 133: /* Line 1792 of yacc.c */ -#line 1225 "dtool/src/cppparser/cppBison.yxx" +#line 1234 "dtool/src/cppparser/cppBison.yxx" { CPPTemplateScope *ts = current_scope->as_template_scope(); assert(ts != NULL); @@ -4774,7 +4810,7 @@ yyreduce: case 134: /* Line 1792 of yacc.c */ -#line 1234 "dtool/src/cppparser/cppBison.yxx" +#line 1243 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[(2) - (2)].u.identifier))); } @@ -4782,7 +4818,7 @@ yyreduce: case 135: /* Line 1792 of yacc.c */ -#line 1238 "dtool/src/cppparser/cppBison.yxx" +#line 1247 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[(2) - (4)].u.identifier), (yyvsp[(4) - (4)].u.type))); } @@ -4790,7 +4826,7 @@ yyreduce: case 136: /* Line 1792 of yacc.c */ -#line 1242 "dtool/src/cppparser/cppBison.yxx" +#line 1251 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[(2) - (2)].u.identifier))); } @@ -4798,7 +4834,7 @@ yyreduce: case 137: /* Line 1792 of yacc.c */ -#line 1246 "dtool/src/cppparser/cppBison.yxx" +#line 1255 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.decl) = CPPType::new_type(new CPPClassTemplateParameter((yyvsp[(2) - (4)].u.identifier), (yyvsp[(4) - (4)].u.type))); } @@ -4806,7 +4842,7 @@ yyreduce: case 138: /* Line 1792 of yacc.c */ -#line 1250 "dtool/src/cppparser/cppBison.yxx" +#line 1259 "dtool/src/cppparser/cppBison.yxx" { CPPInstance *inst = new CPPInstance((yyvsp[(1) - (3)].u.type), (yyvsp[(2) - (3)].u.inst_ident), 0, (yylsp[(2) - (3)]).file); inst->set_initializer((yyvsp[(3) - (3)].u.expr)); @@ -4816,7 +4852,7 @@ yyreduce: case 139: /* Line 1792 of yacc.c */ -#line 1256 "dtool/src/cppparser/cppBison.yxx" +#line 1265 "dtool/src/cppparser/cppBison.yxx" { (yyvsp[(3) - (4)].u.inst_ident)->add_modifier(IIT_const); CPPInstance *inst = new CPPInstance((yyvsp[(2) - (4)].u.type), (yyvsp[(3) - (4)].u.inst_ident), 0, (yylsp[(3) - (4)]).file); @@ -4827,7 +4863,7 @@ yyreduce: case 140: /* Line 1792 of yacc.c */ -#line 1266 "dtool/src/cppparser/cppBison.yxx" +#line 1275 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type)); } @@ -4835,7 +4871,7 @@ yyreduce: case 141: /* Line 1792 of yacc.c */ -#line 1270 "dtool/src/cppparser/cppBison.yxx" +#line 1279 "dtool/src/cppparser/cppBison.yxx" { yywarning("Not a type: " + (yyvsp[(1) - (1)].u.identifier)->get_fully_scoped_name(), (yylsp[(1) - (1)])); (yyval.u.type) = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_unknown)); @@ -4844,7 +4880,7 @@ yyreduce: case 142: /* Line 1792 of yacc.c */ -#line 1275 "dtool/src/cppparser/cppBison.yxx" +#line 1284 "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) { @@ -4856,7 +4892,7 @@ yyreduce: case 143: /* Line 1792 of yacc.c */ -#line 1287 "dtool/src/cppparser/cppBison.yxx" +#line 1296 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier)); } @@ -4864,7 +4900,7 @@ yyreduce: case 144: /* Line 1792 of yacc.c */ -#line 1291 "dtool/src/cppparser/cppBison.yxx" +#line 1300 "dtool/src/cppparser/cppBison.yxx" { // For an operator function. We implement this simply by building a // ficticious name for the function; in other respects it's just @@ -4882,7 +4918,7 @@ yyreduce: case 145: /* Line 1792 of yacc.c */ -#line 1305 "dtool/src/cppparser/cppBison.yxx" +#line 1314 "dtool/src/cppparser/cppBison.yxx" { // A C++11 literal operator. if (!(yyvsp[(2) - (3)].str).empty()) { @@ -4901,7 +4937,7 @@ yyreduce: case 146: /* Line 1792 of yacc.c */ -#line 1320 "dtool/src/cppparser/cppBison.yxx" +#line 1329 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_const); @@ -4910,7 +4946,7 @@ yyreduce: case 147: /* Line 1792 of yacc.c */ -#line 1325 "dtool/src/cppparser/cppBison.yxx" +#line 1334 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_volatile); @@ -4919,7 +4955,7 @@ yyreduce: case 148: /* Line 1792 of yacc.c */ -#line 1330 "dtool/src/cppparser/cppBison.yxx" +#line 1339 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_pointer); @@ -4928,7 +4964,7 @@ yyreduce: case 149: /* Line 1792 of yacc.c */ -#line 1335 "dtool/src/cppparser/cppBison.yxx" +#line 1344 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_reference); @@ -4937,7 +4973,7 @@ yyreduce: case 150: /* Line 1792 of yacc.c */ -#line 1340 "dtool/src/cppparser/cppBison.yxx" +#line 1349 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference); @@ -4946,7 +4982,7 @@ yyreduce: case 151: /* Line 1792 of yacc.c */ -#line 1345 "dtool/src/cppparser/cppBison.yxx" +#line 1354 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(3) - (3)].u.inst_ident); (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[(1) - (3)].u.identifier)); @@ -4955,7 +4991,7 @@ yyreduce: case 152: /* Line 1792 of yacc.c */ -#line 1350 "dtool/src/cppparser/cppBison.yxx" +#line 1359 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(1) - (4)].u.inst_ident); (yyval.u.inst_ident)->add_array_modifier((yyvsp[(3) - (4)].u.expr)); @@ -4964,7 +5000,7 @@ yyreduce: case 153: /* Line 1792 of yacc.c */ -#line 1355 "dtool/src/cppparser/cppBison.yxx" +#line 1364 "dtool/src/cppparser/cppBison.yxx" { // bitfield definition. We ignore the bitfield for now. (yyval.u.inst_ident) = (yyvsp[(1) - (3)].u.inst_ident); @@ -4973,7 +5009,7 @@ yyreduce: case 154: /* Line 1792 of yacc.c */ -#line 1360 "dtool/src/cppparser/cppBison.yxx" +#line 1369 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (3)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_paren); @@ -4982,7 +5018,7 @@ yyreduce: case 155: /* Line 1792 of yacc.c */ -#line 1365 "dtool/src/cppparser/cppBison.yxx" +#line 1374 "dtool/src/cppparser/cppBison.yxx" { push_scope((yyvsp[(1) - (2)].u.inst_ident)->get_scope(current_scope, global_scope)); } @@ -4990,7 +5026,7 @@ yyreduce: case 156: /* Line 1792 of yacc.c */ -#line 1369 "dtool/src/cppparser/cppBison.yxx" +#line 1378 "dtool/src/cppparser/cppBison.yxx" { pop_scope(); (yyval.u.inst_ident) = (yyvsp[(1) - (6)].u.inst_ident); @@ -5008,7 +5044,7 @@ yyreduce: case 157: /* Line 1792 of yacc.c */ -#line 1387 "dtool/src/cppparser/cppBison.yxx" +#line 1396 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.param_list) = new CPPParameterList; } @@ -5016,7 +5052,7 @@ yyreduce: case 158: /* Line 1792 of yacc.c */ -#line 1391 "dtool/src/cppparser/cppBison.yxx" +#line 1400 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.param_list) = new CPPParameterList; (yyval.u.param_list)->_includes_ellipsis = true; @@ -5025,7 +5061,7 @@ yyreduce: case 159: /* Line 1792 of yacc.c */ -#line 1396 "dtool/src/cppparser/cppBison.yxx" +#line 1405 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.param_list) = (yyvsp[(1) - (1)].u.param_list); } @@ -5033,7 +5069,7 @@ yyreduce: case 160: /* Line 1792 of yacc.c */ -#line 1400 "dtool/src/cppparser/cppBison.yxx" +#line 1409 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.param_list) = (yyvsp[(1) - (3)].u.param_list); (yyval.u.param_list)->_includes_ellipsis = true; @@ -5042,7 +5078,7 @@ yyreduce: case 161: /* Line 1792 of yacc.c */ -#line 1405 "dtool/src/cppparser/cppBison.yxx" +#line 1414 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.param_list) = (yyvsp[(1) - (2)].u.param_list); (yyval.u.param_list)->_includes_ellipsis = true; @@ -5051,7 +5087,7 @@ yyreduce: case 162: /* Line 1792 of yacc.c */ -#line 1413 "dtool/src/cppparser/cppBison.yxx" +#line 1422 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.param_list) = new CPPParameterList; (yyval.u.param_list)->_parameters.push_back((yyvsp[(1) - (1)].u.instance)); @@ -5060,7 +5096,7 @@ yyreduce: case 163: /* Line 1792 of yacc.c */ -#line 1418 "dtool/src/cppparser/cppBison.yxx" +#line 1427 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.param_list) = (yyvsp[(1) - (3)].u.param_list); (yyval.u.param_list)->_parameters.push_back((yyvsp[(3) - (3)].u.instance)); @@ -5069,7 +5105,7 @@ yyreduce: case 164: /* Line 1792 of yacc.c */ -#line 1426 "dtool/src/cppparser/cppBison.yxx" +#line 1435 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (CPPExpression *)NULL; } @@ -5077,7 +5113,7 @@ yyreduce: case 165: /* Line 1792 of yacc.c */ -#line 1430 "dtool/src/cppparser/cppBison.yxx" +#line 1439 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (yyvsp[(2) - (2)].u.expr); } @@ -5085,7 +5121,7 @@ yyreduce: case 166: /* Line 1792 of yacc.c */ -#line 1437 "dtool/src/cppparser/cppBison.yxx" +#line 1446 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (CPPExpression *)NULL; } @@ -5093,7 +5129,7 @@ yyreduce: case 167: /* Line 1792 of yacc.c */ -#line 1441 "dtool/src/cppparser/cppBison.yxx" +#line 1450 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (yyvsp[(2) - (2)].u.expr); } @@ -5101,7 +5137,7 @@ yyreduce: case 168: /* Line 1792 of yacc.c */ -#line 1448 "dtool/src/cppparser/cppBison.yxx" +#line 1457 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (CPPExpression *)NULL; } @@ -5109,7 +5145,7 @@ yyreduce: case 169: /* Line 1792 of yacc.c */ -#line 1452 "dtool/src/cppparser/cppBison.yxx" +#line 1461 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (CPPExpression *)NULL; } @@ -5117,7 +5153,7 @@ yyreduce: case 170: /* Line 1792 of yacc.c */ -#line 1456 "dtool/src/cppparser/cppBison.yxx" +#line 1465 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (CPPExpression *)NULL; } @@ -5125,7 +5161,7 @@ yyreduce: case 171: /* Line 1792 of yacc.c */ -#line 1460 "dtool/src/cppparser/cppBison.yxx" +#line 1469 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr); } @@ -5133,7 +5169,7 @@ yyreduce: case 172: /* Line 1792 of yacc.c */ -#line 1464 "dtool/src/cppparser/cppBison.yxx" +#line 1473 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (CPPExpression *)NULL; } @@ -5141,14 +5177,14 @@ yyreduce: case 176: /* Line 1792 of yacc.c */ -#line 1477 "dtool/src/cppparser/cppBison.yxx" +#line 1486 "dtool/src/cppparser/cppBison.yxx" { } break; case 180: /* Line 1792 of yacc.c */ -#line 1486 "dtool/src/cppparser/cppBison.yxx" +#line 1495 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.instance) = new CPPInstance((yyvsp[(1) - (3)].u.type), (yyvsp[(2) - (3)].u.inst_ident), 0, (yylsp[(2) - (3)]).file); (yyval.u.instance)->set_initializer((yyvsp[(3) - (3)].u.expr)); @@ -5157,7 +5193,7 @@ yyreduce: case 181: /* Line 1792 of yacc.c */ -#line 1491 "dtool/src/cppparser/cppBison.yxx" +#line 1500 "dtool/src/cppparser/cppBison.yxx" { (yyvsp[(3) - (4)].u.inst_ident)->add_modifier(IIT_const); (yyval.u.instance) = new CPPInstance((yyvsp[(2) - (4)].u.type), (yyvsp[(3) - (4)].u.inst_ident), 0, (yylsp[(3) - (4)]).file); @@ -5167,7 +5203,7 @@ yyreduce: case 182: /* Line 1792 of yacc.c */ -#line 1497 "dtool/src/cppparser/cppBison.yxx" +#line 1506 "dtool/src/cppparser/cppBison.yxx" { (yyvsp[(4) - (5)].u.inst_ident)->add_modifier(IIT_const); (yyval.u.instance) = new CPPInstance((yyvsp[(3) - (5)].u.type), (yyvsp[(4) - (5)].u.inst_ident), 0, (yylsp[(3) - (5)]).file); @@ -5177,7 +5213,7 @@ yyreduce: case 183: /* Line 1792 of yacc.c */ -#line 1503 "dtool/src/cppparser/cppBison.yxx" +#line 1512 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.instance) = (yyvsp[(2) - (2)].u.instance); } @@ -5185,7 +5221,7 @@ yyreduce: case 184: /* Line 1792 of yacc.c */ -#line 1507 "dtool/src/cppparser/cppBison.yxx" +#line 1516 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_parameter)); @@ -5196,7 +5232,7 @@ yyreduce: case 185: /* Line 1792 of yacc.c */ -#line 1517 "dtool/src/cppparser/cppBison.yxx" +#line 1526 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL); } @@ -5204,7 +5240,7 @@ yyreduce: case 186: /* Line 1792 of yacc.c */ -#line 1521 "dtool/src/cppparser/cppBison.yxx" +#line 1530 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier)); } @@ -5212,7 +5248,7 @@ yyreduce: case 187: /* Line 1792 of yacc.c */ -#line 1525 "dtool/src/cppparser/cppBison.yxx" +#line 1534 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier)); } @@ -5220,7 +5256,7 @@ yyreduce: case 188: /* Line 1792 of yacc.c */ -#line 1529 "dtool/src/cppparser/cppBison.yxx" +#line 1538 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_const); @@ -5229,7 +5265,7 @@ yyreduce: case 189: /* Line 1792 of yacc.c */ -#line 1534 "dtool/src/cppparser/cppBison.yxx" +#line 1543 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_volatile); @@ -5238,7 +5274,7 @@ yyreduce: case 190: /* Line 1792 of yacc.c */ -#line 1539 "dtool/src/cppparser/cppBison.yxx" +#line 1548 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_pointer); @@ -5247,7 +5283,7 @@ yyreduce: case 191: /* Line 1792 of yacc.c */ -#line 1544 "dtool/src/cppparser/cppBison.yxx" +#line 1553 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_reference); @@ -5256,7 +5292,7 @@ yyreduce: case 192: /* Line 1792 of yacc.c */ -#line 1549 "dtool/src/cppparser/cppBison.yxx" +#line 1558 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference); @@ -5265,7 +5301,7 @@ yyreduce: case 193: /* Line 1792 of yacc.c */ -#line 1554 "dtool/src/cppparser/cppBison.yxx" +#line 1563 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(3) - (3)].u.inst_ident); (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[(1) - (3)].u.identifier)); @@ -5274,7 +5310,7 @@ yyreduce: case 194: /* Line 1792 of yacc.c */ -#line 1559 "dtool/src/cppparser/cppBison.yxx" +#line 1568 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(1) - (4)].u.inst_ident); (yyval.u.inst_ident)->add_array_modifier((yyvsp[(3) - (4)].u.expr)); @@ -5283,7 +5319,7 @@ yyreduce: case 195: /* Line 1792 of yacc.c */ -#line 1567 "dtool/src/cppparser/cppBison.yxx" +#line 1576 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL); } @@ -5291,7 +5327,7 @@ yyreduce: case 196: /* Line 1792 of yacc.c */ -#line 1571 "dtool/src/cppparser/cppBison.yxx" +#line 1580 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier)); } @@ -5299,7 +5335,7 @@ yyreduce: case 197: /* Line 1792 of yacc.c */ -#line 1575 "dtool/src/cppparser/cppBison.yxx" +#line 1584 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = new CPPInstanceIdentifier((yyvsp[(1) - (1)].u.identifier)); } @@ -5307,7 +5343,7 @@ yyreduce: case 198: /* Line 1792 of yacc.c */ -#line 1579 "dtool/src/cppparser/cppBison.yxx" +#line 1588 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_const); @@ -5316,7 +5352,7 @@ yyreduce: case 199: /* Line 1792 of yacc.c */ -#line 1584 "dtool/src/cppparser/cppBison.yxx" +#line 1593 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_volatile); @@ -5325,7 +5361,7 @@ yyreduce: case 200: /* Line 1792 of yacc.c */ -#line 1589 "dtool/src/cppparser/cppBison.yxx" +#line 1598 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_pointer); @@ -5334,7 +5370,7 @@ yyreduce: case 201: /* Line 1792 of yacc.c */ -#line 1594 "dtool/src/cppparser/cppBison.yxx" +#line 1603 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_reference); @@ -5343,7 +5379,7 @@ yyreduce: case 202: /* Line 1792 of yacc.c */ -#line 1599 "dtool/src/cppparser/cppBison.yxx" +#line 1608 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference); @@ -5352,7 +5388,7 @@ yyreduce: case 203: /* Line 1792 of yacc.c */ -#line 1604 "dtool/src/cppparser/cppBison.yxx" +#line 1613 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(3) - (3)].u.inst_ident); (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[(1) - (3)].u.identifier)); @@ -5361,7 +5397,7 @@ yyreduce: case 204: /* Line 1792 of yacc.c */ -#line 1609 "dtool/src/cppparser/cppBison.yxx" +#line 1618 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(1) - (4)].u.inst_ident); (yyval.u.inst_ident)->add_array_modifier((yyvsp[(3) - (4)].u.expr)); @@ -5370,7 +5406,7 @@ yyreduce: case 205: /* Line 1792 of yacc.c */ -#line 1614 "dtool/src/cppparser/cppBison.yxx" +#line 1623 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (7)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_paren); @@ -5380,7 +5416,7 @@ yyreduce: case 206: /* Line 1792 of yacc.c */ -#line 1620 "dtool/src/cppparser/cppBison.yxx" +#line 1629 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (3)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_paren); @@ -5389,7 +5425,7 @@ yyreduce: case 207: /* Line 1792 of yacc.c */ -#line 1628 "dtool/src/cppparser/cppBison.yxx" +#line 1637 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = new CPPInstanceIdentifier((CPPIdentifier *)NULL); } @@ -5397,7 +5433,7 @@ yyreduce: case 208: /* Line 1792 of yacc.c */ -#line 1632 "dtool/src/cppparser/cppBison.yxx" +#line 1641 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_const); @@ -5406,7 +5442,7 @@ yyreduce: case 209: /* Line 1792 of yacc.c */ -#line 1637 "dtool/src/cppparser/cppBison.yxx" +#line 1646 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_volatile); @@ -5415,7 +5451,7 @@ yyreduce: case 210: /* Line 1792 of yacc.c */ -#line 1642 "dtool/src/cppparser/cppBison.yxx" +#line 1651 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_pointer); @@ -5424,7 +5460,7 @@ yyreduce: case 211: /* Line 1792 of yacc.c */ -#line 1647 "dtool/src/cppparser/cppBison.yxx" +#line 1656 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_reference); @@ -5433,7 +5469,7 @@ yyreduce: case 212: /* Line 1792 of yacc.c */ -#line 1652 "dtool/src/cppparser/cppBison.yxx" +#line 1661 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (2)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_rvalue_reference); @@ -5442,7 +5478,7 @@ yyreduce: case 213: /* Line 1792 of yacc.c */ -#line 1657 "dtool/src/cppparser/cppBison.yxx" +#line 1666 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(3) - (3)].u.inst_ident); (yyval.u.inst_ident)->add_scoped_pointer_modifier((yyvsp[(1) - (3)].u.identifier)); @@ -5451,7 +5487,7 @@ yyreduce: case 214: /* Line 1792 of yacc.c */ -#line 1662 "dtool/src/cppparser/cppBison.yxx" +#line 1671 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(1) - (4)].u.inst_ident); (yyval.u.inst_ident)->add_array_modifier((yyvsp[(3) - (4)].u.expr)); @@ -5460,7 +5496,7 @@ yyreduce: case 215: /* Line 1792 of yacc.c */ -#line 1667 "dtool/src/cppparser/cppBison.yxx" +#line 1676 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.inst_ident) = (yyvsp[(2) - (7)].u.inst_ident); (yyval.u.inst_ident)->add_modifier(IIT_paren); @@ -5470,7 +5506,7 @@ yyreduce: case 216: /* Line 1792 of yacc.c */ -#line 1676 "dtool/src/cppparser/cppBison.yxx" +#line 1685 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type)); } @@ -5478,7 +5514,7 @@ yyreduce: case 217: /* Line 1792 of yacc.c */ -#line 1680 "dtool/src/cppparser/cppBison.yxx" +#line 1689 "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) { @@ -5490,7 +5526,7 @@ yyreduce: case 218: /* Line 1792 of yacc.c */ -#line 1688 "dtool/src/cppparser/cppBison.yxx" +#line 1697 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier))); } @@ -5498,7 +5534,7 @@ yyreduce: case 219: /* Line 1792 of yacc.c */ -#line 1692 "dtool/src/cppparser/cppBison.yxx" +#line 1701 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.struct_type)); } @@ -5506,7 +5542,7 @@ yyreduce: case 220: /* Line 1792 of yacc.c */ -#line 1696 "dtool/src/cppparser/cppBison.yxx" +#line 1705 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.struct_type)); } @@ -5514,7 +5550,7 @@ yyreduce: case 221: /* Line 1792 of yacc.c */ -#line 1700 "dtool/src/cppparser/cppBison.yxx" +#line 1709 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.enum_type)); } @@ -5522,7 +5558,7 @@ yyreduce: case 222: /* Line 1792 of yacc.c */ -#line 1704 "dtool/src/cppparser/cppBison.yxx" +#line 1713 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { @@ -5542,7 +5578,7 @@ yyreduce: case 223: /* Line 1792 of yacc.c */ -#line 1720 "dtool/src/cppparser/cppBison.yxx" +#line 1729 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = (yyvsp[(2) - (4)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { @@ -5562,7 +5598,7 @@ yyreduce: case 224: /* Line 1792 of yacc.c */ -#line 1736 "dtool/src/cppparser/cppBison.yxx" +#line 1745 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = (yyvsp[(3) - (4)].u.expr)->determine_type(); if ((yyval.u.type) == (CPPType *)NULL) { @@ -5575,7 +5611,7 @@ yyreduce: case 225: /* Line 1792 of yacc.c */ -#line 1745 "dtool/src/cppparser/cppBison.yxx" +#line 1754 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = new CPPSimpleType(CPPSimpleType::T_auto); } @@ -5583,7 +5619,7 @@ yyreduce: case 226: /* Line 1792 of yacc.c */ -#line 1752 "dtool/src/cppparser/cppBison.yxx" +#line 1761 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.decl) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type)); } @@ -5591,7 +5627,7 @@ yyreduce: case 227: /* Line 1792 of yacc.c */ -#line 1756 "dtool/src/cppparser/cppBison.yxx" +#line 1765 "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) { @@ -5603,7 +5639,7 @@ yyreduce: case 228: /* Line 1792 of yacc.c */ -#line 1764 "dtool/src/cppparser/cppBison.yxx" +#line 1773 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.decl) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier))); } @@ -5611,7 +5647,7 @@ yyreduce: case 229: /* Line 1792 of yacc.c */ -#line 1768 "dtool/src/cppparser/cppBison.yxx" +#line 1777 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.decl) = CPPType::new_type((yyvsp[(1) - (1)].u.struct_type)); } @@ -5619,7 +5655,7 @@ yyreduce: case 230: /* Line 1792 of yacc.c */ -#line 1772 "dtool/src/cppparser/cppBison.yxx" +#line 1781 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.decl) = new CPPTypeDeclaration(CPPType::new_type((yyvsp[(1) - (1)].u.struct_type))); } @@ -5627,7 +5663,7 @@ yyreduce: case 231: /* Line 1792 of yacc.c */ -#line 1776 "dtool/src/cppparser/cppBison.yxx" +#line 1785 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.decl) = new CPPTypeDeclaration(CPPType::new_type((yyvsp[(1) - (1)].u.enum_type))); } @@ -5635,7 +5671,7 @@ yyreduce: case 232: /* Line 1792 of yacc.c */ -#line 1780 "dtool/src/cppparser/cppBison.yxx" +#line 1789 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { @@ -5655,7 +5691,7 @@ yyreduce: case 233: /* Line 1792 of yacc.c */ -#line 1796 "dtool/src/cppparser/cppBison.yxx" +#line 1805 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = (yyvsp[(2) - (4)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { @@ -5675,7 +5711,7 @@ yyreduce: case 234: /* Line 1792 of yacc.c */ -#line 1812 "dtool/src/cppparser/cppBison.yxx" +#line 1821 "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)])); @@ -5697,7 +5733,7 @@ yyreduce: case 235: /* Line 1792 of yacc.c */ -#line 1830 "dtool/src/cppparser/cppBison.yxx" +#line 1839 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.decl) = (yyvsp[(3) - (4)].u.expr)->determine_type(); if ((yyval.u.decl) == (CPPType *)NULL) { @@ -5710,7 +5746,7 @@ yyreduce: case 236: /* Line 1792 of yacc.c */ -#line 1839 "dtool/src/cppparser/cppBison.yxx" +#line 1848 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.decl) = new CPPSimpleType(CPPSimpleType::T_auto); } @@ -5718,7 +5754,7 @@ yyreduce: case 237: /* Line 1792 of yacc.c */ -#line 1846 "dtool/src/cppparser/cppBison.yxx" +#line 1855 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type)); } @@ -5726,7 +5762,7 @@ yyreduce: case 238: /* Line 1792 of yacc.c */ -#line 1850 "dtool/src/cppparser/cppBison.yxx" +#line 1859 "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) { @@ -5738,7 +5774,7 @@ yyreduce: case 239: /* Line 1792 of yacc.c */ -#line 1858 "dtool/src/cppparser/cppBison.yxx" +#line 1867 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier))); } @@ -5746,7 +5782,7 @@ yyreduce: case 240: /* Line 1792 of yacc.c */ -#line 1862 "dtool/src/cppparser/cppBison.yxx" +#line 1871 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { @@ -5766,7 +5802,7 @@ yyreduce: case 241: /* Line 1792 of yacc.c */ -#line 1878 "dtool/src/cppparser/cppBison.yxx" +#line 1887 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { @@ -5786,7 +5822,25 @@ yyreduce: case 242: /* Line 1792 of yacc.c */ -#line 1897 "dtool/src/cppparser/cppBison.yxx" +#line 1906 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.decl) = (yyvsp[(1) - (1)].u.decl); +} + break; + + case 243: +/* Line 1792 of yacc.c */ +#line 1910 "dtool/src/cppparser/cppBison.yxx" + { + yyerror(string("unknown type '") + (yyvsp[(1) - (1)].u.identifier)->get_fully_scoped_name() + "'", (yylsp[(1) - (1)])); + + (yyval.u.decl) = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_unknown)); +} + break; + + case 244: +/* Line 1792 of yacc.c */ +#line 1918 "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; @@ -5794,9 +5848,9 @@ yyreduce: } break; - case 243: + case 245: /* Line 1792 of yacc.c */ -#line 1903 "dtool/src/cppparser/cppBison.yxx" +#line 1924 "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); @@ -5805,9 +5859,9 @@ yyreduce: } break; - case 244: + case 246: /* Line 1792 of yacc.c */ -#line 1913 "dtool/src/cppparser/cppBison.yxx" +#line 1934 "dtool/src/cppparser/cppBison.yxx" { CPPVisibility starting_vis = ((yyvsp[(1) - (2)].u.extension_enum) == CPPExtensionType::T_class) ? V_private : V_public; @@ -5823,9 +5877,9 @@ yyreduce: } break; - case 245: + case 247: /* Line 1792 of yacc.c */ -#line 1927 "dtool/src/cppparser/cppBison.yxx" +#line 1948 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.struct_type) = current_struct; current_struct->_incomplete = false; @@ -5834,9 +5888,9 @@ yyreduce: } break; - case 246: + case 248: /* Line 1792 of yacc.c */ -#line 1937 "dtool/src/cppparser/cppBison.yxx" +#line 1958 "dtool/src/cppparser/cppBison.yxx" { CPPVisibility starting_vis = ((yyvsp[(1) - (2)].u.extension_enum) == CPPExtensionType::T_class) ? V_private : V_public; @@ -5858,9 +5912,9 @@ yyreduce: } break; - case 247: + case 249: /* Line 1792 of yacc.c */ -#line 1957 "dtool/src/cppparser/cppBison.yxx" +#line 1978 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.struct_type) = current_struct; current_struct->_incomplete = false; @@ -5869,138 +5923,138 @@ yyreduce: } break; - case 252: + case 254: /* Line 1792 of yacc.c */ -#line 1977 "dtool/src/cppparser/cppBison.yxx" +#line 1998 "dtool/src/cppparser/cppBison.yxx" { current_struct->append_derivation((yyvsp[(2) - (2)].u.type), V_public, false); } break; - case 253: + case 255: /* Line 1792 of yacc.c */ -#line 1981 "dtool/src/cppparser/cppBison.yxx" +#line 2002 "dtool/src/cppparser/cppBison.yxx" { current_struct->append_derivation((yyvsp[(2) - (2)].u.type), V_protected, false); } break; - case 254: + case 256: /* Line 1792 of yacc.c */ -#line 1985 "dtool/src/cppparser/cppBison.yxx" +#line 2006 "dtool/src/cppparser/cppBison.yxx" { current_struct->append_derivation((yyvsp[(2) - (2)].u.type), V_private, false); } break; - case 255: -/* Line 1792 of yacc.c */ -#line 1989 "dtool/src/cppparser/cppBison.yxx" - { - current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_public, true); -} - break; - - case 256: -/* Line 1792 of yacc.c */ -#line 1993 "dtool/src/cppparser/cppBison.yxx" - { - current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_protected, true); -} - break; - case 257: /* Line 1792 of yacc.c */ -#line 1997 "dtool/src/cppparser/cppBison.yxx" +#line 2010 "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 258: /* Line 1792 of yacc.c */ -#line 2001 "dtool/src/cppparser/cppBison.yxx" - { - current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_public, true); -} - break; - - case 259: -/* Line 1792 of yacc.c */ -#line 2005 "dtool/src/cppparser/cppBison.yxx" +#line 2014 "dtool/src/cppparser/cppBison.yxx" { current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_protected, true); } break; - case 260: + case 259: /* Line 1792 of yacc.c */ -#line 2009 "dtool/src/cppparser/cppBison.yxx" +#line 2018 "dtool/src/cppparser/cppBison.yxx" { current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_private, true); } break; + case 260: +/* Line 1792 of yacc.c */ +#line 2022 "dtool/src/cppparser/cppBison.yxx" + { + current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_public, true); +} + break; + case 261: /* Line 1792 of yacc.c */ -#line 2016 "dtool/src/cppparser/cppBison.yxx" +#line 2026 "dtool/src/cppparser/cppBison.yxx" + { + current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_protected, true); +} + break; + + case 262: +/* Line 1792 of yacc.c */ +#line 2030 "dtool/src/cppparser/cppBison.yxx" + { + current_struct->append_derivation((yyvsp[(3) - (3)].u.type), V_private, true); +} + break; + + case 263: +/* Line 1792 of yacc.c */ +#line 2037 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.enum_type) = current_enum; current_enum = NULL; } break; - case 262: + case 264: /* Line 1792 of yacc.c */ -#line 2024 "dtool/src/cppparser/cppBison.yxx" +#line 2045 "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); } break; - case 263: + case 265: /* Line 1792 of yacc.c */ -#line 2028 "dtool/src/cppparser/cppBison.yxx" +#line 2049 "dtool/src/cppparser/cppBison.yxx" { current_enum = new CPPEnumType((yyvsp[(2) - (2)].u.identifier), current_scope, (yylsp[(1) - (2)]).file); } break; - case 264: + case 266: /* Line 1792 of yacc.c */ -#line 2032 "dtool/src/cppparser/cppBison.yxx" +#line 2053 "dtool/src/cppparser/cppBison.yxx" { current_enum = new CPPEnumType(NULL, (yyvsp[(3) - (3)].u.type), current_scope, (yylsp[(1) - (3)]).file); } break; - case 265: + case 267: /* Line 1792 of yacc.c */ -#line 2036 "dtool/src/cppparser/cppBison.yxx" +#line 2057 "dtool/src/cppparser/cppBison.yxx" { current_enum = new CPPEnumType(NULL, current_scope, (yylsp[(1) - (1)]).file); } break; - case 266: + case 268: /* Line 1792 of yacc.c */ -#line 2043 "dtool/src/cppparser/cppBison.yxx" +#line 2064 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type((yyvsp[(1) - (1)].u.simple_type)); } break; - case 267: + case 269: /* Line 1792 of yacc.c */ -#line 2047 "dtool/src/cppparser/cppBison.yxx" +#line 2068 "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: + case 271: /* Line 1792 of yacc.c */ -#line 2055 "dtool/src/cppparser/cppBison.yxx" +#line 2076 "dtool/src/cppparser/cppBison.yxx" { assert(current_enum != NULL); CPPInstance *inst = current_enum->add_element((yyvsp[(2) - (3)].u.identifier)->get_simple_name()); @@ -6008,9 +6062,9 @@ yyreduce: } break; - case 270: + case 272: /* Line 1792 of yacc.c */ -#line 2061 "dtool/src/cppparser/cppBison.yxx" +#line 2082 "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)); @@ -6018,9 +6072,9 @@ yyreduce: } break; - case 272: + case 274: /* Line 1792 of yacc.c */ -#line 2070 "dtool/src/cppparser/cppBison.yxx" +#line 2091 "dtool/src/cppparser/cppBison.yxx" { assert(current_enum != NULL); CPPInstance *inst = current_enum->add_element((yyvsp[(2) - (2)].u.identifier)->get_simple_name()); @@ -6028,9 +6082,9 @@ yyreduce: } break; - case 273: + case 275: /* Line 1792 of yacc.c */ -#line 2076 "dtool/src/cppparser/cppBison.yxx" +#line 2097 "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)); @@ -6038,41 +6092,41 @@ yyreduce: } break; - case 274: + case 276: /* Line 1792 of yacc.c */ -#line 2085 "dtool/src/cppparser/cppBison.yxx" +#line 2106 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.extension_enum) = CPPExtensionType::T_enum; } break; - case 275: + case 277: /* Line 1792 of yacc.c */ -#line 2092 "dtool/src/cppparser/cppBison.yxx" +#line 2113 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.extension_enum) = CPPExtensionType::T_class; } break; - case 276: + case 278: /* Line 1792 of yacc.c */ -#line 2096 "dtool/src/cppparser/cppBison.yxx" +#line 2117 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.extension_enum) = CPPExtensionType::T_struct; } break; - case 277: + case 279: /* Line 1792 of yacc.c */ -#line 2100 "dtool/src/cppparser/cppBison.yxx" +#line 2121 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.extension_enum) = CPPExtensionType::T_union; } break; - case 278: + case 280: /* Line 1792 of yacc.c */ -#line 2107 "dtool/src/cppparser/cppBison.yxx" +#line 2128 "dtool/src/cppparser/cppBison.yxx" { CPPScope *scope = (yyvsp[(2) - (3)].u.identifier)->find_scope(current_scope, global_scope, current_lexer); if (scope == NULL) { @@ -6092,17 +6146,17 @@ yyreduce: } break; - case 279: + case 281: /* Line 1792 of yacc.c */ -#line 2125 "dtool/src/cppparser/cppBison.yxx" +#line 2146 "dtool/src/cppparser/cppBison.yxx" { pop_scope(); } break; - case 280: + case 282: /* Line 1792 of yacc.c */ -#line 2129 "dtool/src/cppparser/cppBison.yxx" +#line 2150 "dtool/src/cppparser/cppBison.yxx" { CPPScope *scope = (yyvsp[(3) - (4)].u.identifier)->find_scope(current_scope, global_scope, current_lexer); if (scope == NULL) { @@ -6123,17 +6177,17 @@ yyreduce: } break; - case 281: + case 283: /* Line 1792 of yacc.c */ -#line 2148 "dtool/src/cppparser/cppBison.yxx" +#line 2169 "dtool/src/cppparser/cppBison.yxx" { pop_scope(); } break; - case 284: + case 286: /* Line 1792 of yacc.c */ -#line 2157 "dtool/src/cppparser/cppBison.yxx" +#line 2178 "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)])); @@ -6141,9 +6195,9 @@ yyreduce: } break; - case 285: + case 287: /* Line 1792 of yacc.c */ -#line 2163 "dtool/src/cppparser/cppBison.yxx" +#line 2184 "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)])); @@ -6151,111 +6205,111 @@ yyreduce: } break; - case 289: + case 291: /* Line 1792 of yacc.c */ -#line 2178 "dtool/src/cppparser/cppBison.yxx" +#line 2199 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_bool); } break; - case 290: + case 292: /* Line 1792 of yacc.c */ -#line 2182 "dtool/src/cppparser/cppBison.yxx" +#line 2203 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char); } break; - case 291: + case 293: /* Line 1792 of yacc.c */ -#line 2186 "dtool/src/cppparser/cppBison.yxx" +#line 2207 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_wchar_t); } break; - case 292: + case 294: /* Line 1792 of yacc.c */ -#line 2190 "dtool/src/cppparser/cppBison.yxx" +#line 2211 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char16_t); } break; - case 293: + case 295: /* Line 1792 of yacc.c */ -#line 2194 "dtool/src/cppparser/cppBison.yxx" +#line 2215 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_char32_t); } break; - case 294: + case 296: /* Line 1792 of yacc.c */ -#line 2198 "dtool/src/cppparser/cppBison.yxx" +#line 2219 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_short); } break; - case 295: + case 297: /* Line 1792 of yacc.c */ -#line 2203 "dtool/src/cppparser/cppBison.yxx" +#line 2224 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_long); } break; - case 296: + case 298: /* Line 1792 of yacc.c */ -#line 2208 "dtool/src/cppparser/cppBison.yxx" +#line 2229 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_longlong); } break; - case 297: + case 299: /* Line 1792 of yacc.c */ -#line 2213 "dtool/src/cppparser/cppBison.yxx" +#line 2234 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_unsigned); } break; - case 298: + case 300: /* Line 1792 of yacc.c */ -#line 2218 "dtool/src/cppparser/cppBison.yxx" +#line 2239 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_signed); } break; - case 299: + case 301: /* Line 1792 of yacc.c */ -#line 2223 "dtool/src/cppparser/cppBison.yxx" +#line 2244 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_int); } break; - case 300: + case 302: /* Line 1792 of yacc.c */ -#line 2227 "dtool/src/cppparser/cppBison.yxx" +#line 2248 "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 301: + case 303: /* Line 1792 of yacc.c */ -#line 2232 "dtool/src/cppparser/cppBison.yxx" +#line 2253 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = (yyvsp[(2) - (2)].u.simple_type); if ((yyval.u.simple_type)->_flags & CPPSimpleType::F_long) { @@ -6266,117 +6320,101 @@ yyreduce: } break; - case 302: + case 304: /* Line 1792 of yacc.c */ -#line 2241 "dtool/src/cppparser/cppBison.yxx" +#line 2262 "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 303: + case 305: /* Line 1792 of yacc.c */ -#line 2246 "dtool/src/cppparser/cppBison.yxx" +#line 2267 "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 304: + case 306: /* Line 1792 of yacc.c */ -#line 2254 "dtool/src/cppparser/cppBison.yxx" +#line 2275 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_float); } break; - case 305: + case 307: /* Line 1792 of yacc.c */ -#line 2258 "dtool/src/cppparser/cppBison.yxx" +#line 2279 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_float, CPPSimpleType::F_long); } break; - case 306: + case 308: /* Line 1792 of yacc.c */ -#line 2263 "dtool/src/cppparser/cppBison.yxx" +#line 2284 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_double); } break; - case 307: + case 309: /* Line 1792 of yacc.c */ -#line 2267 "dtool/src/cppparser/cppBison.yxx" +#line 2288 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_float, CPPSimpleType::F_longlong); } break; - case 308: + case 310: /* Line 1792 of yacc.c */ -#line 2272 "dtool/src/cppparser/cppBison.yxx" +#line 2293 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_double, CPPSimpleType::F_long); } break; - case 309: + case 311: /* Line 1792 of yacc.c */ -#line 2280 "dtool/src/cppparser/cppBison.yxx" +#line 2301 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.simple_type) = new CPPSimpleType(CPPSimpleType::T_void); } break; - case 310: + case 312: /* Line 1792 of yacc.c */ -#line 2289 "dtool/src/cppparser/cppBison.yxx" +#line 2310 "dtool/src/cppparser/cppBison.yxx" { current_lexer->_resolve_identifiers = false; } break; - case 311: + case 313: /* Line 1792 of yacc.c */ -#line 2293 "dtool/src/cppparser/cppBison.yxx" +#line 2314 "dtool/src/cppparser/cppBison.yxx" { current_lexer->_resolve_identifiers = true; } break; - case 406: + case 408: /* Line 1792 of yacc.c */ -#line 2333 "dtool/src/cppparser/cppBison.yxx" +#line 2354 "dtool/src/cppparser/cppBison.yxx" { } break; - case 430: -/* Line 1792 of yacc.c */ -#line 2342 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = (CPPExpression *)NULL; -} - break; - - case 431: -/* Line 1792 of yacc.c */ -#line 2346 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); -} - break; - case 432: /* Line 1792 of yacc.c */ -#line 2353 "dtool/src/cppparser/cppBison.yxx" +#line 2363 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (CPPExpression *)NULL; } @@ -6384,7 +6422,7 @@ yyreduce: case 433: /* Line 1792 of yacc.c */ -#line 2357 "dtool/src/cppparser/cppBison.yxx" +#line 2367 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } @@ -6392,23 +6430,23 @@ yyreduce: case 434: /* Line 1792 of yacc.c */ -#line 2364 "dtool/src/cppparser/cppBison.yxx" +#line 2374 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); + (yyval.u.expr) = (CPPExpression *)NULL; } break; case 435: /* Line 1792 of yacc.c */ -#line 2368 "dtool/src/cppparser/cppBison.yxx" +#line 2378 "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 436: /* Line 1792 of yacc.c */ -#line 2375 "dtool/src/cppparser/cppBison.yxx" +#line 2385 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } @@ -6416,303 +6454,319 @@ yyreduce: case 437: /* Line 1792 of yacc.c */ -#line 2379 "dtool/src/cppparser/cppBison.yxx" +#line 2389 "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; case 438: /* Line 1792 of yacc.c */ -#line 2383 "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 439: -/* Line 1792 of yacc.c */ -#line 2387 "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 440: -/* Line 1792 of yacc.c */ -#line 2391 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type))); -} - break; - - case 441: -/* Line 1792 of yacc.c */ -#line 2395 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[(3) - (4)].u.type))); -} - break; - - case 442: -/* Line 1792 of yacc.c */ -#line 2399 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr)); -} - break; - - case 443: -/* Line 1792 of yacc.c */ -#line 2403 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr)); -} - break; - - case 444: -/* Line 1792 of yacc.c */ -#line 2407 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr)); -} - break; - - case 445: -/* Line 1792 of yacc.c */ -#line 2411 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[(2) - (2)].u.expr)); -} - break; - - case 446: -/* Line 1792 of yacc.c */ -#line 2415 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr)); -} - break; - - case 447: -/* Line 1792 of yacc.c */ -#line 2419 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 448: -/* Line 1792 of yacc.c */ -#line 2423 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 449: -/* Line 1792 of yacc.c */ -#line 2427 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 450: -/* Line 1792 of yacc.c */ -#line 2431 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 451: -/* Line 1792 of yacc.c */ -#line 2435 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 452: -/* Line 1792 of yacc.c */ -#line 2439 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 453: -/* Line 1792 of yacc.c */ -#line 2443 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 454: -/* Line 1792 of yacc.c */ -#line 2447 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 455: -/* Line 1792 of yacc.c */ -#line 2451 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 456: -/* Line 1792 of yacc.c */ -#line 2455 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 457: -/* Line 1792 of yacc.c */ -#line 2459 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 458: -/* Line 1792 of yacc.c */ -#line 2463 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 459: -/* Line 1792 of yacc.c */ -#line 2467 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 460: -/* Line 1792 of yacc.c */ -#line 2471 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 461: -/* Line 1792 of yacc.c */ -#line 2475 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 462: -/* Line 1792 of yacc.c */ -#line 2479 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 463: -/* Line 1792 of yacc.c */ -#line 2483 "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)); -} - break; - - case 464: -/* Line 1792 of yacc.c */ -#line 2487 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); -} - break; - - case 465: -/* Line 1792 of yacc.c */ -#line 2491 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); -} - break; - - case 466: -/* Line 1792 of yacc.c */ -#line 2495 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr)); -} - break; - - case 467: -/* Line 1792 of yacc.c */ -#line 2499 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 468: -/* Line 1792 of yacc.c */ -#line 2503 "dtool/src/cppparser/cppBison.yxx" - { - (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 2507 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr); -} - break; - - case 470: -/* Line 1792 of yacc.c */ -#line 2515 "dtool/src/cppparser/cppBison.yxx" +#line 2396 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } break; - case 471: + case 439: /* Line 1792 of yacc.c */ -#line 2519 "dtool/src/cppparser/cppBison.yxx" +#line 2400 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr))); } break; - case 472: + case 440: /* Line 1792 of yacc.c */ -#line 2523 "dtool/src/cppparser/cppBison.yxx" +#line 2404 "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 441: +/* Line 1792 of yacc.c */ +#line 2408 "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 442: +/* Line 1792 of yacc.c */ +#line 2412 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type))); +} + break; + + case 443: +/* Line 1792 of yacc.c */ +#line 2416 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[(3) - (4)].u.type))); +} + break; + + case 444: +/* Line 1792 of yacc.c */ +#line 2420 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr)); +} + break; + + case 445: +/* Line 1792 of yacc.c */ +#line 2424 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr)); +} + break; + + case 446: +/* Line 1792 of yacc.c */ +#line 2428 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr)); +} + break; + + case 447: +/* Line 1792 of yacc.c */ +#line 2432 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[(2) - (2)].u.expr)); +} + break; + + case 448: +/* Line 1792 of yacc.c */ +#line 2436 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr)); +} + break; + + case 449: +/* Line 1792 of yacc.c */ +#line 2440 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 450: +/* Line 1792 of yacc.c */ +#line 2444 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 451: +/* Line 1792 of yacc.c */ +#line 2448 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 452: +/* Line 1792 of yacc.c */ +#line 2452 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 453: +/* Line 1792 of yacc.c */ +#line 2456 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 454: +/* Line 1792 of yacc.c */ +#line 2460 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 455: +/* Line 1792 of yacc.c */ +#line 2464 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 456: +/* Line 1792 of yacc.c */ +#line 2468 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 457: +/* Line 1792 of yacc.c */ +#line 2472 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 458: +/* Line 1792 of yacc.c */ +#line 2476 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 459: +/* Line 1792 of yacc.c */ +#line 2480 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 460: +/* Line 1792 of yacc.c */ +#line 2484 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 461: +/* Line 1792 of yacc.c */ +#line 2488 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 462: +/* Line 1792 of yacc.c */ +#line 2492 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 463: +/* Line 1792 of yacc.c */ +#line 2496 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 464: +/* Line 1792 of yacc.c */ +#line 2500 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 465: +/* Line 1792 of yacc.c */ +#line 2504 "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)); +} + break; + + case 466: +/* Line 1792 of yacc.c */ +#line 2508 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); +} + break; + + case 467: +/* Line 1792 of yacc.c */ +#line 2512 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); +} + break; + + case 468: +/* Line 1792 of yacc.c */ +#line 2516 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr)); +} + break; + + case 469: +/* Line 1792 of yacc.c */ +#line 2520 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 470: +/* Line 1792 of yacc.c */ +#line 2524 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 471: +/* Line 1792 of yacc.c */ +#line 2528 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr); +} + break; + + case 472: +/* Line 1792 of yacc.c */ +#line 2536 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); +} + break; + case 473: /* Line 1792 of yacc.c */ -#line 2527 "dtool/src/cppparser/cppBison.yxx" +#line 2540 "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; case 474: /* Line 1792 of yacc.c */ -#line 2531 "dtool/src/cppparser/cppBison.yxx" +#line 2544 "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 475: +/* Line 1792 of yacc.c */ +#line 2548 "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 476: +/* Line 1792 of yacc.c */ +#line 2552 "dtool/src/cppparser/cppBison.yxx" { // A constructor call. CPPType *type = (yyvsp[(1) - (4)].u.identifier)->find_type(current_scope, global_scope, false, current_lexer); @@ -6724,9 +6778,9 @@ yyreduce: } break; - case 475: + case 477: /* Line 1792 of yacc.c */ -#line 2541 "dtool/src/cppparser/cppBison.yxx" +#line 2562 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int)); @@ -6734,9 +6788,9 @@ yyreduce: } break; - case 476: + case 478: /* Line 1792 of yacc.c */ -#line 2547 "dtool/src/cppparser/cppBison.yxx" +#line 2568 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char)); @@ -6744,9 +6798,9 @@ yyreduce: } break; - case 477: + case 479: /* Line 1792 of yacc.c */ -#line 2553 "dtool/src/cppparser/cppBison.yxx" +#line 2574 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_wchar_t)); @@ -6754,9 +6808,9 @@ yyreduce: } break; - case 478: + case 480: /* Line 1792 of yacc.c */ -#line 2559 "dtool/src/cppparser/cppBison.yxx" +#line 2580 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char16_t)); @@ -6764,9 +6818,9 @@ yyreduce: } break; - case 479: + case 481: /* Line 1792 of yacc.c */ -#line 2565 "dtool/src/cppparser/cppBison.yxx" +#line 2586 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char32_t)); @@ -6774,9 +6828,9 @@ yyreduce: } break; - case 480: + case 482: /* Line 1792 of yacc.c */ -#line 2571 "dtool/src/cppparser/cppBison.yxx" +#line 2592 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_bool)); @@ -6784,9 +6838,9 @@ yyreduce: } break; - case 481: + case 483: /* Line 1792 of yacc.c */ -#line 2577 "dtool/src/cppparser/cppBison.yxx" +#line 2598 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, @@ -6795,9 +6849,9 @@ yyreduce: } break; - case 482: + case 484: /* Line 1792 of yacc.c */ -#line 2584 "dtool/src/cppparser/cppBison.yxx" +#line 2605 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, @@ -6806,9 +6860,9 @@ yyreduce: } break; - case 483: + case 485: /* Line 1792 of yacc.c */ -#line 2591 "dtool/src/cppparser/cppBison.yxx" +#line 2612 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, @@ -6817,9 +6871,9 @@ yyreduce: } break; - case 484: + case 486: /* Line 1792 of yacc.c */ -#line 2598 "dtool/src/cppparser/cppBison.yxx" +#line 2619 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, @@ -6828,9 +6882,9 @@ yyreduce: } break; - case 485: + case 487: /* Line 1792 of yacc.c */ -#line 2605 "dtool/src/cppparser/cppBison.yxx" +#line 2626 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_float)); @@ -6838,9 +6892,9 @@ yyreduce: } break; - case 486: + case 488: /* Line 1792 of yacc.c */ -#line 2611 "dtool/src/cppparser/cppBison.yxx" +#line 2632 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_double)); @@ -6848,721 +6902,721 @@ yyreduce: } break; - case 487: -/* Line 1792 of yacc.c */ -#line 2617 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type))); -} - break; - - case 488: -/* Line 1792 of yacc.c */ -#line 2621 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[(3) - (4)].u.type))); -} - break; - case 489: /* Line 1792 of yacc.c */ -#line 2625 "dtool/src/cppparser/cppBison.yxx" +#line 2638 "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; case 490: /* Line 1792 of yacc.c */ -#line 2629 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (5)].u.type), (yyvsp[(4) - (5)].u.expr))); -} - break; - - case 491: -/* Line 1792 of yacc.c */ -#line 2633 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr)); -} - break; - - case 492: -/* Line 1792 of yacc.c */ -#line 2637 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr)); -} - break; - - case 493: -/* Line 1792 of yacc.c */ -#line 2641 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr)); -} - break; - - case 494: -/* Line 1792 of yacc.c */ -#line 2645 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[(2) - (2)].u.expr)); -} - break; - - case 495: -/* Line 1792 of yacc.c */ -#line 2649 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr)); -} - break; - - case 496: -/* Line 1792 of yacc.c */ -#line 2653 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 497: -/* Line 1792 of yacc.c */ -#line 2657 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 498: -/* Line 1792 of yacc.c */ -#line 2661 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 499: -/* Line 1792 of yacc.c */ -#line 2665 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 500: -/* Line 1792 of yacc.c */ -#line 2669 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 501: -/* Line 1792 of yacc.c */ -#line 2673 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 502: -/* Line 1792 of yacc.c */ -#line 2677 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 503: -/* Line 1792 of yacc.c */ -#line 2681 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 504: -/* Line 1792 of yacc.c */ -#line 2685 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 505: -/* Line 1792 of yacc.c */ -#line 2689 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 506: -/* Line 1792 of yacc.c */ -#line 2693 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 507: -/* Line 1792 of yacc.c */ -#line 2697 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 508: -/* Line 1792 of yacc.c */ -#line 2701 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 509: -/* Line 1792 of yacc.c */ -#line 2705 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 510: -/* Line 1792 of yacc.c */ -#line 2709 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('<', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 511: -/* Line 1792 of yacc.c */ -#line 2713 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('>', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 512: -/* Line 1792 of yacc.c */ -#line 2717 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 513: -/* Line 1792 of yacc.c */ -#line 2721 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 514: -/* Line 1792 of yacc.c */ -#line 2725 "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)); -} - break; - - case 515: -/* Line 1792 of yacc.c */ -#line 2729 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); -} - break; - - case 516: -/* Line 1792 of yacc.c */ -#line 2733 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); -} - break; - - case 517: -/* Line 1792 of yacc.c */ -#line 2737 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr)); -} - break; - - case 518: -/* Line 1792 of yacc.c */ -#line 2741 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); -} - break; - - case 519: -/* Line 1792 of yacc.c */ -#line 2745 "dtool/src/cppparser/cppBison.yxx" - { - (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 2749 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr); -} - break; - - case 521: -/* Line 1792 of yacc.c */ -#line 2756 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); -} - break; - - case 522: -/* Line 1792 of yacc.c */ -#line 2760 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(true); -} - break; - - case 523: -/* Line 1792 of yacc.c */ -#line 2764 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(false); -} - break; - - case 524: -/* Line 1792 of yacc.c */ -#line 2768 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); -} - break; - - case 525: -/* Line 1792 of yacc.c */ -#line 2772 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.real)); -} - break; - - case 526: -/* Line 1792 of yacc.c */ -#line 2776 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); -} - break; - - case 527: -/* Line 1792 of yacc.c */ -#line 2780 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); -} - break; - - case 528: -/* Line 1792 of yacc.c */ -#line 2784 "dtool/src/cppparser/cppBison.yxx" - { - (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 2788 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(CPPExpression::get_nullptr()); -} - break; - - case 530: -/* Line 1792 of yacc.c */ -#line 2802 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); -} - break; - - case 531: -/* Line 1792 of yacc.c */ -#line 2806 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr))); -} - break; - - case 532: -/* Line 1792 of yacc.c */ -#line 2810 "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 533: -/* Line 1792 of yacc.c */ -#line 2814 "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 534: -/* Line 1792 of yacc.c */ -#line 2818 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type))); -} - break; - - case 535: -/* Line 1792 of yacc.c */ -#line 2822 "dtool/src/cppparser/cppBison.yxx" +#line 2642 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[(3) - (4)].u.type))); } break; - case 536: + case 491: /* Line 1792 of yacc.c */ -#line 2826 "dtool/src/cppparser/cppBison.yxx" +#line 2646 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (2)].u.type))); } break; - case 537: + case 492: /* Line 1792 of yacc.c */ -#line 2830 "dtool/src/cppparser/cppBison.yxx" +#line 2650 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (5)].u.type), (yyvsp[(4) - (5)].u.expr))); } break; - case 538: + case 493: /* Line 1792 of yacc.c */ -#line 2834 "dtool/src/cppparser/cppBison.yxx" +#line 2654 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr)); } break; - case 539: + case 494: /* Line 1792 of yacc.c */ -#line 2838 "dtool/src/cppparser/cppBison.yxx" +#line 2658 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr)); } break; - case 540: + case 495: /* Line 1792 of yacc.c */ -#line 2842 "dtool/src/cppparser/cppBison.yxx" +#line 2662 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr)); } break; - case 541: + case 496: /* Line 1792 of yacc.c */ -#line 2846 "dtool/src/cppparser/cppBison.yxx" +#line 2666 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(UNARY_STAR, (yyvsp[(2) - (2)].u.expr)); +} + break; + + case 497: +/* Line 1792 of yacc.c */ +#line 2670 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr)); } break; - case 542: + case 498: /* Line 1792 of yacc.c */ -#line 2850 "dtool/src/cppparser/cppBison.yxx" +#line 2674 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 543: + case 499: /* Line 1792 of yacc.c */ -#line 2854 "dtool/src/cppparser/cppBison.yxx" +#line 2678 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 544: + case 500: /* Line 1792 of yacc.c */ -#line 2858 "dtool/src/cppparser/cppBison.yxx" +#line 2682 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 545: + case 501: /* Line 1792 of yacc.c */ -#line 2862 "dtool/src/cppparser/cppBison.yxx" +#line 2686 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 546: + case 502: /* Line 1792 of yacc.c */ -#line 2866 "dtool/src/cppparser/cppBison.yxx" +#line 2690 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 547: + case 503: /* Line 1792 of yacc.c */ -#line 2870 "dtool/src/cppparser/cppBison.yxx" +#line 2694 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 548: + case 504: /* Line 1792 of yacc.c */ -#line 2874 "dtool/src/cppparser/cppBison.yxx" +#line 2698 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 549: + case 505: /* Line 1792 of yacc.c */ -#line 2878 "dtool/src/cppparser/cppBison.yxx" +#line 2702 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 550: + case 506: /* Line 1792 of yacc.c */ -#line 2882 "dtool/src/cppparser/cppBison.yxx" +#line 2706 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 551: + case 507: /* Line 1792 of yacc.c */ -#line 2886 "dtool/src/cppparser/cppBison.yxx" +#line 2710 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 552: + case 508: /* Line 1792 of yacc.c */ -#line 2890 "dtool/src/cppparser/cppBison.yxx" +#line 2714 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 553: + case 509: /* Line 1792 of yacc.c */ -#line 2894 "dtool/src/cppparser/cppBison.yxx" +#line 2718 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 554: + case 510: /* Line 1792 of yacc.c */ -#line 2898 "dtool/src/cppparser/cppBison.yxx" +#line 2722 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 555: + case 511: /* Line 1792 of yacc.c */ -#line 2902 "dtool/src/cppparser/cppBison.yxx" +#line 2726 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 556: + case 512: /* Line 1792 of yacc.c */ -#line 2906 "dtool/src/cppparser/cppBison.yxx" +#line 2730 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('<', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 557: + case 513: /* Line 1792 of yacc.c */ -#line 2910 "dtool/src/cppparser/cppBison.yxx" +#line 2734 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('>', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 558: + case 514: /* Line 1792 of yacc.c */ -#line 2914 "dtool/src/cppparser/cppBison.yxx" +#line 2738 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 559: + case 515: /* Line 1792 of yacc.c */ -#line 2918 "dtool/src/cppparser/cppBison.yxx" +#line 2742 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 560: + case 516: /* Line 1792 of yacc.c */ -#line 2922 "dtool/src/cppparser/cppBison.yxx" +#line 2746 "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)); } break; - case 561: + case 517: /* Line 1792 of yacc.c */ -#line 2926 "dtool/src/cppparser/cppBison.yxx" +#line 2750 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); } break; - case 562: + case 518: /* Line 1792 of yacc.c */ -#line 2930 "dtool/src/cppparser/cppBison.yxx" +#line 2754 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); } break; - case 563: + case 519: /* Line 1792 of yacc.c */ -#line 2934 "dtool/src/cppparser/cppBison.yxx" +#line 2758 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr)); } break; - case 564: + case 520: /* Line 1792 of yacc.c */ -#line 2938 "dtool/src/cppparser/cppBison.yxx" +#line 2762 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 565: + case 521: /* Line 1792 of yacc.c */ -#line 2942 "dtool/src/cppparser/cppBison.yxx" +#line 2766 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); } break; - case 566: + case 522: /* Line 1792 of yacc.c */ -#line 2946 "dtool/src/cppparser/cppBison.yxx" +#line 2770 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr); } break; - case 567: + case 523: /* Line 1792 of yacc.c */ -#line 2953 "dtool/src/cppparser/cppBison.yxx" +#line 2777 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); } break; - case 568: + case 524: /* Line 1792 of yacc.c */ -#line 2957 "dtool/src/cppparser/cppBison.yxx" +#line 2781 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(true); } break; - case 569: + case 525: /* Line 1792 of yacc.c */ -#line 2961 "dtool/src/cppparser/cppBison.yxx" +#line 2785 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(false); } break; - case 570: + case 526: /* Line 1792 of yacc.c */ -#line 2965 "dtool/src/cppparser/cppBison.yxx" +#line 2789 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); } break; - case 571: + case 527: /* Line 1792 of yacc.c */ -#line 2969 "dtool/src/cppparser/cppBison.yxx" +#line 2793 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.real)); } break; - case 572: + case 528: /* Line 1792 of yacc.c */ -#line 2973 "dtool/src/cppparser/cppBison.yxx" +#line 2797 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } break; - case 573: + case 529: /* Line 1792 of yacc.c */ -#line 2977 "dtool/src/cppparser/cppBison.yxx" +#line 2801 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); } break; - case 574: + case 530: /* Line 1792 of yacc.c */ -#line 2981 "dtool/src/cppparser/cppBison.yxx" +#line 2805 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.identifier), current_scope, global_scope, current_lexer); } break; - case 575: + case 531: /* Line 1792 of yacc.c */ -#line 2985 "dtool/src/cppparser/cppBison.yxx" +#line 2809 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.expr) = new CPPExpression(CPPExpression::get_nullptr()); } break; + case 532: +/* Line 1792 of yacc.c */ +#line 2823 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); +} + break; + + case 533: +/* Line 1792 of yacc.c */ +#line 2827 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(CPPExpression::typecast_op((yyvsp[(2) - (4)].u.type), (yyvsp[(4) - (4)].u.expr))); +} + break; + + case 534: +/* Line 1792 of yacc.c */ +#line 2831 "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 535: +/* Line 1792 of yacc.c */ +#line 2835 "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 536: +/* Line 1792 of yacc.c */ +#line 2839 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(CPPExpression::sizeof_func((yyvsp[(3) - (4)].u.type))); +} + break; + + case 537: +/* Line 1792 of yacc.c */ +#line 2843 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(CPPExpression::alignof_func((yyvsp[(3) - (4)].u.type))); +} + break; + + case 538: +/* Line 1792 of yacc.c */ +#line 2847 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (2)].u.type))); +} + break; + + case 539: +/* Line 1792 of yacc.c */ +#line 2851 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(CPPExpression::new_op((yyvsp[(2) - (5)].u.type), (yyvsp[(4) - (5)].u.expr))); +} + break; + + case 540: +/* Line 1792 of yacc.c */ +#line 2855 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(UNARY_NOT, (yyvsp[(2) - (2)].u.expr)); +} + break; + + case 541: +/* Line 1792 of yacc.c */ +#line 2859 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(UNARY_NEGATE, (yyvsp[(2) - (2)].u.expr)); +} + break; + + case 542: +/* Line 1792 of yacc.c */ +#line 2863 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(UNARY_MINUS, (yyvsp[(2) - (2)].u.expr)); +} + break; + + case 543: +/* Line 1792 of yacc.c */ +#line 2867 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(UNARY_REF, (yyvsp[(2) - (2)].u.expr)); +} + break; + + case 544: +/* Line 1792 of yacc.c */ +#line 2871 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('*', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 545: +/* Line 1792 of yacc.c */ +#line 2875 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('/', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 546: +/* Line 1792 of yacc.c */ +#line 2879 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('%', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 547: +/* Line 1792 of yacc.c */ +#line 2883 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('+', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 548: +/* Line 1792 of yacc.c */ +#line 2887 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('-', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 549: +/* Line 1792 of yacc.c */ +#line 2891 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('|', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 550: +/* Line 1792 of yacc.c */ +#line 2895 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('^', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 551: +/* Line 1792 of yacc.c */ +#line 2899 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('&', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 552: +/* Line 1792 of yacc.c */ +#line 2903 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(OROR, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 553: +/* Line 1792 of yacc.c */ +#line 2907 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(ANDAND, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 554: +/* Line 1792 of yacc.c */ +#line 2911 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(EQCOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 555: +/* Line 1792 of yacc.c */ +#line 2915 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(NECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 556: +/* Line 1792 of yacc.c */ +#line 2919 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(LECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 557: +/* Line 1792 of yacc.c */ +#line 2923 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(GECOMPARE, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 558: +/* Line 1792 of yacc.c */ +#line 2927 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('<', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 559: +/* Line 1792 of yacc.c */ +#line 2931 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('>', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 560: +/* Line 1792 of yacc.c */ +#line 2935 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(LSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 561: +/* Line 1792 of yacc.c */ +#line 2939 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(RSHIFT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 562: +/* Line 1792 of yacc.c */ +#line 2943 "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)); +} + break; + + case 563: +/* Line 1792 of yacc.c */ +#line 2947 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('[', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); +} + break; + + case 564: +/* Line 1792 of yacc.c */ +#line 2951 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (4)].u.expr), (yyvsp[(3) - (4)].u.expr)); +} + break; + + case 565: +/* Line 1792 of yacc.c */ +#line 2955 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('f', (yyvsp[(1) - (3)].u.expr)); +} + break; + + case 566: +/* Line 1792 of yacc.c */ +#line 2959 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression('.', (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 567: +/* Line 1792 of yacc.c */ +#line 2963 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(POINTSAT, (yyvsp[(1) - (3)].u.expr), (yyvsp[(3) - (3)].u.expr)); +} + break; + + case 568: +/* Line 1792 of yacc.c */ +#line 2967 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = (yyvsp[(2) - (3)].u.expr); +} + break; + + case 569: +/* Line 1792 of yacc.c */ +#line 2974 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); +} + break; + + case 570: +/* Line 1792 of yacc.c */ +#line 2978 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(true); +} + break; + + case 571: +/* Line 1792 of yacc.c */ +#line 2982 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(false); +} + break; + + case 572: +/* Line 1792 of yacc.c */ +#line 2986 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.integer)); +} + break; + + case 573: +/* Line 1792 of yacc.c */ +#line 2990 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.real)); +} + break; + + case 574: +/* Line 1792 of yacc.c */ +#line 2994 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); +} + break; + + case 575: +/* Line 1792 of yacc.c */ +#line 2998 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); +} + break; + case 576: /* Line 1792 of yacc.c */ -#line 2992 "dtool/src/cppparser/cppBison.yxx" +#line 3002 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].u.identifier), current_scope, global_scope, current_lexer); +} + break; + + case 577: +/* Line 1792 of yacc.c */ +#line 3006 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression(CPPExpression::get_nullptr()); +} + break; + + case 578: +/* Line 1792 of yacc.c */ +#line 3013 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = (yyvsp[(1) - (1)].u.identifier)->find_type(current_scope, global_scope, true); if (type == NULL) { @@ -7572,9 +7626,9 @@ yyreduce: } break; - case 577: + case 579: /* Line 1792 of yacc.c */ -#line 3000 "dtool/src/cppparser/cppBison.yxx" +#line 3021 "dtool/src/cppparser/cppBison.yxx" { CPPType *type = (yyvsp[(2) - (2)].u.identifier)->find_type(current_scope, global_scope, true, current_lexer); if (type == NULL) { @@ -7584,49 +7638,49 @@ yyreduce: } break; - case 578: + case 580: /* Line 1792 of yacc.c */ -#line 3008 "dtool/src/cppparser/cppBison.yxx" +#line 3029 "dtool/src/cppparser/cppBison.yxx" { (yyval.u.type) = CPPType::new_type(new CPPTBDType((yyvsp[(2) - (2)].u.identifier))); } break; - case 579: -/* Line 1792 of yacc.c */ -#line 3034 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.identifier) = (yyvsp[(1) - (1)].u.identifier); -} - break; - - case 580: -/* Line 1792 of yacc.c */ -#line 3038 "dtool/src/cppparser/cppBison.yxx" - { - (yyval.u.identifier) = (yyvsp[(1) - (1)].u.identifier); -} - break; - case 581: /* Line 1792 of yacc.c */ -#line 3045 "dtool/src/cppparser/cppBison.yxx" +#line 3055 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].str)); + (yyval.u.identifier) = (yyvsp[(1) - (1)].u.identifier); } break; case 582: /* Line 1792 of yacc.c */ -#line 3049 "dtool/src/cppparser/cppBison.yxx" +#line 3059 "dtool/src/cppparser/cppBison.yxx" { - (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); + (yyval.u.identifier) = (yyvsp[(1) - (1)].u.identifier); } break; case 583: /* Line 1792 of yacc.c */ -#line 3053 "dtool/src/cppparser/cppBison.yxx" +#line 3066 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = new CPPExpression((yyvsp[(1) - (1)].str)); +} + break; + + case 584: +/* Line 1792 of yacc.c */ +#line 3070 "dtool/src/cppparser/cppBison.yxx" + { + (yyval.u.expr) = (yyvsp[(1) - (1)].u.expr); +} + break; + + case 585: +/* Line 1792 of yacc.c */ +#line 3074 "dtool/src/cppparser/cppBison.yxx" { // The right string takes on the literal type of the left. (yyval.u.expr) = (yyvsp[(1) - (2)].u.expr); @@ -7634,9 +7688,9 @@ yyreduce: } break; - case 584: + case 586: /* Line 1792 of yacc.c */ -#line 3059 "dtool/src/cppparser/cppBison.yxx" +#line 3080 "dtool/src/cppparser/cppBison.yxx" { // We have to check that the two literal types match up. (yyval.u.expr) = (yyvsp[(1) - (2)].u.expr); @@ -7649,7 +7703,7 @@ yyreduce: /* Line 1792 of yacc.c */ -#line 7653 "built/tmp/cppBison.yxx.c" +#line 7707 "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 ebca2ad3be..035fd14350 100644 --- a/dtool/src/cppparser/cppBison.yxx +++ b/dtool/src/cppparser/cppBison.yxx @@ -341,6 +341,7 @@ pop_struct() { %type empty_instance_identifier %type type %type type_decl +%type var_type_decl %type predefined_type %type full_type %type anonymous_struct @@ -676,7 +677,7 @@ type_like_declaration: ; multiple_var_declaration: - storage_class type_decl + storage_class var_type_decl { // We don't need to push/pop type, because we can't nest // multiple_var_declarations. @@ -691,11 +692,15 @@ multiple_var_declaration: { pop_storage_class(); } - | storage_class KW_CONST type + | storage_class KW_CONST var_type_decl { // We don't need to push/pop type, because we can't nest // multiple_var_declarations. - current_type = $3; + if ($3->as_type_declaration()) { + current_type = $3->as_type_declaration()->_type; + } else { + current_type = $3->as_type(); + } push_storage_class($1); } multiple_const_instance_identifiers @@ -750,7 +755,7 @@ multiple_const_instance_identifiers: typedef_declaration: - storage_class type_decl + storage_class var_type_decl { // We don't need to push/pop type, because we can't nest // multiple_var_declarations. @@ -765,11 +770,15 @@ typedef_declaration: { pop_storage_class(); } - | storage_class KW_CONST type + | storage_class KW_CONST var_type_decl { // We don't need to push/pop type, because we can't nest // multiple_var_declarations. - current_type = $3; + if ($3->as_type_declaration()) { + current_type = $3->as_type_declaration()->_type; + } else { + current_type = $3->as_type(); + } push_storage_class($1); } typedef_const_instance_identifiers @@ -1892,6 +1901,18 @@ predefined_type: } ; +var_type_decl: + type_decl +{ + $$ = $1; +} + | IDENTIFIER +{ + yyerror(string("unknown type '") + $1->get_fully_scoped_name() + "'", @1); + + $$ = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_unknown)); +} + full_type: type empty_instance_identifier { diff --git a/dtool/src/cppparser/cppScope.cxx b/dtool/src/cppparser/cppScope.cxx index fc221591c6..1f48d6f9ff 100644 --- a/dtool/src/cppparser/cppScope.cxx +++ b/dtool/src/cppparser/cppScope.cxx @@ -1116,7 +1116,7 @@ handle_declaration(CPPDeclaration *decl, CPPScope *global_scope, // We don't do redefinitions of typedefs. But we don't complain // as long as this is actually a typedef to the previous definition. if (other_type != def->_type && - (other_td == NULL || other_td->_type != def->_type)) { + (other_td == NULL || !other_td->_type->is_equivalent(*def->_type))) { if (error_sink != NULL) { ostringstream errstr;