From 3e548e36635a2c5015066b78e8dc198f682f2782 Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 28 Oct 2004 18:33:45 +0000 Subject: [PATCH] new interrogate, minor config changes --- dtool/src/cppparser/cppBison.cxx.prebuilt | 3578 +++++++++-------- dtool/src/cppparser/cppBison.yxx | 204 +- dtool/src/cppparser/cppInstance.cxx | 31 +- dtool/src/cppparser/cppInstanceIdentifier.cxx | 65 +- dtool/src/cppparser/cppInstanceIdentifier.h | 5 + dtool/src/cppparser/cppParameterList.cxx | 18 + dtool/src/cppparser/cppParameterList.h | 4 +- dtool/src/cppparser/cppSimpleType.cxx | 19 + dtool/src/cppparser/cppSimpleType.h | 15 + dtool/src/cppparser/cppType.cxx | 15 + dtool/src/cppparser/cppType.h | 1 + dtool/src/prckeys/makePrcKey.cxx | 2 +- panda/src/char/character.cxx | 2 - panda/src/collide/collisionTraverser.cxx | 2 - panda/src/device/trackerNode.I | 4 +- panda/src/display/graphicsEngine.cxx | 2 - panda/src/display/graphicsOutput.cxx | 2 - panda/src/display/graphicsStateGuardian.cxx | 5 +- panda/src/egg/config_egg.cxx | 16 +- panda/src/egg/config_egg.h | 8 +- panda/src/egg/eggData.cxx | 6 +- panda/src/egg/eggPolygon.cxx | 2 +- panda/src/egg2pg/config_egg2pg.cxx | 2 +- .../glstuff/glGraphicsStateGuardian_src.cxx | 2 +- panda/src/gobj/orthographicLens.cxx | 2 +- panda/src/gobj/perspectiveLens.cxx | 2 +- panda/src/gobj/preparedGraphicsObjects.cxx | 2 - panda/src/grutil/frameRateMeter.cxx | 2 - panda/src/linmath/compose_matrix_src.cxx | 4 +- panda/src/linmath/config_linmath.cxx | 33 +- panda/src/linmath/config_linmath.h | 5 +- panda/src/linmath/coordinateSystem.cxx | 28 +- panda/src/linmath/coordinateSystem.h | 15 +- panda/src/linmath/lmatrix3_src.I | 4 +- panda/src/linmath/lmatrix3_src.cxx | 6 +- panda/src/linmath/lmatrix4_src.I | 4 +- panda/src/linmath/lmatrix4_src.cxx | 4 +- panda/src/linmath/lvector3_src.I | 6 +- panda/src/mathutil/boundingHexahedron.cxx | 2 +- panda/src/mathutil/frustum_src.I | 4 +- panda/src/mathutil/look_at_src.cxx | 4 +- panda/src/parametrics/parametricCurve.cxx | 2 +- .../parametrics/parametricCurveCollection.cxx | 2 +- panda/src/pgraph/cullBin.cxx | 3 - panda/src/pgraph/cullTraverser.cxx | 2 - panda/src/pgraph/polylightEffect.cxx | 2 - panda/src/pstatclient/pStatClient.cxx | 2 - panda/src/putil/config_util.cxx | 2 - panda/src/tform/driveInterface.cxx | 2 +- panda/src/tform/trackball.cxx | 2 +- 50 files changed, 2447 insertions(+), 1709 deletions(-) diff --git a/dtool/src/cppparser/cppBison.cxx.prebuilt b/dtool/src/cppparser/cppBison.cxx.prebuilt index 79e2324a2a..af57454a33 100644 --- a/dtool/src/cppparser/cppBison.cxx.prebuilt +++ b/dtool/src/cppparser/cppBison.cxx.prebuilt @@ -317,12 +317,12 @@ typedef struct yyltype -#define YYFINAL 840 +#define YYFINAL 934 #define YYFLAG -32768 #define YYNTBASE 124 /* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */ -#define YYTRANSLATE(x) ((unsigned)(x) <= 353 ? yytranslate[x] : 215) +#define YYTRANSLATE(x) ((unsigned)(x) <= 353 ? yytranslate[x] : 217) /* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */ static const char yytranslate[] = @@ -385,18 +385,18 @@ static const short yyprhs[] = 420, 421, 428, 430, 432, 434, 438, 441, 443, 447, 449, 452, 454, 457, 459, 463, 469, 473, 478, 480, 482, 485, 487, 491, 495, 501, 505, 509, 514, 516, - 518, 520, 523, 526, 529, 533, 538, 540, 542, 544, - 547, 550, 553, 557, 562, 570, 574, 576, 579, 582, - 585, 589, 594, 602, 604, 606, 609, 611, 613, 615, - 617, 620, 623, 625, 627, 630, 632, 634, 636, 638, - 641, 644, 646, 648, 651, 654, 657, 660, 664, 665, - 671, 672, 680, 682, 684, 687, 691, 694, 697, 700, - 704, 708, 712, 716, 720, 724, 725, 731, 732, 739, - 741, 743, 746, 748, 752, 756, 762, 764, 766, 768, - 770, 771, 778, 783, 786, 790, 792, 794, 796, 798, - 800, 802, 804, 806, 808, 810, 812, 815, 818, 821, - 824, 826, 829, 831, 835, 838, 840, 841, 844, 846, - 849, 851, 853, 855, 857, 859, 861, 863, 865, 867, + 518, 520, 522, 525, 528, 531, 535, 540, 542, 544, + 546, 549, 552, 555, 559, 564, 572, 576, 578, 581, + 584, 587, 591, 596, 604, 606, 608, 611, 613, 615, + 617, 619, 622, 625, 627, 629, 632, 634, 636, 638, + 640, 643, 646, 648, 650, 653, 656, 659, 662, 666, + 667, 673, 674, 682, 684, 686, 689, 693, 696, 699, + 702, 706, 710, 714, 718, 722, 726, 727, 733, 734, + 741, 743, 745, 748, 750, 754, 758, 764, 766, 768, + 770, 772, 773, 780, 785, 788, 792, 794, 796, 798, + 800, 802, 804, 806, 808, 810, 812, 814, 817, 820, + 823, 826, 828, 831, 833, 837, 840, 842, 843, 846, + 848, 851, 853, 855, 857, 859, 861, 863, 865, 867, 869, 871, 873, 875, 877, 879, 881, 883, 885, 887, 889, 891, 893, 895, 897, 899, 901, 903, 905, 907, 909, 911, 913, 915, 917, 919, 921, 923, 925, 927, @@ -406,28 +406,32 @@ static const short yyprhs[] = 989, 991, 993, 995, 997, 999, 1001, 1003, 1005, 1007, 1009, 1011, 1013, 1015, 1017, 1019, 1021, 1023, 1025, 1027, 1029, 1031, 1033, 1035, 1037, 1039, 1041, 1043, 1045, 1047, - 1049, 1051, 1053, 1055, 1059, 1061, 1063, 1065, 1067, 1069, - 1073, 1075, 1080, 1088, 1096, 1101, 1104, 1107, 1110, 1113, - 1116, 1120, 1124, 1128, 1132, 1136, 1140, 1144, 1148, 1152, - 1156, 1160, 1164, 1168, 1172, 1176, 1182, 1187, 1192, 1196, - 1200, 1204, 1208, 1210, 1215, 1223, 1231, 1236, 1241, 1246, - 1251, 1256, 1261, 1266, 1271, 1276, 1281, 1286, 1289, 1295, - 1298, 1301, 1304, 1307, 1310, 1314, 1318, 1322, 1326, 1330, - 1334, 1338, 1342, 1346, 1350, 1354, 1358, 1362, 1366, 1370, - 1374, 1378, 1384, 1389, 1394, 1398, 1402, 1406, 1410, 1412, - 1414, 1416, 1418, 1420, 1422, 1424, 1426, 1429, 1432, 1434, - 1436, 1438, 1441 + 1049, 1051, 1053, 1055, 1057, 1061, 1063, 1065, 1067, 1069, + 1071, 1075, 1077, 1082, 1090, 1098, 1103, 1106, 1109, 1112, + 1115, 1118, 1122, 1126, 1130, 1134, 1138, 1142, 1146, 1150, + 1154, 1158, 1162, 1166, 1170, 1174, 1178, 1184, 1189, 1194, + 1198, 1202, 1206, 1210, 1212, 1217, 1225, 1233, 1238, 1243, + 1248, 1253, 1258, 1263, 1268, 1273, 1278, 1283, 1288, 1291, + 1297, 1300, 1303, 1306, 1309, 1312, 1316, 1320, 1324, 1328, + 1332, 1336, 1340, 1344, 1348, 1352, 1356, 1360, 1364, 1368, + 1372, 1376, 1380, 1386, 1391, 1396, 1400, 1404, 1408, 1412, + 1414, 1416, 1418, 1420, 1422, 1424, 1426, 1428, 1433, 1441, + 1449, 1454, 1457, 1463, 1466, 1469, 1472, 1475, 1479, 1483, + 1487, 1491, 1495, 1499, 1503, 1507, 1511, 1515, 1519, 1523, + 1527, 1531, 1535, 1539, 1543, 1549, 1554, 1559, 1563, 1567, + 1571, 1575, 1577, 1579, 1581, 1583, 1585, 1587, 1589, 1592, + 1595, 1597, 1599, 1601, 1604 }; static const short yyrhs[] = { - 97, 125, 0, 98, 209, 0, 99, 178, 0, 214, + 97, 125, 0, 98, 209, 0, 99, 178, 0, 216, 0, 125, 102, 0, 125, 130, 0, 127, 0, 126, - 101, 127, 0, 212, 118, 206, 120, 0, 0, 133, + 101, 127, 0, 214, 118, 206, 120, 0, 0, 133, 100, 129, 125, 121, 0, 134, 0, 156, 0, 128, 0, 194, 0, 196, 0, 131, 0, 88, 140, 0, 44, 0, 54, 0, 58, 103, 0, 75, 103, 0, 74, 103, 0, 73, 103, 0, 0, 61, 132, 130, - 0, 214, 0, 133, 56, 0, 133, 56, 213, 0, + 0, 216, 0, 133, 56, 0, 133, 56, 215, 0, 133, 81, 0, 133, 65, 0, 133, 93, 0, 133, 57, 0, 133, 95, 0, 133, 69, 0, 133, 76, 0, 135, 0, 133, 176, 102, 0, 133, 145, 168, @@ -439,13 +443,13 @@ static const short yyrhs[] = 162, 167, 101, 143, 0, 162, 168, 0, 162, 167, 101, 144, 0, 0, 8, 118, 146, 164, 120, 153, 0, 0, 9, 118, 147, 164, 120, 153, 0, 0, - 116, 212, 118, 148, 164, 120, 153, 0, 0, 9, + 116, 214, 118, 148, 164, 120, 153, 0, 0, 9, 118, 113, 162, 120, 118, 149, 164, 120, 153, 0, 0, 9, 118, 10, 113, 162, 120, 118, 150, 164, 120, 153, 0, 0, 72, 175, 172, 118, 151, 164, 120, 153, 0, 0, 72, 49, 175, 172, 118, 152, - 164, 120, 153, 0, 8, 0, 214, 0, 49, 0, - 153, 85, 118, 120, 0, 153, 85, 118, 212, 120, + 164, 120, 153, 0, 8, 0, 216, 0, 49, 0, + 153, 85, 118, 120, 0, 153, 85, 118, 214, 120, 0, 122, 0, 116, 0, 113, 0, 114, 0, 115, 0, 111, 0, 112, 0, 106, 0, 108, 0, 107, 0, 13, 0, 14, 0, 15, 0, 16, 0, 17, @@ -455,116 +459,132 @@ static const short yyrhs[] = 0, 39, 0, 40, 0, 41, 0, 42, 0, 29, 0, 119, 123, 0, 118, 120, 0, 71, 0, 50, 0, 134, 0, 156, 0, 0, 84, 157, 109, 158, - 110, 155, 0, 214, 0, 159, 0, 160, 0, 159, - 101, 160, 0, 48, 212, 0, 48, 212, 104, 178, + 110, 155, 0, 216, 0, 159, 0, 160, 0, 159, + 101, 160, 0, 48, 214, 0, 48, 214, 104, 178, 0, 161, 173, 166, 0, 49, 161, 173, 166, 0, - 197, 0, 8, 0, 9, 0, 89, 212, 0, 212, + 197, 0, 8, 0, 9, 0, 89, 214, 0, 214, 0, 72, 154, 0, 49, 162, 0, 113, 162, 0, 108, 162, 0, 10, 113, 162, 0, 162, 119, 205, 123, 0, 162, 103, 4, 0, 118, 162, 120, 0, - 0, 162, 118, 163, 164, 120, 153, 0, 214, 0, + 0, 162, 118, 163, 164, 120, 153, 0, 216, 0, 12, 0, 165, 0, 165, 101, 12, 0, 165, 12, - 0, 171, 0, 165, 101, 171, 0, 214, 0, 104, - 208, 0, 214, 0, 104, 209, 0, 102, 0, 100, + 0, 171, 0, 165, 101, 171, 0, 216, 0, 104, + 208, 0, 216, 0, 104, 209, 0, 102, 0, 100, 201, 121, 0, 103, 126, 100, 201, 121, 0, 104, - 209, 102, 0, 104, 100, 169, 121, 0, 214, 0, + 209, 102, 0, 104, 100, 169, 121, 0, 216, 0, 170, 0, 170, 101, 0, 209, 0, 100, 169, 121, 0, 170, 101, 209, 0, 170, 101, 100, 169, 121, 0, 175, 173, 167, 0, 8, 173, 167, 0, 49, - 175, 173, 167, 0, 214, 0, 8, 0, 9, 0, - 49, 172, 0, 113, 172, 0, 108, 172, 0, 10, - 113, 172, 0, 172, 119, 205, 123, 0, 214, 0, - 8, 0, 9, 0, 49, 173, 0, 113, 173, 0, - 108, 173, 0, 10, 113, 173, 0, 173, 119, 205, - 123, 0, 118, 173, 120, 118, 164, 120, 153, 0, - 118, 173, 120, 0, 214, 0, 49, 174, 0, 113, - 174, 0, 108, 174, 0, 10, 113, 174, 0, 174, - 119, 205, 123, 0, 118, 174, 120, 118, 164, 120, - 153, 0, 197, 0, 9, 0, 89, 212, 0, 179, - 0, 181, 0, 186, 0, 188, 0, 193, 212, 0, - 192, 212, 0, 197, 0, 9, 0, 89, 212, 0, - 179, 0, 181, 0, 186, 0, 188, 0, 193, 212, - 0, 192, 212, 0, 197, 0, 9, 0, 89, 212, - 0, 193, 212, 0, 192, 212, 0, 175, 174, 0, - 49, 175, 174, 0, 0, 193, 100, 180, 125, 121, - 0, 0, 193, 212, 182, 183, 100, 125, 121, 0, - 214, 0, 184, 0, 103, 185, 0, 184, 101, 185, - 0, 75, 211, 0, 74, 211, 0, 73, 211, 0, - 93, 75, 211, 0, 93, 74, 211, 0, 93, 73, - 211, 0, 75, 93, 211, 0, 74, 93, 211, 0, - 73, 93, 211, 0, 0, 192, 100, 187, 190, 121, - 0, 0, 192, 212, 100, 189, 190, 121, 0, 214, - 0, 191, 0, 191, 101, 0, 212, 0, 212, 104, - 209, 0, 191, 101, 212, 0, 191, 101, 212, 104, - 209, 0, 55, 0, 48, 0, 83, 0, 90, 0, - 0, 70, 212, 100, 195, 125, 121, 0, 70, 100, - 125, 121, 0, 92, 212, 0, 92, 70, 212, 0, - 198, 0, 199, 0, 200, 0, 45, 0, 47, 0, - 78, 0, 67, 0, 68, 0, 91, 0, 79, 0, - 66, 0, 78, 198, 0, 67, 198, 0, 91, 198, - 0, 79, 198, 0, 60, 0, 67, 60, 0, 51, - 0, 67, 67, 60, 0, 67, 51, 0, 94, 0, - 0, 202, 203, 0, 214, 0, 203, 204, 0, 3, - 0, 4, 0, 6, 0, 5, 0, 8, 0, 9, - 0, 10, 0, 7, 0, 12, 0, 13, 0, 14, - 0, 15, 0, 16, 0, 17, 0, 18, 0, 19, - 0, 20, 0, 21, 0, 22, 0, 29, 0, 30, - 0, 31, 0, 32, 0, 33, 0, 34, 0, 35, - 0, 36, 0, 37, 0, 38, 0, 39, 0, 40, - 0, 41, 0, 42, 0, 45, 0, 46, 0, 47, - 0, 48, 0, 49, 0, 50, 0, 51, 0, 52, - 0, 53, 0, 55, 0, 56, 0, 57, 0, 59, - 0, 60, 0, 61, 0, 62, 0, 63, 0, 64, - 0, 65, 0, 66, 0, 67, 0, 69, 0, 71, - 0, 73, 0, 74, 0, 75, 0, 58, 0, 76, - 0, 77, 0, 78, 0, 79, 0, 80, 0, 81, - 0, 82, 0, 83, 0, 85, 0, 86, 0, 87, - 0, 88, 0, 89, 0, 90, 0, 91, 0, 93, - 0, 94, 0, 95, 0, 96, 0, 43, 0, 72, - 0, 111, 0, 112, 0, 113, 0, 114, 0, 108, - 0, 106, 0, 107, 0, 122, 0, 116, 0, 104, - 0, 115, 0, 109, 0, 110, 0, 118, 0, 120, - 0, 117, 0, 101, 0, 102, 0, 103, 0, 119, - 0, 123, 0, 105, 0, 100, 203, 121, 0, 214, - 0, 209, 0, 214, 0, 207, 0, 209, 0, 207, - 101, 209, 0, 210, 0, 118, 178, 120, 208, 0, - 82, 109, 178, 110, 118, 207, 120, 0, 52, 109, - 178, 110, 118, 207, 120, 0, 80, 118, 178, 120, - 0, 122, 208, 0, 116, 208, 0, 112, 208, 0, - 113, 208, 0, 108, 208, 0, 208, 113, 208, 0, - 208, 114, 208, 0, 208, 115, 208, 0, 208, 111, - 208, 0, 208, 112, 208, 0, 208, 106, 208, 0, - 208, 108, 208, 0, 208, 13, 208, 0, 208, 14, - 208, 0, 208, 15, 208, 0, 208, 16, 208, 0, - 208, 17, 208, 0, 208, 18, 208, 0, 208, 19, - 208, 0, 208, 20, 208, 0, 208, 105, 208, 103, - 208, 0, 208, 119, 209, 123, 0, 208, 118, 207, - 120, 0, 208, 118, 120, 0, 208, 117, 208, 0, - 208, 29, 208, 0, 118, 207, 120, 0, 210, 0, - 118, 178, 120, 209, 0, 82, 109, 178, 110, 118, - 207, 120, 0, 52, 109, 178, 110, 118, 207, 120, - 0, 9, 118, 206, 120, 0, 66, 118, 206, 120, - 0, 47, 118, 206, 120, 0, 45, 118, 206, 120, - 0, 78, 118, 206, 120, 0, 67, 118, 206, 120, - 0, 91, 118, 206, 120, 0, 79, 118, 206, 120, - 0, 60, 118, 206, 120, 0, 51, 118, 206, 120, - 0, 80, 118, 178, 120, 0, 71, 177, 0, 71, - 177, 118, 206, 120, 0, 122, 209, 0, 116, 209, - 0, 112, 209, 0, 113, 209, 0, 108, 209, 0, - 209, 113, 209, 0, 209, 114, 209, 0, 209, 115, - 209, 0, 209, 111, 209, 0, 209, 112, 209, 0, - 209, 106, 209, 0, 209, 108, 209, 0, 209, 13, - 209, 0, 209, 14, 209, 0, 209, 15, 209, 0, - 209, 16, 209, 0, 209, 17, 209, 0, 209, 18, - 209, 0, 209, 109, 209, 0, 209, 110, 209, 0, - 209, 19, 209, 0, 209, 20, 209, 0, 209, 105, - 209, 103, 209, 0, 209, 119, 209, 123, 0, 209, - 118, 207, 120, 0, 209, 118, 120, 0, 209, 117, - 209, 0, 209, 29, 209, 0, 118, 207, 120, 0, - 4, 0, 86, 0, 59, 0, 5, 0, 3, 0, - 213, 0, 8, 0, 212, 0, 193, 212, 0, 89, - 212, 0, 8, 0, 9, 0, 6, 0, 213, 6, - 0, 0 + 175, 173, 167, 0, 211, 0, 216, 0, 8, 0, + 9, 0, 49, 172, 0, 113, 172, 0, 108, 172, + 0, 10, 113, 172, 0, 172, 119, 205, 123, 0, + 216, 0, 8, 0, 9, 0, 49, 173, 0, 113, + 173, 0, 108, 173, 0, 10, 113, 173, 0, 173, + 119, 205, 123, 0, 118, 173, 120, 118, 164, 120, + 153, 0, 118, 173, 120, 0, 216, 0, 49, 174, + 0, 113, 174, 0, 108, 174, 0, 10, 113, 174, + 0, 174, 119, 205, 123, 0, 118, 174, 120, 118, + 164, 120, 153, 0, 197, 0, 9, 0, 89, 214, + 0, 179, 0, 181, 0, 186, 0, 188, 0, 193, + 214, 0, 192, 214, 0, 197, 0, 9, 0, 89, + 214, 0, 179, 0, 181, 0, 186, 0, 188, 0, + 193, 214, 0, 192, 214, 0, 197, 0, 9, 0, + 89, 214, 0, 193, 214, 0, 192, 214, 0, 175, + 174, 0, 49, 175, 174, 0, 0, 193, 100, 180, + 125, 121, 0, 0, 193, 214, 182, 183, 100, 125, + 121, 0, 216, 0, 184, 0, 103, 185, 0, 184, + 101, 185, 0, 75, 213, 0, 74, 213, 0, 73, + 213, 0, 93, 75, 213, 0, 93, 74, 213, 0, + 93, 73, 213, 0, 75, 93, 213, 0, 74, 93, + 213, 0, 73, 93, 213, 0, 0, 192, 100, 187, + 190, 121, 0, 0, 192, 214, 100, 189, 190, 121, + 0, 216, 0, 191, 0, 191, 101, 0, 214, 0, + 214, 104, 209, 0, 191, 101, 214, 0, 191, 101, + 214, 104, 209, 0, 55, 0, 48, 0, 83, 0, + 90, 0, 0, 70, 214, 100, 195, 125, 121, 0, + 70, 100, 125, 121, 0, 92, 214, 0, 92, 70, + 214, 0, 198, 0, 199, 0, 200, 0, 45, 0, + 47, 0, 78, 0, 67, 0, 68, 0, 91, 0, + 79, 0, 66, 0, 78, 198, 0, 67, 198, 0, + 91, 198, 0, 79, 198, 0, 60, 0, 67, 60, + 0, 51, 0, 67, 67, 60, 0, 67, 51, 0, + 94, 0, 0, 202, 203, 0, 216, 0, 203, 204, + 0, 3, 0, 4, 0, 6, 0, 5, 0, 8, + 0, 9, 0, 10, 0, 7, 0, 12, 0, 13, + 0, 14, 0, 15, 0, 16, 0, 17, 0, 18, + 0, 19, 0, 20, 0, 21, 0, 22, 0, 29, + 0, 30, 0, 31, 0, 32, 0, 33, 0, 34, + 0, 35, 0, 36, 0, 37, 0, 38, 0, 39, + 0, 40, 0, 41, 0, 42, 0, 45, 0, 46, + 0, 47, 0, 48, 0, 49, 0, 50, 0, 51, + 0, 52, 0, 53, 0, 55, 0, 56, 0, 57, + 0, 59, 0, 60, 0, 61, 0, 62, 0, 63, + 0, 64, 0, 65, 0, 66, 0, 67, 0, 69, + 0, 71, 0, 73, 0, 74, 0, 75, 0, 58, + 0, 76, 0, 77, 0, 78, 0, 79, 0, 80, + 0, 81, 0, 82, 0, 83, 0, 85, 0, 86, + 0, 87, 0, 88, 0, 89, 0, 90, 0, 91, + 0, 93, 0, 94, 0, 95, 0, 96, 0, 43, + 0, 72, 0, 111, 0, 112, 0, 113, 0, 114, + 0, 108, 0, 106, 0, 107, 0, 122, 0, 116, + 0, 104, 0, 115, 0, 109, 0, 110, 0, 118, + 0, 120, 0, 117, 0, 101, 0, 102, 0, 103, + 0, 119, 0, 123, 0, 105, 0, 100, 203, 121, + 0, 216, 0, 209, 0, 216, 0, 207, 0, 209, + 0, 207, 101, 209, 0, 210, 0, 118, 178, 120, + 208, 0, 82, 109, 178, 110, 118, 207, 120, 0, + 52, 109, 178, 110, 118, 207, 120, 0, 80, 118, + 178, 120, 0, 122, 208, 0, 116, 208, 0, 112, + 208, 0, 113, 208, 0, 108, 208, 0, 208, 113, + 208, 0, 208, 114, 208, 0, 208, 115, 208, 0, + 208, 111, 208, 0, 208, 112, 208, 0, 208, 106, + 208, 0, 208, 108, 208, 0, 208, 13, 208, 0, + 208, 14, 208, 0, 208, 15, 208, 0, 208, 16, + 208, 0, 208, 17, 208, 0, 208, 18, 208, 0, + 208, 19, 208, 0, 208, 20, 208, 0, 208, 105, + 208, 103, 208, 0, 208, 119, 209, 123, 0, 208, + 118, 207, 120, 0, 208, 118, 120, 0, 208, 117, + 208, 0, 208, 29, 208, 0, 118, 207, 120, 0, + 210, 0, 118, 178, 120, 209, 0, 82, 109, 178, + 110, 118, 207, 120, 0, 52, 109, 178, 110, 118, + 207, 120, 0, 9, 118, 206, 120, 0, 66, 118, + 206, 120, 0, 47, 118, 206, 120, 0, 45, 118, + 206, 120, 0, 78, 118, 206, 120, 0, 67, 118, + 206, 120, 0, 91, 118, 206, 120, 0, 79, 118, + 206, 120, 0, 60, 118, 206, 120, 0, 51, 118, + 206, 120, 0, 80, 118, 178, 120, 0, 71, 177, + 0, 71, 177, 118, 206, 120, 0, 122, 209, 0, + 116, 209, 0, 112, 209, 0, 113, 209, 0, 108, + 209, 0, 209, 113, 209, 0, 209, 114, 209, 0, + 209, 115, 209, 0, 209, 111, 209, 0, 209, 112, + 209, 0, 209, 106, 209, 0, 209, 108, 209, 0, + 209, 13, 209, 0, 209, 14, 209, 0, 209, 15, + 209, 0, 209, 16, 209, 0, 209, 17, 209, 0, + 209, 18, 209, 0, 209, 109, 209, 0, 209, 110, + 209, 0, 209, 19, 209, 0, 209, 20, 209, 0, + 209, 105, 209, 103, 209, 0, 209, 119, 209, 123, + 0, 209, 118, 207, 120, 0, 209, 118, 120, 0, + 209, 117, 209, 0, 209, 29, 209, 0, 118, 207, + 120, 0, 4, 0, 86, 0, 59, 0, 5, 0, + 3, 0, 215, 0, 8, 0, 212, 0, 118, 178, + 120, 209, 0, 82, 109, 178, 110, 118, 207, 120, + 0, 52, 109, 178, 110, 118, 207, 120, 0, 80, + 118, 178, 120, 0, 71, 177, 0, 71, 177, 118, + 206, 120, 0, 122, 209, 0, 116, 209, 0, 112, + 209, 0, 108, 209, 0, 211, 113, 209, 0, 211, + 114, 209, 0, 211, 115, 209, 0, 211, 111, 209, + 0, 211, 112, 209, 0, 211, 106, 209, 0, 211, + 108, 209, 0, 211, 13, 209, 0, 211, 14, 209, + 0, 211, 15, 209, 0, 211, 16, 209, 0, 211, + 17, 209, 0, 211, 18, 209, 0, 211, 109, 209, + 0, 211, 110, 209, 0, 211, 19, 209, 0, 211, + 20, 209, 0, 211, 105, 209, 103, 209, 0, 211, + 119, 209, 123, 0, 211, 118, 207, 120, 0, 211, + 118, 120, 0, 211, 117, 209, 0, 211, 29, 209, + 0, 118, 207, 120, 0, 4, 0, 86, 0, 59, + 0, 5, 0, 3, 0, 215, 0, 214, 0, 193, + 214, 0, 89, 214, 0, 8, 0, 9, 0, 6, + 0, 215, 6, 0, 0 }; #endif @@ -573,55 +593,59 @@ static const short yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const short yyrline[] = { - 0, 374, 376, 380, 386, 388, 389, 392, 394, 397, - 409, 409, 421, 423, 424, 425, 426, 427, 428, 429, - 442, 451, 455, 459, 463, 469, 469, 484, 489, 493, - 504, 508, 512, 516, 520, 524, 528, 534, 539, 548, - 558, 558, 574, 574, 591, 600, 610, 620, 632, 632, - 648, 648, 659, 672, 681, 691, 701, 712, 712, 737, - 737, 761, 761, 791, 791, 806, 806, 823, 823, 854, - 854, 880, 892, 897, 901, 905, 911, 916, 920, 924, - 928, 932, 936, 940, 944, 948, 952, 956, 960, 964, - 968, 972, 976, 980, 984, 988, 992, 996, 1000, 1004, - 1008, 1012, 1016, 1020, 1024, 1028, 1032, 1036, 1040, 1044, - 1048, 1052, 1056, 1060, 1064, 1070, 1072, 1075, 1075, 1086, - 1088, 1091, 1098, 1106, 1111, 1115, 1121, 1130, 1135, 1140, - 1145, 1152, 1157, 1171, 1176, 1181, 1186, 1191, 1196, 1201, - 1206, 1206, 1219, 1224, 1229, 1233, 1238, 1245, 1251, 1258, - 1263, 1269, 1274, 1280, 1285, 1289, 1293, 1297, 1303, 1305, - 1306, 1309, 1313, 1314, 1315, 1318, 1324, 1332, 1340, 1345, - 1349, 1353, 1358, 1363, 1368, 1373, 1380, 1385, 1389, 1393, - 1398, 1403, 1408, 1413, 1418, 1424, 1431, 1436, 1441, 1446, - 1451, 1456, 1461, 1469, 1474, 1479, 1483, 1487, 1491, 1495, - 1499, 1515, 1533, 1538, 1543, 1547, 1551, 1555, 1559, 1563, - 1579, 1597, 1602, 1607, 1611, 1627, 1645, 1652, 1661, 1661, - 1685, 1685, 1715, 1717, 1720, 1722, 1725, 1730, 1734, 1738, - 1742, 1746, 1750, 1754, 1758, 1764, 1764, 1776, 1776, 1788, - 1790, 1791, 1794, 1800, 1805, 1810, 1817, 1824, 1829, 1833, - 1839, 1839, 1862, 1865, 1872, 1880, 1882, 1883, 1886, 1891, - 1895, 1900, 1905, 1910, 1915, 1920, 1924, 1929, 1938, 1943, - 1950, 1955, 1960, 1964, 1969, 1976, 1986, 1986, 1996, 1998, - 2001, 2005, 2008, 2011, 2014, 2017, 2020, 2023, 2026, 2026, - 2026, 2027, 2027, 2027, 2027, 2028, 2028, 2028, 2028, 2028, - 2029, 2029, 2029, 2030, 2030, 2030, 2030, 2030, 2031, 2031, - 2031, 2031, 2031, 2032, 2032, 2032, 2032, 2032, 2033, 2033, - 2033, 2033, 2033, 2034, 2034, 2034, 2035, 2035, 2035, 2035, - 2036, 2036, 2036, 2037, 2037, 2037, 2037, 2037, 2038, 2038, - 2038, 2038, 2039, 2039, 2039, 2039, 2039, 2040, 2040, 2040, - 2040, 2040, 2040, 2041, 2041, 2041, 2041, 2041, 2042, 2042, - 2043, 2046, 2046, 2046, 2046, 2046, 2046, 2046, 2046, 2046, - 2046, 2046, 2047, 2047, 2047, 2047, 2047, 2047, 2047, 2047, - 2047, 2047, 2048, 2048, 2051, 2056, 2062, 2067, 2073, 2078, - 2084, 2089, 2093, 2097, 2101, 2105, 2109, 2113, 2125, 2129, - 2133, 2137, 2141, 2145, 2149, 2153, 2157, 2161, 2165, 2169, - 2173, 2177, 2181, 2185, 2189, 2193, 2197, 2201, 2205, 2209, - 2213, 2217, 2224, 2229, 2233, 2237, 2241, 2248, 2254, 2260, - 2266, 2273, 2280, 2287, 2294, 2300, 2306, 2310, 2314, 2318, - 2322, 2326, 2338, 2342, 2346, 2350, 2354, 2358, 2362, 2366, - 2370, 2374, 2378, 2382, 2386, 2390, 2394, 2398, 2402, 2406, - 2410, 2414, 2418, 2422, 2426, 2430, 2434, 2438, 2444, 2449, - 2453, 2457, 2461, 2465, 2469, 2475, 2484, 2492, 2514, 2519, - 2525, 2530, 2536 + 0, 376, 378, 382, 388, 390, 391, 394, 396, 399, + 411, 411, 423, 425, 426, 427, 428, 429, 430, 431, + 444, 453, 457, 461, 465, 471, 471, 486, 491, 495, + 506, 510, 514, 518, 522, 526, 530, 536, 541, 550, + 560, 560, 576, 576, 593, 602, 612, 622, 634, 634, + 650, 650, 661, 674, 683, 693, 703, 714, 714, 739, + 739, 763, 763, 793, 793, 808, 808, 825, 825, 856, + 856, 882, 894, 899, 903, 907, 913, 918, 922, 926, + 930, 934, 938, 942, 946, 950, 954, 958, 962, 966, + 970, 974, 978, 982, 986, 990, 994, 998, 1002, 1006, + 1010, 1014, 1018, 1022, 1026, 1030, 1034, 1038, 1042, 1046, + 1050, 1054, 1058, 1062, 1066, 1072, 1074, 1077, 1077, 1088, + 1090, 1093, 1100, 1108, 1113, 1117, 1123, 1132, 1137, 1142, + 1147, 1154, 1159, 1173, 1178, 1183, 1188, 1193, 1198, 1203, + 1208, 1208, 1229, 1234, 1239, 1243, 1248, 1255, 1261, 1268, + 1273, 1279, 1284, 1290, 1295, 1299, 1303, 1307, 1313, 1315, + 1316, 1319, 1323, 1324, 1325, 1328, 1334, 1342, 1348, 1357, + 1362, 1366, 1370, 1375, 1380, 1385, 1390, 1397, 1402, 1406, + 1410, 1415, 1420, 1425, 1430, 1435, 1441, 1448, 1453, 1458, + 1463, 1468, 1473, 1478, 1486, 1491, 1496, 1500, 1504, 1508, + 1512, 1516, 1532, 1550, 1555, 1560, 1564, 1568, 1572, 1576, + 1580, 1596, 1614, 1619, 1624, 1628, 1644, 1662, 1669, 1678, + 1678, 1702, 1702, 1732, 1734, 1737, 1739, 1742, 1747, 1751, + 1755, 1759, 1763, 1767, 1771, 1775, 1781, 1781, 1793, 1793, + 1805, 1807, 1808, 1811, 1817, 1822, 1827, 1834, 1841, 1846, + 1850, 1856, 1856, 1879, 1882, 1889, 1897, 1899, 1900, 1903, + 1908, 1912, 1917, 1922, 1927, 1932, 1937, 1941, 1946, 1955, + 1960, 1967, 1972, 1977, 1981, 1986, 1993, 2003, 2003, 2013, + 2015, 2018, 2022, 2025, 2028, 2031, 2034, 2037, 2040, 2043, + 2043, 2043, 2044, 2044, 2044, 2044, 2045, 2045, 2045, 2045, + 2045, 2046, 2046, 2046, 2047, 2047, 2047, 2047, 2047, 2048, + 2048, 2048, 2048, 2048, 2049, 2049, 2049, 2049, 2049, 2050, + 2050, 2050, 2050, 2050, 2051, 2051, 2051, 2052, 2052, 2052, + 2052, 2053, 2053, 2053, 2054, 2054, 2054, 2054, 2054, 2055, + 2055, 2055, 2055, 2056, 2056, 2056, 2056, 2056, 2057, 2057, + 2057, 2057, 2057, 2057, 2058, 2058, 2058, 2058, 2058, 2059, + 2059, 2060, 2063, 2063, 2063, 2063, 2063, 2063, 2063, 2063, + 2063, 2063, 2063, 2064, 2064, 2064, 2064, 2064, 2064, 2064, + 2064, 2064, 2064, 2065, 2065, 2068, 2073, 2079, 2084, 2090, + 2095, 2101, 2106, 2110, 2114, 2118, 2122, 2126, 2130, 2142, + 2146, 2150, 2154, 2158, 2162, 2166, 2170, 2174, 2178, 2182, + 2186, 2190, 2194, 2198, 2202, 2206, 2210, 2214, 2218, 2222, + 2226, 2230, 2234, 2241, 2246, 2250, 2254, 2258, 2265, 2271, + 2277, 2283, 2290, 2297, 2304, 2311, 2317, 2323, 2327, 2331, + 2335, 2339, 2343, 2355, 2359, 2363, 2367, 2371, 2375, 2379, + 2383, 2387, 2391, 2395, 2399, 2403, 2407, 2411, 2415, 2419, + 2423, 2427, 2431, 2435, 2439, 2443, 2447, 2451, 2455, 2461, + 2466, 2470, 2474, 2478, 2482, 2486, 2499, 2504, 2508, 2512, + 2516, 2520, 2524, 2528, 2532, 2536, 2548, 2552, 2556, 2560, + 2564, 2568, 2572, 2576, 2580, 2584, 2588, 2592, 2596, 2600, + 2604, 2608, 2612, 2616, 2620, 2624, 2628, 2632, 2636, 2640, + 2644, 2650, 2655, 2659, 2663, 2667, 2671, 2677, 2686, 2694, + 2716, 2721, 2727, 2732, 2738 }; #endif @@ -678,7 +702,8 @@ static const char *const yytname[] = "@21", "code_block", "element", "optional_const_expr", "optional_const_expr_comma", "const_expr_comma", "no_angle_bracket_const_expr", "const_expr", "const_operand", - "class_derivation_name", "name", "string", "empty", 0 + "formal_const_expr", "formal_const_operand", "class_derivation_name", + "name", "string", "empty", 0 }; #endif @@ -701,18 +726,19 @@ static const short yyr1[] = 161, 162, 162, 162, 162, 162, 162, 162, 162, 162, 163, 162, 164, 164, 164, 164, 164, 165, 165, 166, 166, 167, 167, 168, 168, 168, 168, 168, 169, 169, - 169, 170, 170, 170, 170, 171, 171, 171, 172, 172, - 172, 172, 172, 172, 172, 172, 173, 173, 173, 173, - 173, 173, 173, 173, 173, 173, 174, 174, 174, 174, - 174, 174, 174, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 177, 177, 177, 177, 177, 178, 178, 180, 179, - 182, 181, 183, 183, 184, 184, 185, 185, 185, 185, - 185, 185, 185, 185, 185, 187, 186, 189, 188, 190, - 190, 190, 191, 191, 191, 191, 192, 193, 193, 193, - 195, 194, 194, 196, 196, 197, 197, 197, 198, 198, + 169, 170, 170, 170, 170, 171, 171, 171, 171, 172, + 172, 172, 172, 172, 172, 172, 172, 173, 173, 173, + 173, 173, 173, 173, 173, 173, 173, 174, 174, 174, + 174, 174, 174, 174, 175, 175, 175, 175, 175, 175, + 175, 175, 175, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 177, 177, 177, 177, 177, 178, 178, 180, + 179, 182, 181, 183, 183, 184, 184, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 187, 186, 189, 188, + 190, 190, 190, 191, 191, 191, 191, 192, 193, 193, + 193, 195, 194, 194, 196, 196, 197, 197, 197, 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, - 199, 199, 199, 199, 199, 200, 202, 201, 203, 203, + 198, 199, 199, 199, 199, 199, 200, 202, 201, 203, + 203, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, @@ -722,18 +748,21 @@ static const short yyr1[] = 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, - 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, - 204, 204, 204, 204, 205, 205, 206, 206, 207, 207, + 204, 204, 204, 204, 204, 205, 205, 206, 206, 207, + 207, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 208, 208, 209, 209, 209, 209, 209, 209, 209, 209, + 208, 208, 208, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, - 209, 209, 209, 209, 209, 209, 209, 209, 210, 210, - 210, 210, 210, 210, 210, 211, 211, 211, 212, 212, - 213, 213, 214 + 209, 209, 209, 209, 209, 209, 209, 209, 209, 210, + 210, 210, 210, 210, 210, 210, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 212, 212, 212, 212, 212, 212, 213, 213, 213, + 214, 214, 215, 215, 216 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -756,17 +785,18 @@ static const short yyr2[] = 0, 6, 1, 1, 1, 3, 2, 1, 3, 1, 2, 1, 2, 1, 3, 5, 3, 4, 1, 1, 2, 1, 3, 3, 5, 3, 3, 4, 1, 1, - 1, 2, 2, 2, 3, 4, 1, 1, 1, 2, - 2, 2, 3, 4, 7, 3, 1, 2, 2, 2, - 3, 4, 7, 1, 1, 2, 1, 1, 1, 1, - 2, 2, 1, 1, 2, 1, 1, 1, 1, 2, - 2, 1, 1, 2, 2, 2, 2, 3, 0, 5, - 0, 7, 1, 1, 2, 3, 2, 2, 2, 3, - 3, 3, 3, 3, 3, 0, 5, 0, 6, 1, - 1, 2, 1, 3, 3, 5, 1, 1, 1, 1, - 0, 6, 4, 2, 3, 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, 2, 2, 2, 3, 4, 1, 1, 1, + 2, 2, 2, 3, 4, 7, 3, 1, 2, 2, + 2, 3, 4, 7, 1, 1, 2, 1, 1, 1, + 1, 2, 2, 1, 1, 2, 1, 1, 1, 1, + 2, 2, 1, 1, 2, 2, 2, 2, 3, 0, + 5, 0, 7, 1, 1, 2, 3, 2, 2, 2, + 3, 3, 3, 3, 3, 3, 0, 5, 0, 6, + 1, 1, 2, 1, 3, 3, 5, 1, 1, 1, + 1, 0, 6, 4, 2, 3, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, + 2, 1, 2, 1, 3, 2, 1, 0, 2, 1, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -776,18 +806,21 @@ static const short 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, 1, - 1, 1, 1, 3, 1, 1, 1, 1, 1, 3, - 1, 4, 7, 7, 4, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, + 3, 1, 4, 7, 7, 4, 2, 2, 2, 2, + 2, 3, 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, 2, 5, + 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 5, 4, 4, 3, 3, - 3, 3, 1, 4, 7, 7, 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, 5, 4, 4, 3, 3, 3, 3, 1, + 1, 1, 1, 1, 1, 1, 1, 4, 7, 7, + 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, 2, 2, 1, 1, - 1, 2, 0 + 3, 3, 3, 3, 5, 4, 4, 3, 3, 3, + 3, 1, 1, 1, 1, 1, 1, 1, 2, 2, + 1, 1, 1, 2, 0 }; /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE @@ -795,165 +828,179 @@ static const short yyr2[] = error. */ static const short yydefact[] = { - 0, 482, 0, 0, 482, 4, 472, 468, 471, 480, - 474, 0, 0, 0, 0, 0, 470, 0, 0, 0, - 0, 0, 0, 0, 0, 469, 0, 0, 0, 0, - 0, 0, 0, 2, 422, 473, 194, 258, 259, 247, - 0, 272, 246, 270, 265, 261, 262, 260, 264, 248, - 0, 249, 263, 275, 482, 3, 196, 197, 198, 199, - 0, 0, 193, 255, 256, 257, 19, 20, 0, 25, - 0, 0, 0, 0, 117, 482, 0, 5, 14, 6, - 17, 0, 12, 37, 13, 15, 16, 27, 482, 482, - 482, 482, 0, 482, 482, 482, 212, 0, 437, 0, - 0, 211, 482, 482, 0, 0, 482, 443, 441, 442, - 440, 194, 258, 259, 272, 270, 265, 261, 260, 264, - 263, 0, 0, 388, 439, 0, 0, 0, 0, 0, + 0, 524, 0, 0, 524, 4, 473, 469, 472, 522, + 475, 0, 0, 0, 0, 0, 471, 0, 0, 0, + 0, 0, 0, 0, 0, 470, 0, 0, 0, 0, + 0, 0, 0, 2, 423, 474, 195, 259, 260, 248, + 0, 273, 247, 271, 266, 262, 263, 261, 265, 249, + 0, 250, 264, 276, 524, 3, 197, 198, 199, 200, + 0, 0, 194, 256, 257, 258, 19, 20, 0, 25, + 0, 0, 0, 0, 117, 524, 0, 5, 14, 6, + 17, 0, 12, 37, 13, 15, 16, 27, 524, 524, + 524, 524, 0, 524, 524, 524, 213, 0, 438, 0, + 0, 212, 524, 524, 0, 0, 524, 444, 442, 443, + 441, 195, 259, 260, 273, 271, 266, 262, 261, 265, + 264, 0, 0, 389, 440, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 481, 482, 274, - 271, 261, 267, 261, 266, 269, 478, 479, 195, 268, - 0, 482, 482, 482, 482, 216, 186, 235, 201, 218, - 200, 21, 482, 482, 0, 24, 23, 22, 0, 0, - 18, 0, 253, 71, 203, 0, 28, 33, 31, 35, + 0, 0, 0, 0, 0, 0, 0, 523, 524, 275, + 272, 262, 268, 262, 267, 270, 520, 521, 196, 269, + 0, 524, 524, 524, 524, 217, 187, 236, 202, 219, + 201, 21, 524, 524, 0, 24, 23, 22, 0, 0, + 18, 0, 254, 71, 204, 0, 28, 33, 31, 35, 0, 36, 30, 0, 32, 34, 10, 0, 0, 40, - 205, 206, 207, 208, 0, 0, 202, 0, 387, 386, - 0, 0, 0, 0, 0, 0, 0, 213, 482, 215, - 214, 0, 0, 0, 0, 0, 0, 0, 467, 451, - 452, 453, 454, 455, 456, 459, 460, 466, 0, 449, - 450, 457, 458, 447, 448, 444, 445, 446, 465, 464, - 0, 0, 217, 273, 482, 187, 189, 188, 0, 482, - 482, 237, 482, 482, 26, 482, 250, 482, 0, 0, - 48, 254, 57, 59, 42, 29, 0, 482, 204, 482, - 0, 276, 153, 0, 0, 39, 38, 0, 210, 209, - 426, 429, 428, 435, 0, 434, 427, 431, 0, 430, - 433, 436, 0, 432, 423, 389, 0, 463, 462, 190, - 0, 0, 385, 384, 0, 240, 242, 239, 482, 482, - 0, 0, 223, 222, 252, 482, 128, 129, 0, 0, - 0, 0, 120, 121, 482, 127, 119, 50, 52, 0, - 482, 0, 0, 482, 0, 482, 169, 170, 0, 482, - 482, 482, 0, 168, 482, 61, 0, 482, 0, 7, - 0, 482, 0, 0, 0, 0, 0, 0, 0, 41, - 482, 131, 0, 438, 0, 461, 482, 191, 236, 241, - 0, 0, 219, 0, 0, 0, 0, 224, 482, 0, - 482, 123, 482, 130, 482, 0, 177, 178, 0, 482, - 482, 482, 482, 482, 176, 0, 49, 482, 482, 143, - 0, 0, 144, 147, 482, 142, 0, 0, 0, 43, - 482, 0, 482, 171, 173, 172, 67, 482, 11, 482, - 154, 277, 278, 276, 0, 482, 482, 0, 159, 161, - 158, 156, 0, 133, 86, 87, 88, 89, 90, 91, - 94, 95, 110, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 109, 114, 113, 97, 96, 83, - 85, 84, 92, 93, 81, 82, 78, 79, 80, 77, - 0, 0, 76, 132, 135, 134, 0, 0, 0, 140, - 482, 0, 44, 151, 0, 0, 0, 244, 243, 238, - 0, 0, 0, 228, 475, 0, 227, 0, 226, 0, - 0, 0, 482, 225, 251, 0, 482, 0, 115, 118, - 116, 122, 482, 179, 181, 180, 0, 0, 482, 125, - 149, 51, 482, 0, 53, 482, 482, 482, 146, 0, - 482, 0, 0, 0, 482, 0, 46, 69, 174, 482, - 0, 0, 280, 281, 283, 282, 287, 284, 285, 286, - 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, - 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, - 308, 309, 310, 311, 312, 359, 313, 314, 315, 316, - 317, 318, 319, 320, 321, 322, 323, 324, 339, 325, - 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, - 360, 336, 337, 338, 340, 341, 342, 343, 344, 345, - 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, - 356, 357, 358, 482, 377, 378, 379, 370, 382, 366, - 367, 365, 372, 373, 361, 362, 363, 364, 371, 369, - 376, 374, 380, 375, 368, 381, 279, 0, 8, 0, - 0, 157, 160, 136, 112, 111, 139, 138, 152, 482, - 0, 0, 425, 424, 482, 0, 477, 234, 476, 233, - 232, 231, 230, 229, 221, 124, 126, 182, 185, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 150, 390, - 0, 0, 55, 0, 0, 166, 482, 73, 58, 72, - 145, 148, 165, 0, 63, 60, 0, 482, 0, 175, - 482, 0, 155, 9, 162, 482, 163, 0, 137, 45, - 192, 245, 482, 0, 0, 0, 399, 397, 398, 396, - 0, 0, 395, 0, 0, 0, 0, 0, 0, 0, + 206, 207, 208, 209, 0, 0, 203, 0, 388, 387, + 0, 0, 0, 0, 0, 0, 0, 214, 524, 216, + 215, 0, 0, 0, 0, 0, 0, 0, 468, 452, + 453, 454, 455, 456, 457, 460, 461, 467, 0, 450, + 451, 458, 459, 448, 449, 445, 446, 447, 466, 465, + 0, 0, 218, 274, 524, 188, 190, 189, 0, 524, + 524, 238, 524, 524, 26, 524, 251, 524, 0, 0, + 48, 255, 57, 59, 42, 29, 0, 524, 205, 524, + 0, 277, 153, 0, 0, 39, 38, 0, 211, 210, + 427, 430, 429, 436, 0, 435, 428, 432, 0, 431, + 434, 437, 0, 433, 424, 390, 0, 464, 463, 191, + 0, 0, 386, 385, 0, 241, 243, 240, 524, 524, + 0, 0, 224, 223, 253, 524, 128, 129, 0, 0, + 0, 0, 120, 121, 524, 127, 119, 50, 52, 0, + 524, 0, 0, 524, 0, 524, 170, 171, 0, 524, + 524, 524, 0, 169, 524, 61, 0, 524, 0, 7, + 0, 524, 0, 0, 0, 0, 0, 0, 0, 41, + 524, 131, 0, 439, 0, 462, 524, 192, 237, 242, + 0, 0, 220, 0, 0, 0, 0, 225, 524, 0, + 524, 123, 524, 130, 524, 0, 178, 179, 0, 524, + 524, 524, 524, 524, 177, 0, 49, 524, 515, 511, + 514, 524, 143, 0, 0, 513, 0, 0, 0, 512, + 0, 0, 0, 0, 0, 0, 144, 147, 524, 168, + 476, 516, 142, 0, 0, 0, 43, 524, 0, 524, + 172, 174, 173, 67, 524, 11, 524, 154, 278, 279, + 277, 0, 524, 524, 0, 159, 161, 158, 156, 0, + 133, 86, 87, 88, 89, 90, 91, 94, 95, 110, + 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, + 108, 109, 114, 113, 97, 96, 83, 85, 84, 92, + 93, 81, 82, 78, 79, 80, 77, 0, 0, 76, + 132, 135, 134, 0, 0, 0, 140, 524, 0, 44, + 151, 0, 0, 0, 245, 244, 239, 0, 0, 0, + 229, 517, 0, 228, 0, 227, 0, 0, 0, 524, + 226, 252, 0, 524, 0, 115, 118, 116, 122, 524, + 180, 182, 181, 0, 0, 524, 125, 149, 51, 524, + 0, 53, 524, 524, 0, 481, 0, 0, 486, 485, + 484, 0, 0, 483, 524, 146, 0, 524, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 183, 0, 54, 152, 167, 0, 65, - 482, 47, 0, 482, 62, 383, 0, 482, 0, 0, - 0, 0, 0, 421, 407, 408, 409, 410, 411, 412, - 413, 414, 420, 0, 405, 406, 403, 404, 400, 401, - 402, 419, 418, 0, 0, 56, 0, 482, 0, 482, - 68, 164, 141, 482, 0, 394, 0, 391, 0, 417, - 416, 74, 0, 0, 482, 70, 184, 0, 0, 415, - 75, 482, 64, 0, 0, 66, 393, 392, 0, 0, - 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 524, 0, 46, 69, 175, 524, 0, + 0, 281, 282, 284, 283, 288, 285, 286, 287, 289, + 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, + 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, + 310, 311, 312, 313, 360, 314, 315, 316, 317, 318, + 319, 320, 321, 322, 323, 324, 325, 340, 326, 327, + 328, 329, 330, 331, 332, 333, 334, 335, 336, 361, + 337, 338, 339, 341, 342, 343, 344, 345, 346, 347, + 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, + 358, 359, 524, 378, 379, 380, 371, 383, 367, 368, + 366, 373, 374, 362, 363, 364, 365, 372, 370, 377, + 375, 381, 376, 369, 382, 280, 0, 8, 0, 0, + 157, 160, 136, 112, 111, 139, 138, 152, 524, 0, + 0, 426, 425, 524, 0, 519, 235, 518, 234, 233, + 232, 231, 230, 222, 124, 126, 183, 186, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 150, 391, 0, + 0, 55, 0, 0, 166, 524, 0, 524, 0, 0, + 0, 510, 73, 58, 72, 145, 148, 165, 494, 495, + 496, 497, 498, 499, 502, 503, 509, 0, 492, 493, + 500, 501, 490, 491, 487, 488, 489, 508, 507, 0, + 0, 0, 63, 60, 0, 524, 0, 176, 524, 0, + 155, 9, 162, 524, 163, 0, 137, 45, 193, 246, + 524, 0, 0, 0, 400, 398, 399, 397, 0, 0, + 396, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 184, 0, 54, 152, 167, 0, 0, 480, 0, + 477, 0, 0, 506, 505, 65, 524, 47, 0, 524, + 62, 384, 0, 524, 0, 0, 0, 0, 0, 422, + 408, 409, 410, 411, 412, 413, 414, 415, 421, 0, + 406, 407, 404, 405, 401, 402, 403, 420, 419, 0, + 0, 56, 0, 482, 0, 0, 504, 524, 0, 524, + 68, 164, 141, 524, 0, 395, 0, 392, 0, 418, + 417, 0, 0, 74, 0, 0, 524, 70, 185, 0, + 0, 416, 479, 478, 75, 524, 64, 0, 0, 66, + 394, 393, 0, 0, 0 }; static const short yydefgoto[] = { - 838, 4, 358, 359, 78, 279, 79, 80, 172, 81, - 82, 83, 287, 344, 369, 419, 180, 339, 405, 406, - 531, 198, 340, 343, 429, 770, 807, 549, 717, 708, - 483, 519, 84, 178, 331, 332, 333, 334, 370, 669, - 411, 412, 529, 491, 285, 437, 438, 413, 352, 403, - 165, 414, 199, 98, 55, 56, 262, 57, 263, 321, + 932, 4, 358, 359, 78, 279, 79, 80, 172, 81, + 82, 83, 287, 344, 369, 436, 180, 339, 405, 406, + 548, 198, 340, 343, 446, 856, 897, 598, 795, 763, + 500, 536, 84, 178, 331, 332, 333, 334, 370, 718, + 425, 426, 546, 508, 285, 454, 455, 427, 352, 403, + 165, 54, 199, 98, 55, 56, 262, 57, 263, 321, 322, 387, 58, 260, 59, 318, 314, 315, 60, 61, - 85, 325, 86, 62, 63, 64, 65, 356, 357, 431, - 656, 311, 207, 208, 698, 123, 34, 503, 371, 35, - 209 + 85, 325, 86, 62, 63, 64, 65, 356, 357, 448, + 705, 311, 207, 208, 747, 123, 34, 429, 430, 520, + 371, 35, 209 }; static const short yypact[] = { - 260,-32768, 1635, 2576, 2357,-32768,-32768,-32768,-32768,-32768, - -32768, -108, -102, -81, -57, -86,-32768, -23, -21, -10, - 2638, -3, 38, 60, 4,-32768, 67, 1635, 1635, 1635, - 1635, 1123, 1635, 2057,-32768, 80,-32768,-32768,-32768,-32768, - 2652,-32768,-32768,-32768,-32768, 1541,-32768, 1335, 1335,-32768, - 180,-32768, 1335,-32768, 40,-32768,-32768,-32768,-32768,-32768, - 55, 57,-32768,-32768,-32768,-32768,-32768,-32768, 65,-32768, - 69, 70, 78, 113,-32768,-32768, 62,-32768,-32768,-32768, - -32768, 1827,-32768,-32768,-32768,-32768,-32768,-32768, 1635, 1635, - 1635, 1635, 2576, 1635, 1635, 1635,-32768, 180, 119, 180, - 180,-32768, 1635, 1635, 2576, 2576, 1635, 58, 58, 58, - 58, -108, -102, -81, -57, -23, -21, 234, 1243, 1251, - 1327, 111, -80, 2057, 58, 1635, 1635, 1635, 1635, 1635, - 1635, 1635, 1635, 1635, 1635, 1635, 1635, 1635, 1635, 1635, - 1635, 1635, 1635, 1635, 1635, 1215, 1635,-32768, 40,-32768, - -32768, 735,-32768, 1335,-32768,-32768,-32768,-32768,-32768,-32768, - 147, 40, 40, 40, 40, 146,-32768,-32768, 168,-32768, - -51,-32768, 1436,-32768, 170,-32768,-32768,-32768, 166, 1881, - -32768, 180,-32768, 162, 171, 2652, 278,-32768,-32768,-32768, - 2590,-32768,-32768, 180,-32768,-32768,-32768, 180, 262, 193, - -32768,-32768,-32768,-32768, 55, 57,-32768, 191, 225,-32768, - 208, 212, 220, 241, 243, 256, 261,-32768, 1635,-32768, - -32768, 266, 270, 272, 244, 277, 1635, 1635,-32768, 2090, - 2211, 474, 474, 365, 365, 107, 107,-32768, 2019, 2226, - 2241, 365, 365, 121, 121, 58, 58, 58,-32768,-32768, - -65, 1138, 146,-32768, 40, 146, 146, 146, 20, 1635, - 180,-32768,-32768, 279,-32768, 2363,-32768, 2514, 2652, 262, - -32768,-32768,-32768, 7,-32768, 80, 2652, 82,-32768,-32768, - 287,-32768,-32768, 180, 1299,-32768,-32768, 115, 168, -51, - -32768,-32768,-32768,-32768, 290,-32768,-32768,-32768, 292,-32768, - -32768,-32768, 296,-32768, 58, 2057, 1635,-32768,-32768, 146, - 297, 293, 2057,-32768, 289, 316, 314,-32768, 180, 2679, - 9, 322, 324,-32768,-32768,-32768,-32768,-32768, 180, 2528, - 180, 313, 326,-32768, 134,-32768,-32768,-32768,-32768, 115, - 2452, 320, 115, 2452, 115, 82,-32768,-32768, 321, 82, - 82, 82, 219,-32768, 2703,-32768, 308,-32768, 144,-32768, - 318, 1383, 2040, 325, 115, 1745, 115, 115, 115,-32768, - 203,-32768, 1635,-32768, 1635, 2057, 2452,-32768,-32768, 180, - 1635, 336,-32768, 667, 704, 1139, 299,-32768,-32768, 9, - 2728, 333, 134,-32768, 355, 2514,-32768,-32768, 328, 134, - 134, 134, 134, -59,-32768, 115,-32768, 203, 134,-32768, - 2652, 323, 50,-32768, 134,-32768, 115, 154, 343,-32768, - 203, 228, 82, 342, 342, 342,-32768, 1635,-32768, 2452, - -32768, 1002,-32768,-32768, 180, 1635, 1383, 344, 346, 2057, - -32768,-32768, 115, 249,-32768,-32768,-32768,-32768,-32768,-32768, + 231,-32768, 1990, 2879, 2743,-32768,-32768,-32768,-32768,-32768, + -32768, -88, -86, -84, -78, -43,-32768, -37, -23, -15, + 2941, 3, 6, 10, 9,-32768, 13, 1990, 1990, 1990, + 1990, 1210, 1990, 2479,-32768, 82,-32768,-32768,-32768,-32768, + 2989,-32768,-32768,-32768,-32768, 1560,-32768, 1522, 1522,-32768, + 157,-32768, 1522,-32768, 105,-32768,-32768,-32768,-32768,-32768, + 43, 98,-32768,-32768,-32768,-32768,-32768,-32768, 41,-32768, + 100, 114, 142, 151,-32768,-32768, 241,-32768,-32768,-32768, + -32768, 2232,-32768,-32768,-32768,-32768,-32768,-32768, 1990, 1990, + 1990, 1990, 2879, 1990, 1990, 1990,-32768, 157, 113, 157, + 157,-32768, 1990, 1990, 2879, 2879, 1990, 97, 97, 97, + 97, -88, -86, -84, -78, -37, -23, 1987, 759, 1206, + 1390, 21, -66, 2479, 97, 1990, 1990, 1990, 1990, 1990, + 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, + 1990, 1990, 1990, 1990, 1990, 1486, 1990,-32768, 105,-32768, + -32768, 814,-32768, 1522,-32768,-32768,-32768,-32768,-32768,-32768, + 147, 105, 105, 105, 105, 144,-32768,-32768, 165,-32768, + -30,-32768, 617,-32768, 168,-32768,-32768,-32768, 191, 2286, + -32768, 157,-32768, 152, 190, 2989, 300,-32768,-32768,-32768, + 2927,-32768,-32768, 157,-32768,-32768,-32768, 157, 344, 212, + -32768,-32768,-32768,-32768, 43, 98,-32768, 196, 219,-32768, + 214, 217, 221, 230, 239, 246, 250,-32768, 1990,-32768, + -32768, 257, 268, 270, 273, 276, 1990, 1990,-32768, 1411, + 2148, 2681, 2681, 38, 38, 402, 402,-32768, 2424, 824, + 799, 38, 38, 298, 298, 97, 97, 97,-32768,-32768, + -60, 1225, 144,-32768, 105, 144, 144, 144, 132, 1990, + 157,-32768,-32768, 292,-32768, 3015,-32768, 2803, 2989, 344, + -32768,-32768,-32768, 26,-32768, 82, 2989, 263,-32768,-32768, + 286,-32768,-32768, 157, 1570,-32768,-32768, 197, 165, -30, + -32768,-32768,-32768,-32768, 287,-32768,-32768,-32768, 288,-32768, + -32768,-32768, 296,-32768, 97, 2479, 1990,-32768,-32768, 144, + 302, 303, 2479,-32768, 308, 320, 326,-32768, 157, 3040, + 220, 332, 333,-32768,-32768,-32768,-32768,-32768, 157, 2865, + 157, 325, 336,-32768, 218,-32768,-32768,-32768,-32768, 197, + 1302, 329, 197, 1302, 197, 263,-32768,-32768, 342, 263, + 263, 263, 106,-32768, 3064,-32768, 335,-32768, 188,-32768, + 353, 1654, 2445, 363, 197, 2120, 197, 197, 197,-32768, + 729,-32768, 1990,-32768, 1990, 2479, 1302,-32768,-32768, 157, + 1990, 357,-32768, 275, 450, 605, 376,-32768,-32768, 220, + 3089, 377, 218,-32768, 396, 2803,-32768,-32768, 369, 218, + 218, 218, 218, -58,-32768, 197,-32768, 729,-32768,-32768, + -32768, 218,-32768, 2989, 381,-32768, 2941, 373, 385,-32768, + 1990, 1990, 1990, 1210, 1990, 375, 16,-32768, 218, 2496, + -32768, 82,-32768, 197, 179, 379,-32768, 729, 161, 263, + 386, 386, 386,-32768, 1990,-32768, 1302,-32768, 1086,-32768, + -32768, 157, 1990, 1654, 383, 395, 2479,-32768,-32768, 197, + 173,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 348, 319,-32768,-32768, 249, 249, 190, 327, 1299,-32768, - 1635, 363,-32768,-32768, -32, -26, 351, 362, 2057,-32768, - 180, 594, 180,-32768,-32768, 594,-32768, 594,-32768, 594, - 594, 594, 2752,-32768,-32768, 2576, -59, 1936,-32768,-32768, - -32768,-32768, 134, 353, 353, 353, 284, 574, 1635,-32768, - -32768,-32768, 203, 372,-32768, 63, 134, 425,-32768, 2466, - 63, 196, 471, 367, 425, 380,-32768,-32768, 342, 2452, - 364, 366,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + -32768,-32768,-32768,-32768,-32768,-32768,-32768, 387, 388,-32768, + -32768, 173, 173, 243, 415, 1570,-32768, 1990, 407,-32768, + -32768, -38, -33, 389, 406, 2479,-32768, 157, 675, 157, + -32768,-32768, 675,-32768, 675,-32768, 675, 675, 675, 3113, + -32768,-32768, 2879, -58, 2341,-32768,-32768,-32768,-32768, 218, + 399, 399, 399, 184, 644, 1990,-32768,-32768,-32768, 729, + 421,-32768, -48, 218, 2879, 423, 2879, 2879, 97, 97, + 97, 404, -22, 97, 493,-32768, 1394, -48, 1990, 1990, + 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, + 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1990, 1738, 1990, + 254, 542, 429, 493, 448,-32768,-32768, 386, 1302, 427, + 434,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, @@ -963,628 +1010,704 @@ static const short yypact[] = -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768,-32768, 374,-32768, 368, - 376,-32768, 1467, 249,-32768,-32768,-32768,-32768, 2040, 2452, - 378, 115,-32768,-32768, 425, 1635,-32768,-32768,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768,-32768, 353, 391, 401, - 395, 405, 574, 574, 574, 574, 1123, 574, 748,-32768, - 396, 417,-32768, 115, 1635,-32768, 63,-32768, 435,-32768, - -32768,-32768,-32768, 404,-32768, 435, 115, 2452, 408,-32768, - 425, 881,-32768,-32768,-32768, 1383, 2057, 409,-32768,-32768, - 435, 2057, 2452, 2576, 2576, 2576, 75, 75, 75, 75, - 412, 17, 75, 574, 574, 574, 574, 574, 574, 574, - 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, - 574, 1551, 1635,-32768, 115,-32768, 2057,-32768, 406,-32768, - 2452,-32768, 413, 425, 435,-32768, 416, 425, 418, 430, - 421, 432, 574,-32768, 2196, 2256, 1679, 1679, 626, 626, - 341, 341,-32768, 2074, 2271, 2376, 521, 521, 75, 75, - 75,-32768,-32768, 126, 1715,-32768, 25, 2452, 424, 425, - 435,-32768, 435, 425, 427,-32768, 428, 75, 574,-32768, - -32768,-32768, 429, 437, 425, 435, 435, 1635, 1635, 748, - -32768, 425, 435, 128, 131, 435,-32768,-32768, 547, 552, - -32768 + -32768,-32768,-32768,-32768,-32768,-32768, 439,-32768, 441, 443, + -32768, 1822, 173,-32768,-32768,-32768,-32768, 2445, 1302, 442, + 197,-32768,-32768, 493, 1990,-32768,-32768,-32768,-32768,-32768, + -32768,-32768,-32768,-32768,-32768,-32768, 399, 444, 458, 451, + 459, 644, 644, 644, 644, 1210, 644, 2620,-32768, 447, + 470,-32768, 197, 1990,-32768, -48, 462, 1990, 453, 465, + 1990,-32768,-32768, 503,-32768,-32768,-32768,-32768, 1411, 2148, + 2681, 2681, 38, 38, 402, 402,-32768, 2462, 824, 799, + 38, 38, 298, 298, 97, 97, 97,-32768,-32768, 0, + 2070, 460,-32768, 503, 197, 1302, 469,-32768, 493, 965, + -32768,-32768,-32768, 1654, 2479, 471,-32768,-32768, 503, 2479, + 1302, 2879, 2879, 2879, 117, 117, 117, 117, 474, 22, + 117, 644, 644, 644, 644, 644, 644, 644, 644, 644, + 644, 644, 644, 644, 644, 644, 644, 644, 644, 1906, + 1990,-32768, 197,-32768, 2479,-32768, 472, 478,-32768, 484, + 97, 488, 1990,-32768,-32768,-32768, 1302,-32768, 489, 493, + 503,-32768, 491, 493, 490, 505, 516, 533, 644,-32768, + 2636, 2651, 2790, 2790, 267, 267, 527, 527,-32768, 2603, + 2666, 468, 412, 412, 117, 117, 117,-32768,-32768, 28, + 2100,-32768, 1990,-32768, 1990, 18, 2479, 1302, 538, 493, + 503,-32768, 503, 493, 544,-32768, 546, 117, 644,-32768, + -32768, 92, 120,-32768, 540, 545, 493, 503, 503, 1990, + 1990, 2620,-32768,-32768,-32768, 493, 503, 128, 137, 503, + -32768,-32768, 667, 668,-32768 }; static const short yypgoto[] = { - -32768, -145,-32768, 130,-32768,-32768, 388,-32768,-32768, -74, - 172,-32768,-32768,-32768, -109, -151,-32768,-32768,-32768, -135, - -195, 392,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -490, - -32768,-32768, 176,-32768,-32768,-32768, 177, 247, -320,-32768, - -308,-32768, 74, -402, -261, -429,-32768, 34, -95, -273, - -105, 1, 402,-32768, -25, -72,-32768, -69,-32768,-32768, - -32768, 205, -68,-32768, -67,-32768, 282,-32768, -9, -5, - -32768,-32768,-32768, 0, 478,-32768,-32768, 189,-32768, -8, - -32768, -376, -64, -29, 91, 71, -139, -219, 370, 415, - -1 + -32768, -166,-32768, 222,-32768,-32768, 497,-32768,-32768, -59, + 280,-32768,-32768,-32768, -50, -118,-32768,-32768,-32768, -75, + -163, 501,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -578, + -32768,-32768, 291,-32768,-32768,-32768, 294, 364, -319,-32768, + -321,-32768, 149, -348, -240, -452,-32768, 133, -312, -309, + 47, -21, 521, 290, -20, -69,-32768, -68,-32768,-32768, + -32768, 313, -67,-32768, -57,-32768, 390,-32768, 24, 77, + -32768,-32768,-32768, 23, 17,-32768,-32768, 260,-32768, 25, + -32768, -413, -85, -29, 125, 48, -87,-32768,-32768, -285, + 403, -144, -1 }; -#define YYLAST 2873 +#define YYLAST 3234 static const short yytable[] = { - 5, 179, 122, 87, 54, 533, 121, 660, 338, 200, - 88, 99, 201, 202, 203, 100, 89, 341, 545, 407, - 101, 227, 417, 92, 420, 210, 211, 212, 265, 214, - 215, 216, 54, 156, 157, 418, 227, 90, 221, 222, - 228, 148, 225, 252, 443, 527, 484, 485, 486, -220, - 160, 550, -220, 166, 715, 307, 255, 256, 257, 258, - 528, 91, 538, 156, 157, 156, 157, 213, 496, 227, - 156, 157, 204, 33, 87, 227, 205, 156, 157, 223, - 224, 206, 383, 384, 385, 532, 147, 133, 672, 161, - 346, 347, 348, 54, 673, 93, 541, 94, 107, 108, - 109, 110, 386, 124, 751, 54, 54, 200, 95, 492, - 201, 202, 203, 105, 670, 102, 250, 319, 227, 516, - 342, 551, 663, 156, 157, 363, 523, 524, 525, 526, - 701, 349, 181, 705, 354, 535, 133, 783, 712, 259, - 310, 540, 396, 397, 398, 821, 534, 166, 162, 309, - 133, 539, 700, 163, 298, 167, 103, 169, 164, 546, - 166, 166, 166, 166, 364, 506, 508, 704, 171, 173, - 204, 87, 5, 175, 205, 144, 145, 146, 104, 206, - 390, 176, 528, 399, 730, 106, 274, 365, 156, 157, - 350, 277, 760, 761, 762, 351, 229, 230, 231, 232, - 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, - 243, 244, 245, 246, 247, 248, 177, 251, 139, 140, - 141, 142, 143, 366, 144, 145, 146, 227, 367, 227, - 774, 226, 227, 368, 141, 142, 143, 218, 144, 145, - 146, 718, 400, 512, 433, 434, 819, 401, 836, 687, - 421, 837, 402, 166, 423, 424, 425, 542, 313, 317, - 254, 5, 323, 706, 87, 259, 336, 335, 261, 337, - 266, 702, 489, 490, 543, 267, 353, 345, 5, 37, - 272, 38, 677, 810, 9, 149, 679, 812, 680, 273, - 681, 682, 683, 542, 150, 286, 776, 304, 305, 542, - 44, 151, 46, 281, 767, 282, 487, 488, 489, 490, - 666, 290, 47, 48, 489, 490, 713, 317, 87, 825, - 517, 489, 490, 826, 5, 52, 227, 548, 291, 335, - 312, 667, 292, 404, 832, 156, 157, 426, 427, 415, - 293, 835, 415, 494, 353, 495, 547, 427, 353, 353, - 353, 294, 95, 87, 302, 362, 432, 1, 2, 3, - 440, 727, 281, 295, 282, 283, 284, 489, 490, 493, - 751, 659, 509, 510, 511, 415, 296, 375, 502, 502, - 502, 297, 320, 407, 131, 132, 299, 5, 699, 87, - 300, 404, 301, 87, 133, 335, 420, 303, 404, 404, - 404, 404, 530, 528, 688, 355, 493, 404, 372, 772, - 378, 536, 373, 404, 374, 376, 377, 379, 380, 493, - 158, 353, 388, 394, 778, 389, 313, 395, 415, 430, - 168, 170, 439, 416, 422, 440, 435, 515, 442, 74, - 174, 522, 665, 537, 532, 200, 182, 662, 201, 202, - 203, 498, 755, 756, 757, 758, 759, 499, 760, 761, - 762, 427, 808, 544, 671, 661, 675, 217, 664, 219, - 220, 674, 528, 703, 707, 667, 139, 140, 141, 142, - 143, 716, 144, 145, 146, 714, 720, 719, 723, 313, - 685, 129, 130, 131, 132, 722, 502, 724, 312, 823, - 502, 728, 502, 133, 502, 502, 502, 439, 204, 732, - 733, 87, 205, 734, 735, 530, 54, 206, 764, 763, - 768, 404, 769, 152, 806, 154, 155, 313, 773, 777, - 159, 493, 782, 809, 493, 404, 709, 811, 813, 493, - 814, 815, 816, 709, 824, 827, 828, 839, 415, 830, - 751, 271, 840, 699, 699, 699, 699, 831, 699, 668, - 264, 312, 729, 278, 658, 771, 518, 280, 765, 805, - 520, 269, 521, 711, 288, 289, 392, 6, 7, 8, - 9, 270, 10, 137, 138, 139, 140, 141, 142, 143, - 686, 144, 145, 146, 513, 152, 154, 155, 159, 312, - 381, 275, 156, 157, 699, 699, 699, 699, 699, 699, - 699, 699, 699, 699, 699, 699, 699, 699, 699, 699, - 699, 699, 657, 0, 0, 721, 689, 0, 0, 152, - 316, 152, 432, 16, 757, 758, 759, 0, 760, 761, - 762, 0, 39, 699, 0, 749, 750, 0, 0, 0, - 0, 0, 0, 360, 690, 751, 691, 0, 0, 0, - 25, 0, 0, 0, 0, 0, 0, 741, 415, 0, - 0, 740, 0, 709, 0, 156, 157, 49, 0, 699, - 0, 0, 692, 500, 51, 0, 693, 694, 316, 0, - 695, 0, 696, 0, 0, 0, 697, 54, 391, 0, - 393, 0, 0, 0, 0, 493, 0, 0, 779, 780, - 781, 0, 156, 157, 0, 39, 415, 0, 0, 709, - 0, 0, 0, 0, 440, 0, 0, 0, 0, 0, - 0, 415, 803, 726, 54, 54, 54, 755, 756, 757, - 758, 759, 0, 760, 761, 762, 731, 0, 0, 497, - 49, 0, 39, 504, 504, 504, 500, 51, 0, 0, - 501, 743, 744, 745, 746, 747, 748, 749, 750, 415, - 0, 0, 709, 0, 0, 766, 709, 751, 0, 0, - 37, 0, 38, 736, 737, 738, 739, 49, 742, 0, - 0, 0, 0, 500, 51, 253, 439, 505, 833, 834, - 0, 44, 153, 46, 360, 0, 415, 0, 709, 0, - 0, 0, 709, 47, 48, 0, 0, 0, 0, 0, - 0, 0, 0, 709, 0, 0, 52, 0, 0, 0, - 709, 0, 0, 804, 784, 785, 786, 787, 788, 789, - 790, 791, 792, 793, 794, 795, 796, 797, 798, 799, - 800, 801, 0, 752, 753, 0, 754, 360, 0, 755, - 756, 757, 758, 759, 0, 760, 761, 762, 0, 0, - 676, 504, 678, 817, 0, 504, 0, 504, 0, 504, - 504, 504, 0, 0, 552, 553, 554, 555, 556, 557, - 558, 559, 0, 560, 561, 562, 563, 564, 565, 566, - 567, 568, 569, 570, 0, 0, 0, 0, 0, 829, - 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, - 581, 582, 583, 584, 585, 0, 586, 587, 588, 589, - 590, 591, 592, 593, 594, 0, 595, 596, 597, 598, - 599, 600, 601, 602, 603, 604, 605, 606, 607, 0, - 608, 0, 609, 610, 611, 612, 613, 614, 615, 616, - 617, 618, 619, 620, 621, 0, 622, 623, 624, 625, - 626, 627, 628, 0, 629, 630, 631, 632, 0, 0, - 0, 633, 634, 635, 636, 637, 638, 639, 640, 641, - 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, - 652, 653, 775, 654, 655, 552, 553, 554, 555, 556, - 557, 558, 559, 0, 560, 561, 562, 563, 564, 565, - 566, 567, 568, 569, 570, 0, 0, 0, 0, 0, - 0, 571, 572, 573, 574, 575, 576, 577, 578, 579, - 580, 581, 582, 583, 584, 585, 0, 586, 587, 588, - 589, 590, 591, 592, 593, 594, 0, 595, 596, 597, - 598, 599, 600, 601, 602, 603, 604, 605, 606, 607, - 0, 608, 0, 609, 610, 611, 612, 613, 614, 615, - 616, 617, 618, 619, 620, 621, 0, 622, 623, 624, - 625, 626, 627, 628, 0, 629, 630, 631, 632, 0, - 0, 0, 633, 634, 635, 636, 637, 638, 639, 640, - 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, - 651, 652, 653, 0, 654, 655, 6, 7, 8, 9, - 0, 10, 111, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 156, 157, 0, - 0, 125, 126, 127, 128, 129, 130, 131, 132, 0, - 0, 0, 0, 0, 0, 0, 0, 133, 112, 0, - 113, 39, 40, 0, 114, 15, 822, 0, 42, 0, - 0, 0, 16, 115, 0, 0, 0, 39, 0, 116, - 117, 46, 0, 0, 20, 0, 0, 0, 0, 0, - 0, 118, 119, 23, 0, 24, 49, 0, 0, 25, - 0, 0, 50, 51, 120, 0, 0, 53, 6, 7, - 8, 9, 49, 10, 11, 0, 0, 0, 500, 51, - 0, 27, 507, 0, 0, 28, 29, 0, 0, 30, - 0, 31, 0, 134, 135, 32, 136, 137, 138, 139, - 140, 141, 142, 143, 0, 144, 145, 146, 0, 0, - 12, 308, 13, 0, 0, 0, 14, 15, 0, 0, - 0, 0, 0, 0, 16, 17, 0, 0, 0, 0, - 0, 18, 19, 0, 0, 0, 20, 0, 37, 0, - 38, 0, 0, 21, 22, 23, 37, 24, 38, 0, - 0, 25, 6, 7, 8, 9, 26, 10, 11, 44, - 153, 46, 0, 0, 0, 0, 0, 44, 153, 46, - 0, 47, 48, 27, 0, 0, 0, 28, 29, 47, - 48, 30, 0, 31, 52, 249, 0, 32, 0, 0, - 0, 0, 52, 0, 12, 0, 13, 0, 0, 0, - 14, 15, 0, 0, 0, 0, 0, 0, 16, 17, - 0, 102, 0, 0, 0, 18, 19, 0, 0, 103, - 20, 0, 37, 0, 38, 0, 0, 21, 22, 23, - 37, 24, 38, 0, 0, 25, 6, 7, 8, 9, - 26, 10, 11, 44, 153, 46, 0, 0, 0, 361, - 0, 44, 153, 46, 0, 47, 48, 27, 0, 0, - 0, 28, 29, 47, 48, 30, 0, 31, 52, 0, - 0, 32, 0, 0, 0, 0, 52, 0, 12, 0, - 13, 0, 0, 0, 14, 15, 0, 0, 0, 0, - 0, 0, 16, 17, 0, 106, 0, 0, 0, 18, - 19, 0, 0, 0, 20, 0, 0, 0, 0, 0, - 0, 21, 22, 23, 0, 24, 0, 0, 0, 25, - 6, 7, 8, 9, 26, 10, 11, 0, 0, 0, - 66, 0, 0, 436, 0, 0, 0, 0, 0, 0, - 67, 27, 0, 0, 68, 28, 29, 69, 0, 30, - 0, 31, 0, 0, 0, 32, 70, 0, 0, 71, - 72, 73, 12, 0, 13, 0, 0, 0, 14, 15, - 74, 0, 0, 0, 75, 0, 16, 17, 76, 0, - 0, 0, 0, 18, 19, 0, 0, 0, 20, 0, - 0, 0, 0, 0, 0, 21, 22, 23, 0, 24, - 0, 0, 0, 25, 6, 7, 8, 9, 26, 10, - 11, 0, 0, 0, 0, 0, 0, 725, 0, 0, - 0, 0, 0, 0, 0, 27, 0, 0, 0, 28, - 29, 0, 0, 30, 0, 31, 37, 0, 38, 32, - 0, 0, 149, 0, 0, 0, 12, 0, 13, 0, - 0, 150, 14, 15, 0, 0, 0, 44, 151, 46, - 16, 17, 0, 0, 0, 0, 0, 18, 19, 47, - 48, 0, 20, 0, 0, 0, 0, 0, 0, 21, - 22, 23, 52, 24, 0, 0, 0, 25, 6, 7, - 8, 9, 26, 10, 11, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, - 0, 0, 0, 28, 29, 0, 0, 30, 0, 31, - 0, 802, 0, 32, 0, 0, 0, 0, 0, 0, - 12, 0, 13, 0, 0, 0, 14, 15, 0, 0, - 0, 0, 0, 0, 16, 17, 747, 748, 749, 750, - 0, 18, 19, 0, 0, 0, 20, 0, 751, 0, - 0, 0, 0, 21, 22, 23, 0, 24, 0, 0, - 0, 25, 0, 0, 0, 0, 26, 0, 125, 126, - 127, 128, 129, 130, 131, 132, 0, 0, 0, 0, - 0, 0, 0, 27, 133, 0, 0, 28, 29, 0, - 0, 30, 0, 31, 0, 0, 0, 32, 444, 445, - 446, 447, 448, 449, 450, 451, 0, 0, 0, 0, - 0, 0, 0, 0, 452, 0, 453, 454, 455, 456, - 457, 458, 459, 460, 461, 462, 463, 464, 0, 0, - 755, 756, 757, 758, 759, 465, 760, 761, 762, 0, + 5, 709, 122, 87, 210, 211, 212, 265, 214, 215, + 216, 121, 200, 201, 202, 793, 179, 221, 222, 148, + 407, 225, 435, 434, 203, 437, 156, 157, 565, 338, + 88, 599, 89, 438, 90, 227, 341, 440, 441, 442, + 91, 227, 275, 101, 99, 460, 544, 501, 502, 503, + 33, 156, 157, 166, 228, 513, 753, 131, 132, 550, + 307, 545, 152, 227, 154, 155, 92, 133, 227, 159, + -221, 545, 213, -221, 87, 107, 108, 109, 110, 227, + 124, 93, 721, 533, 223, 224, 549, 722, 147, 594, + 540, 541, 542, 543, 719, 94, 319, 100, 761, 523, + 525, 227, 552, 95, 206, 204, 156, 157, 156, 157, + 200, 201, 202, 354, 590, 160, 250, 566, 105, 567, + 853, 102, 203, 227, 103, 600, 133, 597, 104, 227, + 509, 106, 749, 298, 152, 154, 155, 159, 913, 342, + 712, 226, 869, 167, 171, 808, 829, 166, 909, 139, + 140, 141, 142, 143, 161, 144, 145, 146, 205, 390, + 166, 166, 166, 166, 274, 156, 157, 551, 152, 277, + 152, 87, 5, 229, 230, 231, 232, 233, 234, 235, + 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, + 246, 247, 248, 227, 251, 252, 431, 595, 169, 431, + 173, 750, 206, 204, 754, 156, 157, 363, 255, 256, + 257, 258, 922, 162, 144, 145, 146, 175, 163, 767, + 860, 227, 529, 164, 443, 444, 396, 397, 398, 227, + 736, 218, 431, 726, 838, 839, 840, 728, 227, 729, + 923, 730, 731, 732, 755, 176, 364, 337, 930, 156, + 157, 259, 310, 166, 177, 345, 205, 931, 313, 317, + 254, 5, 323, 259, 87, 261, 336, 399, 266, 365, + 272, 346, 347, 348, 304, 305, 353, 796, 5, 596, + 444, 900, 591, 156, 157, 902, 827, 828, 450, 451, + 335, 506, 507, 383, 384, 385, 829, 506, 507, 592, + 267, 309, 431, 545, 737, 366, 9, 312, 273, 751, + 367, 181, 349, 386, 286, 368, 290, 317, 87, 428, + 227, 917, 428, 39, 5, 918, 400, 133, 1, 2, + 3, 401, 362, 404, 291, 534, 402, 292, 926, 432, + 294, 293, 432, 511, 353, 512, 591, 929, 353, 353, + 353, 862, 335, 87, 375, 428, 449, 591, 49, 295, + 457, 506, 507, 715, 517, 51, 296, 708, 518, 510, + 297, 350, 506, 507, 791, 432, 351, 299, 833, 834, + 835, 836, 837, 302, 838, 839, 840, 5, 300, 87, + 301, 404, 553, 87, 562, 320, 303, 805, 404, 404, + 404, 404, 547, 561, 355, 372, 510, 845, 373, 456, + 404, 141, 142, 143, 374, 144, 145, 146, 335, 716, + 376, 379, 431, 156, 157, 428, 377, 404, 515, 378, + 380, 133, 388, 407, 389, 394, 510, 395, 353, 101, + 99, 829, 433, 313, 281, 432, 282, 283, 284, 526, + 527, 528, 457, 158, 431, 439, 447, 748, 156, 157, + 519, 519, 519, 168, 170, 200, 201, 202, 558, 559, + 560, 452, 563, 174, 858, 437, 459, 203, 516, 182, + 74, 532, 539, 823, 824, 825, 826, 827, 828, 864, + 554, 556, 312, 100, 557, 564, 711, 829, 39, 593, + 217, 456, 219, 220, 710, 444, 313, 713, 720, 723, + 724, 714, 734, 139, 140, 141, 142, 143, 545, 144, + 145, 146, 752, 549, 760, 835, 836, 837, 87, 838, + 839, 840, 547, 49, 756, 898, 758, 759, 404, 517, + 51, 757, 762, 522, 313, 428, 716, 792, 510, 794, + 797, 510, 404, 717, 798, 312, 829, 206, 204, 789, + 800, 801, 810, 764, 802, 806, 510, 811, 813, 812, + 841, 842, 846, 848, 431, 849, 915, 428, 855, 833, + 834, 835, 836, 837, 271, 838, 839, 840, 851, 859, + 892, 863, 764, 312, 868, 519, 278, 432, 893, 519, + 280, 519, 894, 519, 519, 519, 895, 288, 289, 899, + 903, 205, 901, 156, 157, 904, 768, 769, 770, 771, + 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, + 782, 783, 784, 785, 786, 787, 905, 790, 833, 834, + 835, 836, 837, 906, 838, 839, 840, 6, 7, 8, + 9, 431, 10, 39, 748, 748, 748, 748, 916, 748, + 924, 66, 919, 316, 920, 925, 431, 933, 934, 264, + 807, 67, 847, 707, 535, 68, 857, 843, 69, 891, + 269, 449, 735, 156, 157, 537, 360, 70, 49, 538, + 71, 72, 73, 392, 517, 51, 738, 428, 524, 766, + 270, 74, 530, 16, 0, 75, 555, 799, 381, 76, + 706, 0, 431, 0, 0, 0, 819, 432, 0, 0, + 0, 316, 764, 39, 739, 818, 740, 0, 0, 0, + 25, 391, 0, 393, 748, 748, 748, 748, 748, 748, + 748, 748, 748, 748, 748, 748, 748, 748, 748, 748, + 748, 748, 741, 431, 510, 0, 742, 743, 49, 804, + 744, 0, 745, 0, 517, 51, 746, 0, 0, 0, + 0, 0, 809, 0, 428, 0, 0, 0, 0, 0, + 0, 748, 514, 0, 0, 0, 521, 521, 521, 428, + 0, 865, 866, 867, 432, 0, 0, 764, 0, 0, + 0, 844, 457, 0, 37, 0, 38, 0, 850, 432, + 889, 0, 0, 0, 127, 128, 129, 130, 131, 132, + 0, 748, 0, 0, 0, 44, 153, 46, 133, 281, + 0, 282, 504, 505, 0, 428, 0, 47, 48, 127, + 128, 129, 130, 131, 132, 0, 0, 506, 507, 0, + 52, 456, 0, 133, 360, 432, 0, 0, 764, 37, + 0, 38, 764, 911, 0, 912, 814, 815, 816, 817, + 0, 820, 0, 0, 253, 0, 428, 102, 0, 0, + 44, 153, 46, 0, 0, 0, 0, 0, 890, 0, + 927, 928, 47, 48, 0, 0, 432, 0, 764, 0, + 896, 0, 764, 0, 0, 52, 0, 360, 137, 138, + 139, 140, 141, 142, 143, 764, 144, 145, 146, 0, + 725, 521, 727, 0, 764, 521, 0, 521, 0, 521, + 521, 521, 136, 137, 138, 139, 140, 141, 142, 143, + 0, 144, 145, 146, 0, 0, 870, 871, 872, 873, + 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, + 884, 885, 886, 887, 0, 0, 0, 0, 601, 602, + 603, 604, 605, 606, 607, 608, 0, 609, 610, 611, + 612, 613, 614, 615, 616, 617, 618, 619, 0, 0, + 0, 0, 0, 907, 620, 621, 622, 623, 624, 625, + 626, 627, 628, 629, 630, 631, 632, 633, 634, 0, + 635, 636, 637, 638, 639, 640, 641, 642, 643, 0, + 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, + 654, 655, 656, 921, 657, 0, 658, 659, 660, 661, + 662, 663, 664, 665, 666, 667, 668, 669, 670, 0, + 671, 672, 673, 674, 675, 676, 677, 0, 678, 679, + 680, 681, 0, 0, 0, 682, 683, 684, 685, 686, + 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, + 697, 698, 699, 700, 701, 702, 861, 703, 704, 601, + 602, 603, 604, 605, 606, 607, 608, 0, 609, 610, + 611, 612, 613, 614, 615, 616, 617, 618, 619, 0, + 0, 0, 0, 0, 0, 620, 621, 622, 623, 624, + 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, + 0, 635, 636, 637, 638, 639, 640, 641, 642, 643, + 0, 644, 645, 646, 647, 648, 649, 650, 651, 652, + 653, 654, 655, 656, 0, 657, 0, 658, 659, 660, + 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, + 0, 671, 672, 673, 674, 675, 676, 677, 0, 678, + 679, 680, 681, 0, 0, 0, 682, 683, 684, 685, + 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, + 696, 697, 698, 699, 700, 701, 702, 0, 703, 704, + 0, 0, 0, 6, 7, 8, 9, 0, 10, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 466, 0, 0, 0, - 134, 135, 0, 136, 137, 138, 139, 140, 141, 142, - 143, 0, 144, 145, 146, 183, 184, 0, 820, 0, - 0, 0, 0, 0, 0, 0, 467, 0, 0, 468, - 0, 469, 470, 471, 472, 473, 474, 475, 476, 477, - 478, 479, 0, 480, 481, 0, 0, 482, 0, 0, - 0, 0, 37, 0, 38, 39, 185, 0, 41, 0, - 0, 0, 42, 186, 187, 0, 0, 43, 0, 183, - 184, 0, 188, 44, 45, 46, 189, 0, 0, 190, - 0, 0, 0, 191, 0, 47, 48, 0, 192, 0, - 49, 0, 0, 0, 0, 0, 193, 51, 52, 0, - 194, 53, 195, 0, 0, 0, 37, 196, 38, 39, - 268, 0, 41, 0, 0, 0, 42, 186, 187, 0, - 0, 43, 0, 197, 183, 184, 188, 44, 45, 46, - 189, 0, 0, 190, 0, 0, 0, 191, 0, 47, - 48, 0, 192, 0, 49, 0, 0, 0, 0, 0, - 193, 51, 52, 0, 194, 53, 195, 0, 0, 0, - 0, 37, 0, 38, 39, 185, 0, 41, 0, 0, - 0, 42, 186, 187, 0, 0, 43, 197, 0, 0, - 0, 188, 44, 45, 46, 189, 0, 0, 190, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 125, 126, + 127, 128, 129, 130, 131, 132, 0, 0, 0, 0, + 0, 37, 0, 38, 133, 112, 0, 113, 39, 40, + 0, 114, 15, 0, 0, 42, 0, 0, 0, 16, + 115, 0, 44, 153, 46, 0, 116, 117, 46, 0, + 0, 20, 0, 0, 47, 48, 0, 0, 118, 119, + 23, 0, 24, 49, 0, 0, 25, 52, 914, 50, + 51, 120, 0, 0, 53, 408, 409, 410, 9, 0, + 411, 36, 0, 0, 412, 0, 0, 0, 27, 0, + 0, 0, 28, 29, 103, 0, 30, 0, 31, 0, + 134, 135, 32, 136, 137, 138, 139, 140, 141, 142, + 143, 0, 144, 145, 146, 0, 0, 37, 308, 38, + 39, 413, 0, 41, 414, 0, 0, 42, 0, 0, + 0, 415, 43, 0, 0, 0, 0, 0, 44, 45, + 46, 0, 0, 416, 0, 0, 0, 0, 0, 0, + 47, 48, 417, 0, 418, 49, 0, 0, 419, 0, + 0, 50, 51, 52, 0, 0, 53, 408, 409, 410, + 9, 0, 411, 36, 0, 0, 765, 0, 0, 0, + 420, 0, 0, 0, 421, 0, 0, 0, 422, 0, + 423, 0, 0, 0, 424, 126, 127, 128, 129, 130, + 131, 132, 0, 0, 0, 37, 0, 38, 0, 37, + 133, 38, 39, 413, 0, 41, 414, 0, 0, 42, + 0, 0, 0, 415, 43, 0, 44, 153, 46, 0, + 44, 45, 46, 0, 0, 416, 0, 0, 47, 48, + 0, 0, 47, 48, 417, 0, 418, 49, 0, 0, + 419, 52, 0, 50, 51, 52, 0, 0, 53, 6, + 7, 8, 9, 0, 10, 11, 0, 0, 0, 0, + 0, 0, 420, 0, 0, 0, 421, 0, 106, 0, + 422, 0, 423, 0, 0, 0, 424, 135, 0, 136, + 137, 138, 139, 140, 141, 142, 143, 0, 144, 145, + 146, 12, 0, 13, 0, 0, 0, 14, 15, 0, + 0, 0, 0, 0, 0, 16, 17, 0, 0, 0, + 0, 0, 18, 19, 0, 0, 0, 20, 0, 0, + 0, 0, 0, 0, 21, 22, 23, 37, 24, 38, + 0, 0, 25, 6, 7, 8, 9, 26, 10, 11, + 0, 0, 0, 0, 0, 0, 0, 0, 44, 153, + 46, 0, 0, 0, 27, 0, 0, 0, 28, 29, + 47, 48, 30, 0, 31, 37, 249, 38, 32, 0, + 0, 149, 0, 52, 0, 12, 0, 13, 0, 0, + 150, 14, 15, 0, 0, 0, 44, 151, 46, 16, + 17, 0, 0, 0, 0, 0, 18, 19, 47, 48, + 0, 20, 0, 0, 0, 0, 0, 0, 21, 22, + 23, 52, 24, 0, 0, 0, 25, 6, 7, 8, + 9, 26, 10, 11, 0, 0, 0, 0, 0, 0, + 361, 0, 0, 0, 0, 0, 0, 0, 27, 0, + 0, 0, 28, 29, 0, 0, 30, 0, 31, 0, + 0, 0, 32, 0, 0, 0, 0, 0, 0, 12, + 0, 13, 0, 0, 0, 14, 15, 0, 0, 0, + 0, 0, 0, 16, 17, 0, 0, 0, 0, 0, + 18, 19, 0, 0, 0, 20, 0, 0, 0, 0, + 0, 0, 21, 22, 23, 0, 24, 0, 0, 0, + 25, 6, 7, 8, 9, 26, 10, 11, 0, 0, + 0, 0, 0, 0, 453, 0, 0, 0, 0, 0, + 0, 0, 27, 0, 0, 0, 28, 29, 0, 0, + 30, 0, 31, 0, 0, 0, 32, 0, 0, 0, + 0, 0, 0, 12, 0, 13, 0, 0, 0, 14, + 15, 0, 0, 0, 0, 0, 0, 16, 17, 0, + 0, 0, 0, 0, 18, 19, 0, 0, 0, 20, + 0, 0, 0, 0, 0, 0, 21, 22, 23, 0, + 24, 0, 0, 0, 25, 6, 7, 8, 9, 26, + 10, 11, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 27, 0, 0, 0, + 28, 29, 0, 0, 30, 0, 31, 0, 788, 0, + 32, 0, 0, 0, 0, 0, 0, 12, 0, 13, + 0, 0, 0, 14, 15, 0, 0, 0, 0, 0, + 0, 16, 17, 0, 0, 0, 0, 0, 18, 19, + 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, + 21, 22, 23, 0, 24, 0, 0, 0, 25, 6, + 7, 8, 9, 26, 10, 11, 0, 0, 0, 0, + 0, 0, 803, 0, 0, 0, 0, 0, 0, 0, + 27, 0, 0, 0, 28, 29, 0, 0, 30, 0, + 31, 0, 0, 0, 32, 0, 0, 0, 0, 0, + 0, 12, 0, 13, 0, 0, 0, 14, 15, 0, + 0, 0, 0, 0, 0, 16, 17, 0, 0, 0, + 0, 0, 18, 19, 0, 0, 0, 20, 0, 0, + 0, 0, 0, 0, 21, 22, 23, 0, 24, 0, + 0, 0, 25, 6, 7, 8, 9, 26, 10, 11, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 27, 0, 0, 0, 28, 29, + 0, 0, 30, 0, 31, 0, 888, 0, 32, 0, + 0, 0, 37, 0, 38, 12, 0, 13, 149, 0, + 0, 14, 15, 0, 0, 0, 0, 150, 0, 16, + 17, 0, 0, 44, 151, 46, 18, 19, 0, 0, + 0, 20, 0, 0, 0, 47, 48, 0, 21, 22, + 23, 0, 24, 0, 0, 0, 25, 0, 52, 0, + 0, 26, 0, 125, 126, 127, 128, 129, 130, 131, + 132, 0, 0, 0, 0, 0, 0, 0, 27, 133, + 0, 0, 28, 29, 0, 95, 30, 0, 31, 0, + 0, 0, 32, 125, 126, 127, 128, 129, 130, 131, + 132, 0, 0, 0, 0, 0, 0, 0, 0, 133, + 0, 0, 0, 461, 462, 463, 464, 465, 466, 467, + 468, 0, 0, 0, 0, 0, 0, 0, 0, 469, + 0, 470, 471, 472, 473, 474, 475, 476, 477, 478, + 479, 480, 481, 127, 128, 129, 130, 131, 132, 0, + 482, 0, 0, 0, 0, 134, 135, 133, 136, 137, + 138, 139, 140, 141, 142, 143, 0, 144, 145, 146, + 0, 483, 0, 854, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 134, 135, 0, 136, 137, + 138, 139, 140, 141, 142, 143, 0, 144, 145, 146, + 0, 484, 0, 910, 485, 0, 486, 487, 488, 489, + 490, 491, 492, 493, 494, 495, 496, 0, 497, 498, + 183, 184, 499, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 135, 0, 136, 137, 138, 139, + 140, 141, 142, 143, 0, 144, 145, 146, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 37, 0, 38, + 39, 185, 0, 41, 0, 0, 0, 42, 186, 187, + 0, 0, 43, 0, 183, 184, 0, 188, 44, 45, + 46, 189, 0, 0, 190, 0, 0, 0, 191, 0, + 47, 48, 0, 192, 0, 49, 0, 0, 0, 0, + 0, 193, 51, 52, 0, 194, 53, 195, 0, 0, + 0, 37, 196, 38, 39, 268, 0, 41, 0, 0, + 0, 42, 186, 187, 0, 0, 43, 0, 197, 183, + 184, 188, 44, 45, 46, 189, 0, 0, 190, 0, 0, 0, 191, 0, 47, 48, 0, 192, 0, 49, 0, 0, 0, 0, 0, 193, 51, 52, 0, 194, - 53, 195, 125, 126, 127, 128, 129, 130, 131, 132, - 0, 0, 0, 0, 0, 0, 0, 0, 133, 0, - 0, 0, 197, 125, 126, 127, 128, 129, 130, 131, - 132, 0, 0, 0, 0, 0, 0, 0, 0, 133, - 125, 126, 127, 128, 129, 130, 131, 132, 0, 0, - 0, 0, 0, 0, 0, 0, 133, 743, 744, 745, - 746, 747, 748, 749, 750, 0, 0, 0, 0, 0, - 0, 0, 0, 751, 126, 127, 128, 129, 130, 131, - 132, 0, 0, 0, 0, 0, 0, 0, 0, 133, - 0, 0, 306, 0, 134, 135, 0, 136, 137, 138, + 53, 195, 0, 0, 0, 0, 37, 0, 38, 39, + 185, 0, 41, 0, 0, 0, 42, 186, 187, 0, + 0, 43, 197, 0, 0, 0, 188, 44, 45, 46, + 189, 0, 0, 190, 0, 0, 0, 191, 0, 47, + 48, 0, 192, 0, 49, 0, 0, 0, 0, 0, + 193, 51, 52, 0, 194, 53, 195, 125, 126, 127, + 128, 129, 130, 131, 132, 0, 0, 0, 0, 0, + 0, 0, 0, 133, 0, 0, 0, 197, 125, 126, + 127, 128, 129, 130, 131, 132, 0, 0, 0, 0, + 0, 0, 0, 0, 133, 125, 126, 127, 128, 129, + 130, 131, 132, 0, 0, 0, 0, 0, 0, 0, + 0, 133, 125, 126, 127, 128, 129, 130, 131, 132, + 0, 0, 0, 0, 0, 0, 0, 0, 133, 568, + 569, 570, 571, 572, 573, 574, 575, 0, 0, 0, + 0, 0, 0, 0, 0, 576, 0, 306, 0, 134, + 135, 0, 136, 137, 138, 139, 140, 141, 142, 143, + 0, 144, 145, 146, 0, 0, 0, 458, 0, 0, + 134, 135, 0, 136, 137, 138, 139, 140, 141, 142, + 143, 0, 144, 145, 146, 852, 0, 134, 135, 0, + 136, 137, 138, 139, 140, 141, 142, 143, 0, 144, + 145, 146, 0, 0, 134, 135, 0, 136, 137, 138, 139, 140, 141, 142, 143, 0, 144, 145, 146, 0, - 0, 0, 441, 0, 0, 134, 135, 0, 136, 137, - 138, 139, 140, 141, 142, 143, 0, 144, 145, 146, - 0, 0, 134, 135, 0, 136, 137, 138, 139, 140, - 141, 142, 143, 0, 144, 145, 146, 818, 0, 752, - 753, 0, 754, 0, 0, 755, 756, 757, 758, 759, - 0, 760, 761, 762, 0, 0, 135, 0, 136, 137, - 138, 139, 140, 141, 142, 143, 0, 144, 145, 146, - 744, 745, 746, 747, 748, 749, 750, 0, 0, 0, - 0, 0, 0, 0, 0, 751, 127, 128, 129, 130, - 131, 132, 0, 0, 0, 0, 0, 0, 0, 0, - 133, 127, 128, 129, 130, 131, 132, 0, 0, 0, - 0, 0, 0, 0, 0, 133, 127, 128, 129, 130, - 131, 132, 0, 0, 0, 0, 0, 0, 0, 0, - 133, 745, 746, 747, 748, 749, 750, 0, 0, 0, - 0, 0, 0, 0, 0, 751, 745, 746, 747, 748, - 749, 750, 0, 0, 0, 0, 0, 0, 0, 0, - 751, 0, 753, 0, 754, 0, 0, 755, 756, 757, - 758, 759, 0, 760, 761, 762, 0, 135, 0, 136, - 137, 138, 139, 140, 141, 142, 143, 0, 144, 145, - 146, 0, 0, 0, 136, 137, 138, 139, 140, 141, - 142, 143, 0, 144, 145, 146, 0, 0, 0, 0, - 137, 138, 139, 140, 141, 142, 143, -1, 144, 145, - 146, 0, 753, 0, 754, 0, 0, 755, 756, 757, - 758, 759, 0, 760, 761, 762, 0, 0, 0, 754, - 0, 0, 755, 756, 757, 758, 759, 0, 760, 761, - 762, 745, 746, 747, 748, 749, 750, 0, 0, 0, - 0, 66, 0, 0, 0, 751, 0, 66, 0, 0, - 0, 67, 0, 0, 0, 68, 0, 67, 69, 0, - 0, 68, 0, 0, 69, 0, 0, 70, 0, 0, - 71, 72, 73, 70, 0, 0, 71, 72, 73, 0, - 0, 74, 0, 0, 0, 75, 0, 74, 0, 76, - 0, 75, 0, 0, 0, 76, 0, 0, 0, 77, - 408, 36, 0, 0, 409, 77, 0, 0, 0, 0, - 0, 0, 0, 0, 408, 36, 0, 0, 710, 0, - 0, 0, 0, 0, 324, 0, 0, 755, 756, 757, - 758, 759, 0, 760, 761, 762, 0, 37, 0, 38, - 39, 410, 0, 41, 0, 0, 0, 42, 0, 0, - 0, 37, 43, 38, 39, 410, 0, 41, 44, 45, - 46, 42, 326, 327, 0, 0, 43, 0, 0, 0, - 47, 48, 44, 45, 46, 49, 326, 327, 0, 0, - 0, 50, 51, 52, 47, 48, 53, 0, 0, 49, - 0, 0, 0, 0, 0, 50, 51, 52, 0, 37, - 53, 38, 328, 329, 0, 41, 0, 0, 0, 0, - 0, 0, 0, 37, 43, 38, 0, 0, 0, 41, - 44, 45, 46, 0, 0, 36, 0, 0, 43, 0, - 0, 0, 47, 48, 44, 45, 46, 0, 0, 36, - 0, 0, 0, 330, 0, 52, 47, 48, 53, 0, - 0, 0, 0, 0, 0, 0, 0, 330, 0, 52, - 0, 37, 53, 38, 39, 40, 0, 41, 0, 0, - 0, 42, 0, 0, 0, 37, 43, 38, 39, 276, - 0, 41, 44, 45, 46, 42, 0, 96, 0, 0, - 43, 0, 0, 0, 47, 48, 44, 45, 46, 49, - 0, 36, 0, 0, 0, 50, 51, 52, 47, 48, - 53, 0, 0, 49, 0, 0, 0, 0, 0, 50, - 51, 52, 0, 37, 53, 38, 39, 0, 0, 41, - 0, 0, 0, 42, 0, 0, 0, 37, 43, 38, - 39, 0, 0, 41, 44, 45, 46, 42, 0, 0, - 0, 0, 43, 0, 0, 0, 47, 48, 44, 45, - 46, 49, 0, 66, 0, 0, 0, 97, 51, 52, - 47, 48, 53, 67, 0, 49, 0, 68, 0, 0, - 69, 50, 51, 52, 0, 0, 53, 66, 0, 70, - 0, 0, 71, 72, 73, 0, 0, 67, 0, 0, + 0, 577, 578, 0, 579, 580, 581, 582, 583, 584, + 585, 586, 0, 587, 588, 589, 821, 822, 823, 824, + 825, 826, 827, 828, 0, 0, 0, 0, 0, 0, + 0, 0, 829, 821, 822, 823, 824, 825, 826, 827, + 828, 0, 0, 0, 0, 0, 0, 0, 0, 829, + 822, 823, 824, 825, 826, 827, 828, 0, 0, 0, + 0, 0, 0, 0, 0, 829, 823, 824, 825, 826, + 827, 828, 0, 0, 0, 0, 0, 0, 0, 0, + 829, 823, 824, 825, 826, 827, 828, 0, 0, 0, + 0, 0, 0, 0, 0, 829, 0, 0, 129, 130, + 131, 132, 0, 0, 0, 0, 908, 0, 830, 831, + 133, 832, 0, 0, 833, 834, 835, 836, 837, 0, + 838, 839, 840, 0, 0, 830, 831, 0, 832, 0, + 0, 833, 834, 835, 836, 837, 0, 838, 839, 840, + 0, 0, 831, -1, 832, 0, 0, 833, 834, 835, + 836, 837, 0, 838, 839, 840, 0, 831, 0, 832, + 0, 0, 833, 834, 835, 836, 837, 0, 838, 839, + 840, 0, 0, 0, 832, 0, 0, 833, 834, 835, + 836, 837, 0, 838, 839, 840, 0, 66, 0, 0, + 137, 138, 139, 140, 141, 142, 143, 67, 144, 145, + 146, 68, 0, 0, 69, 0, 0, 825, 826, 827, + 828, 326, 327, 70, 0, 0, 71, 72, 73, 829, + 0, 0, 0, 0, 0, 0, 0, 74, 0, 0, + 0, 75, 0, 0, 0, 76, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 77, 0, 0, 37, 0, + 38, 328, 329, 0, 41, 0, 0, 0, 0, 0, + 0, 0, 0, 43, 0, 0, 0, 0, 0, 44, + 45, 46, 0, 326, 327, 0, 0, 0, 0, 0, + 0, 47, 48, 0, 0, 0, 0, 0, 36, 0, + 0, 0, 330, 0, 52, 0, 0, 53, 0, 0, + 0, 833, 834, 835, 836, 837, 0, 838, 839, 840, + 37, 0, 38, 0, 0, 0, 41, 0, 0, 0, + 0, 0, 0, 0, 37, 43, 38, 39, 40, 0, + 41, 44, 45, 46, 42, 0, 36, 0, 0, 43, + 0, 0, 0, 47, 48, 44, 45, 46, 0, 0, + 96, 0, 0, 0, 330, 0, 52, 47, 48, 53, + 0, 0, 49, 0, 0, 0, 0, 0, 50, 51, + 52, 0, 37, 53, 38, 39, 276, 0, 41, 0, + 0, 0, 42, 0, 0, 0, 37, 43, 38, 39, + 0, 0, 41, 44, 45, 46, 42, 0, 36, 0, + 0, 43, 0, 0, 0, 47, 48, 44, 45, 46, + 49, 0, 0, 0, 0, 0, 50, 51, 52, 47, + 48, 53, 0, 0, 49, 0, 0, 0, 0, 0, + 97, 51, 52, 0, 37, 53, 38, 39, 0, 0, + 41, 0, 0, 0, 42, 0, 0, 0, 0, 43, + 0, 0, 0, 0, 0, 44, 45, 46, 0, 66, + 0, 0, 0, 0, 0, 0, 0, 47, 48, 67, + 0, 0, 49, 68, 0, 0, 69, 0, 50, 51, + 52, 0, 0, 53, 66, 70, 0, 0, 71, 72, + 73, 0, 0, 0, 67, 0, 0, 0, 68, 74, + 0, 69, 0, 75, 0, 0, 0, 76, 66, 0, + 70, 0, 0, 71, 72, 73, 0, 77, 67, 0, + 0, 0, 68, 0, 74, 69, 0, 0, 75, 0, + 0, 0, 76, 66, 70, 0, 324, 71, 72, 73, + 0, 0, 77, 67, 0, 0, 0, 68, 74, 0, + 69, 0, 75, 0, 0, 0, 76, 66, 0, 70, + 0, 382, 71, 72, 73, 0, 77, 67, 0, 0, 0, 68, 0, 74, 69, 0, 0, 75, 0, 0, - 0, 76, 66, 70, 0, 0, 71, 72, 73, 0, - 0, 77, 67, 0, 0, 0, 68, 74, 0, 69, - 0, 75, 0, 0, 0, 76, 66, 0, 70, 0, - 382, 71, 72, 73, 0, 77, 67, 0, 0, 0, - 68, 0, 74, 69, 0, 0, 75, 0, 0, 0, - 76, 0, 70, 0, 428, 71, 72, 73, 0, 0, - 77, 0, 0, 0, 0, 0, 74, 0, 0, 0, - 75, 0, 0, 0, 76, 0, 0, 0, 0, 514, - 0, 0, 0, 0, 77, 0, 0, 0, 0, 0, + 0, 76, 0, 70, 0, 445, 71, 72, 73, 0, + 0, 77, 0, 0, 0, 0, 0, 74, 0, 0, + 0, 75, 0, 0, 0, 76, 0, 0, 0, 0, + 531, 0, 0, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 684 + 0, 0, 0, 0, 733 }; static const short yycheck[] = { - 1, 75, 31, 4, 3, 407, 31, 436, 269, 81, - 118, 20, 81, 81, 81, 20, 118, 10, 420, 339, - 20, 101, 342, 109, 344, 89, 90, 91, 173, 93, - 94, 95, 31, 8, 9, 343, 101, 118, 102, 103, - 120, 40, 106, 148, 364, 104, 366, 367, 368, 100, - 10, 427, 103, 54, 544, 120, 161, 162, 163, 164, - 119, 118, 12, 8, 9, 8, 9, 92, 376, 101, - 8, 9, 81, 2, 75, 101, 81, 8, 9, 104, - 105, 81, 73, 74, 75, 405, 6, 29, 120, 49, - 8, 9, 10, 92, 120, 118, 416, 118, 27, 28, - 29, 30, 93, 32, 29, 104, 105, 179, 118, 370, - 179, 179, 179, 109, 490, 118, 145, 262, 101, 392, - 113, 429, 442, 8, 9, 10, 399, 400, 401, 402, - 532, 49, 70, 535, 279, 408, 29, 120, 540, 119, - 120, 414, 8, 9, 10, 120, 407, 148, 108, 254, - 29, 101, 528, 113, 218, 100, 118, 100, 118, 420, - 161, 162, 163, 164, 49, 384, 385, 104, 103, 100, - 179, 172, 173, 103, 179, 117, 118, 119, 118, 179, - 325, 103, 119, 49, 674, 118, 185, 72, 8, 9, - 108, 190, 117, 118, 119, 113, 125, 126, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 103, 146, 111, 112, - 113, 114, 115, 108, 117, 118, 119, 101, 113, 101, - 720, 120, 101, 118, 113, 114, 115, 118, 117, 118, - 119, 549, 108, 388, 100, 101, 120, 113, 120, 522, - 345, 120, 118, 254, 349, 350, 351, 103, 259, 260, - 113, 262, 263, 536, 265, 119, 267, 267, 100, 268, - 100, 532, 118, 119, 120, 109, 277, 276, 279, 45, - 118, 47, 501, 773, 6, 51, 505, 777, 507, 118, - 509, 510, 511, 103, 60, 102, 725, 226, 227, 103, - 66, 67, 68, 100, 706, 102, 103, 104, 118, 119, - 120, 120, 78, 79, 118, 119, 120, 318, 319, 809, - 394, 118, 119, 813, 325, 91, 101, 422, 120, 329, - 259, 4, 120, 334, 824, 8, 9, 118, 119, 340, - 120, 831, 343, 372, 345, 374, 118, 119, 349, 350, - 351, 110, 118, 354, 110, 284, 357, 97, 98, 99, - 361, 669, 100, 120, 102, 103, 104, 118, 119, 370, - 29, 435, 73, 74, 75, 376, 120, 306, 383, 384, - 385, 120, 103, 703, 19, 20, 120, 388, 527, 390, - 120, 392, 120, 394, 29, 395, 716, 120, 399, 400, - 401, 402, 403, 119, 120, 118, 407, 408, 118, 717, - 121, 410, 120, 414, 118, 118, 123, 101, 104, 420, - 50, 422, 100, 110, 732, 101, 427, 101, 429, 121, - 60, 61, 361, 113, 113, 436, 118, 104, 113, 84, - 70, 113, 123, 120, 764, 517, 76, 101, 517, 517, - 517, 380, 111, 112, 113, 114, 115, 121, 117, 118, - 119, 119, 770, 120, 101, 121, 104, 97, 120, 99, - 100, 120, 119, 101, 49, 4, 111, 112, 113, 114, - 115, 101, 117, 118, 119, 118, 120, 123, 120, 490, - 515, 17, 18, 19, 20, 121, 501, 121, 427, 807, - 505, 123, 507, 29, 509, 510, 511, 436, 517, 118, - 109, 512, 517, 118, 109, 516, 515, 517, 101, 123, - 85, 522, 118, 45, 118, 47, 48, 528, 120, 120, - 52, 532, 120, 120, 535, 536, 537, 121, 120, 540, - 110, 120, 110, 544, 120, 118, 118, 0, 549, 120, - 29, 181, 0, 692, 693, 694, 695, 120, 697, 488, - 172, 490, 671, 193, 434, 716, 394, 197, 703, 764, - 394, 179, 395, 539, 204, 205, 329, 3, 4, 5, - 6, 179, 8, 109, 110, 111, 112, 113, 114, 115, - 516, 117, 118, 119, 389, 117, 118, 119, 120, 528, - 318, 186, 8, 9, 743, 744, 745, 746, 747, 748, - 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, - 759, 760, 433, -1, -1, 633, 52, -1, -1, 151, - 260, 153, 633, 59, 113, 114, 115, -1, 117, 118, - 119, -1, 48, 782, -1, 19, 20, -1, -1, -1, - -1, -1, -1, 283, 80, 29, 82, -1, -1, -1, - 86, -1, -1, -1, -1, -1, -1, 696, 669, -1, - -1, 696, -1, 674, -1, 8, 9, 83, -1, 818, - -1, -1, 108, 89, 90, -1, 112, 113, 318, -1, - 116, -1, 118, -1, -1, -1, 122, 696, 328, -1, - 330, -1, -1, -1, -1, 706, -1, -1, 733, 734, - 735, -1, 8, 9, -1, 48, 717, -1, -1, 720, - -1, -1, -1, -1, 725, -1, -1, -1, -1, -1, - -1, 732, 761, 662, 733, 734, 735, 111, 112, 113, - 114, 115, -1, 117, 118, 119, 675, -1, -1, 379, - 83, -1, 48, 383, 384, 385, 89, 90, -1, -1, - 93, 13, 14, 15, 16, 17, 18, 19, 20, 770, - -1, -1, 773, -1, -1, 704, 777, 29, -1, -1, - 45, -1, 47, 692, 693, 694, 695, 83, 697, -1, - -1, -1, -1, 89, 90, 60, 725, 93, 827, 828, - -1, 66, 67, 68, 434, -1, 807, -1, 809, -1, - -1, -1, 813, 78, 79, -1, -1, -1, -1, -1, - -1, -1, -1, 824, -1, -1, 91, -1, -1, -1, - 831, -1, -1, 762, 743, 744, 745, 746, 747, 748, - 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, - 759, 760, -1, 105, 106, -1, 108, 487, -1, 111, - 112, 113, 114, 115, -1, 117, 118, 119, -1, -1, - 500, 501, 502, 782, -1, 505, -1, 507, -1, 509, - 510, 511, -1, -1, 3, 4, 5, 6, 7, 8, - 9, 10, -1, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, -1, -1, -1, -1, -1, 818, - 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 40, 41, 42, 43, -1, 45, 46, 47, 48, - 49, 50, 51, 52, 53, -1, 55, 56, 57, 58, - 59, 60, 61, 62, 63, 64, 65, 66, 67, -1, - 69, -1, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, -1, 85, 86, 87, 88, - 89, 90, 91, -1, 93, 94, 95, 96, -1, -1, - -1, 100, 101, 102, 103, 104, 105, 106, 107, 108, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 3, 4, 5, 6, 7, - 8, 9, 10, -1, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, -1, -1, -1, -1, -1, - -1, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, -1, 45, 46, 47, - 48, 49, 50, 51, 52, 53, -1, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - -1, 69, -1, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, -1, 85, 86, 87, - 88, 89, 90, 91, -1, 93, 94, 95, 96, -1, - -1, -1, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, -1, 122, 123, 3, 4, 5, 6, - -1, 8, 9, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 8, 9, -1, - -1, 13, 14, 15, 16, 17, 18, 19, 20, -1, - -1, -1, -1, -1, -1, -1, -1, 29, 45, -1, - 47, 48, 49, -1, 51, 52, 806, -1, 55, -1, - -1, -1, 59, 60, -1, -1, -1, 48, -1, 66, - 67, 68, -1, -1, 71, -1, -1, -1, -1, -1, - -1, 78, 79, 80, -1, 82, 83, -1, -1, 86, - -1, -1, 89, 90, 91, -1, -1, 94, 3, 4, - 5, 6, 83, 8, 9, -1, -1, -1, 89, 90, - -1, 108, 93, -1, -1, 112, 113, -1, -1, 116, - -1, 118, -1, 105, 106, 122, 108, 109, 110, 111, - 112, 113, 114, 115, -1, 117, 118, 119, -1, -1, - 45, 123, 47, -1, -1, -1, 51, 52, -1, -1, - -1, -1, -1, -1, 59, 60, -1, -1, -1, -1, - -1, 66, 67, -1, -1, -1, 71, -1, 45, -1, - 47, -1, -1, 78, 79, 80, 45, 82, 47, -1, - -1, 86, 3, 4, 5, 6, 91, 8, 9, 66, - 67, 68, -1, -1, -1, -1, -1, 66, 67, 68, - -1, 78, 79, 108, -1, -1, -1, 112, 113, 78, - 79, 116, -1, 118, 91, 120, -1, 122, -1, -1, - -1, -1, 91, -1, 45, -1, 47, -1, -1, -1, - 51, 52, -1, -1, -1, -1, -1, -1, 59, 60, - -1, 118, -1, -1, -1, 66, 67, -1, -1, 118, - 71, -1, 45, -1, 47, -1, -1, 78, 79, 80, - 45, 82, 47, -1, -1, 86, 3, 4, 5, 6, - 91, 8, 9, 66, 67, 68, -1, -1, -1, 100, - -1, 66, 67, 68, -1, 78, 79, 108, -1, -1, - -1, 112, 113, 78, 79, 116, -1, 118, 91, -1, - -1, 122, -1, -1, -1, -1, 91, -1, 45, -1, - 47, -1, -1, -1, 51, 52, -1, -1, -1, -1, - -1, -1, 59, 60, -1, 118, -1, -1, -1, 66, - 67, -1, -1, -1, 71, -1, -1, -1, -1, -1, - -1, 78, 79, 80, -1, 82, -1, -1, -1, 86, - 3, 4, 5, 6, 91, 8, 9, -1, -1, -1, - 44, -1, -1, 100, -1, -1, -1, -1, -1, -1, - 54, 108, -1, -1, 58, 112, 113, 61, -1, 116, - -1, 118, -1, -1, -1, 122, 70, -1, -1, 73, - 74, 75, 45, -1, 47, -1, -1, -1, 51, 52, - 84, -1, -1, -1, 88, -1, 59, 60, 92, -1, - -1, -1, -1, 66, 67, -1, -1, -1, 71, -1, - -1, -1, -1, -1, -1, 78, 79, 80, -1, 82, - -1, -1, -1, 86, 3, 4, 5, 6, 91, 8, - 9, -1, -1, -1, -1, -1, -1, 100, -1, -1, - -1, -1, -1, -1, -1, 108, -1, -1, -1, 112, - 113, -1, -1, 116, -1, 118, 45, -1, 47, 122, - -1, -1, 51, -1, -1, -1, 45, -1, 47, -1, - -1, 60, 51, 52, -1, -1, -1, 66, 67, 68, - 59, 60, -1, -1, -1, -1, -1, 66, 67, 78, - 79, -1, 71, -1, -1, -1, -1, -1, -1, 78, - 79, 80, 91, 82, -1, -1, -1, 86, 3, 4, - 5, 6, 91, 8, 9, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 108, - -1, -1, -1, 112, 113, -1, -1, 116, -1, 118, - -1, 120, -1, 122, -1, -1, -1, -1, -1, -1, - 45, -1, 47, -1, -1, -1, 51, 52, -1, -1, - -1, -1, -1, -1, 59, 60, 17, 18, 19, 20, - -1, 66, 67, -1, -1, -1, 71, -1, 29, -1, - -1, -1, -1, 78, 79, 80, -1, 82, -1, -1, - -1, 86, -1, -1, -1, -1, 91, -1, 13, 14, - 15, 16, 17, 18, 19, 20, -1, -1, -1, -1, - -1, -1, -1, 108, 29, -1, -1, 112, 113, -1, - -1, 116, -1, 118, -1, -1, -1, 122, 13, 14, - 15, 16, 17, 18, 19, 20, -1, -1, -1, -1, - -1, -1, -1, -1, 29, -1, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, -1, -1, - 111, 112, 113, 114, 115, 50, 117, 118, 119, -1, + 1, 453, 31, 4, 89, 90, 91, 173, 93, 94, + 95, 31, 81, 81, 81, 593, 75, 102, 103, 40, + 339, 106, 343, 342, 81, 344, 8, 9, 12, 269, + 118, 444, 118, 345, 118, 101, 10, 349, 350, 351, + 118, 101, 186, 20, 20, 364, 104, 366, 367, 368, + 2, 8, 9, 54, 120, 376, 104, 19, 20, 407, + 120, 119, 45, 101, 47, 48, 109, 29, 101, 52, + 100, 119, 92, 103, 75, 27, 28, 29, 30, 101, + 32, 118, 120, 392, 104, 105, 405, 120, 6, 437, + 399, 400, 401, 402, 507, 118, 262, 20, 120, 384, + 385, 101, 411, 118, 81, 81, 8, 9, 8, 9, + 179, 179, 179, 279, 433, 10, 145, 101, 109, 428, + 120, 118, 179, 101, 118, 446, 29, 439, 118, 101, + 370, 118, 545, 218, 117, 118, 119, 120, 120, 113, + 459, 120, 120, 100, 103, 723, 29, 148, 120, 111, + 112, 113, 114, 115, 49, 117, 118, 119, 81, 325, + 161, 162, 163, 164, 185, 8, 9, 407, 151, 190, + 153, 172, 173, 125, 126, 127, 128, 129, 130, 131, + 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, + 142, 143, 144, 101, 146, 148, 340, 437, 100, 343, + 100, 549, 179, 179, 552, 8, 9, 10, 161, 162, + 163, 164, 120, 108, 117, 118, 119, 103, 113, 567, + 798, 101, 388, 118, 118, 119, 8, 9, 10, 101, + 539, 118, 376, 518, 117, 118, 119, 522, 101, 524, + 120, 526, 527, 528, 553, 103, 49, 268, 120, 8, + 9, 119, 120, 254, 103, 276, 179, 120, 259, 260, + 113, 262, 263, 119, 265, 100, 267, 49, 100, 72, + 118, 8, 9, 10, 226, 227, 277, 598, 279, 118, + 119, 859, 103, 8, 9, 863, 19, 20, 100, 101, + 267, 118, 119, 73, 74, 75, 29, 118, 119, 120, + 109, 254, 446, 119, 120, 108, 6, 259, 118, 549, + 113, 70, 49, 93, 102, 118, 120, 318, 319, 340, + 101, 899, 343, 48, 325, 903, 108, 29, 97, 98, + 99, 113, 284, 334, 120, 394, 118, 120, 916, 340, + 110, 120, 343, 372, 345, 374, 103, 925, 349, 350, + 351, 803, 329, 354, 306, 376, 357, 103, 83, 120, + 361, 118, 119, 120, 89, 90, 120, 452, 93, 370, + 120, 108, 118, 119, 120, 376, 113, 120, 111, 112, + 113, 114, 115, 110, 117, 118, 119, 388, 120, 390, + 120, 392, 413, 394, 423, 103, 120, 718, 399, 400, + 401, 402, 403, 423, 118, 118, 407, 755, 120, 361, + 411, 113, 114, 115, 118, 117, 118, 119, 395, 4, + 118, 101, 566, 8, 9, 446, 123, 428, 380, 121, + 104, 29, 100, 752, 101, 110, 437, 101, 439, 416, + 416, 29, 113, 444, 100, 446, 102, 103, 104, 73, + 74, 75, 453, 50, 598, 113, 121, 544, 8, 9, + 383, 384, 385, 60, 61, 534, 534, 534, 420, 421, + 422, 118, 424, 70, 795, 794, 113, 534, 121, 76, + 84, 104, 113, 15, 16, 17, 18, 19, 20, 810, + 109, 118, 444, 416, 109, 120, 101, 29, 48, 120, + 97, 453, 99, 100, 121, 119, 507, 120, 101, 120, + 104, 123, 532, 111, 112, 113, 114, 115, 119, 117, + 118, 119, 101, 842, 120, 113, 114, 115, 529, 117, + 118, 119, 533, 83, 554, 856, 556, 557, 539, 89, + 90, 118, 49, 93, 545, 566, 4, 118, 549, 101, + 123, 552, 553, 505, 120, 507, 29, 534, 534, 588, + 121, 120, 118, 564, 121, 123, 567, 109, 109, 118, + 123, 101, 110, 120, 718, 110, 897, 598, 118, 111, + 112, 113, 114, 115, 181, 117, 118, 119, 85, 120, + 118, 120, 593, 545, 120, 518, 193, 598, 120, 522, + 197, 524, 118, 526, 527, 528, 118, 204, 205, 120, + 120, 534, 121, 8, 9, 110, 568, 569, 570, 571, + 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, + 582, 583, 584, 585, 586, 587, 120, 589, 111, 112, + 113, 114, 115, 110, 117, 118, 119, 3, 4, 5, + 6, 795, 8, 48, 741, 742, 743, 744, 120, 746, + 120, 44, 118, 260, 118, 120, 810, 0, 0, 172, + 720, 54, 757, 451, 394, 58, 794, 752, 61, 842, + 179, 682, 533, 8, 9, 394, 283, 70, 83, 395, + 73, 74, 75, 329, 89, 90, 52, 718, 93, 566, + 179, 84, 389, 59, -1, 88, 416, 682, 318, 92, + 450, -1, 856, -1, -1, -1, 745, 718, -1, -1, + -1, 318, 723, 48, 80, 745, 82, -1, -1, -1, + 86, 328, -1, 330, 821, 822, 823, 824, 825, 826, + 827, 828, 829, 830, 831, 832, 833, 834, 835, 836, + 837, 838, 108, 897, 755, -1, 112, 113, 83, 711, + 116, -1, 118, -1, 89, 90, 122, -1, -1, -1, + -1, -1, 724, -1, 795, -1, -1, -1, -1, -1, + -1, 868, 379, -1, -1, -1, 383, 384, 385, 810, + -1, 811, 812, 813, 795, -1, -1, 798, -1, -1, + -1, 753, 803, -1, 45, -1, 47, -1, 760, 810, + 839, -1, -1, -1, 15, 16, 17, 18, 19, 20, + -1, 908, -1, -1, -1, 66, 67, 68, 29, 100, + -1, 102, 103, 104, -1, 856, -1, 78, 79, 15, + 16, 17, 18, 19, 20, -1, -1, 118, 119, -1, + 91, 803, -1, 29, 451, 856, -1, -1, 859, 45, + -1, 47, 863, 892, -1, 894, 741, 742, 743, 744, + -1, 746, -1, -1, 60, -1, 897, 118, -1, -1, + 66, 67, 68, -1, -1, -1, -1, -1, 840, -1, + 919, 920, 78, 79, -1, -1, 897, -1, 899, -1, + 852, -1, 903, -1, -1, 91, -1, 504, 109, 110, + 111, 112, 113, 114, 115, 916, 117, 118, 119, -1, + 517, 518, 519, -1, 925, 522, -1, 524, -1, 526, + 527, 528, 108, 109, 110, 111, 112, 113, 114, 115, + -1, 117, 118, 119, -1, -1, 821, 822, 823, 824, + 825, 826, 827, 828, 829, 830, 831, 832, 833, 834, + 835, 836, 837, 838, -1, -1, -1, -1, 3, 4, + 5, 6, 7, 8, 9, 10, -1, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, -1, -1, + -1, -1, -1, 868, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, -1, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 908, 69, -1, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, -1, + 85, 86, 87, 88, 89, 90, 91, -1, 93, 94, + 95, 96, -1, -1, -1, 100, 101, 102, 103, 104, + 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 3, + 4, 5, 6, 7, 8, 9, 10, -1, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, -1, + -1, -1, -1, -1, -1, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, + -1, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, -1, 69, -1, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + -1, 85, 86, 87, 88, 89, 90, 91, -1, 93, + 94, 95, 96, -1, -1, -1, 100, 101, 102, 103, + 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, -1, 122, 123, + -1, -1, -1, 3, 4, 5, 6, -1, 8, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 71, -1, -1, -1, - 105, 106, -1, 108, 109, 110, 111, 112, 113, 114, - 115, -1, 117, 118, 119, 8, 9, -1, 123, -1, - -1, -1, -1, -1, -1, -1, 101, -1, -1, 104, - -1, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, -1, 118, 119, -1, -1, 122, -1, -1, - -1, -1, 45, -1, 47, 48, 49, -1, 51, -1, - -1, -1, 55, 56, 57, -1, -1, 60, -1, 8, - 9, -1, 65, 66, 67, 68, 69, -1, -1, 72, - -1, -1, -1, 76, -1, 78, 79, -1, 81, -1, - 83, -1, -1, -1, -1, -1, 89, 90, 91, -1, - 93, 94, 95, -1, -1, -1, 45, 100, 47, 48, - 49, -1, 51, -1, -1, -1, 55, 56, 57, -1, - -1, 60, -1, 116, 8, 9, 65, 66, 67, 68, - 69, -1, -1, 72, -1, -1, -1, 76, -1, 78, - 79, -1, 81, -1, 83, -1, -1, -1, -1, -1, - 89, 90, 91, -1, 93, 94, 95, -1, -1, -1, - -1, 45, -1, 47, 48, 49, -1, 51, -1, -1, - -1, 55, 56, 57, -1, -1, 60, 116, -1, -1, - -1, 65, 66, 67, 68, 69, -1, -1, 72, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 13, 14, + 15, 16, 17, 18, 19, 20, -1, -1, -1, -1, + -1, 45, -1, 47, 29, 45, -1, 47, 48, 49, + -1, 51, 52, -1, -1, 55, -1, -1, -1, 59, + 60, -1, 66, 67, 68, -1, 66, 67, 68, -1, + -1, 71, -1, -1, 78, 79, -1, -1, 78, 79, + 80, -1, 82, 83, -1, -1, 86, 91, 895, 89, + 90, 91, -1, -1, 94, 3, 4, 5, 6, -1, + 8, 9, -1, -1, 12, -1, -1, -1, 108, -1, + -1, -1, 112, 113, 118, -1, 116, -1, 118, -1, + 105, 106, 122, 108, 109, 110, 111, 112, 113, 114, + 115, -1, 117, 118, 119, -1, -1, 45, 123, 47, + 48, 49, -1, 51, 52, -1, -1, 55, -1, -1, + -1, 59, 60, -1, -1, -1, -1, -1, 66, 67, + 68, -1, -1, 71, -1, -1, -1, -1, -1, -1, + 78, 79, 80, -1, 82, 83, -1, -1, 86, -1, + -1, 89, 90, 91, -1, -1, 94, 3, 4, 5, + 6, -1, 8, 9, -1, -1, 12, -1, -1, -1, + 108, -1, -1, -1, 112, -1, -1, -1, 116, -1, + 118, -1, -1, -1, 122, 14, 15, 16, 17, 18, + 19, 20, -1, -1, -1, 45, -1, 47, -1, 45, + 29, 47, 48, 49, -1, 51, 52, -1, -1, 55, + -1, -1, -1, 59, 60, -1, 66, 67, 68, -1, + 66, 67, 68, -1, -1, 71, -1, -1, 78, 79, + -1, -1, 78, 79, 80, -1, 82, 83, -1, -1, + 86, 91, -1, 89, 90, 91, -1, -1, 94, 3, + 4, 5, 6, -1, 8, 9, -1, -1, -1, -1, + -1, -1, 108, -1, -1, -1, 112, -1, 118, -1, + 116, -1, 118, -1, -1, -1, 122, 106, -1, 108, + 109, 110, 111, 112, 113, 114, 115, -1, 117, 118, + 119, 45, -1, 47, -1, -1, -1, 51, 52, -1, + -1, -1, -1, -1, -1, 59, 60, -1, -1, -1, + -1, -1, 66, 67, -1, -1, -1, 71, -1, -1, + -1, -1, -1, -1, 78, 79, 80, 45, 82, 47, + -1, -1, 86, 3, 4, 5, 6, 91, 8, 9, + -1, -1, -1, -1, -1, -1, -1, -1, 66, 67, + 68, -1, -1, -1, 108, -1, -1, -1, 112, 113, + 78, 79, 116, -1, 118, 45, 120, 47, 122, -1, + -1, 51, -1, 91, -1, 45, -1, 47, -1, -1, + 60, 51, 52, -1, -1, -1, 66, 67, 68, 59, + 60, -1, -1, -1, -1, -1, 66, 67, 78, 79, + -1, 71, -1, -1, -1, -1, -1, -1, 78, 79, + 80, 91, 82, -1, -1, -1, 86, 3, 4, 5, + 6, 91, 8, 9, -1, -1, -1, -1, -1, -1, + 100, -1, -1, -1, -1, -1, -1, -1, 108, -1, + -1, -1, 112, 113, -1, -1, 116, -1, 118, -1, + -1, -1, 122, -1, -1, -1, -1, -1, -1, 45, + -1, 47, -1, -1, -1, 51, 52, -1, -1, -1, + -1, -1, -1, 59, 60, -1, -1, -1, -1, -1, + 66, 67, -1, -1, -1, 71, -1, -1, -1, -1, + -1, -1, 78, 79, 80, -1, 82, -1, -1, -1, + 86, 3, 4, 5, 6, 91, 8, 9, -1, -1, + -1, -1, -1, -1, 100, -1, -1, -1, -1, -1, + -1, -1, 108, -1, -1, -1, 112, 113, -1, -1, + 116, -1, 118, -1, -1, -1, 122, -1, -1, -1, + -1, -1, -1, 45, -1, 47, -1, -1, -1, 51, + 52, -1, -1, -1, -1, -1, -1, 59, 60, -1, + -1, -1, -1, -1, 66, 67, -1, -1, -1, 71, + -1, -1, -1, -1, -1, -1, 78, 79, 80, -1, + 82, -1, -1, -1, 86, 3, 4, 5, 6, 91, + 8, 9, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 108, -1, -1, -1, + 112, 113, -1, -1, 116, -1, 118, -1, 120, -1, + 122, -1, -1, -1, -1, -1, -1, 45, -1, 47, + -1, -1, -1, 51, 52, -1, -1, -1, -1, -1, + -1, 59, 60, -1, -1, -1, -1, -1, 66, 67, + -1, -1, -1, 71, -1, -1, -1, -1, -1, -1, + 78, 79, 80, -1, 82, -1, -1, -1, 86, 3, + 4, 5, 6, 91, 8, 9, -1, -1, -1, -1, + -1, -1, 100, -1, -1, -1, -1, -1, -1, -1, + 108, -1, -1, -1, 112, 113, -1, -1, 116, -1, + 118, -1, -1, -1, 122, -1, -1, -1, -1, -1, + -1, 45, -1, 47, -1, -1, -1, 51, 52, -1, + -1, -1, -1, -1, -1, 59, 60, -1, -1, -1, + -1, -1, 66, 67, -1, -1, -1, 71, -1, -1, + -1, -1, -1, -1, 78, 79, 80, -1, 82, -1, + -1, -1, 86, 3, 4, 5, 6, 91, 8, 9, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 108, -1, -1, -1, 112, 113, + -1, -1, 116, -1, 118, -1, 120, -1, 122, -1, + -1, -1, 45, -1, 47, 45, -1, 47, 51, -1, + -1, 51, 52, -1, -1, -1, -1, 60, -1, 59, + 60, -1, -1, 66, 67, 68, 66, 67, -1, -1, + -1, 71, -1, -1, -1, 78, 79, -1, 78, 79, + 80, -1, 82, -1, -1, -1, 86, -1, 91, -1, + -1, 91, -1, 13, 14, 15, 16, 17, 18, 19, + 20, -1, -1, -1, -1, -1, -1, -1, 108, 29, + -1, -1, 112, 113, -1, 118, 116, -1, 118, -1, + -1, -1, 122, 13, 14, 15, 16, 17, 18, 19, + 20, -1, -1, -1, -1, -1, -1, -1, -1, 29, + -1, -1, -1, 13, 14, 15, 16, 17, 18, 19, + 20, -1, -1, -1, -1, -1, -1, -1, -1, 29, + -1, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 15, 16, 17, 18, 19, 20, -1, + 50, -1, -1, -1, -1, 105, 106, 29, 108, 109, + 110, 111, 112, 113, 114, 115, -1, 117, 118, 119, + -1, 71, -1, 123, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 105, 106, -1, 108, 109, + 110, 111, 112, 113, 114, 115, -1, 117, 118, 119, + -1, 101, -1, 123, 104, -1, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, -1, 118, 119, + 8, 9, 122, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 106, -1, 108, 109, 110, 111, + 112, 113, 114, 115, -1, 117, 118, 119, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 45, -1, 47, + 48, 49, -1, 51, -1, -1, -1, 55, 56, 57, + -1, -1, 60, -1, 8, 9, -1, 65, 66, 67, + 68, 69, -1, -1, 72, -1, -1, -1, 76, -1, + 78, 79, -1, 81, -1, 83, -1, -1, -1, -1, + -1, 89, 90, 91, -1, 93, 94, 95, -1, -1, + -1, 45, 100, 47, 48, 49, -1, 51, -1, -1, + -1, 55, 56, 57, -1, -1, 60, -1, 116, 8, + 9, 65, 66, 67, 68, 69, -1, -1, 72, -1, -1, -1, 76, -1, 78, 79, -1, 81, -1, 83, -1, -1, -1, -1, -1, 89, 90, 91, -1, 93, - 94, 95, 13, 14, 15, 16, 17, 18, 19, 20, - -1, -1, -1, -1, -1, -1, -1, -1, 29, -1, - -1, -1, 116, 13, 14, 15, 16, 17, 18, 19, - 20, -1, -1, -1, -1, -1, -1, -1, -1, 29, - 13, 14, 15, 16, 17, 18, 19, 20, -1, -1, - -1, -1, -1, -1, -1, -1, 29, 13, 14, 15, + 94, 95, -1, -1, -1, -1, 45, -1, 47, 48, + 49, -1, 51, -1, -1, -1, 55, 56, 57, -1, + -1, 60, 116, -1, -1, -1, 65, 66, 67, 68, + 69, -1, -1, 72, -1, -1, -1, 76, -1, 78, + 79, -1, 81, -1, 83, -1, -1, -1, -1, -1, + 89, 90, 91, -1, 93, 94, 95, 13, 14, 15, 16, 17, 18, 19, 20, -1, -1, -1, -1, -1, - -1, -1, -1, 29, 14, 15, 16, 17, 18, 19, - 20, -1, -1, -1, -1, -1, -1, -1, -1, 29, - -1, -1, 103, -1, 105, 106, -1, 108, 109, 110, + -1, -1, -1, 29, -1, -1, -1, 116, 13, 14, + 15, 16, 17, 18, 19, 20, -1, -1, -1, -1, + -1, -1, -1, -1, 29, 13, 14, 15, 16, 17, + 18, 19, 20, -1, -1, -1, -1, -1, -1, -1, + -1, 29, 13, 14, 15, 16, 17, 18, 19, 20, + -1, -1, -1, -1, -1, -1, -1, -1, 29, 13, + 14, 15, 16, 17, 18, 19, 20, -1, -1, -1, + -1, -1, -1, -1, -1, 29, -1, 103, -1, 105, + 106, -1, 108, 109, 110, 111, 112, 113, 114, 115, + -1, 117, 118, 119, -1, -1, -1, 102, -1, -1, + 105, 106, -1, 108, 109, 110, 111, 112, 113, 114, + 115, -1, 117, 118, 119, 103, -1, 105, 106, -1, + 108, 109, 110, 111, 112, 113, 114, 115, -1, 117, + 118, 119, -1, -1, 105, 106, -1, 108, 109, 110, 111, 112, 113, 114, 115, -1, 117, 118, 119, -1, - -1, -1, 102, -1, -1, 105, 106, -1, 108, 109, - 110, 111, 112, 113, 114, 115, -1, 117, 118, 119, - -1, -1, 105, 106, -1, 108, 109, 110, 111, 112, - 113, 114, 115, -1, 117, 118, 119, 103, -1, 105, - 106, -1, 108, -1, -1, 111, 112, 113, 114, 115, - -1, 117, 118, 119, -1, -1, 106, -1, 108, 109, - 110, 111, 112, 113, 114, 115, -1, 117, 118, 119, + -1, 105, 106, -1, 108, 109, 110, 111, 112, 113, + 114, 115, -1, 117, 118, 119, 13, 14, 15, 16, + 17, 18, 19, 20, -1, -1, -1, -1, -1, -1, + -1, -1, 29, 13, 14, 15, 16, 17, 18, 19, + 20, -1, -1, -1, -1, -1, -1, -1, -1, 29, 14, 15, 16, 17, 18, 19, 20, -1, -1, -1, -1, -1, -1, -1, -1, 29, 15, 16, 17, 18, 19, 20, -1, -1, -1, -1, -1, -1, -1, -1, 29, 15, 16, 17, 18, 19, 20, -1, -1, -1, - -1, -1, -1, -1, -1, 29, 15, 16, 17, 18, - 19, 20, -1, -1, -1, -1, -1, -1, -1, -1, - 29, 15, 16, 17, 18, 19, 20, -1, -1, -1, - -1, -1, -1, -1, -1, 29, 15, 16, 17, 18, - 19, 20, -1, -1, -1, -1, -1, -1, -1, -1, - 29, -1, 106, -1, 108, -1, -1, 111, 112, 113, + -1, -1, -1, -1, -1, 29, -1, -1, 17, 18, + 19, 20, -1, -1, -1, -1, 103, -1, 105, 106, + 29, 108, -1, -1, 111, 112, 113, 114, 115, -1, + 117, 118, 119, -1, -1, 105, 106, -1, 108, -1, + -1, 111, 112, 113, 114, 115, -1, 117, 118, 119, + -1, -1, 106, 0, 108, -1, -1, 111, 112, 113, 114, 115, -1, 117, 118, 119, -1, 106, -1, 108, - 109, 110, 111, 112, 113, 114, 115, -1, 117, 118, - 119, -1, -1, -1, 108, 109, 110, 111, 112, 113, - 114, 115, -1, 117, 118, 119, -1, -1, -1, -1, - 109, 110, 111, 112, 113, 114, 115, 0, 117, 118, - 119, -1, 106, -1, 108, -1, -1, 111, 112, 113, - 114, 115, -1, 117, 118, 119, -1, -1, -1, 108, -1, -1, 111, 112, 113, 114, 115, -1, 117, 118, - 119, 15, 16, 17, 18, 19, 20, -1, -1, -1, - -1, 44, -1, -1, -1, 29, -1, 44, -1, -1, - -1, 54, -1, -1, -1, 58, -1, 54, 61, -1, - -1, 58, -1, -1, 61, -1, -1, 70, -1, -1, - 73, 74, 75, 70, -1, -1, 73, 74, 75, -1, - -1, 84, -1, -1, -1, 88, -1, 84, -1, 92, - -1, 88, -1, -1, -1, 92, -1, -1, -1, 102, - 8, 9, -1, -1, 12, 102, -1, -1, -1, -1, - -1, -1, -1, -1, 8, 9, -1, -1, 12, -1, - -1, -1, -1, -1, 121, -1, -1, 111, 112, 113, - 114, 115, -1, 117, 118, 119, -1, 45, -1, 47, - 48, 49, -1, 51, -1, -1, -1, 55, -1, -1, - -1, 45, 60, 47, 48, 49, -1, 51, 66, 67, - 68, 55, 8, 9, -1, -1, 60, -1, -1, -1, - 78, 79, 66, 67, 68, 83, 8, 9, -1, -1, - -1, 89, 90, 91, 78, 79, 94, -1, -1, 83, - -1, -1, -1, -1, -1, 89, 90, 91, -1, 45, - 94, 47, 48, 49, -1, 51, -1, -1, -1, -1, - -1, -1, -1, 45, 60, 47, -1, -1, -1, 51, - 66, 67, 68, -1, -1, 9, -1, -1, 60, -1, - -1, -1, 78, 79, 66, 67, 68, -1, -1, 9, - -1, -1, -1, 89, -1, 91, 78, 79, 94, -1, - -1, -1, -1, -1, -1, -1, -1, 89, -1, 91, - -1, 45, 94, 47, 48, 49, -1, 51, -1, -1, - -1, 55, -1, -1, -1, 45, 60, 47, 48, 49, - -1, 51, 66, 67, 68, 55, -1, 9, -1, -1, - 60, -1, -1, -1, 78, 79, 66, 67, 68, 83, - -1, 9, -1, -1, -1, 89, 90, 91, 78, 79, - 94, -1, -1, 83, -1, -1, -1, -1, -1, 89, - 90, 91, -1, 45, 94, 47, 48, -1, -1, 51, - -1, -1, -1, 55, -1, -1, -1, 45, 60, 47, - 48, -1, -1, 51, 66, 67, 68, 55, -1, -1, - -1, -1, 60, -1, -1, -1, 78, 79, 66, 67, - 68, 83, -1, 44, -1, -1, -1, 89, 90, 91, - 78, 79, 94, 54, -1, 83, -1, 58, -1, -1, - 61, 89, 90, 91, -1, -1, 94, 44, -1, 70, - -1, -1, 73, 74, 75, -1, -1, 54, -1, -1, + 119, -1, -1, -1, 108, -1, -1, 111, 112, 113, + 114, 115, -1, 117, 118, 119, -1, 44, -1, -1, + 109, 110, 111, 112, 113, 114, 115, 54, 117, 118, + 119, 58, -1, -1, 61, -1, -1, 17, 18, 19, + 20, 8, 9, 70, -1, -1, 73, 74, 75, 29, + -1, -1, -1, -1, -1, -1, -1, 84, -1, -1, + -1, 88, -1, -1, -1, 92, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 102, -1, -1, 45, -1, + 47, 48, 49, -1, 51, -1, -1, -1, -1, -1, + -1, -1, -1, 60, -1, -1, -1, -1, -1, 66, + 67, 68, -1, 8, 9, -1, -1, -1, -1, -1, + -1, 78, 79, -1, -1, -1, -1, -1, 9, -1, + -1, -1, 89, -1, 91, -1, -1, 94, -1, -1, + -1, 111, 112, 113, 114, 115, -1, 117, 118, 119, + 45, -1, 47, -1, -1, -1, 51, -1, -1, -1, + -1, -1, -1, -1, 45, 60, 47, 48, 49, -1, + 51, 66, 67, 68, 55, -1, 9, -1, -1, 60, + -1, -1, -1, 78, 79, 66, 67, 68, -1, -1, + 9, -1, -1, -1, 89, -1, 91, 78, 79, 94, + -1, -1, 83, -1, -1, -1, -1, -1, 89, 90, + 91, -1, 45, 94, 47, 48, 49, -1, 51, -1, + -1, -1, 55, -1, -1, -1, 45, 60, 47, 48, + -1, -1, 51, 66, 67, 68, 55, -1, 9, -1, + -1, 60, -1, -1, -1, 78, 79, 66, 67, 68, + 83, -1, -1, -1, -1, -1, 89, 90, 91, 78, + 79, 94, -1, -1, 83, -1, -1, -1, -1, -1, + 89, 90, 91, -1, 45, 94, 47, 48, -1, -1, + 51, -1, -1, -1, 55, -1, -1, -1, -1, 60, + -1, -1, -1, -1, -1, 66, 67, 68, -1, 44, + -1, -1, -1, -1, -1, -1, -1, 78, 79, 54, + -1, -1, 83, 58, -1, -1, 61, -1, 89, 90, + 91, -1, -1, 94, 44, 70, -1, -1, 73, 74, + 75, -1, -1, -1, 54, -1, -1, -1, 58, 84, + -1, 61, -1, 88, -1, -1, -1, 92, 44, -1, + 70, -1, -1, 73, 74, 75, -1, 102, 54, -1, + -1, -1, 58, -1, 84, 61, -1, -1, 88, -1, + -1, -1, 92, 44, 70, -1, 121, 73, 74, 75, + -1, -1, 102, 54, -1, -1, -1, 58, 84, -1, + 61, -1, 88, -1, -1, -1, 92, 44, -1, 70, + -1, 121, 73, 74, 75, -1, 102, 54, -1, -1, -1, 58, -1, 84, 61, -1, -1, 88, -1, -1, - -1, 92, 44, 70, -1, -1, 73, 74, 75, -1, - -1, 102, 54, -1, -1, -1, 58, 84, -1, 61, - -1, 88, -1, -1, -1, 92, 44, -1, 70, -1, - 121, 73, 74, 75, -1, 102, 54, -1, -1, -1, - 58, -1, 84, 61, -1, -1, 88, -1, -1, -1, - 92, -1, 70, -1, 121, 73, 74, 75, -1, -1, - 102, -1, -1, -1, -1, -1, 84, -1, -1, -1, - 88, -1, -1, -1, 92, -1, -1, -1, -1, 121, - -1, -1, -1, -1, 102, -1, -1, -1, -1, -1, + -1, 92, -1, 70, -1, 121, 73, 74, 75, -1, + -1, 102, -1, -1, -1, -1, -1, 84, -1, -1, + -1, 88, -1, -1, -1, 92, -1, -1, -1, -1, + 121, -1, -1, -1, -1, 102, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 121 + -1, -1, -1, -1, 121 }; #define YYPURE 1 @@ -2296,38 +2419,38 @@ yyreduce: switch (yyn) { case 2: -#line 377 "cppBison.yxx" +#line 379 "cppBison.yxx" { current_expr = yyvsp[0].u.expr; } break; case 3: -#line 381 "cppBison.yxx" +#line 383 "cppBison.yxx" { current_type = yyvsp[0].u.type; } break; case 9: -#line 399 "cppBison.yxx" +#line 401 "cppBison.yxx" { delete yyvsp[-1].u.expr; } break; case 10: -#line 411 "cppBison.yxx" +#line 413 "cppBison.yxx" { push_storage_class((current_storage_class & ~CPPInstance::SC_c_binding) | (yyvsp[-1].u.integer & CPPInstance::SC_c_binding)); } break; case 11: -#line 416 "cppBison.yxx" +#line 418 "cppBison.yxx" { pop_storage_class(); } break; case 19: -#line 430 "cppBison.yxx" +#line 432 "cppBison.yxx" { if (publish_nest_level != 0) { yyerror("Unclosed __begin_publish", publish_loc); @@ -2342,7 +2465,7 @@ case 19: } break; case 20: -#line 443 "cppBison.yxx" +#line 445 "cppBison.yxx" { if (publish_nest_level != 1) { yyerror("Unmatched __end_publish", yylsp[0]); @@ -2353,31 +2476,31 @@ case 20: } break; case 21: -#line 452 "cppBison.yxx" +#line 454 "cppBison.yxx" { current_scope->set_current_vis(V_published); } break; case 22: -#line 456 "cppBison.yxx" +#line 458 "cppBison.yxx" { current_scope->set_current_vis(V_public); } break; case 23: -#line 460 "cppBison.yxx" +#line 462 "cppBison.yxx" { current_scope->set_current_vis(V_protected); } break; case 24: -#line 464 "cppBison.yxx" +#line 466 "cppBison.yxx" { current_scope->set_current_vis(V_private); } break; case 25: -#line 471 "cppBison.yxx" +#line 473 "cppBison.yxx" { CPPScope *new_scope = new CPPScope(current_scope, CPPNameComponent("temp"), V_public); @@ -2385,26 +2508,26 @@ case 25: } break; case 26: -#line 477 "cppBison.yxx" +#line 479 "cppBison.yxx" { delete current_scope; pop_scope(); } break; case 27: -#line 486 "cppBison.yxx" +#line 488 "cppBison.yxx" { yyval.u.integer = 0; } break; case 28: -#line 490 "cppBison.yxx" +#line 492 "cppBison.yxx" { yyval.u.integer = yyvsp[-1].u.integer | (int)CPPInstance::SC_extern; } break; case 29: -#line 494 "cppBison.yxx" +#line 496 "cppBison.yxx" { yyval.u.integer = yyvsp[-2].u.integer | (int)CPPInstance::SC_extern; if (yyvsp[0].str == "C") { @@ -2417,55 +2540,55 @@ case 29: } break; case 30: -#line 505 "cppBison.yxx" +#line 507 "cppBison.yxx" { yyval.u.integer = yyvsp[-1].u.integer | (int)CPPInstance::SC_static; } break; case 31: -#line 509 "cppBison.yxx" +#line 511 "cppBison.yxx" { yyval.u.integer = yyvsp[-1].u.integer | (int)CPPInstance::SC_inline; } break; case 32: -#line 513 "cppBison.yxx" +#line 515 "cppBison.yxx" { yyval.u.integer = yyvsp[-1].u.integer | (int)CPPInstance::SC_virtual; } break; case 33: -#line 517 "cppBison.yxx" +#line 519 "cppBison.yxx" { yyval.u.integer = yyvsp[-1].u.integer | (int)CPPInstance::SC_explicit; } break; case 34: -#line 521 "cppBison.yxx" +#line 523 "cppBison.yxx" { yyval.u.integer = yyvsp[-1].u.integer | (int)CPPInstance::SC_volatile; } break; case 35: -#line 525 "cppBison.yxx" +#line 527 "cppBison.yxx" { yyval.u.integer = yyvsp[-1].u.integer | (int)CPPInstance::SC_mutable; } break; case 36: -#line 529 "cppBison.yxx" +#line 531 "cppBison.yxx" { yyval.u.integer = yyvsp[-1].u.integer | (int)CPPInstance::SC_register; } break; case 37: -#line 536 "cppBison.yxx" +#line 538 "cppBison.yxx" { /* multiple_var_declaration adds itself to the scope. */ } break; case 38: -#line 540 "cppBison.yxx" +#line 542 "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 @@ -2476,7 +2599,7 @@ case 38: } break; case 39: -#line 549 "cppBison.yxx" +#line 551 "cppBison.yxx" { if (yyvsp[-1].u.instance != (CPPInstance *)NULL) { yyvsp[-1].u.instance->_storage_class |= (current_storage_class | yyvsp[-2].u.integer); @@ -2486,7 +2609,7 @@ case 39: } break; case 40: -#line 560 "cppBison.yxx" +#line 562 "cppBison.yxx" { // We don't need to push/pop type, because we can't nest // multiple_var_declarations. @@ -2499,13 +2622,13 @@ case 40: } break; case 41: -#line 571 "cppBison.yxx" +#line 573 "cppBison.yxx" { pop_storage_class(); } break; case 42: -#line 575 "cppBison.yxx" +#line 577 "cppBison.yxx" { // We don't need to push/pop type, because we can't nest // multiple_var_declarations. @@ -2514,13 +2637,13 @@ case 42: } break; case 43: -#line 582 "cppBison.yxx" +#line 584 "cppBison.yxx" { pop_storage_class(); } break; case 44: -#line 593 "cppBison.yxx" +#line 595 "cppBison.yxx" { CPPInstance *inst = new CPPInstance(current_type, yyvsp[-1].u.inst_ident, current_storage_class, @@ -2530,7 +2653,7 @@ case 44: } break; case 45: -#line 601 "cppBison.yxx" +#line 603 "cppBison.yxx" { CPPInstance *inst = new CPPInstance(current_type, yyvsp[-3].u.inst_ident, current_storage_class, @@ -2540,7 +2663,7 @@ case 45: } break; case 46: -#line 612 "cppBison.yxx" +#line 614 "cppBison.yxx" { yyvsp[-1].u.inst_ident->add_modifier(IIT_const); CPPInstance *inst = new CPPInstance(current_type, yyvsp[-1].u.inst_ident, @@ -2551,7 +2674,7 @@ case 46: } break; case 47: -#line 621 "cppBison.yxx" +#line 623 "cppBison.yxx" { yyvsp[-3].u.inst_ident->add_modifier(IIT_const); CPPInstance *inst = new CPPInstance(current_type, yyvsp[-3].u.inst_ident, @@ -2562,7 +2685,7 @@ case 47: } break; case 48: -#line 634 "cppBison.yxx" +#line 636 "cppBison.yxx" { // We don't need to push/pop type, because we can't nest // multiple_var_declarations. @@ -2575,13 +2698,13 @@ case 48: } break; case 49: -#line 645 "cppBison.yxx" +#line 647 "cppBison.yxx" { pop_storage_class(); } break; case 50: -#line 649 "cppBison.yxx" +#line 651 "cppBison.yxx" { // We don't need to push/pop type, because we can't nest // multiple_var_declarations. @@ -2590,13 +2713,13 @@ case 50: } break; case 51: -#line 656 "cppBison.yxx" +#line 658 "cppBison.yxx" { pop_storage_class(); } break; case 52: -#line 660 "cppBison.yxx" +#line 662 "cppBison.yxx" { if (yyvsp[-1].u.instance != (CPPDeclaration *)NULL) { CPPInstance *inst = yyvsp[-1].u.instance->as_instance(); @@ -2609,7 +2732,7 @@ case 52: } break; case 53: -#line 674 "cppBison.yxx" +#line 676 "cppBison.yxx" { CPPInstance *inst = new CPPInstance(current_type, yyvsp[-1].u.inst_ident, current_storage_class, @@ -2619,7 +2742,7 @@ case 53: } break; case 54: -#line 682 "cppBison.yxx" +#line 684 "cppBison.yxx" { CPPInstance *inst = new CPPInstance(current_type, yyvsp[-3].u.inst_ident, current_storage_class, @@ -2629,7 +2752,7 @@ case 54: } break; case 55: -#line 693 "cppBison.yxx" +#line 695 "cppBison.yxx" { yyvsp[-1].u.inst_ident->add_modifier(IIT_const); CPPInstance *inst = new CPPInstance(current_type, yyvsp[-1].u.inst_ident, @@ -2640,7 +2763,7 @@ case 55: } break; case 56: -#line 702 "cppBison.yxx" +#line 704 "cppBison.yxx" { yyvsp[-3].u.inst_ident->add_modifier(IIT_const); CPPInstance *inst = new CPPInstance(current_type, yyvsp[-3].u.inst_ident, @@ -2651,13 +2774,13 @@ case 56: } break; case 57: -#line 716 "cppBison.yxx" +#line 718 "cppBison.yxx" { push_scope(yyvsp[-1].u.identifier->get_scope(current_scope, global_scope)); } break; case 58: -#line 720 "cppBison.yxx" +#line 722 "cppBison.yxx" { pop_scope(); CPPType *type; @@ -2677,13 +2800,13 @@ case 58: } break; case 59: -#line 738 "cppBison.yxx" +#line 740 "cppBison.yxx" { push_scope(yyvsp[-1].u.identifier->get_scope(current_scope, global_scope)); } break; case 60: -#line 742 "cppBison.yxx" +#line 744 "cppBison.yxx" { pop_scope(); CPPType *type; @@ -2703,13 +2826,13 @@ case 60: } break; case 61: -#line 762 "cppBison.yxx" +#line 764 "cppBison.yxx" { push_scope(yyvsp[-1].u.identifier->get_scope(current_scope, global_scope)); } break; case 62: -#line 766 "cppBison.yxx" +#line 768 "cppBison.yxx" { pop_scope(); if (yyvsp[-5].u.identifier->is_scoped()) { @@ -2730,13 +2853,13 @@ case 62: } break; case 63: -#line 792 "cppBison.yxx" +#line 794 "cppBison.yxx" { push_scope(yyvsp[-2].u.inst_ident->get_scope(current_scope, global_scope)); } break; case 64: -#line 796 "cppBison.yxx" +#line 798 "cppBison.yxx" { pop_scope(); CPPType *type = yyvsp[-9].u.identifier->find_type(current_scope, global_scope, false, current_lexer); @@ -2749,13 +2872,13 @@ case 64: } break; case 65: -#line 807 "cppBison.yxx" +#line 809 "cppBison.yxx" { push_scope(yyvsp[-2].u.inst_ident->get_scope(current_scope, global_scope)); } break; case 66: -#line 811 "cppBison.yxx" +#line 813 "cppBison.yxx" { pop_scope(); CPPType *type = yyvsp[-10].u.identifier->find_type(current_scope, global_scope, false, current_lexer); @@ -2768,7 +2891,7 @@ case 66: } break; case 67: -#line 824 "cppBison.yxx" +#line 826 "cppBison.yxx" { if (yyvsp[-3].u.identifier != NULL) { push_scope(yyvsp[-3].u.identifier->get_scope(current_scope, global_scope)); @@ -2776,7 +2899,7 @@ case 67: } break; case 68: -#line 830 "cppBison.yxx" +#line 832 "cppBison.yxx" { if (yyvsp[-7].u.identifier != NULL) { pop_scope(); @@ -2803,7 +2926,7 @@ case 68: } break; case 69: -#line 855 "cppBison.yxx" +#line 857 "cppBison.yxx" { if (yyvsp[-4].u.identifier != NULL) { push_scope(yyvsp[-4].u.identifier->get_scope(current_scope, global_scope)); @@ -2811,7 +2934,7 @@ case 69: } break; case 70: -#line 861 "cppBison.yxx" +#line 863 "cppBison.yxx" { if (yyvsp[-8].u.identifier != NULL) { pop_scope(); @@ -2829,7 +2952,7 @@ case 70: } break; case 71: -#line 881 "cppBison.yxx" +#line 883 "cppBison.yxx" { CPPDeclaration *decl = yyvsp[0].u.identifier->find_symbol(current_scope, global_scope, current_lexer); @@ -2841,277 +2964,277 @@ case 71: } break; case 72: -#line 894 "cppBison.yxx" +#line 896 "cppBison.yxx" { yyval.u.integer = 0; } break; case 73: -#line 898 "cppBison.yxx" +#line 900 "cppBison.yxx" { yyval.u.integer = (int)CPPFunctionType::F_const_method; } break; case 74: -#line 902 "cppBison.yxx" +#line 904 "cppBison.yxx" { yyval.u.integer = yyvsp[-3].u.integer; } break; case 75: -#line 906 "cppBison.yxx" +#line 908 "cppBison.yxx" { yyval.u.integer = yyvsp[-4].u.integer; } break; case 76: -#line 913 "cppBison.yxx" +#line 915 "cppBison.yxx" { yyval.str = "!"; } break; case 77: -#line 917 "cppBison.yxx" +#line 919 "cppBison.yxx" { yyval.str = "~"; } break; case 78: -#line 921 "cppBison.yxx" +#line 923 "cppBison.yxx" { yyval.str = "*"; } break; case 79: -#line 925 "cppBison.yxx" +#line 927 "cppBison.yxx" { yyval.str = "/"; } break; case 80: -#line 929 "cppBison.yxx" +#line 931 "cppBison.yxx" { yyval.str = "%"; } break; case 81: -#line 933 "cppBison.yxx" +#line 935 "cppBison.yxx" { yyval.str = "+"; } break; case 82: -#line 937 "cppBison.yxx" +#line 939 "cppBison.yxx" { yyval.str = "-"; } break; case 83: -#line 941 "cppBison.yxx" +#line 943 "cppBison.yxx" { yyval.str = "|"; } break; case 84: -#line 945 "cppBison.yxx" +#line 947 "cppBison.yxx" { yyval.str = "&"; } break; case 85: -#line 949 "cppBison.yxx" +#line 951 "cppBison.yxx" { yyval.str = "^"; } break; case 86: -#line 953 "cppBison.yxx" +#line 955 "cppBison.yxx" { yyval.str = "||"; } break; case 87: -#line 957 "cppBison.yxx" +#line 959 "cppBison.yxx" { yyval.str = "&&"; } break; case 88: -#line 961 "cppBison.yxx" +#line 963 "cppBison.yxx" { yyval.str = "=="; } break; case 89: -#line 965 "cppBison.yxx" +#line 967 "cppBison.yxx" { yyval.str = "!="; } break; case 90: -#line 969 "cppBison.yxx" +#line 971 "cppBison.yxx" { yyval.str = "<="; } break; case 91: -#line 973 "cppBison.yxx" +#line 975 "cppBison.yxx" { yyval.str = ">="; } break; case 92: -#line 977 "cppBison.yxx" +#line 979 "cppBison.yxx" { yyval.str = "<"; } break; case 93: -#line 981 "cppBison.yxx" +#line 983 "cppBison.yxx" { yyval.str = ">"; } break; case 94: -#line 985 "cppBison.yxx" +#line 987 "cppBison.yxx" { yyval.str = "<<"; } break; case 95: -#line 989 "cppBison.yxx" +#line 991 "cppBison.yxx" { yyval.str = ">>"; } break; case 96: -#line 993 "cppBison.yxx" +#line 995 "cppBison.yxx" { yyval.str = "="; } break; case 97: -#line 997 "cppBison.yxx" +#line 999 "cppBison.yxx" { yyval.str = ","; } break; case 98: -#line 1001 "cppBison.yxx" +#line 1003 "cppBison.yxx" { yyval.str = "++"; } break; case 99: -#line 1005 "cppBison.yxx" +#line 1007 "cppBison.yxx" { yyval.str = "--"; } break; case 100: -#line 1009 "cppBison.yxx" +#line 1011 "cppBison.yxx" { yyval.str = "*="; } break; case 101: -#line 1013 "cppBison.yxx" +#line 1015 "cppBison.yxx" { yyval.str = "/="; } break; case 102: -#line 1017 "cppBison.yxx" +#line 1019 "cppBison.yxx" { yyval.str = "%="; } break; case 103: -#line 1021 "cppBison.yxx" +#line 1023 "cppBison.yxx" { yyval.str = "+="; } break; case 104: -#line 1025 "cppBison.yxx" +#line 1027 "cppBison.yxx" { yyval.str = "-="; } break; case 105: -#line 1029 "cppBison.yxx" +#line 1031 "cppBison.yxx" { yyval.str = "|="; } break; case 106: -#line 1033 "cppBison.yxx" +#line 1035 "cppBison.yxx" { yyval.str = "&="; } break; case 107: -#line 1037 "cppBison.yxx" +#line 1039 "cppBison.yxx" { yyval.str = "^="; } break; case 108: -#line 1041 "cppBison.yxx" +#line 1043 "cppBison.yxx" { yyval.str = "<<="; } break; case 109: -#line 1045 "cppBison.yxx" +#line 1047 "cppBison.yxx" { yyval.str = ">>="; } break; case 110: -#line 1049 "cppBison.yxx" +#line 1051 "cppBison.yxx" { yyval.str = "->"; } break; case 111: -#line 1053 "cppBison.yxx" +#line 1055 "cppBison.yxx" { yyval.str = "[]"; } break; case 112: -#line 1057 "cppBison.yxx" +#line 1059 "cppBison.yxx" { yyval.str = "()"; } break; case 113: -#line 1061 "cppBison.yxx" +#line 1063 "cppBison.yxx" { yyval.str = "new"; } break; case 114: -#line 1065 "cppBison.yxx" +#line 1067 "cppBison.yxx" { yyval.str = "delete"; } break; case 117: -#line 1077 "cppBison.yxx" +#line 1079 "cppBison.yxx" { push_scope(new CPPTemplateScope(current_scope)); } break; case 118: -#line 1081 "cppBison.yxx" +#line 1083 "cppBison.yxx" { pop_scope(); } break; case 121: -#line 1093 "cppBison.yxx" +#line 1095 "cppBison.yxx" { CPPTemplateScope *ts = current_scope->as_template_scope(); assert(ts != NULL); @@ -3119,7 +3242,7 @@ case 121: } break; case 122: -#line 1099 "cppBison.yxx" +#line 1101 "cppBison.yxx" { CPPTemplateScope *ts = current_scope->as_template_scope(); assert(ts != NULL); @@ -3127,19 +3250,19 @@ case 122: } break; case 123: -#line 1108 "cppBison.yxx" +#line 1110 "cppBison.yxx" { yyval.u.decl = CPPType::new_type(new CPPClassTemplateParameter(yyvsp[0].u.identifier)); } break; case 124: -#line 1112 "cppBison.yxx" +#line 1114 "cppBison.yxx" { yyval.u.decl = CPPType::new_type(new CPPClassTemplateParameter(yyvsp[-2].u.identifier, yyvsp[0].u.type)); } break; case 125: -#line 1116 "cppBison.yxx" +#line 1118 "cppBison.yxx" { CPPInstance *inst = new CPPInstance(yyvsp[-2].u.type, yyvsp[-1].u.inst_ident, 0, yylsp[-1].file); inst->set_initializer(yyvsp[0].u.expr); @@ -3147,7 +3270,7 @@ case 125: } break; case 126: -#line 1122 "cppBison.yxx" +#line 1124 "cppBison.yxx" { yyvsp[-1].u.inst_ident->add_modifier(IIT_const); CPPInstance *inst = new CPPInstance(yyvsp[-2].u.type, yyvsp[-1].u.inst_ident, 0, yylsp[-1].file); @@ -3156,39 +3279,39 @@ case 126: } break; case 127: -#line 1132 "cppBison.yxx" +#line 1134 "cppBison.yxx" { yyval.u.type = CPPType::new_type(yyvsp[0].u.simple_type); } break; case 128: -#line 1136 "cppBison.yxx" +#line 1138 "cppBison.yxx" { yywarning("Not a type: " + yyvsp[0].u.identifier->get_fully_scoped_name(), yylsp[0]); yyval.u.type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_unknown)); } break; case 129: -#line 1141 "cppBison.yxx" +#line 1143 "cppBison.yxx" { yyval.u.type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); assert(yyval.u.type != NULL); } break; case 130: -#line 1146 "cppBison.yxx" +#line 1148 "cppBison.yxx" { yyval.u.type = CPPType::new_type(new CPPTBDType(yyvsp[0].u.identifier)); } break; case 131: -#line 1154 "cppBison.yxx" +#line 1156 "cppBison.yxx" { yyval.u.inst_ident = new CPPInstanceIdentifier(yyvsp[0].u.identifier); } break; case 132: -#line 1158 "cppBison.yxx" +#line 1160 "cppBison.yxx" { // For an operator function. We implement this simply by building a // ficticious name for the function; in other respects it's just @@ -3204,183 +3327,191 @@ case 132: } break; case 133: -#line 1172 "cppBison.yxx" +#line 1174 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_const); } break; case 134: -#line 1177 "cppBison.yxx" +#line 1179 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_pointer); } break; case 135: -#line 1182 "cppBison.yxx" +#line 1184 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_reference); } break; case 136: -#line 1187 "cppBison.yxx" +#line 1189 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_scoped_pointer_modifier(yyvsp[-2].u.identifier); } break; case 137: -#line 1192 "cppBison.yxx" +#line 1194 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[-3].u.inst_ident; yyval.u.inst_ident->add_array_modifier(yyvsp[-1].u.expr); } break; case 138: -#line 1197 "cppBison.yxx" +#line 1199 "cppBison.yxx" { // bitfield definition. We ignore the bitfield for now. yyval.u.inst_ident = yyvsp[-2].u.inst_ident; } break; case 139: -#line 1202 "cppBison.yxx" +#line 1204 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[-1].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_paren); } break; case 140: -#line 1207 "cppBison.yxx" +#line 1209 "cppBison.yxx" { push_scope(yyvsp[-1].u.inst_ident->get_scope(current_scope, global_scope)); } break; case 141: -#line 1211 "cppBison.yxx" +#line 1213 "cppBison.yxx" { pop_scope(); yyval.u.inst_ident = yyvsp[-5].u.inst_ident; - yyval.u.inst_ident->add_func_modifier(yyvsp[-2].u.param_list, yyvsp[0].u.integer); + if (yyvsp[-2].u.param_list->is_parameter_expr() && yyvsp[0].u.integer == 0) { + // Oops, this must have been an instance declaration with a + // parameter list, not a function prototype. + yyval.u.inst_ident->add_initializer_modifier(yyvsp[-2].u.param_list); + + } else { + // This was (probably) a function prototype. + yyval.u.inst_ident->add_func_modifier(yyvsp[-2].u.param_list, yyvsp[0].u.integer); + } } break; case 142: -#line 1221 "cppBison.yxx" +#line 1231 "cppBison.yxx" { yyval.u.param_list = new CPPParameterList; } break; case 143: -#line 1225 "cppBison.yxx" +#line 1235 "cppBison.yxx" { yyval.u.param_list = new CPPParameterList; yyval.u.param_list->_includes_ellipsis = true; } break; case 144: -#line 1230 "cppBison.yxx" +#line 1240 "cppBison.yxx" { yyval.u.param_list = yyvsp[0].u.param_list; } break; case 145: -#line 1234 "cppBison.yxx" +#line 1244 "cppBison.yxx" { yyval.u.param_list = yyvsp[-2].u.param_list; yyval.u.param_list->_includes_ellipsis = true; } break; case 146: -#line 1239 "cppBison.yxx" +#line 1249 "cppBison.yxx" { yyval.u.param_list = yyvsp[-1].u.param_list; yyval.u.param_list->_includes_ellipsis = true; } break; case 147: -#line 1247 "cppBison.yxx" +#line 1257 "cppBison.yxx" { yyval.u.param_list = new CPPParameterList; yyval.u.param_list->_parameters.push_back(yyvsp[0].u.instance); } break; case 148: -#line 1252 "cppBison.yxx" +#line 1262 "cppBison.yxx" { yyval.u.param_list = yyvsp[-2].u.param_list; yyval.u.param_list->_parameters.push_back(yyvsp[0].u.instance); } break; case 149: -#line 1260 "cppBison.yxx" +#line 1270 "cppBison.yxx" { yyval.u.expr = (CPPExpression *)NULL; } break; case 150: -#line 1264 "cppBison.yxx" +#line 1274 "cppBison.yxx" { yyval.u.expr = yyvsp[0].u.expr; } break; case 151: -#line 1271 "cppBison.yxx" +#line 1281 "cppBison.yxx" { yyval.u.expr = (CPPExpression *)NULL; } break; case 152: -#line 1275 "cppBison.yxx" +#line 1285 "cppBison.yxx" { yyval.u.expr = yyvsp[0].u.expr; } break; case 153: -#line 1282 "cppBison.yxx" +#line 1292 "cppBison.yxx" { yyval.u.expr = (CPPExpression *)NULL; } break; case 154: -#line 1286 "cppBison.yxx" +#line 1296 "cppBison.yxx" { yyval.u.expr = (CPPExpression *)NULL; } break; case 155: -#line 1290 "cppBison.yxx" +#line 1300 "cppBison.yxx" { yyval.u.expr = (CPPExpression *)NULL; } break; case 156: -#line 1294 "cppBison.yxx" +#line 1304 "cppBison.yxx" { yyval.u.expr = yyvsp[-1].u.expr; } break; case 157: -#line 1298 "cppBison.yxx" +#line 1308 "cppBison.yxx" { yyval.u.expr = (CPPExpression *)NULL; } break; case 161: -#line 1311 "cppBison.yxx" +#line 1321 "cppBison.yxx" { } break; case 165: -#line 1320 "cppBison.yxx" +#line 1330 "cppBison.yxx" { yyval.u.instance = new CPPInstance(yyvsp[-2].u.type, yyvsp[-1].u.inst_ident, 0, yylsp[-1].file); yyval.u.instance->set_initializer(yyvsp[0].u.expr); } break; case 166: -#line 1325 "cppBison.yxx" +#line 1335 "cppBison.yxx" { yywarning("Not a type: " + yyvsp[-2].u.identifier->get_fully_scoped_name(), yylsp[-2]); CPPType *type = @@ -3390,7 +3521,7 @@ case 166: } break; case 167: -#line 1333 "cppBison.yxx" +#line 1343 "cppBison.yxx" { yyvsp[-1].u.inst_ident->add_modifier(IIT_const); yyval.u.instance = new CPPInstance(yyvsp[-2].u.type, yyvsp[-1].u.inst_ident, 0, yylsp[-1].file); @@ -3398,238 +3529,229 @@ case 167: } break; case 168: -#line 1342 "cppBison.yxx" +#line 1349 "cppBison.yxx" +{ + CPPType *type = + CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_parameter)); + yyval.u.instance = new CPPInstance(type, "expr"); + yyval.u.instance->set_initializer(yyvsp[0].u.expr); +} + break; +case 169: +#line 1359 "cppBison.yxx" { yyval.u.inst_ident = new CPPInstanceIdentifier((CPPIdentifier *)NULL); } break; -case 169: -#line 1346 "cppBison.yxx" -{ - yyval.u.inst_ident = new CPPInstanceIdentifier(yyvsp[0].u.identifier); -} - break; case 170: -#line 1350 "cppBison.yxx" +#line 1363 "cppBison.yxx" { yyval.u.inst_ident = new CPPInstanceIdentifier(yyvsp[0].u.identifier); } break; case 171: -#line 1354 "cppBison.yxx" +#line 1367 "cppBison.yxx" +{ + yyval.u.inst_ident = new CPPInstanceIdentifier(yyvsp[0].u.identifier); +} + break; +case 172: +#line 1371 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_const); } break; -case 172: -#line 1359 "cppBison.yxx" +case 173: +#line 1376 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_pointer); } break; -case 173: -#line 1364 "cppBison.yxx" +case 174: +#line 1381 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_reference); } break; -case 174: -#line 1369 "cppBison.yxx" +case 175: +#line 1386 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_scoped_pointer_modifier(yyvsp[-2].u.identifier); } break; -case 175: -#line 1374 "cppBison.yxx" +case 176: +#line 1391 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[-3].u.inst_ident; yyval.u.inst_ident->add_array_modifier(yyvsp[-1].u.expr); } break; -case 176: -#line 1382 "cppBison.yxx" +case 177: +#line 1399 "cppBison.yxx" { yyval.u.inst_ident = new CPPInstanceIdentifier((CPPIdentifier *)NULL); } break; -case 177: -#line 1386 "cppBison.yxx" -{ - yyval.u.inst_ident = new CPPInstanceIdentifier(yyvsp[0].u.identifier); -} - break; case 178: -#line 1390 "cppBison.yxx" +#line 1403 "cppBison.yxx" { yyval.u.inst_ident = new CPPInstanceIdentifier(yyvsp[0].u.identifier); } break; case 179: -#line 1394 "cppBison.yxx" +#line 1407 "cppBison.yxx" +{ + yyval.u.inst_ident = new CPPInstanceIdentifier(yyvsp[0].u.identifier); +} + break; +case 180: +#line 1411 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_const); } break; -case 180: -#line 1399 "cppBison.yxx" +case 181: +#line 1416 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_pointer); } break; -case 181: -#line 1404 "cppBison.yxx" +case 182: +#line 1421 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_reference); } break; -case 182: -#line 1409 "cppBison.yxx" +case 183: +#line 1426 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_scoped_pointer_modifier(yyvsp[-2].u.identifier); } break; -case 183: -#line 1414 "cppBison.yxx" +case 184: +#line 1431 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[-3].u.inst_ident; yyval.u.inst_ident->add_array_modifier(yyvsp[-1].u.expr); } break; -case 184: -#line 1419 "cppBison.yxx" +case 185: +#line 1436 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[-5].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_paren); yyval.u.inst_ident->add_func_modifier(yyvsp[-2].u.param_list, yyvsp[0].u.integer); } break; -case 185: -#line 1425 "cppBison.yxx" +case 186: +#line 1442 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[-1].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_paren); } break; -case 186: -#line 1433 "cppBison.yxx" +case 187: +#line 1450 "cppBison.yxx" { yyval.u.inst_ident = new CPPInstanceIdentifier((CPPIdentifier *)NULL); } break; -case 187: -#line 1437 "cppBison.yxx" +case 188: +#line 1454 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_const); } break; -case 188: -#line 1442 "cppBison.yxx" +case 189: +#line 1459 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_pointer); } break; -case 189: -#line 1447 "cppBison.yxx" +case 190: +#line 1464 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_reference); } break; -case 190: -#line 1452 "cppBison.yxx" +case 191: +#line 1469 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[0].u.inst_ident; yyval.u.inst_ident->add_scoped_pointer_modifier(yyvsp[-2].u.identifier); } break; -case 191: -#line 1457 "cppBison.yxx" +case 192: +#line 1474 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[-3].u.inst_ident; yyval.u.inst_ident->add_array_modifier(yyvsp[-1].u.expr); } break; -case 192: -#line 1462 "cppBison.yxx" +case 193: +#line 1479 "cppBison.yxx" { yyval.u.inst_ident = yyvsp[-5].u.inst_ident; yyval.u.inst_ident->add_modifier(IIT_paren); yyval.u.inst_ident->add_func_modifier(yyvsp[-2].u.param_list, yyvsp[0].u.integer); } break; -case 193: -#line 1471 "cppBison.yxx" +case 194: +#line 1488 "cppBison.yxx" { yyval.u.type = CPPType::new_type(yyvsp[0].u.simple_type); } break; -case 194: -#line 1475 "cppBison.yxx" +case 195: +#line 1492 "cppBison.yxx" { yyval.u.type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); assert(yyval.u.type != NULL); } break; -case 195: -#line 1480 "cppBison.yxx" +case 196: +#line 1497 "cppBison.yxx" { yyval.u.type = CPPType::new_type(new CPPTBDType(yyvsp[0].u.identifier)); } break; -case 196: -#line 1484 "cppBison.yxx" -{ - yyval.u.type = CPPType::new_type(yyvsp[0].u.struct_type); -} - break; case 197: -#line 1488 "cppBison.yxx" +#line 1501 "cppBison.yxx" { yyval.u.type = CPPType::new_type(yyvsp[0].u.struct_type); } break; case 198: -#line 1492 "cppBison.yxx" +#line 1505 "cppBison.yxx" { - yyval.u.type = CPPType::new_type(yyvsp[0].u.enum_type); + yyval.u.type = CPPType::new_type(yyvsp[0].u.struct_type); } break; case 199: -#line 1496 "cppBison.yxx" +#line 1509 "cppBison.yxx" { yyval.u.type = CPPType::new_type(yyvsp[0].u.enum_type); } break; case 200: -#line 1500 "cppBison.yxx" +#line 1513 "cppBison.yxx" { - CPPType *type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); - if (type != NULL) { - yyval.u.type = type; - } else { - CPPExtensionType *et = - CPPType::new_type(new CPPExtensionType(yyvsp[-1].u.extension_enum, yyvsp[0].u.identifier, current_scope, yylsp[-1].file)) - ->as_extension_type(); - CPPScope *scope = yyvsp[0].u.identifier->get_scope(current_scope, global_scope); - if (scope != NULL) { - scope->define_extension_type(et); - } - yyval.u.type = et; - } + yyval.u.type = CPPType::new_type(yyvsp[0].u.enum_type); } break; case 201: -#line 1516 "cppBison.yxx" +#line 1517 "cppBison.yxx" { CPPType *type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { @@ -3647,54 +3769,11 @@ case 201: } break; case 202: -#line 1535 "cppBison.yxx" -{ - yyval.u.decl = CPPType::new_type(yyvsp[0].u.simple_type); -} - break; -case 203: -#line 1539 "cppBison.yxx" -{ - yyval.u.decl = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); - assert(yyval.u.decl != NULL); -} - break; -case 204: -#line 1544 "cppBison.yxx" -{ - yyval.u.decl = CPPType::new_type(new CPPTBDType(yyvsp[0].u.identifier)); -} - break; -case 205: -#line 1548 "cppBison.yxx" -{ - yyval.u.decl = CPPType::new_type(yyvsp[0].u.struct_type); -} - break; -case 206: -#line 1552 "cppBison.yxx" -{ - yyval.u.decl = new CPPTypeDeclaration(CPPType::new_type(yyvsp[0].u.struct_type)); -} - break; -case 207: -#line 1556 "cppBison.yxx" -{ - yyval.u.decl = CPPType::new_type(yyvsp[0].u.enum_type); -} - break; -case 208: -#line 1560 "cppBison.yxx" -{ - yyval.u.decl = new CPPTypeDeclaration(CPPType::new_type(yyvsp[0].u.enum_type)); -} - break; -case 209: -#line 1564 "cppBison.yxx" +#line 1533 "cppBison.yxx" { CPPType *type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { - yyval.u.decl = type; + yyval.u.type = type; } else { CPPExtensionType *et = CPPType::new_type(new CPPExtensionType(yyvsp[-1].u.extension_enum, yyvsp[0].u.identifier, current_scope, yylsp[-1].file)) @@ -3703,12 +3782,55 @@ case 209: if (scope != NULL) { scope->define_extension_type(et); } - yyval.u.decl = et; + yyval.u.type = et; } } break; +case 203: +#line 1552 "cppBison.yxx" +{ + yyval.u.decl = CPPType::new_type(yyvsp[0].u.simple_type); +} + break; +case 204: +#line 1556 "cppBison.yxx" +{ + yyval.u.decl = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); + assert(yyval.u.decl != NULL); +} + break; +case 205: +#line 1561 "cppBison.yxx" +{ + yyval.u.decl = CPPType::new_type(new CPPTBDType(yyvsp[0].u.identifier)); +} + break; +case 206: +#line 1565 "cppBison.yxx" +{ + yyval.u.decl = CPPType::new_type(yyvsp[0].u.struct_type); +} + break; +case 207: +#line 1569 "cppBison.yxx" +{ + yyval.u.decl = new CPPTypeDeclaration(CPPType::new_type(yyvsp[0].u.struct_type)); +} + break; +case 208: +#line 1573 "cppBison.yxx" +{ + yyval.u.decl = CPPType::new_type(yyvsp[0].u.enum_type); +} + break; +case 209: +#line 1577 "cppBison.yxx" +{ + yyval.u.decl = new CPPTypeDeclaration(CPPType::new_type(yyvsp[0].u.enum_type)); +} + break; case 210: -#line 1580 "cppBison.yxx" +#line 1581 "cppBison.yxx" { CPPType *type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { @@ -3726,30 +3848,11 @@ case 210: } break; case 211: -#line 1599 "cppBison.yxx" -{ - yyval.u.type = CPPType::new_type(yyvsp[0].u.simple_type); -} - break; -case 212: -#line 1603 "cppBison.yxx" -{ - yyval.u.type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); - assert(yyval.u.type != NULL); -} - break; -case 213: -#line 1608 "cppBison.yxx" -{ - yyval.u.type = CPPType::new_type(new CPPTBDType(yyvsp[0].u.identifier)); -} - break; -case 214: -#line 1612 "cppBison.yxx" +#line 1597 "cppBison.yxx" { CPPType *type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { - yyval.u.type = type; + yyval.u.decl = type; } else { CPPExtensionType *et = CPPType::new_type(new CPPExtensionType(yyvsp[-1].u.extension_enum, yyvsp[0].u.identifier, current_scope, yylsp[-1].file)) @@ -3758,12 +3861,31 @@ case 214: if (scope != NULL) { scope->define_extension_type(et); } - yyval.u.type = et; + yyval.u.decl = et; } } break; +case 212: +#line 1616 "cppBison.yxx" +{ + yyval.u.type = CPPType::new_type(yyvsp[0].u.simple_type); +} + break; +case 213: +#line 1620 "cppBison.yxx" +{ + yyval.u.type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); + assert(yyval.u.type != NULL); +} + break; +case 214: +#line 1625 "cppBison.yxx" +{ + yyval.u.type = CPPType::new_type(new CPPTBDType(yyvsp[0].u.identifier)); +} + break; case 215: -#line 1628 "cppBison.yxx" +#line 1629 "cppBison.yxx" { CPPType *type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); if (type != NULL) { @@ -3781,15 +3903,33 @@ case 215: } break; case 216: -#line 1647 "cppBison.yxx" +#line 1645 "cppBison.yxx" +{ + CPPType *type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, false, current_lexer); + if (type != NULL) { + yyval.u.type = type; + } else { + CPPExtensionType *et = + CPPType::new_type(new CPPExtensionType(yyvsp[-1].u.extension_enum, yyvsp[0].u.identifier, current_scope, yylsp[-1].file)) + ->as_extension_type(); + CPPScope *scope = yyvsp[0].u.identifier->get_scope(current_scope, global_scope); + if (scope != NULL) { + scope->define_extension_type(et); + } + yyval.u.type = et; + } +} + break; +case 217: +#line 1664 "cppBison.yxx" { CPPInstance *inst = new CPPInstance(yyvsp[-1].u.type, yyvsp[0].u.inst_ident, 0, yylsp[-1].file); yyval.u.type = inst->_type; delete inst; } break; -case 217: -#line 1653 "cppBison.yxx" +case 218: +#line 1670 "cppBison.yxx" { yyvsp[0].u.inst_ident->add_modifier(IIT_const); CPPInstance *inst = new CPPInstance(yyvsp[-1].u.type, yyvsp[0].u.inst_ident, 0, yylsp[-2].file); @@ -3797,8 +3937,8 @@ case 217: delete inst; } break; -case 218: -#line 1663 "cppBison.yxx" +case 219: +#line 1680 "cppBison.yxx" { CPPVisibility starting_vis = (yyvsp[-1].u.extension_enum == CPPExtensionType::T_class) ? V_private : V_public; @@ -3813,8 +3953,8 @@ case 218: push_struct(st); } break; -case 219: -#line 1677 "cppBison.yxx" +case 220: +#line 1694 "cppBison.yxx" { yyval.u.struct_type = current_struct; current_struct->_incomplete = false; @@ -3822,8 +3962,8 @@ case 219: pop_scope(); } break; -case 220: -#line 1687 "cppBison.yxx" +case 221: +#line 1704 "cppBison.yxx" { CPPVisibility starting_vis = (yyvsp[-1].u.extension_enum == CPPExtensionType::T_class) ? V_private : V_public; @@ -3844,8 +3984,8 @@ case 220: push_struct(st); } break; -case 221: -#line 1707 "cppBison.yxx" +case 222: +#line 1724 "cppBison.yxx" { yyval.u.struct_type = current_struct; current_struct->_incomplete = false; @@ -3853,140 +3993,140 @@ case 221: pop_scope(); } break; -case 226: -#line 1727 "cppBison.yxx" +case 227: +#line 1744 "cppBison.yxx" { current_struct->append_derivation(yyvsp[0].u.type, V_public, false); } break; -case 227: -#line 1731 "cppBison.yxx" +case 228: +#line 1748 "cppBison.yxx" { current_struct->append_derivation(yyvsp[0].u.type, V_protected, false); } break; -case 228: -#line 1735 "cppBison.yxx" +case 229: +#line 1752 "cppBison.yxx" { current_struct->append_derivation(yyvsp[0].u.type, V_private, false); } break; -case 229: -#line 1739 "cppBison.yxx" +case 230: +#line 1756 "cppBison.yxx" { current_struct->append_derivation(yyvsp[0].u.type, V_public, true); } break; -case 230: -#line 1743 "cppBison.yxx" -{ - current_struct->append_derivation(yyvsp[0].u.type, V_protected, true); -} - break; case 231: -#line 1747 "cppBison.yxx" -{ - current_struct->append_derivation(yyvsp[0].u.type, V_private, true); -} - break; -case 232: -#line 1751 "cppBison.yxx" -{ - current_struct->append_derivation(yyvsp[0].u.type, V_public, true); -} - break; -case 233: -#line 1755 "cppBison.yxx" +#line 1760 "cppBison.yxx" { current_struct->append_derivation(yyvsp[0].u.type, V_protected, true); } break; -case 234: -#line 1759 "cppBison.yxx" +case 232: +#line 1764 "cppBison.yxx" { current_struct->append_derivation(yyvsp[0].u.type, V_private, true); } break; +case 233: +#line 1768 "cppBison.yxx" +{ + current_struct->append_derivation(yyvsp[0].u.type, V_public, true); +} + break; +case 234: +#line 1772 "cppBison.yxx" +{ + current_struct->append_derivation(yyvsp[0].u.type, V_protected, true); +} + break; case 235: -#line 1766 "cppBison.yxx" +#line 1776 "cppBison.yxx" +{ + current_struct->append_derivation(yyvsp[0].u.type, V_private, true); +} + break; +case 236: +#line 1783 "cppBison.yxx" { current_enum = new CPPEnumType(NULL, current_scope, yylsp[-1].file); } break; -case 236: -#line 1770 "cppBison.yxx" +case 237: +#line 1787 "cppBison.yxx" { yyval.u.enum_type = current_enum; current_enum = NULL; } break; -case 237: -#line 1778 "cppBison.yxx" +case 238: +#line 1795 "cppBison.yxx" { current_enum = new CPPEnumType(yyvsp[-1].u.identifier, current_scope, yylsp[-2].file); } break; -case 238: -#line 1782 "cppBison.yxx" +case 239: +#line 1799 "cppBison.yxx" { yyval.u.enum_type = current_enum; current_enum = NULL; } break; -case 242: -#line 1796 "cppBison.yxx" +case 243: +#line 1813 "cppBison.yxx" { assert(current_enum != NULL); current_enum->add_element(yyvsp[0].u.identifier->get_simple_name(), current_scope); } break; -case 243: -#line 1801 "cppBison.yxx" -{ - assert(current_enum != NULL); - current_enum->add_element(yyvsp[-2].u.identifier->get_simple_name(), current_scope, yyvsp[0].u.expr); -} - break; case 244: -#line 1806 "cppBison.yxx" -{ - assert(current_enum != NULL); - current_enum->add_element(yyvsp[0].u.identifier->get_simple_name(), current_scope); -} - break; -case 245: -#line 1811 "cppBison.yxx" +#line 1818 "cppBison.yxx" { assert(current_enum != NULL); current_enum->add_element(yyvsp[-2].u.identifier->get_simple_name(), current_scope, yyvsp[0].u.expr); } break; +case 245: +#line 1823 "cppBison.yxx" +{ + assert(current_enum != NULL); + current_enum->add_element(yyvsp[0].u.identifier->get_simple_name(), current_scope); +} + break; case 246: -#line 1819 "cppBison.yxx" +#line 1828 "cppBison.yxx" +{ + assert(current_enum != NULL); + current_enum->add_element(yyvsp[-2].u.identifier->get_simple_name(), current_scope, yyvsp[0].u.expr); +} + break; +case 247: +#line 1836 "cppBison.yxx" { yyval.u.extension_enum = CPPExtensionType::T_enum; } break; -case 247: -#line 1826 "cppBison.yxx" +case 248: +#line 1843 "cppBison.yxx" { yyval.u.extension_enum = CPPExtensionType::T_class; } break; -case 248: -#line 1830 "cppBison.yxx" +case 249: +#line 1847 "cppBison.yxx" { yyval.u.extension_enum = CPPExtensionType::T_struct; } break; -case 249: -#line 1834 "cppBison.yxx" +case 250: +#line 1851 "cppBison.yxx" { yyval.u.extension_enum = CPPExtensionType::T_union; } break; -case 250: -#line 1841 "cppBison.yxx" +case 251: +#line 1858 "cppBison.yxx" { CPPScope *scope = yyvsp[-1].u.identifier->find_scope(current_scope, global_scope, current_lexer); if (scope == NULL) { @@ -4005,90 +4145,90 @@ case 250: push_scope(scope); } break; -case 251: -#line 1859 "cppBison.yxx" +case 252: +#line 1876 "cppBison.yxx" { pop_scope(); } break; -case 253: -#line 1867 "cppBison.yxx" +case 254: +#line 1884 "cppBison.yxx" { CPPUsing *using_decl = new CPPUsing(yyvsp[0].u.identifier, false, yylsp[-1].file); current_scope->add_declaration(using_decl, global_scope, current_lexer, yylsp[-1]); current_scope->add_using(using_decl, global_scope, current_lexer); } break; -case 254: -#line 1873 "cppBison.yxx" +case 255: +#line 1890 "cppBison.yxx" { CPPUsing *using_decl = new CPPUsing(yyvsp[0].u.identifier, true, yylsp[-2].file); current_scope->add_declaration(using_decl, global_scope, current_lexer, yylsp[-2]); current_scope->add_using(using_decl, global_scope, current_lexer); } break; -case 258: -#line 1888 "cppBison.yxx" +case 259: +#line 1905 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_bool); } break; -case 259: -#line 1892 "cppBison.yxx" +case 260: +#line 1909 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_char); } break; -case 260: -#line 1896 "cppBison.yxx" +case 261: +#line 1913 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_short); } break; -case 261: -#line 1901 "cppBison.yxx" +case 262: +#line 1918 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_long); } break; -case 262: -#line 1906 "cppBison.yxx" +case 263: +#line 1923 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_longlong); } break; -case 263: -#line 1911 "cppBison.yxx" +case 264: +#line 1928 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_unsigned); } break; -case 264: -#line 1916 "cppBison.yxx" +case 265: +#line 1933 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_signed); } break; -case 265: -#line 1921 "cppBison.yxx" +case 266: +#line 1938 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_int); } break; -case 266: -#line 1925 "cppBison.yxx" +case 267: +#line 1942 "cppBison.yxx" { yyval.u.simple_type = yyvsp[0].u.simple_type; yyval.u.simple_type->_flags |= CPPSimpleType::F_short; } break; -case 267: -#line 1930 "cppBison.yxx" +case 268: +#line 1947 "cppBison.yxx" { yyval.u.simple_type = yyvsp[0].u.simple_type; if (yyval.u.simple_type->_flags & CPPSimpleType::F_long) { @@ -4098,196 +4238,196 @@ case 267: } } break; -case 268: -#line 1939 "cppBison.yxx" +case 269: +#line 1956 "cppBison.yxx" { yyval.u.simple_type = yyvsp[0].u.simple_type; yyval.u.simple_type->_flags |= CPPSimpleType::F_unsigned; } break; -case 269: -#line 1944 "cppBison.yxx" +case 270: +#line 1961 "cppBison.yxx" { yyval.u.simple_type = yyvsp[0].u.simple_type; yyval.u.simple_type->_flags |= CPPSimpleType::F_signed; } break; -case 270: -#line 1952 "cppBison.yxx" +case 271: +#line 1969 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_float); } break; -case 271: -#line 1956 "cppBison.yxx" +case 272: +#line 1973 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_float, CPPSimpleType::F_long); } break; -case 272: -#line 1961 "cppBison.yxx" +case 273: +#line 1978 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_double); } break; -case 273: -#line 1965 "cppBison.yxx" +case 274: +#line 1982 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_float, CPPSimpleType::F_longlong); } break; -case 274: -#line 1970 "cppBison.yxx" +case 275: +#line 1987 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_double, CPPSimpleType::F_long); } break; -case 275: -#line 1978 "cppBison.yxx" +case 276: +#line 1995 "cppBison.yxx" { yyval.u.simple_type = new CPPSimpleType(CPPSimpleType::T_void); } break; -case 276: -#line 1987 "cppBison.yxx" +case 277: +#line 2004 "cppBison.yxx" { current_lexer->_resolve_identifiers = false; } break; -case 277: -#line 1991 "cppBison.yxx" +case 278: +#line 2008 "cppBison.yxx" { current_lexer->_resolve_identifiers = true; -} - break; -case 280: -#line 2003 "cppBison.yxx" -{ } break; case 281: -#line 2006 "cppBison.yxx" +#line 2020 "cppBison.yxx" { } break; case 282: -#line 2009 "cppBison.yxx" +#line 2023 "cppBison.yxx" { } break; case 283: -#line 2012 "cppBison.yxx" +#line 2026 "cppBison.yxx" { } break; case 284: -#line 2015 "cppBison.yxx" +#line 2029 "cppBison.yxx" { } break; case 285: -#line 2018 "cppBison.yxx" +#line 2032 "cppBison.yxx" { } break; case 286: -#line 2021 "cppBison.yxx" +#line 2035 "cppBison.yxx" { } break; case 287: -#line 2024 "cppBison.yxx" +#line 2038 "cppBison.yxx" { } break; -case 360: -#line 2044 "cppBison.yxx" +case 288: +#line 2041 "cppBison.yxx" { } break; -case 384: -#line 2053 "cppBison.yxx" +case 361: +#line 2061 "cppBison.yxx" { - yyval.u.expr = (CPPExpression *)NULL; } break; case 385: -#line 2057 "cppBison.yxx" -{ - yyval.u.expr = yyvsp[0].u.expr; -} - break; -case 386: -#line 2064 "cppBison.yxx" +#line 2070 "cppBison.yxx" { yyval.u.expr = (CPPExpression *)NULL; } break; -case 387: -#line 2068 "cppBison.yxx" +case 386: +#line 2074 "cppBison.yxx" { yyval.u.expr = yyvsp[0].u.expr; } break; +case 387: +#line 2081 "cppBison.yxx" +{ + yyval.u.expr = (CPPExpression *)NULL; +} + break; case 388: -#line 2075 "cppBison.yxx" +#line 2085 "cppBison.yxx" { yyval.u.expr = yyvsp[0].u.expr; } break; case 389: -#line 2079 "cppBison.yxx" -{ - yyval.u.expr = new CPPExpression(',', yyvsp[-2].u.expr, yyvsp[0].u.expr); -} - break; -case 390: -#line 2086 "cppBison.yxx" +#line 2092 "cppBison.yxx" { yyval.u.expr = yyvsp[0].u.expr; } break; +case 390: +#line 2096 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(',', yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; case 391: -#line 2090 "cppBison.yxx" +#line 2103 "cppBison.yxx" +{ + yyval.u.expr = yyvsp[0].u.expr; +} + break; +case 392: +#line 2107 "cppBison.yxx" { yyval.u.expr = new CPPExpression(CPPExpression::typecast_op(yyvsp[-2].u.type, yyvsp[0].u.expr)); } break; -case 392: -#line 2094 "cppBison.yxx" -{ - yyval.u.expr = new CPPExpression(CPPExpression::typecast_op(yyvsp[-4].u.type, yyvsp[-1].u.expr)); -} - break; case 393: -#line 2098 "cppBison.yxx" +#line 2111 "cppBison.yxx" { yyval.u.expr = new CPPExpression(CPPExpression::typecast_op(yyvsp[-4].u.type, yyvsp[-1].u.expr)); } break; case 394: -#line 2102 "cppBison.yxx" +#line 2115 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(CPPExpression::typecast_op(yyvsp[-4].u.type, yyvsp[-1].u.expr)); +} + break; +case 395: +#line 2119 "cppBison.yxx" { yyval.u.expr = new CPPExpression(CPPExpression::sizeof_func(yyvsp[-1].u.type)); } break; -case 395: -#line 2106 "cppBison.yxx" +case 396: +#line 2123 "cppBison.yxx" { yyval.u.expr = new CPPExpression(UNARY_NOT, yyvsp[0].u.expr); } break; -case 396: -#line 2110 "cppBison.yxx" +case 397: +#line 2127 "cppBison.yxx" { yyval.u.expr = new CPPExpression(UNARY_NEGATE, yyvsp[0].u.expr); } break; -case 397: -#line 2114 "cppBison.yxx" +case 398: +#line 2131 "cppBison.yxx" { if (yyvsp[0].u.expr->_type == CPPExpression::T_integer) { yyval.u.expr = yyvsp[0].u.expr; @@ -4300,176 +4440,176 @@ case 397: } } break; -case 398: -#line 2126 "cppBison.yxx" +case 399: +#line 2143 "cppBison.yxx" { yyval.u.expr = new CPPExpression(UNARY_STAR, yyvsp[0].u.expr); } break; -case 399: -#line 2130 "cppBison.yxx" +case 400: +#line 2147 "cppBison.yxx" { yyval.u.expr = new CPPExpression(UNARY_REF, yyvsp[0].u.expr); } break; -case 400: -#line 2134 "cppBison.yxx" +case 401: +#line 2151 "cppBison.yxx" { yyval.u.expr = new CPPExpression('*', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 401: -#line 2138 "cppBison.yxx" +case 402: +#line 2155 "cppBison.yxx" { yyval.u.expr = new CPPExpression('/', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 402: -#line 2142 "cppBison.yxx" +case 403: +#line 2159 "cppBison.yxx" { yyval.u.expr = new CPPExpression('%', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 403: -#line 2146 "cppBison.yxx" +case 404: +#line 2163 "cppBison.yxx" { yyval.u.expr = new CPPExpression('+', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 404: -#line 2150 "cppBison.yxx" +case 405: +#line 2167 "cppBison.yxx" { yyval.u.expr = new CPPExpression('-', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 405: -#line 2154 "cppBison.yxx" +case 406: +#line 2171 "cppBison.yxx" { yyval.u.expr = new CPPExpression('|', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 406: -#line 2158 "cppBison.yxx" +case 407: +#line 2175 "cppBison.yxx" { yyval.u.expr = new CPPExpression('&', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 407: -#line 2162 "cppBison.yxx" +case 408: +#line 2179 "cppBison.yxx" { yyval.u.expr = new CPPExpression(OROR, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 408: -#line 2166 "cppBison.yxx" +case 409: +#line 2183 "cppBison.yxx" { yyval.u.expr = new CPPExpression(ANDAND, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 409: -#line 2170 "cppBison.yxx" +case 410: +#line 2187 "cppBison.yxx" { yyval.u.expr = new CPPExpression(EQCOMPARE, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 410: -#line 2174 "cppBison.yxx" +case 411: +#line 2191 "cppBison.yxx" { yyval.u.expr = new CPPExpression(NECOMPARE, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 411: -#line 2178 "cppBison.yxx" +case 412: +#line 2195 "cppBison.yxx" { yyval.u.expr = new CPPExpression(LECOMPARE, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 412: -#line 2182 "cppBison.yxx" +case 413: +#line 2199 "cppBison.yxx" { yyval.u.expr = new CPPExpression(GECOMPARE, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 413: -#line 2186 "cppBison.yxx" +case 414: +#line 2203 "cppBison.yxx" { yyval.u.expr = new CPPExpression(LSHIFT, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 414: -#line 2190 "cppBison.yxx" +case 415: +#line 2207 "cppBison.yxx" { yyval.u.expr = new CPPExpression(RSHIFT, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 415: -#line 2194 "cppBison.yxx" +case 416: +#line 2211 "cppBison.yxx" { yyval.u.expr = new CPPExpression('?', yyvsp[-4].u.expr, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 416: -#line 2198 "cppBison.yxx" +case 417: +#line 2215 "cppBison.yxx" { yyval.u.expr = new CPPExpression('[', yyvsp[-3].u.expr, yyvsp[-1].u.expr); } break; -case 417: -#line 2202 "cppBison.yxx" +case 418: +#line 2219 "cppBison.yxx" { yyval.u.expr = new CPPExpression('f', yyvsp[-3].u.expr, yyvsp[-1].u.expr); } break; -case 418: -#line 2206 "cppBison.yxx" +case 419: +#line 2223 "cppBison.yxx" { yyval.u.expr = new CPPExpression('f', yyvsp[-2].u.expr); } break; -case 419: -#line 2210 "cppBison.yxx" +case 420: +#line 2227 "cppBison.yxx" { yyval.u.expr = new CPPExpression('.', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 420: -#line 2214 "cppBison.yxx" +case 421: +#line 2231 "cppBison.yxx" { yyval.u.expr = new CPPExpression(POINTSAT, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 421: -#line 2218 "cppBison.yxx" +case 422: +#line 2235 "cppBison.yxx" { yyval.u.expr = yyvsp[-1].u.expr; } break; -case 422: -#line 2226 "cppBison.yxx" +case 423: +#line 2243 "cppBison.yxx" { yyval.u.expr = yyvsp[0].u.expr; } break; -case 423: -#line 2230 "cppBison.yxx" +case 424: +#line 2247 "cppBison.yxx" { yyval.u.expr = new CPPExpression(CPPExpression::typecast_op(yyvsp[-2].u.type, yyvsp[0].u.expr)); } break; -case 424: -#line 2234 "cppBison.yxx" -{ - yyval.u.expr = new CPPExpression(CPPExpression::typecast_op(yyvsp[-4].u.type, yyvsp[-1].u.expr)); -} - break; case 425: -#line 2238 "cppBison.yxx" +#line 2251 "cppBison.yxx" { yyval.u.expr = new CPPExpression(CPPExpression::typecast_op(yyvsp[-4].u.type, yyvsp[-1].u.expr)); } break; case 426: -#line 2242 "cppBison.yxx" +#line 2255 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(CPPExpression::typecast_op(yyvsp[-4].u.type, yyvsp[-1].u.expr)); +} + break; +case 427: +#line 2259 "cppBison.yxx" { // A constructor call. CPPType *type = yyvsp[-3].u.identifier->find_type(current_scope, global_scope, false, current_lexer); @@ -4477,32 +4617,32 @@ case 426: yyval.u.expr = new CPPExpression(CPPExpression::construct_op(type, yyvsp[-1].u.expr)); } break; -case 427: -#line 2249 "cppBison.yxx" +case 428: +#line 2266 "cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int)); yyval.u.expr = new CPPExpression(CPPExpression::construct_op(type, yyvsp[-1].u.expr)); } break; -case 428: -#line 2255 "cppBison.yxx" +case 429: +#line 2272 "cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_char)); yyval.u.expr = new CPPExpression(CPPExpression::construct_op(type, yyvsp[-1].u.expr)); } break; -case 429: -#line 2261 "cppBison.yxx" +case 430: +#line 2278 "cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_bool)); yyval.u.expr = new CPPExpression(CPPExpression::construct_op(type, yyvsp[-1].u.expr)); } break; -case 430: -#line 2267 "cppBison.yxx" +case 431: +#line 2284 "cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, @@ -4510,8 +4650,8 @@ case 430: yyval.u.expr = new CPPExpression(CPPExpression::construct_op(type, yyvsp[-1].u.expr)); } break; -case 431: -#line 2274 "cppBison.yxx" +case 432: +#line 2291 "cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, @@ -4519,8 +4659,8 @@ case 431: yyval.u.expr = new CPPExpression(CPPExpression::construct_op(type, yyvsp[-1].u.expr)); } break; -case 432: -#line 2281 "cppBison.yxx" +case 433: +#line 2298 "cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, @@ -4528,8 +4668,8 @@ case 432: yyval.u.expr = new CPPExpression(CPPExpression::construct_op(type, yyvsp[-1].u.expr)); } break; -case 433: -#line 2288 "cppBison.yxx" +case 434: +#line 2305 "cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, @@ -4537,54 +4677,54 @@ case 433: yyval.u.expr = new CPPExpression(CPPExpression::construct_op(type, yyvsp[-1].u.expr)); } break; -case 434: -#line 2295 "cppBison.yxx" +case 435: +#line 2312 "cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_float)); yyval.u.expr = new CPPExpression(CPPExpression::construct_op(type, yyvsp[-1].u.expr)); } break; -case 435: -#line 2301 "cppBison.yxx" +case 436: +#line 2318 "cppBison.yxx" { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_double)); yyval.u.expr = new CPPExpression(CPPExpression::construct_op(type, yyvsp[-1].u.expr)); } break; -case 436: -#line 2307 "cppBison.yxx" +case 437: +#line 2324 "cppBison.yxx" { yyval.u.expr = new CPPExpression(CPPExpression::sizeof_func(yyvsp[-1].u.type)); } break; -case 437: -#line 2311 "cppBison.yxx" +case 438: +#line 2328 "cppBison.yxx" { yyval.u.expr = new CPPExpression(CPPExpression::new_op(yyvsp[0].u.type)); } break; -case 438: -#line 2315 "cppBison.yxx" +case 439: +#line 2332 "cppBison.yxx" { yyval.u.expr = new CPPExpression(CPPExpression::new_op(yyvsp[-3].u.type, yyvsp[-1].u.expr)); } break; -case 439: -#line 2319 "cppBison.yxx" +case 440: +#line 2336 "cppBison.yxx" { yyval.u.expr = new CPPExpression(UNARY_NOT, yyvsp[0].u.expr); } break; -case 440: -#line 2323 "cppBison.yxx" +case 441: +#line 2340 "cppBison.yxx" { yyval.u.expr = new CPPExpression(UNARY_NEGATE, yyvsp[0].u.expr); } break; -case 441: -#line 2327 "cppBison.yxx" +case 442: +#line 2344 "cppBison.yxx" { if (yyvsp[0].u.expr->_type == CPPExpression::T_integer) { yyval.u.expr = yyvsp[0].u.expr; @@ -4597,206 +4737,460 @@ case 441: } } break; -case 442: -#line 2339 "cppBison.yxx" +case 443: +#line 2356 "cppBison.yxx" { yyval.u.expr = new CPPExpression(UNARY_STAR, yyvsp[0].u.expr); } break; -case 443: -#line 2343 "cppBison.yxx" +case 444: +#line 2360 "cppBison.yxx" { yyval.u.expr = new CPPExpression(UNARY_REF, yyvsp[0].u.expr); } break; -case 444: -#line 2347 "cppBison.yxx" +case 445: +#line 2364 "cppBison.yxx" { yyval.u.expr = new CPPExpression('*', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 445: -#line 2351 "cppBison.yxx" +case 446: +#line 2368 "cppBison.yxx" { yyval.u.expr = new CPPExpression('/', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 446: -#line 2355 "cppBison.yxx" +case 447: +#line 2372 "cppBison.yxx" { yyval.u.expr = new CPPExpression('%', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 447: -#line 2359 "cppBison.yxx" +case 448: +#line 2376 "cppBison.yxx" { yyval.u.expr = new CPPExpression('+', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 448: -#line 2363 "cppBison.yxx" +case 449: +#line 2380 "cppBison.yxx" { yyval.u.expr = new CPPExpression('-', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 449: -#line 2367 "cppBison.yxx" +case 450: +#line 2384 "cppBison.yxx" { yyval.u.expr = new CPPExpression('|', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 450: -#line 2371 "cppBison.yxx" +case 451: +#line 2388 "cppBison.yxx" { yyval.u.expr = new CPPExpression('&', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 451: -#line 2375 "cppBison.yxx" +case 452: +#line 2392 "cppBison.yxx" { yyval.u.expr = new CPPExpression(OROR, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 452: -#line 2379 "cppBison.yxx" +case 453: +#line 2396 "cppBison.yxx" { yyval.u.expr = new CPPExpression(ANDAND, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 453: -#line 2383 "cppBison.yxx" +case 454: +#line 2400 "cppBison.yxx" { yyval.u.expr = new CPPExpression(EQCOMPARE, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 454: -#line 2387 "cppBison.yxx" +case 455: +#line 2404 "cppBison.yxx" { yyval.u.expr = new CPPExpression(NECOMPARE, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 455: -#line 2391 "cppBison.yxx" +case 456: +#line 2408 "cppBison.yxx" { yyval.u.expr = new CPPExpression(LECOMPARE, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 456: -#line 2395 "cppBison.yxx" +case 457: +#line 2412 "cppBison.yxx" { yyval.u.expr = new CPPExpression(GECOMPARE, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 457: -#line 2399 "cppBison.yxx" +case 458: +#line 2416 "cppBison.yxx" { yyval.u.expr = new CPPExpression('<', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 458: -#line 2403 "cppBison.yxx" +case 459: +#line 2420 "cppBison.yxx" { yyval.u.expr = new CPPExpression('>', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 459: -#line 2407 "cppBison.yxx" +case 460: +#line 2424 "cppBison.yxx" { yyval.u.expr = new CPPExpression(LSHIFT, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 460: -#line 2411 "cppBison.yxx" +case 461: +#line 2428 "cppBison.yxx" { yyval.u.expr = new CPPExpression(RSHIFT, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 461: -#line 2415 "cppBison.yxx" +case 462: +#line 2432 "cppBison.yxx" { yyval.u.expr = new CPPExpression('?', yyvsp[-4].u.expr, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 462: -#line 2419 "cppBison.yxx" +case 463: +#line 2436 "cppBison.yxx" { yyval.u.expr = new CPPExpression('[', yyvsp[-3].u.expr, yyvsp[-1].u.expr); } break; -case 463: -#line 2423 "cppBison.yxx" +case 464: +#line 2440 "cppBison.yxx" { yyval.u.expr = new CPPExpression('f', yyvsp[-3].u.expr, yyvsp[-1].u.expr); } break; -case 464: -#line 2427 "cppBison.yxx" +case 465: +#line 2444 "cppBison.yxx" { yyval.u.expr = new CPPExpression('f', yyvsp[-2].u.expr); } break; -case 465: -#line 2431 "cppBison.yxx" +case 466: +#line 2448 "cppBison.yxx" { yyval.u.expr = new CPPExpression('.', yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 466: -#line 2435 "cppBison.yxx" +case 467: +#line 2452 "cppBison.yxx" { yyval.u.expr = new CPPExpression(POINTSAT, yyvsp[-2].u.expr, yyvsp[0].u.expr); } break; -case 467: -#line 2439 "cppBison.yxx" +case 468: +#line 2456 "cppBison.yxx" { yyval.u.expr = yyvsp[-1].u.expr; } break; -case 468: -#line 2446 "cppBison.yxx" +case 469: +#line 2463 "cppBison.yxx" { yyval.u.expr = new CPPExpression(yyvsp[0].u.integer); } break; -case 469: -#line 2450 "cppBison.yxx" +case 470: +#line 2467 "cppBison.yxx" { yyval.u.expr = new CPPExpression(true); } break; -case 470: -#line 2454 "cppBison.yxx" +case 471: +#line 2471 "cppBison.yxx" { yyval.u.expr = new CPPExpression(false); } break; -case 471: -#line 2458 "cppBison.yxx" +case 472: +#line 2475 "cppBison.yxx" { yyval.u.expr = new CPPExpression(yyvsp[0].u.integer); } break; -case 472: -#line 2462 "cppBison.yxx" +case 473: +#line 2479 "cppBison.yxx" { yyval.u.expr = new CPPExpression(yyvsp[0].u.real); } break; -case 473: -#line 2466 "cppBison.yxx" +case 474: +#line 2483 "cppBison.yxx" { yyval.u.expr = new CPPExpression(yyvsp[0].str); } break; -case 474: -#line 2470 "cppBison.yxx" +case 475: +#line 2487 "cppBison.yxx" { yyval.u.expr = new CPPExpression(yyvsp[0].u.identifier, current_scope, global_scope, current_lexer); } break; -case 475: -#line 2477 "cppBison.yxx" +case 476: +#line 2501 "cppBison.yxx" +{ + yyval.u.expr = yyvsp[0].u.expr; +} + break; +case 477: +#line 2505 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(CPPExpression::typecast_op(yyvsp[-2].u.type, yyvsp[0].u.expr)); +} + break; +case 478: +#line 2509 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(CPPExpression::typecast_op(yyvsp[-4].u.type, yyvsp[-1].u.expr)); +} + break; +case 479: +#line 2513 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(CPPExpression::typecast_op(yyvsp[-4].u.type, yyvsp[-1].u.expr)); +} + break; +case 480: +#line 2517 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(CPPExpression::sizeof_func(yyvsp[-1].u.type)); +} + break; +case 481: +#line 2521 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(CPPExpression::new_op(yyvsp[0].u.type)); +} + break; +case 482: +#line 2525 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(CPPExpression::new_op(yyvsp[-3].u.type, yyvsp[-1].u.expr)); +} + break; +case 483: +#line 2529 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(UNARY_NOT, yyvsp[0].u.expr); +} + break; +case 484: +#line 2533 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(UNARY_NEGATE, yyvsp[0].u.expr); +} + break; +case 485: +#line 2537 "cppBison.yxx" +{ + if (yyvsp[0].u.expr->_type == CPPExpression::T_integer) { + yyval.u.expr = yyvsp[0].u.expr; + yyval.u.expr->_u._integer = -yyval.u.expr->_u._integer; + } else if (yyvsp[0].u.expr->_type == CPPExpression::T_real) { + yyval.u.expr = yyvsp[0].u.expr; + yyval.u.expr->_u._real = -yyval.u.expr->_u._real; + } else { + yyval.u.expr = new CPPExpression(UNARY_MINUS, yyvsp[0].u.expr); + } +} + break; +case 486: +#line 2549 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(UNARY_REF, yyvsp[0].u.expr); +} + break; +case 487: +#line 2553 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('*', yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 488: +#line 2557 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('/', yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 489: +#line 2561 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('%', yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 490: +#line 2565 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('+', yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 491: +#line 2569 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('-', yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 492: +#line 2573 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('|', yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 493: +#line 2577 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('&', yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 494: +#line 2581 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(OROR, yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 495: +#line 2585 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(ANDAND, yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 496: +#line 2589 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(EQCOMPARE, yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 497: +#line 2593 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(NECOMPARE, yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 498: +#line 2597 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(LECOMPARE, yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 499: +#line 2601 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(GECOMPARE, yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 500: +#line 2605 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('<', yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 501: +#line 2609 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('>', yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 502: +#line 2613 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(LSHIFT, yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 503: +#line 2617 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(RSHIFT, yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 504: +#line 2621 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('?', yyvsp[-4].u.expr, yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 505: +#line 2625 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('[', yyvsp[-3].u.expr, yyvsp[-1].u.expr); +} + break; +case 506: +#line 2629 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('f', yyvsp[-3].u.expr, yyvsp[-1].u.expr); +} + break; +case 507: +#line 2633 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('f', yyvsp[-2].u.expr); +} + break; +case 508: +#line 2637 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression('.', yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 509: +#line 2641 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(POINTSAT, yyvsp[-2].u.expr, yyvsp[0].u.expr); +} + break; +case 510: +#line 2645 "cppBison.yxx" +{ + yyval.u.expr = yyvsp[-1].u.expr; +} + break; +case 511: +#line 2652 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(yyvsp[0].u.integer); +} + break; +case 512: +#line 2656 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(true); +} + break; +case 513: +#line 2660 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(false); +} + break; +case 514: +#line 2664 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(yyvsp[0].u.integer); +} + break; +case 515: +#line 2668 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(yyvsp[0].u.real); +} + break; +case 516: +#line 2672 "cppBison.yxx" +{ + yyval.u.expr = new CPPExpression(yyvsp[0].str); +} + break; +case 517: +#line 2679 "cppBison.yxx" { CPPType *type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, true); if (type == NULL) { @@ -4805,8 +5199,8 @@ case 475: yyval.u.type = type; } break; -case 476: -#line 2485 "cppBison.yxx" +case 518: +#line 2687 "cppBison.yxx" { CPPType *type = yyvsp[0].u.identifier->find_type(current_scope, global_scope, true, current_lexer); if (type == NULL) { @@ -4815,32 +5209,32 @@ case 476: yyval.u.type = type; } break; -case 477: -#line 2493 "cppBison.yxx" +case 519: +#line 2695 "cppBison.yxx" { yyval.u.type = CPPType::new_type(new CPPTBDType(yyvsp[0].u.identifier)); } break; -case 478: -#line 2516 "cppBison.yxx" +case 520: +#line 2718 "cppBison.yxx" { yyval.u.identifier = yyvsp[0].u.identifier; } break; -case 479: -#line 2520 "cppBison.yxx" +case 521: +#line 2722 "cppBison.yxx" { yyval.u.identifier = yyvsp[0].u.identifier; } break; -case 480: -#line 2527 "cppBison.yxx" +case 522: +#line 2729 "cppBison.yxx" { yyval.str = yyvsp[0].str; } break; -case 481: -#line 2531 "cppBison.yxx" +case 523: +#line 2733 "cppBison.yxx" { yyval.str = yyvsp[-1].str + yyvsp[0].str; } @@ -5078,4 +5472,4 @@ yyreturn: #endif return yyresult; } -#line 2538 "cppBison.yxx" +#line 2740 "cppBison.yxx" diff --git a/dtool/src/cppparser/cppBison.yxx b/dtool/src/cppparser/cppBison.yxx index 42750c11cb..58165f4d3e 100644 --- a/dtool/src/cppparser/cppBison.yxx +++ b/dtool/src/cppparser/cppBison.yxx @@ -340,6 +340,8 @@ pop_struct() { %type no_angle_bracket_const_expr %type const_expr %type const_operand +%type formal_const_expr +%type formal_const_operand /* Precedence rules. */ @@ -1211,7 +1213,15 @@ instance_identifier: { pop_scope(); $$ = $1; - $$->add_func_modifier($4, $6); + if ($4->is_parameter_expr() && $6 == 0) { + // Oops, this must have been an instance declaration with a + // parameter list, not a function prototype. + $$->add_initializer_modifier($4); + + } else { + // This was (probably) a function prototype. + $$->add_func_modifier($4, $6); + } } ; @@ -1334,6 +1344,13 @@ formal_parameter: $3->add_modifier(IIT_const); $$ = new CPPInstance($2, $3, 0, @3.file); $$->set_initializer($4); +} + | formal_const_expr +{ + CPPType *type = + CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_parameter)); + $$ = new CPPInstance(type, "expr"); + $$->set_initializer($1); } ; @@ -2472,6 +2489,191 @@ const_operand: } ; +/* This is used for a const_expr as a "formal parameter", which really + means an instance declaration using a parameter list (which looks a + lot like a function prototype). It differs from const_expr mainly + in that it forbids some expressions unless they are parenthesized, + to avoid shift/reduce conflicts with the actual formal parameter + definition. */ + +formal_const_expr: + formal_const_operand +{ + $$ = $1; +} + | '(' full_type ')' const_expr %prec UNARY +{ + $$ = new CPPExpression(CPPExpression::typecast_op($2, $4)); +} + | KW_STATIC_CAST '<' full_type '>' '(' const_expr_comma ')' +{ + $$ = new CPPExpression(CPPExpression::typecast_op($3, $6)); +} + | KW_DYNAMIC_CAST '<' full_type '>' '(' const_expr_comma ')' +{ + $$ = new CPPExpression(CPPExpression::typecast_op($3, $6)); +} + | KW_SIZEOF '(' full_type ')' %prec UNARY +{ + $$ = new CPPExpression(CPPExpression::sizeof_func($3)); +} + | KW_NEW predefined_type %prec UNARY +{ + $$ = new CPPExpression(CPPExpression::new_op($2)); +} + | KW_NEW predefined_type '(' optional_const_expr_comma ')' %prec UNARY +{ + $$ = new CPPExpression(CPPExpression::new_op($2, $4)); +} + | '!' const_expr %prec UNARY +{ + $$ = new CPPExpression(UNARY_NOT, $2); +} + | '~' const_expr %prec UNARY +{ + $$ = new CPPExpression(UNARY_NEGATE, $2); +} + | '-' const_expr %prec UNARY +{ + if ($2->_type == CPPExpression::T_integer) { + $$ = $2; + $$->_u._integer = -$$->_u._integer; + } else if ($2->_type == CPPExpression::T_real) { + $$ = $2; + $$->_u._real = -$$->_u._real; + } else { + $$ = new CPPExpression(UNARY_MINUS, $2); + } +} + | '&' const_expr %prec UNARY +{ + $$ = new CPPExpression(UNARY_REF, $2); +} + | formal_const_expr '*' const_expr +{ + $$ = new CPPExpression('*', $1, $3); +} + | formal_const_expr '/' const_expr +{ + $$ = new CPPExpression('/', $1, $3); +} + | formal_const_expr '%' const_expr +{ + $$ = new CPPExpression('%', $1, $3); +} + | formal_const_expr '+' const_expr +{ + $$ = new CPPExpression('+', $1, $3); +} + | formal_const_expr '-' const_expr +{ + $$ = new CPPExpression('-', $1, $3); +} + | formal_const_expr '|' const_expr +{ + $$ = new CPPExpression('|', $1, $3); +} + | formal_const_expr '&' const_expr +{ + $$ = new CPPExpression('&', $1, $3); +} + | formal_const_expr OROR const_expr +{ + $$ = new CPPExpression(OROR, $1, $3); +} + | formal_const_expr ANDAND const_expr +{ + $$ = new CPPExpression(ANDAND, $1, $3); +} + | formal_const_expr EQCOMPARE const_expr +{ + $$ = new CPPExpression(EQCOMPARE, $1, $3); +} + | formal_const_expr NECOMPARE const_expr +{ + $$ = new CPPExpression(NECOMPARE, $1, $3); +} + | formal_const_expr LECOMPARE const_expr +{ + $$ = new CPPExpression(LECOMPARE, $1, $3); +} + | formal_const_expr GECOMPARE const_expr +{ + $$ = new CPPExpression(GECOMPARE, $1, $3); +} + | formal_const_expr '<' const_expr +{ + $$ = new CPPExpression('<', $1, $3); +} + | formal_const_expr '>' const_expr +{ + $$ = new CPPExpression('>', $1, $3); +} + | formal_const_expr LSHIFT const_expr +{ + $$ = new CPPExpression(LSHIFT, $1, $3); +} + | formal_const_expr RSHIFT const_expr +{ + $$ = new CPPExpression(RSHIFT, $1, $3); +} + | formal_const_expr '?' const_expr ':' const_expr +{ + $$ = new CPPExpression('?', $1, $3, $5); +} + | formal_const_expr '[' const_expr ']' +{ + $$ = new CPPExpression('[', $1, $3); +} + | formal_const_expr '(' const_expr_comma ')' +{ + $$ = new CPPExpression('f', $1, $3); +} + | formal_const_expr '(' ')' +{ + $$ = new CPPExpression('f', $1); +} + | formal_const_expr '.' const_expr +{ + $$ = new CPPExpression('.', $1, $3); +} + | formal_const_expr POINTSAT const_expr +{ + $$ = new CPPExpression(POINTSAT, $1, $3); +} + | '(' const_expr_comma ')' +{ + $$ = $2; +} + ; + +formal_const_operand: + INTEGER +{ + $$ = new CPPExpression($1); +} + | KW_TRUE +{ + $$ = new CPPExpression(true); +} + | KW_FALSE +{ + $$ = new CPPExpression(false); +} + | CHAR +{ + $$ = new CPPExpression($1); +} + | REAL +{ + $$ = new CPPExpression($1); +} + | string +{ + $$ = new CPPExpression($1); +} + ; + class_derivation_name: name { diff --git a/dtool/src/cppparser/cppInstance.cxx b/dtool/src/cppparser/cppInstance.cxx index 2555c9b5ad..2f53cfd497 100644 --- a/dtool/src/cppparser/cppInstance.cxx +++ b/dtool/src/cppparser/cppInstance.cxx @@ -25,10 +25,10 @@ #include "cppSimpleType.h" #include "cppExpression.h" #include "cppPreprocessor.h" -#include "indent.h" - +#include "cppParameterList.h" #include "cppReferenceType.h" #include "cppConstType.h" +#include "indent.h" #include @@ -79,8 +79,20 @@ CPPInstance(CPPType *type, CPPInstanceIdentifier *ii, int storage_class, _ident = ii->_ident; ii->_ident = NULL; _storage_class = storage_class; - delete ii; _initializer = NULL; + + CPPParameterList *params = ii->get_initializer(); + if (params != (CPPParameterList *)NULL) { + // In this case, the instance has a parameter-list initializer, e.g.: + // + // int foo(0); + // + // We really should save this initializer in the instance object. + // But we don't for now, since no one really cares about + // initializers anyway. + } + + delete ii; } //////////////////////////////////////////////////////////////////// @@ -489,6 +501,17 @@ output(ostream &out, int indent_level, CPPScope *scope, bool complete) const { void CPPInstance:: output(ostream &out, int indent_level, CPPScope *scope, bool complete, int num_default_parameters) const { + assert(_type != NULL); + + if (_type->is_parameter_expr()) { + // In this case, the whole thing is really an expression, and not + // an instance at all. This can only happen if we parsed an + // instance declaration while we thought we were parsing a + // function prototype. + out << *_initializer; + return; + } + if (is_template()) { get_template_scope()->_parameters.write_formal(out, scope); indent(out, indent_level); @@ -525,12 +548,12 @@ output(ostream &out, int indent_level, CPPScope *scope, bool complete, if (_ident != NULL) { name = _ident->get_local_name(scope); } - assert(_type != NULL); if (_type->as_function_type()) { _type->as_function_type()-> output_instance(out, indent_level, scope, complete, "", name, num_default_parameters); + } else { _type->output_instance(out, indent_level, scope, complete, "", name); } diff --git a/dtool/src/cppparser/cppInstanceIdentifier.cxx b/dtool/src/cppparser/cppInstanceIdentifier.cxx index 554a1f77ff..96cd58c583 100644 --- a/dtool/src/cppparser/cppInstanceIdentifier.cxx +++ b/dtool/src/cppparser/cppInstanceIdentifier.cxx @@ -78,6 +78,19 @@ scoped_pointer_type(CPPIdentifier *scoping) { return mod; } +//////////////////////////////////////////////////////////////////// +// Function: CPPInstanceIdentifier::Modifier::named initializer_type constructor +// Access: Public, Static +// Description: This is used only for instance declarations that turn +// out to be have a parameter list for an initializer. +//////////////////////////////////////////////////////////////////// +CPPInstanceIdentifier::Modifier CPPInstanceIdentifier::Modifier:: +initializer_type(CPPParameterList *params) { + Modifier mod(IIT_initializer); + mod._func_params = params; + return mod; +} + //////////////////////////////////////////////////////////////////// // Function: CPPInstanceIdentifier::Constructor // Access: Public @@ -114,7 +127,7 @@ add_modifier(CPPInstanceIdentifierType type) { } //////////////////////////////////////////////////////////////////// -// Function: CPPInstanceIdentifier::add_modifier +// Function: CPPInstanceIdentifier::add_func_modifier // Access: Public // Description: //////////////////////////////////////////////////////////////////// @@ -123,13 +136,18 @@ add_func_modifier(CPPParameterList *params, int flags) { _modifiers.push_back(Modifier::func_type(params, flags)); } +//////////////////////////////////////////////////////////////////// +// Function: CPPInstanceIdentifier::add_scoped_pointer_modifier +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// void CPPInstanceIdentifier:: add_scoped_pointer_modifier(CPPIdentifier *scoping) { _modifiers.push_back(Modifier::scoped_pointer_type(scoping)); } //////////////////////////////////////////////////////////////////// -// Function: CPPInstanceIdentifier::add_modifier +// Function: CPPInstanceIdentifier::add_array_modifier // Access: Public // Description: //////////////////////////////////////////////////////////////////// @@ -138,6 +156,42 @@ add_array_modifier(CPPExpression *expr) { _modifiers.push_back(Modifier::array_type(expr)); } +//////////////////////////////////////////////////////////////////// +// Function: CPPInstanceIdentifier::add_initializer_modifier +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +void CPPInstanceIdentifier:: +add_initializer_modifier(CPPParameterList *params) { + _modifiers.push_back(Modifier::initializer_type(params)); +} + +//////////////////////////////////////////////////////////////////// +// Function: CPPInstanceIdentifier::get_initializer +// Access: Public +// Description: Returns the initializer parameter list that was set +// for this particular instance, e.g. if the instance +// were: +// +// int foo(0); +// +// this would return the parameter list (0). Returns +// NULL if the instance did not use a parameter list +// initializer. +//////////////////////////////////////////////////////////////////// +CPPParameterList *CPPInstanceIdentifier:: +get_initializer() const { + Modifiers::const_iterator mi; + for (mi = _modifiers.begin(); mi != _modifiers.end(); ++mi) { + const Modifier &mod = (*mi); + if (mod._type == IIT_initializer) { + return mod._func_params; + } + } + + return NULL; +} + //////////////////////////////////////////////////////////////////// // Function: CPPInstanceIdentifier::get_scope // Access: Public @@ -216,6 +270,13 @@ r_unroll_type(CPPType *start_type, } break; + case IIT_initializer: + // In this case, we have parsed an instance declaration with a set + // of initializers as a parameter list. We lose the initializers + // at this point, but the instance will put it back again. + result = start_type; + break; + default: cerr << "Internal error--invalid CPPInstanceIdentifier\n"; abort(); diff --git a/dtool/src/cppparser/cppInstanceIdentifier.h b/dtool/src/cppparser/cppInstanceIdentifier.h index bbcd0800d0..8ac18ad958 100644 --- a/dtool/src/cppparser/cppInstanceIdentifier.h +++ b/dtool/src/cppparser/cppInstanceIdentifier.h @@ -41,6 +41,7 @@ enum CPPInstanceIdentifierType { IIT_const, IIT_paren, IIT_func, + IIT_initializer, }; /////////////////////////////////////////////////////////////////// @@ -61,6 +62,9 @@ public: void add_func_modifier(CPPParameterList *params, int flags); void add_scoped_pointer_modifier(CPPIdentifier *scoping); void add_array_modifier(CPPExpression *expr); + void add_initializer_modifier(CPPParameterList *params); + + CPPParameterList *get_initializer() const; CPPScope *get_scope(CPPScope *current_scope, CPPScope *global_scope, CPPPreprocessor *error_sink = NULL) const; @@ -73,6 +77,7 @@ public: static Modifier func_type(CPPParameterList *params, int flags); static Modifier array_type(CPPExpression *expr); static Modifier scoped_pointer_type(CPPIdentifier *scoping); + static Modifier initializer_type(CPPParameterList *params); CPPInstanceIdentifierType _type; CPPParameterList *_func_params; diff --git a/dtool/src/cppparser/cppParameterList.cxx b/dtool/src/cppparser/cppParameterList.cxx index fdba47aeec..d30f9a1afa 100644 --- a/dtool/src/cppparser/cppParameterList.cxx +++ b/dtool/src/cppparser/cppParameterList.cxx @@ -122,6 +122,24 @@ is_tbd() const { return false; } +//////////////////////////////////////////////////////////////////// +// Function: CPPParameterList::is_parameter_expr +// Access: Public +// Description: Returns true if any of the types in the parameter +// list turns out to be a constant expression, which is +// a clue that this parameter list is actually intended +// to be an instance declaration. +//////////////////////////////////////////////////////////////////// +bool CPPParameterList:: +is_parameter_expr() const { + for (int i = 0; i < (int)_parameters.size(); i++) { + if (_parameters[i]->_type->is_parameter_expr()) { + return true; + } + } + return false; +} + //////////////////////////////////////////////////////////////////// // Function: CPPParameterList::is_fully_specified // Access: Public diff --git a/dtool/src/cppparser/cppParameterList.h b/dtool/src/cppparser/cppParameterList.h index d77655c556..ebd676737e 100644 --- a/dtool/src/cppparser/cppParameterList.h +++ b/dtool/src/cppparser/cppParameterList.h @@ -30,7 +30,8 @@ class CPPScope; /////////////////////////////////////////////////////////////////// // Class : CPPParameterList -// Description : +// Description : A list of formal parameters for a function +// declaration. //////////////////////////////////////////////////////////////////// class CPPParameterList { public: @@ -43,6 +44,7 @@ public: bool operator < (const CPPParameterList &other) const; bool is_tbd() const; + bool is_parameter_expr() const; bool is_fully_specified() const; CPPParameterList *substitute_decl(CPPDeclaration::SubstDecl &subst, diff --git a/dtool/src/cppparser/cppSimpleType.cxx b/dtool/src/cppparser/cppSimpleType.cxx index 7133bae580..c8cfd72a92 100644 --- a/dtool/src/cppparser/cppSimpleType.cxx +++ b/dtool/src/cppparser/cppSimpleType.cxx @@ -44,6 +44,21 @@ is_tbd() const { return (_type == T_unknown); } +//////////////////////////////////////////////////////////////////// +// Function: CPPSimpleType::is_parameter_expr +// Access: Public, Virtual +// Description: Returns true if the type is a special parameter +// expression type. +// +// This sort of type is created to handle instance +// declarations that initially look like function +// prototypes. +//////////////////////////////////////////////////////////////////// +bool CPPSimpleType:: +is_parameter_expr() const { + return (_type == T_parameter); +} + //////////////////////////////////////////////////////////////////// // Function: CPPSimpleType::get_preferred_name // Access: Public, Virtual @@ -116,6 +131,10 @@ output(ostream &out, int, CPPScope *, bool) const { out << "unknown"; break; + case T_parameter: + out << "parameter"; + break; + default: out << "***invalid type***"; } diff --git a/dtool/src/cppparser/cppSimpleType.h b/dtool/src/cppparser/cppSimpleType.h index 5e2a0fd5f4..de1e22aca7 100644 --- a/dtool/src/cppparser/cppSimpleType.h +++ b/dtool/src/cppparser/cppSimpleType.h @@ -37,6 +37,20 @@ public: T_double, T_void, T_unknown, + + // T_parameter is a special type which is assigned to expressions + // that are discovered where a formal parameter was expected. + // This is a special case for handling cases like this: + // + // int foo(0); + // + // which really means the same thing as: + // + // int foo = 0; + // + // but it initially looks like a function prototype. + // + T_parameter, }; enum Flags { @@ -53,6 +67,7 @@ public: int _flags; virtual bool is_tbd() const; + virtual bool is_parameter_expr() const; virtual string get_preferred_name() const; diff --git a/dtool/src/cppparser/cppType.cxx b/dtool/src/cppparser/cppType.cxx index 58cad77dfb..756afd8ba7 100644 --- a/dtool/src/cppparser/cppType.cxx +++ b/dtool/src/cppparser/cppType.cxx @@ -66,6 +66,21 @@ is_tbd() const { return false; } +//////////////////////////////////////////////////////////////////// +// Function: CPPType::is_parameter_expr +// Access: Public, Virtual +// Description: Returns true if the type is a special parameter +// expression type. +// +// This sort of type is created to handle instance +// declarations that initially look like function +// prototypes. +//////////////////////////////////////////////////////////////////// +bool CPPType:: +is_parameter_expr() const { + return false; +} + //////////////////////////////////////////////////////////////////// // Function: CPPType::has_typedef_name // Access: Public diff --git a/dtool/src/cppparser/cppType.h b/dtool/src/cppparser/cppType.h index 3ac7b02abf..a2e83386c4 100644 --- a/dtool/src/cppparser/cppType.h +++ b/dtool/src/cppparser/cppType.h @@ -52,6 +52,7 @@ public: CPPScope *global_scope); virtual bool is_tbd() const; + virtual bool is_parameter_expr() const; bool has_typedef_name() const; string get_typedef_name(CPPScope *scope = NULL) const; diff --git a/dtool/src/prckeys/makePrcKey.cxx b/dtool/src/prckeys/makePrcKey.cxx index 672a1e3281..3102277fa2 100644 --- a/dtool/src/prckeys/makePrcKey.cxx +++ b/dtool/src/prckeys/makePrcKey.cxx @@ -105,7 +105,7 @@ output_c_string(ostream &out, const string &string_name, } } } - out << "\";\nstatic const size_t " << string_name << index + out << "\";\nstatic const unsigned int " << string_name << index << "_length = " << data_size << ";\n"; } diff --git a/panda/src/char/character.cxx b/panda/src/char/character.cxx index 3d492bf4d6..a2d1de7e1c 100644 --- a/panda/src/char/character.cxx +++ b/panda/src/char/character.cxx @@ -33,9 +33,7 @@ TypeHandle Character::_type_handle; -#ifndef CPPPARSER PStatCollector Character::_anim_pcollector("App:Animation"); -#endif //////////////////////////////////////////////////////////////////// // Function: Character::Copy Constructor diff --git a/panda/src/collide/collisionTraverser.cxx b/panda/src/collide/collisionTraverser.cxx index c793b6714d..9c797595eb 100644 --- a/panda/src/collide/collisionTraverser.cxx +++ b/panda/src/collide/collisionTraverser.cxx @@ -32,10 +32,8 @@ #include "pStatTimer.h" #include "indent.h" -#ifndef CPPPARSER PStatCollector CollisionTraverser::_collisions_pcollector("App:Collisions"); PStatCollector CollisionTraverser::_reset_prev_pcollector("App:Collisions:Reset"); -#endif //////////////////////////////////////////////////////////////////// // Function: CollisionTraverser::Constructor diff --git a/panda/src/device/trackerNode.I b/panda/src/device/trackerNode.I index 045fbf0293..6c401f0e34 100644 --- a/panda/src/device/trackerNode.I +++ b/panda/src/device/trackerNode.I @@ -95,7 +95,7 @@ INLINE void TrackerNode:: set_tracker_coordinate_system(CoordinateSystem cs) { _tracker_cs = cs; if (_tracker_cs == CS_default) { - _tracker_cs = default_coordinate_system; + _tracker_cs = get_default_coordinate_system(); } } @@ -121,7 +121,7 @@ INLINE void TrackerNode:: set_graph_coordinate_system(CoordinateSystem cs) { _graph_cs = cs; if (_graph_cs == CS_default) { - _graph_cs = default_coordinate_system; + _graph_cs = get_default_coordinate_system(); } } diff --git a/panda/src/display/graphicsEngine.cxx b/panda/src/display/graphicsEngine.cxx index ec3710afaa..b997d60b08 100644 --- a/panda/src/display/graphicsEngine.cxx +++ b/panda/src/display/graphicsEngine.cxx @@ -40,7 +40,6 @@ #include #endif -#ifndef CPPPARSER PStatCollector GraphicsEngine::_app_pcollector("App"); PStatCollector GraphicsEngine::_yield_pcollector("App:Yield"); PStatCollector GraphicsEngine::_cull_pcollector("Cull"); @@ -53,7 +52,6 @@ PStatCollector GraphicsEngine::_transform_states_pcollector("TransformStates"); PStatCollector GraphicsEngine::_transform_states_unused_pcollector("TransformStates:Unused"); PStatCollector GraphicsEngine::_render_states_pcollector("RenderStates"); PStatCollector GraphicsEngine::_render_states_unused_pcollector("RenderStates:Unused"); -#endif // CPPPARSER //////////////////////////////////////////////////////////////////// // Function: GraphicsEngine::Constructor diff --git a/panda/src/display/graphicsOutput.cxx b/panda/src/display/graphicsOutput.cxx index 6ca5fb69f2..9fccfa357a 100644 --- a/panda/src/display/graphicsOutput.cxx +++ b/panda/src/display/graphicsOutput.cxx @@ -27,10 +27,8 @@ TypeHandle GraphicsOutput::_type_handle; -#ifndef CPPPARSER PStatCollector GraphicsOutput::_make_current_pcollector("Draw:Make current"); PStatCollector GraphicsOutput::_copy_texture_pcollector("Draw:Copy texture"); -#endif // CPPPARSER //////////////////////////////////////////////////////////////////// // Function: GraphicsOutput::Constructor diff --git a/panda/src/display/graphicsStateGuardian.cxx b/panda/src/display/graphicsStateGuardian.cxx index 811e17f0d7..ee302529fa 100644 --- a/panda/src/display/graphicsStateGuardian.cxx +++ b/panda/src/display/graphicsStateGuardian.cxx @@ -40,7 +40,6 @@ #include -#ifndef CPPPARSER PStatCollector GraphicsStateGuardian::_total_texusage_pcollector("Texture usage"); PStatCollector GraphicsStateGuardian::_active_texusage_pcollector("Texture usage:Active"); PStatCollector GraphicsStateGuardian::_total_geom_pcollector("Prepared Geoms"); @@ -62,8 +61,6 @@ PStatCollector GraphicsStateGuardian::_draw_primitive_pcollector("Draw:Primitive PStatCollector GraphicsStateGuardian::_clear_pcollector("Draw:Clear"); PStatCollector GraphicsStateGuardian::_flush_pcollector("Draw:Flush"); -#endif - TypeHandle GraphicsStateGuardian::_type_handle; //////////////////////////////////////////////////////////////////// @@ -74,7 +71,7 @@ TypeHandle GraphicsStateGuardian::_type_handle; GraphicsStateGuardian:: GraphicsStateGuardian(const FrameBufferProperties &properties) { _properties = properties; - _coordinate_system = default_coordinate_system; + _coordinate_system = get_default_coordinate_system(); _current_display_region = (DisplayRegion*)0L; _current_lens = (Lens *)NULL; _needs_reset = true; diff --git a/panda/src/egg/config_egg.cxx b/panda/src/egg/config_egg.cxx index d470218092..7446b19592 100644 --- a/panda/src/egg/config_egg.cxx +++ b/panda/src/egg/config_egg.cxx @@ -63,15 +63,15 @@ ConfigureFn(config_egg) { init_libegg(); } -const DSearchPath & -get_egg_path() { - static DSearchPath *egg_path = NULL; - return get_config_path("egg-path", egg_path); -} +ConfigVariableSearchPath egg_path +("egg-path", + "The search path along which only egg files are searched. Generally, you " + "should use model-path instead of egg-path."); -// Set this true to support loading of old character animation files, which -// had the convention that the order "phr" implied a reversed roll. -bool egg_support_old_anims = config_egg.GetBool("egg-support-old-anims", true); +ConfigVariableBool egg_support_old_anims +("egg-support-old-anims", true, + "Set this true to support loading of old character animation files, which " + "had the convention that the order \"phr\" implied a reversed roll."); //////////////////////////////////////////////////////////////////// // Function: init_libegg diff --git a/panda/src/egg/config_egg.h b/panda/src/egg/config_egg.h index 71b2c9c338..cf4867e338 100644 --- a/panda/src/egg/config_egg.h +++ b/panda/src/egg/config_egg.h @@ -21,13 +21,13 @@ #include "pandabase.h" #include "notifyCategoryProxy.h" - -class DSearchPath; +#include "configVariableSearchPath.h" +#include "configVariableBool.h" NotifyCategoryDecl(egg, EXPCL_PANDAEGG, EXPTP_PANDAEGG); -const DSearchPath &get_egg_path(); -extern bool egg_support_old_anims; +extern ConfigVariableSearchPath egg_path; +extern ConfigVariableBool egg_support_old_anims; extern EXPCL_PANDAEGG void init_libegg(); diff --git a/panda/src/egg/eggData.cxx b/panda/src/egg/eggData.cxx index 6d4bb58982..deb533f0c7 100644 --- a/panda/src/egg/eggData.cxx +++ b/panda/src/egg/eggData.cxx @@ -55,7 +55,7 @@ resolve_egg_filename(Filename &egg_filename, const DSearchPath &searchpath) { } vfs->resolve_filename(egg_filename, searchpath, "egg") || - vfs->resolve_filename(egg_filename, get_egg_path(), "egg") || + vfs->resolve_filename(egg_filename, egg_path, "egg") || vfs->resolve_filename(egg_filename, get_model_path(), "egg"); return vfs->exists(egg_filename); @@ -66,7 +66,7 @@ resolve_egg_filename(Filename &egg_filename, const DSearchPath &searchpath) { } egg_filename.resolve_filename(searchpath, "egg") || - egg_filename.resolve_filename(get_egg_path(), "egg") || + egg_filename.resolve_filename(egg_path, "egg") || egg_filename.resolve_filename(get_model_path(), "egg"); return egg_filename.exists(); @@ -278,7 +278,7 @@ write_egg(ostream &out) { void EggData:: set_coordinate_system(CoordinateSystem new_coordsys) { if (new_coordsys == CS_default) { - new_coordsys = default_coordinate_system; + new_coordsys = get_default_coordinate_system(); } if (new_coordsys != _coordsys && (_coordsys != CS_default && _coordsys != CS_invalid)) { diff --git a/panda/src/egg/eggPolygon.cxx b/panda/src/egg/eggPolygon.cxx index 64981d07b1..6b32f12e25 100644 --- a/panda/src/egg/eggPolygon.cxx +++ b/panda/src/egg/eggPolygon.cxx @@ -80,7 +80,7 @@ calculate_normal(Normald &result, CoordinateSystem cs) const { } if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } if (cs == CS_zup_left || cs == CS_yup_left) { // In a left-handed coordinate system, we must flip the result. diff --git a/panda/src/egg2pg/config_egg2pg.cxx b/panda/src/egg2pg/config_egg2pg.cxx index 58172cf321..4d74932969 100644 --- a/panda/src/egg2pg/config_egg2pg.cxx +++ b/panda/src/egg2pg/config_egg2pg.cxx @@ -131,7 +131,7 @@ init_libegg2pg() { cs = CS_default; } egg_coordinate_system = (cs == CS_default) ? - default_coordinate_system : cs; + get_default_coordinate_system() : cs; // Get egg-alpha-mode string amstr = config_egg2pg.GetString("egg-alpha-mode", "blend"); diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index 10f886a133..a078f1820c 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -60,7 +60,7 @@ TypeHandle CLP(GraphicsStateGuardian)::_type_handle; -#if !defined(CPPPARSER) && defined(DO_PSTATS) +#ifdef DO_PSTATS PStatCollector CLP(GraphicsStateGuardian)::_vertices_display_list_pcollector("Vertices:Display lists"); #endif diff --git a/panda/src/gobj/orthographicLens.cxx b/panda/src/gobj/orthographicLens.cxx index 1e937f5ace..000595781d 100644 --- a/panda/src/gobj/orthographicLens.cxx +++ b/panda/src/gobj/orthographicLens.cxx @@ -65,7 +65,7 @@ void OrthographicLens:: compute_projection_mat() { CoordinateSystem cs = _cs; if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } float a = 2.0f / (_far_distance - _near_distance); diff --git a/panda/src/gobj/perspectiveLens.cxx b/panda/src/gobj/perspectiveLens.cxx index ffe8827b5d..c635336787 100644 --- a/panda/src/gobj/perspectiveLens.cxx +++ b/panda/src/gobj/perspectiveLens.cxx @@ -54,7 +54,7 @@ void PerspectiveLens:: compute_projection_mat() { CoordinateSystem cs = _cs; if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } float fl = get_focal_length(); diff --git a/panda/src/gobj/preparedGraphicsObjects.cxx b/panda/src/gobj/preparedGraphicsObjects.cxx index bccd9d8917..e31737bca2 100644 --- a/panda/src/gobj/preparedGraphicsObjects.cxx +++ b/panda/src/gobj/preparedGraphicsObjects.cxx @@ -20,9 +20,7 @@ #include "textureContext.h" #include "mutexHolder.h" -#ifndef CPPPARSER PStatCollector PreparedGraphicsObjects::_total_texusage_pcollector("Texture usage"); -#endif // CPPPARSER //////////////////////////////////////////////////////////////////// // Function: PreparedGraphicsObjects::Constructor diff --git a/panda/src/grutil/frameRateMeter.cxx b/panda/src/grutil/frameRateMeter.cxx index af5c8a7a4d..6e2f190f46 100644 --- a/panda/src/grutil/frameRateMeter.cxx +++ b/panda/src/grutil/frameRateMeter.cxx @@ -28,9 +28,7 @@ #include "pStatTimer.h" #include // For sprintf/snprintf -#ifndef CPPPARSER PStatCollector FrameRateMeter::_show_fps_pcollector("Cull:Show fps"); -#endif // CPPPARSER TypeHandle FrameRateMeter::_type_handle; diff --git a/panda/src/linmath/compose_matrix_src.cxx b/panda/src/linmath/compose_matrix_src.cxx index 4194f51866..4926a6b1f5 100644 --- a/panda/src/linmath/compose_matrix_src.cxx +++ b/panda/src/linmath/compose_matrix_src.cxx @@ -527,7 +527,7 @@ decompose_matrix(const FLOATNAME(LMatrix3) &mat, FLOATNAME(LVecBase3) &hpr, CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } if (linmath_cat.is_debug()) { @@ -649,7 +649,7 @@ decompose_matrix(const FLOATNAME(LMatrix3) &mat, FLOATTYPE roll, CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } if (linmath_cat.is_debug()) { diff --git a/panda/src/linmath/config_linmath.cxx b/panda/src/linmath/config_linmath.cxx index 2567e990c6..ab077088ee 100644 --- a/panda/src/linmath/config_linmath.cxx +++ b/panda/src/linmath/config_linmath.cxx @@ -29,19 +29,18 @@ ConfigureFn(config_linmath) { init_liblinmath(); } -// Set this true to doublecheck the quaternion-hpr compose and -// decompose operations against the quaternion-matrix and matrix-hpr -// operations. This only has effect if NDEBUG is not defined. -const bool paranoid_hpr_quat = config_linmath.GetBool("paranoid-hpr-quat", false); +ConfigVariableBool paranoid_hpr_quat +("paranoid-hpr-quat", false, + "Set this true to doublecheck the quaternion-hpr compose and " + "decompose operations against the quaternion-matrix and matrix-hpr " + "operations. This only has effect if NDEBUG is not defined."); -// Set this true to compute hpr's correctly. Presently, we apply -// these in the wrong order, and roll is backwards relative to the -// other two. But we can't globally fix this because some of our old -// tools, most notably egg-optchar, depend on the old broken behavior. -// Until we are able to rewrite these tools into the new system, we -// must keep the old behavior; setting this switch lets you use the -// new, correct behavior but you don't get animated characters. -const bool temp_hpr_fix = config_linmath.GetBool("temp-hpr-fix", false); +ConfigVariableBool temp_hpr_fix +("temp-hpr-fix", true, + "Set this true to compute hpr's correctly. Historically, Panda has " + "applied these in the wrong order, and roll was backwards relative " + "to the other two. Set this false if you need compatibility with " + "Panda's old hpr calculations."); //////////////////////////////////////////////////////////////////// // Function: init_liblinmath @@ -90,14 +89,4 @@ init_liblinmath() { LQuaterniond::init_type(); LRotationd::init_type(); LOrientationd::init_type(); - - string csstr = config_linmath.GetString("coordinate-system", "default"); - CoordinateSystem cs = parse_coordinate_system_string(csstr); - - if (cs == CS_invalid) { - linmath_cat.error() - << "Unexpected coordinate-system string: " << csstr << "\n"; - cs = CS_default; - } - default_coordinate_system = (cs == CS_default) ? CS_zup_right : cs; } diff --git a/panda/src/linmath/config_linmath.h b/panda/src/linmath/config_linmath.h index 42ff15c435..b060e54a7a 100644 --- a/panda/src/linmath/config_linmath.h +++ b/panda/src/linmath/config_linmath.h @@ -21,11 +21,12 @@ #include "pandabase.h" #include "notifyCategoryProxy.h" +#include "configVariableBool.h" NotifyCategoryDecl(linmath, EXPCL_PANDA, EXPTP_PANDA); -extern const bool paranoid_hpr_quat; -extern EXPCL_PANDA const bool temp_hpr_fix; +extern EXPCL_PANDA ConfigVariableBool paranoid_hpr_quat; +extern EXPCL_PANDA ConfigVariableBool temp_hpr_fix; extern EXPCL_PANDA void init_liblinmath(); diff --git a/panda/src/linmath/coordinateSystem.cxx b/panda/src/linmath/coordinateSystem.cxx index 7ca3432826..28d98862db 100644 --- a/panda/src/linmath/coordinateSystem.cxx +++ b/panda/src/linmath/coordinateSystem.cxx @@ -18,14 +18,25 @@ #include "coordinateSystem.h" #include "config_linmath.h" +#include "configVariableEnum.h" #include "dconfig.h" #include "notify.h" #include -#include -CoordinateSystem default_coordinate_system; +static ConfigVariableEnum default_cs +("coordinate-system", CS_zup_right, + "The default coordinate system to use throughout Panda for rendering, " + "user input, and matrix operations, unless specified otherwise."); + + +CoordinateSystem +get_default_coordinate_system() { + CoordinateSystem cs = default_cs; + return (cs == CS_default || cs == CS_invalid) ? CS_zup_right : cs; +} + CoordinateSystem parse_coordinate_system_string(const string &str) { @@ -57,10 +68,10 @@ parse_coordinate_system_string(const string &str) { return CS_invalid; } -INLINE_LINMATH bool +bool is_right_handed(CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } switch (cs) { case CS_zup_right: @@ -106,3 +117,12 @@ operator << (ostream &out, CoordinateSystem cs) { nassertr(false, out); return out; } + +istream & +operator >> (istream &in, CoordinateSystem &cs) { + string word; + in >> word; + cs = parse_coordinate_system_string(word); + return in; +} + diff --git a/panda/src/linmath/coordinateSystem.h b/panda/src/linmath/coordinateSystem.h index d3d219b08d..c80b073ec7 100644 --- a/panda/src/linmath/coordinateSystem.h +++ b/panda/src/linmath/coordinateSystem.h @@ -23,15 +23,13 @@ #include "typedef.h" -#include - BEGIN_PUBLISH enum CoordinateSystem { // The CS_default entry does not refer to a particular coordinate // system, but rather to the value stored in // default_coordinate_system, which in turn is loaded from the - // Configrc variable "coordinate-system". + // config variable "coordinate-system". CS_default, CS_zup_right, @@ -45,16 +43,17 @@ enum CoordinateSystem { CS_invalid, }; +EXPCL_PANDA CoordinateSystem get_default_coordinate_system(); + END_PUBLISH -extern CoordinateSystem EXPCL_PANDA default_coordinate_system; - -CoordinateSystem EXPCL_PANDA parse_coordinate_system_string(const string &str); -bool EXPCL_PANDA is_right_handed(CoordinateSystem cs = CS_default); +EXPCL_PANDA CoordinateSystem parse_coordinate_system_string(const string &str); +EXPCL_PANDA bool is_right_handed(CoordinateSystem cs = CS_default); #define IS_LEFT_HANDED_COORDSYSTEM(cs) ((cs==CS_zup_left) || (cs==CS_yup_left)) -ostream EXPCL_PANDA &operator << (ostream &out, CoordinateSystem cs); +EXPCL_PANDA ostream &operator << (ostream &out, CoordinateSystem cs); +EXPCL_PANDA istream &operator >> (istream &in, CoordinateSystem &cs); #endif diff --git a/panda/src/linmath/lmatrix3_src.I b/panda/src/linmath/lmatrix3_src.I index 2d5c0e429c..27e9d8f74f 100644 --- a/panda/src/linmath/lmatrix3_src.I +++ b/panda/src/linmath/lmatrix3_src.I @@ -965,7 +965,7 @@ INLINE_LINMATH FLOATNAME(LMatrix3) FLOATNAME(LMatrix3):: rotate_mat(FLOATTYPE angle, FLOATNAME(LVecBase3) axis, CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } FLOATNAME(LMatrix3) mat; @@ -1044,7 +1044,7 @@ INLINE_LINMATH FLOATNAME(LMatrix3) FLOATNAME(LMatrix3):: rotate_mat_normaxis(FLOATTYPE angle, const FLOATNAME(LVecBase3) &axis, CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } FLOATNAME(LMatrix3) mat; diff --git a/panda/src/linmath/lmatrix3_src.cxx b/panda/src/linmath/lmatrix3_src.cxx index 89e3c95590..320f4010ec 100644 --- a/panda/src/linmath/lmatrix3_src.cxx +++ b/panda/src/linmath/lmatrix3_src.cxx @@ -61,7 +61,7 @@ scale_shear_mat(const FLOATNAME(LVecBase3) &scale, const FLOATNAME(LVecBase3) &shear, CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } // We have to match the placement of the shear components in the @@ -134,10 +134,10 @@ scale_shear_mat(const FLOATNAME(LVecBase3) &scale, const FLOATNAME(LMatrix3) &FLOATNAME(LMatrix3):: convert_mat(CoordinateSystem from, CoordinateSystem to) { if (from == CS_default) { - from = default_coordinate_system; + from = get_default_coordinate_system(); } if (to == CS_default) { - to = default_coordinate_system; + to = get_default_coordinate_system(); } switch (from) { case CS_zup_left: diff --git a/panda/src/linmath/lmatrix4_src.I b/panda/src/linmath/lmatrix4_src.I index 4968ffd8c8..cd836cc655 100644 --- a/panda/src/linmath/lmatrix4_src.I +++ b/panda/src/linmath/lmatrix4_src.I @@ -1201,7 +1201,7 @@ rotate_mat(FLOATTYPE angle, FLOATNAME(LVecBase3) axis, CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } FLOATNAME(LMatrix4) mat; @@ -1297,7 +1297,7 @@ rotate_mat_normaxis(FLOATTYPE angle, const FLOATNAME(LVecBase3) &axis, FLOATNAME(LMatrix4) &result_mat, CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } if(IS_LEFT_HANDED_COORDSYSTEM(cs)) { diff --git a/panda/src/linmath/lmatrix4_src.cxx b/panda/src/linmath/lmatrix4_src.cxx index 41d9794c06..1e6a14ac05 100644 --- a/panda/src/linmath/lmatrix4_src.cxx +++ b/panda/src/linmath/lmatrix4_src.cxx @@ -63,10 +63,10 @@ const FLOATNAME(LMatrix4) FLOATNAME(LMatrix4)::_ly_to_rz_mat = const FLOATNAME(LMatrix4) &FLOATNAME(LMatrix4):: convert_mat(CoordinateSystem from, CoordinateSystem to) { if (from == CS_default) { - from = default_coordinate_system; + from = get_default_coordinate_system(); } if (to == CS_default) { - to = default_coordinate_system; + to = get_default_coordinate_system(); } switch (from) { case CS_zup_left: diff --git a/panda/src/linmath/lvector3_src.I b/panda/src/linmath/lvector3_src.I index d5e04806b0..916bc87bf5 100644 --- a/panda/src/linmath/lvector3_src.I +++ b/panda/src/linmath/lvector3_src.I @@ -252,7 +252,7 @@ operator / (FLOATTYPE scalar) const { INLINE_LINMATH FLOATNAME(LVector3) FLOATNAME(LVector3):: up(CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } switch (cs) { case CS_zup_right: @@ -290,7 +290,7 @@ right(CoordinateSystem) { INLINE_LINMATH FLOATNAME(LVector3) FLOATNAME(LVector3):: forward(CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } switch (cs) { case CS_zup_right: @@ -364,7 +364,7 @@ rfu(FLOATTYPE right_v, FLOATTYPE fwd_v, FLOATTYPE up_v, if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } FLOATTYPE vy,vz; switch(cs) { diff --git a/panda/src/mathutil/boundingHexahedron.cxx b/panda/src/mathutil/boundingHexahedron.cxx index e46754966d..198b6585d8 100644 --- a/panda/src/mathutil/boundingHexahedron.cxx +++ b/panda/src/mathutil/boundingHexahedron.cxx @@ -29,7 +29,7 @@ BoundingHexahedron:: BoundingHexahedron(const Frustumf &frustum, bool is_ortho, CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } float fs = 1.0f; diff --git a/panda/src/mathutil/frustum_src.I b/panda/src/mathutil/frustum_src.I index fde9068a3f..9836ad7754 100644 --- a/panda/src/mathutil/frustum_src.I +++ b/panda/src/mathutil/frustum_src.I @@ -173,7 +173,7 @@ get_perspective_params(FLOATTYPE& xfov, FLOATTYPE& yfov, FLOATTYPE& aspect, INLINE_MATHUTIL FLOATNAME(LMatrix4) FLOATNAME(Frustum):: get_perspective_projection_mat(CoordinateSystem cs) const { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } FLOATTYPE recip_far_minus_near = 1.0f/(_ffar - _fnear); @@ -235,7 +235,7 @@ get_perspective_projection_mat(CoordinateSystem cs) const { INLINE_MATHUTIL FLOATNAME(LMatrix4) FLOATNAME(Frustum):: get_ortho_projection_mat(CoordinateSystem cs) const { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } FLOATTYPE a = 2.0f / (_r - _l); diff --git a/panda/src/mathutil/look_at_src.cxx b/panda/src/mathutil/look_at_src.cxx index de388f8d4d..705dccf9b9 100644 --- a/panda/src/mathutil/look_at_src.cxx +++ b/panda/src/mathutil/look_at_src.cxx @@ -62,7 +62,7 @@ void heads_up(FLOATNAME(LMatrix3) &mat, const FLOATNAME(LVector3) &fwd, const FLOATNAME(LVector3) &up, CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } if (cs == CS_zup_right || cs == CS_zup_left) { @@ -198,7 +198,7 @@ void look_at(FLOATNAME(LMatrix3) &mat, const FLOATNAME(LVector3) &fwd, const FLOATNAME(LVector3) &up, CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } if (cs == CS_zup_right || cs == CS_zup_left) { diff --git a/panda/src/parametrics/parametricCurve.cxx b/panda/src/parametrics/parametricCurve.cxx index e83e49c06c..1266f68fb6 100644 --- a/panda/src/parametrics/parametricCurve.cxx +++ b/panda/src/parametrics/parametricCurve.cxx @@ -416,7 +416,7 @@ write_egg(ostream &out, const Filename &filename, CoordinateSystem cs) { } if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } if (cs != CS_invalid) { diff --git a/panda/src/parametrics/parametricCurveCollection.cxx b/panda/src/parametrics/parametricCurveCollection.cxx index 349dcaaa82..406b2e4510 100644 --- a/panda/src/parametrics/parametricCurveCollection.cxx +++ b/panda/src/parametrics/parametricCurveCollection.cxx @@ -771,7 +771,7 @@ write_egg(Filename filename, CoordinateSystem cs) { bool ParametricCurveCollection:: write_egg(ostream &out, const Filename &filename, CoordinateSystem cs) { if (cs == CS_default) { - cs = default_coordinate_system; + cs = get_default_coordinate_system(); } if (cs != CS_invalid) { diff --git a/panda/src/pgraph/cullBin.cxx b/panda/src/pgraph/cullBin.cxx index bc6bb25377..004b04b678 100644 --- a/panda/src/pgraph/cullBin.cxx +++ b/panda/src/pgraph/cullBin.cxx @@ -18,11 +18,8 @@ #include "cullBin.h" - -#ifndef CPPPARSER PStatCollector CullBin::_cull_bin_pcollector("Cull:Bins"); PStatCollector CullBin::_draw_bin_pcollector("Draw:Bins"); -#endif TypeHandle CullBin::_type_handle; diff --git a/panda/src/pgraph/cullTraverser.cxx b/panda/src/pgraph/cullTraverser.cxx index 6835318125..e04676f140 100644 --- a/panda/src/pgraph/cullTraverser.cxx +++ b/panda/src/pgraph/cullTraverser.cxx @@ -34,10 +34,8 @@ #include "geomSphere.h" #include "portalClipper.h" -#ifndef CPPPARSER PStatCollector CullTraverser::_nodes_pcollector("Nodes"); PStatCollector CullTraverser::_geom_nodes_pcollector("Nodes:GeomNodes"); -#endif // CPPPARSER TypeHandle CullTraverser::_type_handle; diff --git a/panda/src/pgraph/polylightEffect.cxx b/panda/src/pgraph/polylightEffect.cxx index 0612127349..e9e580608a 100755 --- a/panda/src/pgraph/polylightEffect.cxx +++ b/panda/src/pgraph/polylightEffect.cxx @@ -30,9 +30,7 @@ TypeHandle PolylightEffect::_type_handle; -#ifndef CPPPARSER PStatCollector PolylightEffect::_cull_pcollector("Cull:Polylight"); -#endif /// CPPPARSER //////////////////////////////////////////////////////////////////// // Function: PolylightEffect::make diff --git a/panda/src/pstatclient/pStatClient.cxx b/panda/src/pstatclient/pStatClient.cxx index 6acd41781d..2f6d8154de 100644 --- a/panda/src/pstatclient/pStatClient.cxx +++ b/panda/src/pstatclient/pStatClient.cxx @@ -41,12 +41,10 @@ PStatClient *PStatClient::_global_pstats = NULL; -#ifndef CPPPARSER PStatCollector _total_size_pcollector("Memory usage"); PStatCollector _cpp_size_pcollector("Memory usage:C++"); PStatCollector _interpreter_size_pcollector("Memory usage:Interpreter"); PStatCollector _pstats_pcollector("App:PStats"); -#endif //////////////////////////////////////////////////////////////////// // Function: PStatClient::PerThreadData::Constructor diff --git a/panda/src/putil/config_util.cxx b/panda/src/putil/config_util.cxx index 811bfef4dd..80ee1f5eac 100644 --- a/panda/src/putil/config_util.cxx +++ b/panda/src/putil/config_util.cxx @@ -40,7 +40,6 @@ ConfigureDef(config_util); NotifyCategoryDef(util, ""); NotifyCategoryDef(bam, util_cat); -#ifndef CPPPARSER ConfigVariableSearchPath model_path ("model-path", "The default directories to search for all models and general files loaded into Panda."); @@ -49,7 +48,6 @@ ConfigVariableSearchPath texture_path ConfigVariableSearchPath sound_path ("sound-path", "The directories to search for loaded sound and music files."); -#endif // CPPPARSER ConfigureFn(config_util) { BamReaderParam::init_type(); diff --git a/panda/src/tform/driveInterface.cxx b/panda/src/tform/driveInterface.cxx index 34f4899bfc..5f1ac8d43a 100644 --- a/panda/src/tform/driveInterface.cxx +++ b/panda/src/tform/driveInterface.cxx @@ -360,7 +360,7 @@ apply(double x, double y, bool any_button) { // To prevent upward drift due to numerical errors, force the // vertical component of our step to zero (it should be pretty near // zero anyway). - switch (default_coordinate_system) { + switch (get_default_coordinate_system()) { case CS_zup_right: case CS_zup_left: step[2] = 0.0f; diff --git a/panda/src/tform/trackball.cxx b/panda/src/tform/trackball.cxx index 843ef16d06..250cab5fee 100644 --- a/panda/src/tform/trackball.cxx +++ b/panda/src/tform/trackball.cxx @@ -56,7 +56,7 @@ Trackball(const string &name) : _mat = LMatrix4f::ident_mat(); _orig = LMatrix4f::ident_mat(); _invert = true; - _cs = default_coordinate_system; + _cs = get_default_coordinate_system(); // We want to track the state of these buttons. watch_button(MouseButton::one());