Remove half-baked non-sized array support
ANGLE used to accept shaders with non-sized arrays in initializer lists.
Fix this. Proper support for implicitly sized arrays will be implemented
later for ESSL3.
TEST=angle_unittests
BUG=angleproject:941
Change-Id: I53c5ccf0f7ef09ad30e142f8350812959fc4846c
Reviewed-on: https://chromium-review.googlesource.com/264360
Tested-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
index 86eeb6d..f162e42 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -1462,7 +1462,7 @@
{
recover();
}
- else if (indexExpression)
+ else
{
int size;
if (arraySizeErrorCheck(arrayLocation, indexExpression, size))
@@ -1477,14 +1477,6 @@
return intermediate.growAggregate(declaratorList, intermediate.addSymbol(variable ? variable->getUniqueId() : 0, identifier, type, identifierLocation), identifierLocation);
}
- else
- {
- TPublicType arrayType(publicType);
- arrayType.setArray(true);
- TVariable* variable = NULL;
- if (arrayErrorCheck(arrayLocation, identifier, arrayType, variable))
- recover();
- }
return NULL;
}
diff --git a/src/compiler/translator/glslang.y b/src/compiler/translator/glslang.y
index 8eb54a2..34f1cf9 100644
--- a/src/compiler/translator/glslang.y
+++ b/src/compiler/translator/glslang.y
@@ -883,10 +883,6 @@
$$ = $1;
$$.intermAggregate = context->parseDeclarator($$.type, $1.intermAggregate, $3.symbol, @3, *$3.string);
}
- | init_declarator_list COMMA identifier LEFT_BRACKET RIGHT_BRACKET {
- $$ = $1;
- context->parseArrayDeclarator($$.type, @3, *$3.string, @4, NULL, NULL);
- }
| init_declarator_list COMMA identifier LEFT_BRACKET constant_expression RIGHT_BRACKET {
$$ = $1;
$$.intermAggregate = context->parseArrayDeclarator($$.type, @3, *$3.string, @4, $1.intermNode, $5);
diff --git a/src/compiler/translator/glslang_tab.cpp b/src/compiler/translator/glslang_tab.cpp
index 80c7285..a527d40 100644
--- a/src/compiler/translator/glslang_tab.cpp
+++ b/src/compiler/translator/glslang_tab.cpp
@@ -622,16 +622,16 @@
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 114
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 2336
+#define YYLAST 2307
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 128
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 94
/* YYNRULES -- Number of rules. */
-#define YYNRULES 270
+#define YYNRULES 269
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 405
+#define YYNSTATES 404
/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
by yylex, with out-of-bounds checking. */
@@ -701,23 +701,22 @@
561, 565, 569, 573, 580, 583, 594, 602, 610, 637,
643, 654, 658, 662, 666, 673, 729, 732, 739, 747,
768, 789, 799, 827, 832, 842, 847, 857, 860, 863,
- 866, 872, 879, 882, 886, 890, 894, 901, 905, 909,
- 916, 920, 924, 931, 941, 947, 950, 956, 962, 969,
- 978, 987, 995, 998, 1005, 1009, 1016, 1019, 1023, 1027,
- 1036, 1045, 1053, 1063, 1075, 1078, 1081, 1087, 1094, 1097,
- 1103, 1106, 1109, 1115, 1118, 1133, 1137, 1141, 1145, 1149,
- 1153, 1158, 1163, 1168, 1173, 1178, 1183, 1188, 1193, 1198,
- 1203, 1208, 1213, 1218, 1223, 1228, 1233, 1238, 1243, 1248,
- 1253, 1258, 1262, 1266, 1270, 1274, 1278, 1282, 1286, 1290,
- 1294, 1298, 1302, 1306, 1310, 1314, 1318, 1326, 1334, 1338,
- 1351, 1351, 1354, 1354, 1360, 1363, 1379, 1382, 1391, 1395,
- 1401, 1408, 1423, 1427, 1431, 1432, 1438, 1439, 1440, 1441,
- 1442, 1443, 1444, 1448, 1449, 1449, 1449, 1459, 1460, 1464,
- 1464, 1465, 1465, 1470, 1473, 1483, 1486, 1492, 1493, 1497,
- 1505, 1509, 1516, 1516, 1523, 1526, 1533, 1538, 1555, 1555,
- 1560, 1560, 1567, 1567, 1575, 1578, 1584, 1587, 1593, 1597,
- 1604, 1607, 1610, 1613, 1616, 1625, 1629, 1636, 1639, 1645,
- 1645
+ 866, 872, 879, 882, 886, 890, 897, 901, 905, 912,
+ 916, 920, 927, 937, 943, 946, 952, 958, 965, 974,
+ 983, 991, 994, 1001, 1005, 1012, 1015, 1019, 1023, 1032,
+ 1041, 1049, 1059, 1071, 1074, 1077, 1083, 1090, 1093, 1099,
+ 1102, 1105, 1111, 1114, 1129, 1133, 1137, 1141, 1145, 1149,
+ 1154, 1159, 1164, 1169, 1174, 1179, 1184, 1189, 1194, 1199,
+ 1204, 1209, 1214, 1219, 1224, 1229, 1234, 1239, 1244, 1249,
+ 1254, 1258, 1262, 1266, 1270, 1274, 1278, 1282, 1286, 1290,
+ 1294, 1298, 1302, 1306, 1310, 1314, 1322, 1330, 1334, 1347,
+ 1347, 1350, 1350, 1356, 1359, 1375, 1378, 1387, 1391, 1397,
+ 1404, 1419, 1423, 1427, 1428, 1434, 1435, 1436, 1437, 1438,
+ 1439, 1440, 1444, 1445, 1445, 1445, 1455, 1456, 1460, 1460,
+ 1461, 1461, 1466, 1469, 1479, 1482, 1488, 1489, 1493, 1501,
+ 1505, 1512, 1512, 1519, 1522, 1529, 1534, 1551, 1551, 1556,
+ 1556, 1563, 1563, 1571, 1574, 1580, 1583, 1589, 1593, 1600,
+ 1603, 1606, 1609, 1612, 1621, 1625, 1632, 1635, 1641, 1641
};
#endif
@@ -806,12 +805,12 @@
};
# endif
-#define YYPACT_NINF -328
+#define YYPACT_NINF -349
#define yypact_value_is_default(Yystate) \
- (!!((Yystate) == (-328)))
+ (!!((Yystate) == (-349)))
-#define YYTABLE_NINF -230
+#define YYTABLE_NINF -229
#define yytable_value_is_error(Yytable_value) \
0
@@ -820,47 +819,47 @@
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- 1974, -24, -328, -328, -328, 184, -328, -328, -328, -328,
- -328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
- -328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
- -328, -328, -328, -328, -328, -328, -328, -14, -328, -328,
- -54, -328, -328, -328, -328, -328, -328, -328, -328, -328,
- -328, -328, -328, -328, -328, -328, -328, -328, -328, -36,
- -328, -328, -78, -9, -30, 3, 53, -328, 30, 10,
- 260, -328, -328, 2259, 10, -328, -8, -328, 1899, -328,
- -328, -328, -328, 2259, -328, -328, -328, -328, -328, -23,
- 43, -328, 26, -328, 62, -328, -328, -328, -328, -328,
- 2123, 151, 108, -328, 34, -22, -328, 60, -328, 2049,
- -328, -328, -328, 1452, -328, -328, 16, 2049, -328, 65,
- -10, -328, 389, -328, -328, -328, -328, 108, 2123, -16,
- -328, 1161, 1452, -328, 129, 2123, 108, 1644, -328, 90,
- -328, -328, -328, -328, -328, 1452, 1452, 1452, -328, -328,
- -328, -328, -328, -328, -48, -328, -328, -328, 71, 13,
- 1547, 96, -328, 1452, 87, -70, 113, -57, 131, 98,
- 97, 109, 141, 143, -71, -328, 133, -328, -328, 1729,
- 2049, 123, -328, 43, 127, 128, -328, 139, 142, 134,
- 1259, 145, 1452, 138, 149, 136, -328, -328, 116, -328,
- -328, 55, -328, -78, 152, -328, -328, -328, -328, 505,
- -328, -328, -328, -328, -328, -328, 153, -328, -328, 1354,
- 1452, -328, 148, -328, -328, 108, 154, 61, -328, -59,
- -328, -328, -328, 15, -328, -328, 1452, 2191, -328, -328,
- 1452, 156, -328, -328, -328, 1452, 1452, 1452, 1452, 1452,
- 1452, 1452, 1452, 1452, 1452, 1452, 1452, 1452, 1452, 1452,
- 1452, 1452, 1452, 1452, 1452, -328, -328, 1814, -328, -328,
- -328, -328, -328, 150, -328, 1452, -328, -328, 63, 1452,
- 157, -328, -328, -328, 621, -328, -328, -328, -328, -328,
- -328, -328, -328, -328, -328, -328, 1452, 1452, -328, -328,
- -328, 1452, -328, 167, -328, -328, 72, 1452, 108, -328,
- -32, -328, -328, 168, 146, -328, 159, -328, -328, -328,
- -328, -328, 87, 87, -70, -70, 113, 113, 113, 113,
- -57, -57, 131, 98, 97, 109, 141, 143, 114, -328,
- 220, 26, 853, 969, 18, -328, 20, -328, 1066, 621,
- -328, -328, 170, -328, -328, 171, -328, 1452, -328, -328,
- 1452, 175, -328, -328, -328, -328, 1066, 150, -328, 146,
- 108, 2123, 176, 173, -328, -328, 193, -328, 1452, -328,
- 166, 178, 284, -328, 194, 191, 737, -328, 197, 22,
- 1452, 737, 150, -328, 1452, -328, -328, -328, -328, 198,
- 146, -328, -328, -328, -328
+ 1945, -28, -349, -349, -349, 161, -349, -349, -349, -349,
+ -349, -349, -349, -349, -349, -349, -349, -349, -349, -349,
+ -349, -349, -349, -349, -349, -349, -349, -349, -349, -349,
+ -349, -349, -349, -349, -349, -349, -349, 135, -349, -349,
+ -40, -349, -349, -349, -349, -349, -349, -349, -349, -349,
+ -349, -349, -349, -349, -349, -349, -349, -349, -349, -77,
+ -349, -349, -79, -55, -45, 16, -88, -349, 134, 55,
+ 1160, -349, -349, 2230, 55, -349, -25, -349, 1870, -349,
+ -349, -349, -349, 2230, -349, -349, -349, -349, -349, -19,
+ 39, -349, 35, -349, 62, -349, -349, -349, -349, -349,
+ 2094, 142, 136, -349, 74, -27, -349, 77, -349, 2020,
+ -349, -349, -349, 1423, -349, -349, 10, 2020, -349, 85,
+ -50, -349, 388, -349, -349, -349, -349, 136, 2094, -12,
+ -349, 1230, 1423, -349, 143, 2094, 136, 1615, -349, 125,
+ -349, -349, -349, -349, -349, 1423, 1423, 1423, -349, -349,
+ -349, -349, -349, -349, -64, -349, -349, -349, 126, -21,
+ 1518, 129, -349, 1423, 83, -11, 131, -48, 127, 104,
+ 110, 113, 148, 141, -75, -349, 133, -349, -349, 1700,
+ 2020, 139, -349, 39, 128, 132, -349, 137, 144, 138,
+ 1328, 145, 1423, 146, 149, 150, -349, -349, 94, -349,
+ -349, 19, -349, -79, 153, -349, -349, -349, -349, 504,
+ -349, -349, -349, -349, -349, -349, 154, -349, -349, 1423,
+ 1423, -349, 140, -349, -349, 136, 155, 20, -349, -61,
+ -349, -349, -349, 3, -349, -349, 1423, 2162, -349, -349,
+ 1423, 158, -349, -349, -349, 1423, 1423, 1423, 1423, 1423,
+ 1423, 1423, 1423, 1423, 1423, 1423, 1423, 1423, 1423, 1423,
+ 1423, 1423, 1423, 1423, 1423, -349, -349, 1785, -349, -349,
+ -349, -349, -349, 156, -349, 1423, -349, -349, 27, 1423,
+ 157, -349, -349, -349, 620, -349, -349, -349, -349, -349,
+ -349, -349, -349, -349, -349, -349, 1423, 1423, -349, -349,
+ -349, 1423, 147, -349, -349, 28, 1423, 136, -349, -86,
+ -349, -349, 163, 160, -349, 164, -349, -349, -349, -349,
+ -349, 83, 83, -11, -11, 131, 131, 131, 131, -48,
+ -48, 127, 104, 110, 113, 148, 141, 109, -349, 187,
+ 35, 852, 968, 5, -349, 15, -349, 1065, 620, -349,
+ -349, 165, -349, -349, 166, -349, 1423, -349, -349, 1423,
+ 170, -349, -349, -349, -349, 1065, 156, -349, 160, 136,
+ 2094, 171, 168, -349, -349, 172, -349, 1423, -349, 151,
+ 173, 228, -349, 167, 169, 736, -349, 174, 18, 1423,
+ 736, 156, -349, 1423, -349, -349, -349, -349, 175, 160,
+ -349, -349, -349, -349
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -868,76 +867,76 @@
means the default is an error. */
static const yytype_uint16 yydefact[] =
{
- 0, 0, 144, 145, 146, 0, 128, 136, 159, 156,
- 157, 158, 163, 164, 165, 166, 167, 168, 160, 161,
- 162, 169, 170, 171, 172, 173, 174, 137, 138, 141,
- 129, 175, 176, 177, 178, 179, 180, 0, 126, 125,
- 0, 155, 181, 183, 196, 197, 184, 185, 186, 187,
- 188, 189, 190, 191, 192, 182, 193, 194, 195, 0,
- 199, 268, 269, 0, 97, 107, 0, 112, 117, 133,
- 0, 131, 123, 0, 134, 142, 153, 198, 0, 265,
- 267, 130, 122, 0, 139, 140, 2, 3, 202, 0,
- 0, 88, 0, 95, 107, 127, 108, 109, 110, 98,
- 0, 107, 0, 89, 2, 118, 132, 0, 94, 0,
- 124, 143, 135, 0, 1, 266, 0, 0, 200, 150,
- 0, 148, 0, 270, 99, 104, 106, 111, 0, 113,
- 100, 0, 0, 87, 0, 0, 0, 0, 204, 4,
+ 0, 0, 143, 144, 145, 0, 127, 135, 158, 155,
+ 156, 157, 162, 163, 164, 165, 166, 167, 159, 160,
+ 161, 168, 169, 170, 171, 172, 173, 136, 137, 140,
+ 128, 174, 175, 176, 177, 178, 179, 0, 125, 124,
+ 0, 154, 180, 182, 195, 196, 183, 184, 185, 186,
+ 187, 188, 189, 190, 191, 181, 192, 193, 194, 0,
+ 198, 267, 268, 0, 97, 107, 0, 112, 116, 132,
+ 0, 130, 122, 0, 133, 141, 152, 197, 0, 264,
+ 266, 129, 121, 0, 138, 139, 2, 3, 201, 0,
+ 0, 88, 0, 95, 107, 126, 108, 109, 110, 98,
+ 0, 107, 0, 89, 2, 117, 131, 0, 94, 0,
+ 123, 142, 134, 0, 1, 265, 0, 0, 199, 149,
+ 0, 147, 0, 269, 99, 104, 106, 111, 0, 113,
+ 100, 0, 0, 87, 0, 0, 0, 0, 203, 4,
8, 6, 7, 9, 30, 0, 0, 0, 37, 36,
38, 35, 5, 11, 31, 13, 18, 19, 0, 0,
24, 0, 39, 0, 43, 46, 49, 54, 57, 59,
61, 63, 65, 67, 69, 86, 0, 28, 90, 0,
- 0, 0, 147, 0, 0, 0, 250, 0, 0, 0,
- 0, 0, 0, 0, 0, 224, 233, 237, 39, 71,
- 84, 0, 213, 0, 142, 216, 235, 215, 214, 0,
- 217, 218, 219, 220, 221, 222, 101, 103, 105, 0,
- 0, 119, 0, 212, 121, 0, 210, 0, 208, 0,
- 205, 32, 33, 0, 15, 16, 0, 0, 22, 21,
- 0, 155, 25, 27, 34, 0, 0, 0, 0, 0,
+ 0, 0, 146, 0, 0, 0, 249, 0, 0, 0,
+ 0, 0, 0, 0, 0, 223, 232, 236, 39, 71,
+ 84, 0, 212, 0, 141, 215, 234, 214, 213, 0,
+ 216, 217, 218, 219, 220, 221, 101, 103, 105, 0,
+ 0, 118, 0, 211, 120, 0, 209, 0, 207, 0,
+ 204, 32, 33, 0, 15, 16, 0, 0, 22, 21,
+ 0, 154, 25, 27, 34, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 154, 203, 0, 151, 152,
- 149, 261, 260, 231, 252, 0, 264, 262, 0, 0,
- 0, 245, 248, 223, 0, 74, 75, 77, 76, 79,
- 80, 81, 82, 83, 78, 73, 0, 0, 238, 234,
- 236, 0, 114, 0, 116, 120, 0, 0, 0, 206,
- 0, 91, 10, 0, 17, 29, 14, 20, 26, 40,
- 41, 42, 45, 44, 47, 48, 52, 53, 50, 51,
- 55, 56, 58, 60, 62, 64, 66, 68, 0, 201,
- 0, 0, 0, 0, 0, 263, 0, 244, 0, 225,
- 72, 85, 0, 115, 207, 0, 209, 0, 92, 12,
- 0, 0, 230, 232, 255, 254, 257, 231, 242, 246,
- 0, 0, 0, 0, 102, 211, 0, 70, 0, 256,
- 0, 0, 241, 239, 0, 0, 0, 226, 0, 0,
- 258, 0, 231, 243, 0, 228, 249, 227, 93, 0,
- 259, 253, 240, 247, 251
+ 0, 0, 0, 0, 0, 153, 202, 0, 150, 151,
+ 148, 260, 259, 230, 251, 0, 263, 261, 0, 0,
+ 0, 244, 247, 222, 0, 74, 75, 77, 76, 79,
+ 80, 81, 82, 83, 78, 73, 0, 0, 237, 233,
+ 235, 0, 0, 115, 119, 0, 0, 0, 205, 0,
+ 91, 10, 0, 17, 29, 14, 20, 26, 40, 41,
+ 42, 45, 44, 47, 48, 52, 53, 50, 51, 55,
+ 56, 58, 60, 62, 64, 66, 68, 0, 200, 0,
+ 0, 0, 0, 0, 262, 0, 243, 0, 224, 72,
+ 85, 0, 114, 206, 0, 208, 0, 92, 12, 0,
+ 0, 229, 231, 254, 253, 256, 230, 241, 245, 0,
+ 0, 0, 0, 102, 210, 0, 70, 0, 255, 0,
+ 0, 240, 238, 0, 0, 0, 225, 0, 0, 257,
+ 0, 230, 242, 0, 227, 248, 226, 93, 0, 258,
+ 252, 239, 246, 250
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -328, -39, -328, -328, -328, -328, -328, -328, 76, -328,
- -328, -328, -328, -106, -328, -21, -20, -93, -18, 58,
- 79, 75, 78, 82, 77, -328, -103, -126, -328, -143,
- -120, -328, 9, 14, -328, -328, -328, 213, 251, 245,
- 219, -328, -328, -324, -328, -328, -104, 41, -68, 345,
- -328, -328, 169, 0, -328, -328, -328, -328, -101, -102,
- 126, 45, -212, 11, -191, -327, -29, -328, -328, -35,
- -287, -328, -328, -89, 73, 17, -328, -328, -328, -328,
- -328, -7, -328, -328, -328, -328, -328, -328, -328, -328,
- -328, 280, -328, -328
+ -349, -39, -349, -349, -349, -349, -349, -349, 43, -349,
+ -349, -349, -349, -101, -349, -26, -23, -81, -32, 23,
+ 24, 25, 26, 29, 30, -349, -100, -127, -349, -139,
+ -120, -349, 7, 9, -349, -349, -349, 162, 192, 191,
+ 176, -349, -349, -300, -349, -349, -103, 58, -68, 289,
+ -349, -349, 112, 0, -349, -349, -349, -349, -98, -99,
+ 71, -10, -216, -44, -185, -331, -84, -349, -349, -90,
+ -348, -349, -349, -89, 17, -37, -349, -349, -349, -349,
+ -349, -62, -349, -349, -349, -349, -349, -349, -349, -349,
+ -349, 229, -349, -349
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 226, 152, 153, 154, 313, 155, 156, 157, 158,
+ -1, 226, 152, 153, 154, 312, 155, 156, 157, 158,
159, 160, 161, 198, 163, 164, 165, 166, 167, 168,
169, 170, 171, 172, 173, 174, 199, 200, 296, 201,
176, 109, 202, 203, 63, 64, 65, 125, 99, 100,
126, 66, 67, 68, 69, 101, 70, 71, 72, 73,
74, 120, 121, 177, 76, 77, 180, 117, 137, 138,
- 227, 228, 224, 205, 206, 207, 208, 284, 373, 396,
- 340, 341, 342, 397, 209, 210, 211, 383, 212, 384,
- 213, 372, 214, 348, 273, 343, 366, 380, 381, 215,
+ 227, 228, 224, 205, 206, 207, 208, 284, 372, 395,
+ 339, 340, 341, 396, 209, 210, 211, 382, 212, 383,
+ 213, 371, 214, 347, 273, 342, 365, 379, 380, 215,
78, 79, 80, 92
};
@@ -946,478 +945,472 @@
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 75, 89, 110, 123, 233, 135, 223, 162, 304, 61,
- 175, 222, 95, 135, 62, 363, 179, 310, 300, 7,
- 81, 263, 86, 87, 370, 162, 84, 85, 175, 105,
- 252, 253, 127, 135, 242, 230, 91, 234, 235, 231,
- 232, 136, 370, 96, 97, 98, 248, 278, 249, 136,
- 27, 28, 82, 29, 88, 311, 264, 244, 236, 395,
- 127, 37, 237, 129, 395, 254, 255, 225, 90, 136,
- 75, 95, 280, 111, 357, 135, 135, 230, 75, 267,
- 382, 94, 358, 116, 131, 118, 162, 61, 216, 175,
- 219, 132, 62, 314, 223, 182, 93, 220, 113, 303,
- 75, 183, 96, 97, 98, 402, 104, 87, -96, 75,
- 106, 136, 136, 162, 318, 112, 175, 75, 239, 119,
- 312, 338, 204, 367, 240, 368, 297, 399, 75, 297,
- 178, 297, 344, 297, 122, 75, 346, 75, 130, 319,
- 320, 321, 162, 162, 162, 162, 162, 162, 162, 162,
- 162, 162, 162, 162, 162, 162, 162, 162, 300, 326,
- 327, 328, 329, 135, 102, 230, 297, 103, 133, 298,
- 350, 351, 308, 81, 297, 309, 238, 345, 181, 75,
- 75, 352, 403, 308, 86, 87, 354, 355, 2, 3,
- 4, 96, 97, 98, -29, 162, 250, 251, 175, 136,
- 243, 162, 268, 269, 175, 369, 245, 246, 247, 204,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 256, 257, 259, 369, 258, 297, 360, 322, 323, 295,
- 324, 325, 261, 260, 377, 389, 262, 376, 330, 331,
- 265, 271, 272, 274, 371, 283, 275, 400, 276, 279,
- 281, 162, 362, 282, 175, 305, -28, 297, -229, 301,
- 307, -23, 371, -30, 2, 3, 4, 75, 223, 347,
- 8, 9, 10, 11, 353, 359, 361, 374, 375, 378,
- 390, 386, 387, 391, 204, 12, 13, 14, 15, 16,
+ 75, 89, 110, 123, 303, 223, 135, 61, 233, 62,
+ 362, 222, 162, 175, 135, 309, 81, 263, 381, 179,
+ 356, 234, 235, 102, 300, 95, 103, 90, 357, 105,
+ 162, 175, 127, 242, 135, 91, 86, 87, 230, 252,
+ 253, 136, 236, 401, 231, 232, 237, 369, 82, 136,
+ 93, 278, 264, 310, 394, 182, 96, 97, 98, 394,
+ 127, 183, 244, 129, 7, 369, 94, 225, 88, 136,
+ 75, 95, 280, 111, 254, 255, 135, 135, 75, 131,
+ 230, 113, 267, 116, 239, 61, 132, 62, 216, 118,
+ 240, 162, 175, 223, 219, 27, 28, 313, 29, 302,
+ 75, 220, 96, 97, 98, 248, 37, 249, 311, 75,
+ 366, 136, 136, 317, 297, 119, 297, 75, 162, 175,
+ 367, -96, 204, 398, 178, 337, 297, 106, 75, 297,
+ 297, 307, 112, 298, 308, 75, 343, 75, 297, 307,
+ 345, 344, 353, 122, 318, 319, 320, 162, 162, 162,
+ 162, 162, 162, 162, 162, 162, 162, 162, 162, 162,
+ 162, 162, 162, 300, 135, 2, 3, 4, 230, 349,
+ 350, 325, 326, 327, 328, 84, 85, 402, 130, 75,
+ 75, 351, 96, 97, 98, 133, 354, 81, 285, 286,
+ 287, 288, 289, 290, 291, 292, 293, 294, 181, 136,
+ 162, 175, 245, 246, 247, 162, 175, 295, 368, 204,
+ 104, 87, 86, 87, 250, 251, 256, 257, 268, 269,
+ 297, 359, 321, 322, 329, 330, 368, 323, 324, -29,
+ 258, 238, 376, 243, 262, 259, 375, 260, 388, 261,
+ 265, 274, 271, 360, 370, 391, 272, 304, 275, 279,
+ 399, 361, 276, 282, 352, 162, 175, -28, 281, 283,
+ 301, 306, 370, -23, -228, 389, 223, 75, -30, 346,
+ 358, 297, 373, 374, 377, 195, 385, 386, 390, 387,
+ 316, 331, 393, 332, 204, 333, 124, 334, 397, 403,
+ 217, 335, 128, 336, 83, 270, 305, 355, 363, 392,
+ 400, 348, 110, 378, 218, 364, 0, 115, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 384, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 204, 204, 0, 0, 0, 0, 204, 204, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 204, 0, 0, 0, 0,
+ 75, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 204, 0, 0, 0, 0,
+ 204, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 184, 185, 186, 0, 187, 188, 189, 190,
+ 191, 192, 193, 12, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 0, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 194, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 0,
+ 56, 57, 58, 59, 139, 60, 140, 141, 142, 143,
+ 144, 0, 0, 145, 146, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 147, 0, 0, 0, 195, 196, 0, 0,
+ 0, 0, 197, 148, 149, 150, 151, 1, 2, 3,
+ 4, 5, 6, 7, 8, 9, 10, 11, 184, 185,
+ 186, 0, 187, 188, 189, 190, 191, 192, 193, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 0, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 194, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 0, 56, 57, 58, 59,
+ 139, 60, 140, 141, 142, 143, 144, 0, 0, 145,
+ 146, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 147, 0,
+ 0, 0, 195, 299, 0, 0, 0, 0, 197, 148,
+ 149, 150, 151, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 184, 185, 186, 0, 187, 188,
+ 189, 190, 191, 192, 193, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 388, 392, 195, 110, 394, 31, 32, 33, 34, 35,
- 36, 398, 404, 317, 40, 41, 332, 42, 43, 44,
+ 27, 28, 0, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 194, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 385, 56, 57, 58, 334, 107, 60, 333, 335,
- 337, 217, 204, 204, 336, 124, 128, 218, 204, 204,
- 83, 306, 270, 356, 364, 393, 401, 349, 115, 379,
- 365, 0, 0, 0, 0, 0, 204, 0, 0, 0,
- 0, 75, 0, 0, 108, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 204, 0, 0, 0,
- 0, 204, 1, 2, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 184, 185, 186, 0, 187, 188, 189,
- 190, 191, 192, 193, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 0, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 194, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 0, 56, 57, 58, 59, 139, 60, 140, 141, 142,
- 143, 144, 0, 0, 145, 146, 0, 0, 0, 0,
+ 55, 0, 56, 57, 58, 59, 139, 60, 140, 141,
+ 142, 143, 144, 0, 0, 145, 146, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 147, 0, 0, 0, 195, 196, 0,
- 0, 0, 0, 197, 148, 149, 150, 151, 1, 2,
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 184,
- 185, 186, 0, 187, 188, 189, 190, 191, 192, 193,
- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 0, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 194, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 0, 56, 57, 58,
- 59, 139, 60, 140, 141, 142, 143, 144, 0, 0,
- 145, 146, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 147,
- 0, 0, 0, 195, 299, 0, 0, 0, 0, 197,
- 148, 149, 150, 151, 1, 2, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 184, 185, 186, 0, 187,
- 188, 189, 190, 191, 192, 193, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 0, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 194, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 0, 56, 57, 58, 59, 139, 60, 140,
- 141, 142, 143, 144, 0, 0, 145, 146, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 147, 0, 0, 0, 195,
- 0, 0, 0, 0, 0, 197, 148, 149, 150, 151,
- 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 184, 185, 186, 0, 187, 188, 189, 190, 191,
- 192, 193, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 0,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 194, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 0, 56,
- 57, 58, 59, 139, 60, 140, 141, 142, 143, 144,
- 0, 0, 145, 146, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 147, 0, 0, 0, 122, 0, 0, 0, 0,
- 0, 197, 148, 149, 150, 151, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 184, 185, 186,
- 0, 187, 188, 189, 190, 191, 192, 193, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 0, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 194,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 0, 56, 57, 58, 59, 139,
- 60, 140, 141, 142, 143, 144, 0, 0, 145, 146,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 147, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 197, 148, 149,
- 150, 151, 1, 2, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 0, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 0, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 0, 56, 57, 58, 59, 139, 60, 140, 141, 142,
- 143, 144, 0, 0, 145, 146, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 134,
- 2, 3, 4, 147, 6, 7, 8, 9, 10, 11,
- 0, 0, 0, 197, 148, 149, 150, 151, 0, 0,
- 0, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+ 0, 0, 0, 0, 147, 0, 0, 0, 195, 0,
+ 0, 0, 0, 0, 197, 148, 149, 150, 151, 1,
+ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 184, 185, 186, 0, 187, 188, 189, 190, 191, 192,
+ 193, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 0, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 0, 42, 43, 44, 45, 46, 47, 48,
+ 40, 41, 194, 42, 43, 44, 45, 46, 47, 48,
49, 50, 51, 52, 53, 54, 55, 0, 56, 57,
58, 59, 139, 60, 140, 141, 142, 143, 144, 0,
0, 145, 146, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 147, 8, 9, 10, 11, 0, 0, 0, 0, 0,
- 0, 148, 149, 150, 151, 0, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 0, 0, 0, 0, 0, 31, 32, 33, 34,
- 35, 36, 0, 0, 0, 40, 41, 0, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 0, 56, 57, 58, 0, 139, 60, 140,
- 141, 142, 143, 144, 0, 0, 145, 146, 0, 0,
+ 147, 0, 0, 0, 122, 0, 0, 0, 0, 0,
+ 197, 148, 149, 150, 151, 1, 2, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 184, 185, 186, 0,
+ 187, 188, 189, 190, 191, 192, 193, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 0, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 194, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 0, 56, 57, 58, 59, 139, 60,
+ 140, 141, 142, 143, 144, 0, 0, 145, 146, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 147, 0, 0, 221, 8,
- 9, 10, 11, 0, 0, 0, 148, 149, 150, 151,
- 0, 0, 0, 0, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 0,
- 0, 0, 0, 0, 31, 32, 33, 34, 35, 36,
- 0, 0, 0, 40, 41, 0, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 0, 56, 57, 58, 0, 139, 60, 140, 141, 142,
- 143, 144, 0, 0, 145, 146, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 147, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 197, 148, 149, 150,
+ 151, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 12, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 0, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 0, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 0,
+ 56, 57, 58, 59, 139, 60, 140, 141, 142, 143,
+ 144, 0, 0, 145, 146, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 134, 2,
+ 3, 4, 147, 6, 7, 8, 9, 10, 11, 0,
+ 0, 0, 197, 148, 149, 150, 151, 0, 0, 0,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 0, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 0, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 0, 56, 57, 58,
+ 59, 139, 60, 140, 141, 142, 143, 144, 0, 0,
+ 145, 146, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 2, 3, 4, 0, 0, 147,
+ 8, 9, 10, 11, 0, 0, 0, 0, 0, 0,
+ 148, 149, 150, 151, 0, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 0, 0, 0, 0, 0, 31, 32, 33, 34, 35,
+ 36, 0, 0, 0, 40, 41, 0, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 0, 56, 57, 58, 0, 107, 60, 0, 0,
+ 8, 9, 10, 11, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 0, 0, 0, 0, 108, 31, 32, 33, 34, 35,
+ 36, 0, 0, 0, 40, 41, 0, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 0, 56, 57, 58, 0, 139, 60, 140, 141,
+ 142, 143, 144, 0, 0, 145, 146, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 147, 8, 9, 10, 11, 0, 0,
- 0, 0, 0, 277, 148, 149, 150, 151, 0, 12,
+ 0, 0, 0, 0, 147, 0, 0, 221, 8, 9,
+ 10, 11, 0, 0, 0, 148, 149, 150, 151, 0,
+ 0, 0, 0, 12, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 0, 0,
+ 0, 0, 0, 31, 32, 33, 34, 35, 36, 0,
+ 0, 0, 40, 41, 0, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 0,
+ 56, 57, 58, 0, 139, 60, 140, 141, 142, 143,
+ 144, 0, 0, 145, 146, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 147, 8, 9, 10, 11, 0, 0, 0,
+ 0, 0, 277, 148, 149, 150, 151, 0, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 0, 0, 0, 0, 0, 31, 32,
+ 33, 34, 35, 36, 0, 0, 0, 40, 41, 0,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 0, 56, 57, 58, 0, 139,
+ 60, 140, 141, 142, 143, 144, 0, 0, 145, 146,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 147, 8, 9,
+ 10, 11, 0, 0, 0, 0, 0, 0, 148, 149,
+ 150, 151, 0, 12, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 0, 0,
+ 0, 0, 0, 31, 32, 33, 34, 35, 36, 0,
+ 0, 0, 40, 241, 0, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 0,
+ 56, 57, 58, 0, 139, 60, 140, 141, 142, 143,
+ 144, 0, 0, 145, 146, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 134, 2,
+ 3, 4, 147, 6, 7, 8, 9, 10, 11, 0,
+ 0, 0, 0, 148, 149, 150, 151, 0, 0, 0,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 0, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 0, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 0, 56, 57, 58,
+ 59, 0, 60, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 134, 2, 3, 4, 0, 6, 7,
+ 8, 9, 10, 11, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 229, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 0, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 0, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 0, 56, 57, 58, 59, 0, 60, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 134, 2,
+ 3, 4, 0, 6, 7, 8, 9, 10, 11, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 266,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 0, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 0, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 0, 56, 57, 58,
+ 59, 0, 60, 0, 0, 0, 0, 0, 0, 0,
+ 114, 0, 0, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 338, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 0, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 0, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 0, 56, 57, 58, 59, 0, 60, 1, 2,
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 0, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 0, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 0, 56, 57, 58,
+ 59, 0, 60, 134, 2, 3, 4, 0, 6, 7,
+ 8, 9, 10, 11, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 0, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 0, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 0, 56, 57, 58, 59, 0, 60, 2, 3,
+ 4, 0, 0, 0, 8, 9, 10, 11, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 0, 0, 0, 0, 0, 31,
32, 33, 34, 35, 36, 0, 0, 0, 40, 41,
0, 42, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 53, 54, 55, 0, 56, 57, 58, 0,
- 139, 60, 140, 141, 142, 143, 144, 0, 0, 145,
- 146, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 147, 0,
- 0, 302, 8, 9, 10, 11, 0, 0, 0, 148,
- 149, 150, 151, 0, 0, 0, 0, 12, 13, 14,
+ 0, 60, 8, 9, 10, 11, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 0, 0, 0, 0, 0, 31, 32, 33,
34, 35, 36, 0, 0, 0, 40, 41, 0, 42,
43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 0, 56, 57, 58, 0, 139, 60,
- 140, 141, 142, 143, 144, 0, 0, 145, 146, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 147, 8, 9, 10,
- 11, 0, 0, 0, 0, 0, 0, 148, 149, 150,
- 151, 0, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 0, 0, 0,
- 0, 0, 31, 32, 33, 34, 35, 36, 0, 0,
- 0, 40, 241, 0, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 0, 56,
- 57, 58, 0, 139, 60, 140, 141, 142, 143, 144,
- 0, 0, 145, 146, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 134, 2, 3,
- 4, 147, 6, 7, 8, 9, 10, 11, 0, 0,
- 0, 0, 148, 149, 150, 151, 0, 0, 0, 12,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 0, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 0, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 0, 56, 57, 58, 59,
- 0, 60, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 134, 2, 3, 4, 0, 6, 7, 8,
- 9, 10, 11, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 229, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 0, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 0, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 0, 56, 57, 58, 59, 0, 60, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 134, 2, 3,
- 4, 0, 6, 7, 8, 9, 10, 11, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 266, 12,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 0, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 0, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 0, 56, 57, 58, 59,
- 0, 60, 0, 0, 0, 0, 0, 0, 0, 114,
- 0, 0, 1, 2, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 339, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 0, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 0, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 0, 56, 57, 58, 59, 0, 60, 1, 2, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 12,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 0, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 0, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 0, 56, 57, 58, 59,
- 0, 60, 134, 2, 3, 4, 0, 6, 7, 8,
- 9, 10, 11, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 0, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 0, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 0, 56, 57, 58, 59, 0, 60, 2, 3, 4,
- 0, 0, 0, 8, 9, 10, 11, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 0, 0, 0, 0, 0, 31, 32,
- 33, 34, 35, 36, 0, 0, 0, 40, 41, 0,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 0, 56, 57, 58, 0, 0,
- 60, 8, 9, 10, 11, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 0, 0, 0, 0, 0, 31, 32, 33, 34,
- 35, 36, 0, 0, 0, 40, 41, 0, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 0, 56, 57, 58, 0, 315, 60, 8,
- 9, 10, 11, 316, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 0,
- 0, 0, 0, 0, 31, 32, 33, 34, 35, 36,
- 0, 0, 0, 40, 41, 0, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 0, 56, 57, 58, 0, 0, 60
+ 53, 54, 55, 0, 56, 57, 58, 0, 314, 60,
+ 8, 9, 10, 11, 315, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 0, 0, 0, 0, 0, 31, 32, 33, 34, 35,
+ 36, 0, 0, 0, 40, 41, 0, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 0, 56, 57, 58, 0, 0, 60
};
static const yytype_int16 yycheck[] =
{
- 0, 40, 70, 92, 147, 109, 132, 113, 220, 0,
- 113, 131, 9, 117, 0, 342, 117, 76, 209, 9,
- 44, 92, 76, 77, 348, 131, 40, 41, 131, 68,
- 87, 88, 100, 137, 160, 137, 114, 85, 86, 145,
- 146, 109, 366, 40, 41, 42, 116, 190, 118, 117,
- 40, 41, 76, 43, 108, 114, 127, 163, 106, 386,
- 128, 51, 110, 102, 391, 122, 123, 135, 104, 137,
- 70, 9, 192, 73, 106, 179, 180, 179, 78, 180,
- 367, 111, 114, 83, 106, 108, 192, 78, 127, 192,
- 106, 113, 78, 236, 220, 105, 105, 113, 106, 219,
- 100, 111, 40, 41, 42, 392, 76, 77, 105, 109,
- 69, 179, 180, 219, 240, 74, 219, 117, 105, 76,
- 105, 264, 122, 105, 111, 105, 111, 105, 128, 111,
- 114, 111, 275, 111, 108, 135, 279, 137, 104, 245,
- 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
- 256, 257, 258, 259, 260, 261, 262, 263, 349, 252,
- 253, 254, 255, 267, 111, 267, 111, 114, 108, 114,
- 296, 297, 111, 44, 111, 114, 105, 114, 113, 179,
- 180, 301, 394, 111, 76, 77, 114, 307, 4, 5,
- 6, 40, 41, 42, 104, 301, 83, 84, 301, 267,
- 104, 307, 79, 80, 307, 348, 119, 120, 121, 209,
- 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
- 89, 90, 125, 366, 126, 111, 112, 248, 249, 113,
- 250, 251, 91, 124, 360, 378, 93, 357, 256, 257,
- 107, 114, 114, 104, 348, 109, 104, 390, 114, 104,
- 112, 357, 341, 104, 357, 107, 104, 111, 108, 106,
- 106, 105, 366, 104, 4, 5, 6, 267, 394, 112,
- 10, 11, 12, 13, 107, 107, 56, 107, 107, 104,
- 114, 105, 109, 105, 284, 25, 26, 27, 28, 29,
+ 0, 40, 70, 92, 220, 132, 109, 0, 147, 0,
+ 341, 131, 113, 113, 117, 76, 44, 92, 366, 117,
+ 106, 85, 86, 111, 209, 9, 114, 104, 114, 68,
+ 131, 131, 100, 160, 137, 114, 76, 77, 137, 87,
+ 88, 109, 106, 391, 145, 146, 110, 347, 76, 117,
+ 105, 190, 127, 114, 385, 105, 40, 41, 42, 390,
+ 128, 111, 163, 102, 9, 365, 111, 135, 108, 137,
+ 70, 9, 192, 73, 122, 123, 179, 180, 78, 106,
+ 179, 106, 180, 83, 105, 78, 113, 78, 127, 108,
+ 111, 192, 192, 220, 106, 40, 41, 236, 43, 219,
+ 100, 113, 40, 41, 42, 116, 51, 118, 105, 109,
+ 105, 179, 180, 240, 111, 76, 111, 117, 219, 219,
+ 105, 105, 122, 105, 114, 264, 111, 69, 128, 111,
+ 111, 111, 74, 114, 114, 135, 275, 137, 111, 111,
+ 279, 114, 114, 108, 245, 246, 247, 248, 249, 250,
+ 251, 252, 253, 254, 255, 256, 257, 258, 259, 260,
+ 261, 262, 263, 348, 267, 4, 5, 6, 267, 296,
+ 297, 252, 253, 254, 255, 40, 41, 393, 104, 179,
+ 180, 301, 40, 41, 42, 108, 306, 44, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 113, 267,
+ 301, 301, 119, 120, 121, 306, 306, 113, 347, 209,
+ 76, 77, 76, 77, 83, 84, 89, 90, 79, 80,
+ 111, 112, 248, 249, 256, 257, 365, 250, 251, 104,
+ 126, 105, 359, 104, 93, 125, 356, 124, 377, 91,
+ 107, 104, 114, 56, 347, 17, 114, 107, 104, 104,
+ 389, 340, 114, 104, 107, 356, 356, 104, 112, 109,
+ 106, 106, 365, 105, 108, 114, 393, 267, 104, 112,
+ 107, 111, 107, 107, 104, 108, 105, 109, 105, 107,
+ 237, 258, 113, 259, 284, 260, 94, 261, 114, 114,
+ 128, 262, 101, 263, 5, 183, 225, 307, 342, 383,
+ 390, 284, 370, 365, 128, 342, -1, 78, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 369, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 341, 342, -1, -1, -1, -1, 347, 348, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 365, -1, -1, -1, -1,
+ 370, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 385, -1, -1, -1, -1,
+ 390, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, -1, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ -1, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, -1,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, -1, -1, 85, 86, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 104, -1, -1, -1, 108, 109, -1, -1,
+ -1, -1, 114, 115, 116, 117, 118, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, -1, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, -1, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, -1, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, -1, -1, 85,
+ 86, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 104, -1,
+ -1, -1, 108, 109, -1, -1, -1, -1, 114, 115,
+ 116, 117, 118, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, -1, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 107, 17, 108, 371, 113, 45, 46, 47, 48, 49,
- 50, 114, 114, 237, 54, 55, 258, 57, 58, 59,
+ 40, 41, -1, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 370, 72, 73, 74, 260, 76, 77, 259, 261,
- 263, 128, 342, 343, 262, 94, 101, 128, 348, 349,
- 5, 225, 183, 308, 343, 384, 391, 284, 78, 366,
- 343, -1, -1, -1, -1, -1, 366, -1, -1, -1,
- -1, 371, -1, -1, 114, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 386, -1, -1, -1,
- -1, 391, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, -1, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, -1, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- -1, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, -1, -1, 85, 86, -1, -1, -1, -1,
+ 70, -1, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, -1, -1, 85, 86, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 104, -1, -1, -1, 108, 109, -1,
- -1, -1, -1, 114, 115, 116, 117, 118, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, -1, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, -1, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, -1, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, -1, -1,
- 85, 86, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 104,
- -1, -1, -1, 108, 109, -1, -1, -1, -1, 114,
- 115, 116, 117, 118, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 16, -1, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, -1, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 70, -1, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, -1, -1, 85, 86, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 104, -1, -1, -1, 108,
- -1, -1, -1, -1, -1, 114, 115, 116, 117, 118,
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
- 13, 14, 15, 16, -1, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, -1,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, 70, -1, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- -1, -1, 85, 86, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 104, -1, -1, -1, 108, -1, -1, -1, -1,
- -1, 114, 115, 116, 117, 118, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- -1, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, -1, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, -1, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, -1, -1, 85, 86,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 104, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 114, 115, 116,
- 117, 118, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, -1, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, -1, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- -1, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, -1, -1, 85, 86, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 3,
- 4, 5, 6, 104, 8, 9, 10, 11, 12, 13,
- -1, -1, -1, 114, 115, 116, 117, 118, -1, -1,
- -1, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ -1, -1, -1, -1, 104, -1, -1, -1, 108, -1,
+ -1, -1, -1, -1, 114, 115, 116, 117, 118, 3,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, -1, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
34, 35, 36, 37, 38, 39, 40, 41, -1, 43,
44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, -1, 57, 58, 59, 60, 61, 62, 63,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
64, 65, 66, 67, 68, 69, 70, -1, 72, 73,
74, 75, 76, 77, 78, 79, 80, 81, 82, -1,
-1, 85, 86, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 104, 10, 11, 12, 13, -1, -1, -1, -1, -1,
- -1, 115, 116, 117, 118, -1, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, -1, -1, -1, -1, -1, 45, 46, 47, 48,
- 49, 50, -1, -1, -1, 54, 55, -1, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 70, -1, 72, 73, 74, -1, 76, 77, 78,
- 79, 80, 81, 82, -1, -1, 85, 86, -1, -1,
+ 104, -1, -1, -1, 108, -1, -1, -1, -1, -1,
+ 114, 115, 116, 117, 118, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, -1,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, -1, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, -1, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, -1, -1, 85, 86, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 104, -1, -1, 107, 10,
- 11, 12, 13, -1, -1, -1, 115, 116, 117, 118,
- -1, -1, -1, -1, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, -1,
- -1, -1, -1, -1, 45, 46, 47, 48, 49, 50,
- -1, -1, -1, 54, 55, -1, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- -1, 72, 73, 74, -1, 76, 77, 78, 79, 80,
- 81, 82, -1, -1, 85, 86, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 104, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 114, 115, 116, 117,
+ 118, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ -1, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, -1, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, -1,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, -1, -1, 85, 86, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 3, 4,
+ 5, 6, 104, 8, 9, 10, 11, 12, 13, -1,
+ -1, -1, 114, 115, 116, 117, 118, -1, -1, -1,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, -1, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, -1, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, 70, -1, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, -1, -1,
+ 85, 86, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 4, 5, 6, -1, -1, 104,
+ 10, 11, 12, 13, -1, -1, -1, -1, -1, -1,
+ 115, 116, 117, 118, -1, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ -1, -1, -1, -1, -1, 45, 46, 47, 48, 49,
+ 50, -1, -1, -1, 54, 55, -1, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, -1, 72, 73, 74, -1, 76, 77, -1, -1,
+ 10, 11, 12, 13, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ -1, -1, -1, -1, 114, 45, 46, 47, 48, 49,
+ 50, -1, -1, -1, 54, 55, -1, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, -1, 72, 73, 74, -1, 76, 77, 78, 79,
+ 80, 81, 82, -1, -1, 85, 86, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 104, 10, 11, 12, 13, -1, -1,
- -1, -1, -1, 114, 115, 116, 117, 118, -1, 25,
+ -1, -1, -1, -1, 104, -1, -1, 107, 10, 11,
+ 12, 13, -1, -1, -1, 115, 116, 117, 118, -1,
+ -1, -1, -1, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, -1, -1,
+ -1, -1, -1, 45, 46, 47, 48, 49, 50, -1,
+ -1, -1, 54, 55, -1, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, -1,
+ 72, 73, 74, -1, 76, 77, 78, 79, 80, 81,
+ 82, -1, -1, 85, 86, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 104, 10, 11, 12, 13, -1, -1, -1,
+ -1, -1, 114, 115, 116, 117, 118, -1, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, -1, -1, -1, -1, -1, 45, 46,
+ 47, 48, 49, 50, -1, -1, -1, 54, 55, -1,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 68, 69, 70, -1, 72, 73, 74, -1, 76,
+ 77, 78, 79, 80, 81, 82, -1, -1, 85, 86,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 104, 10, 11,
+ 12, 13, -1, -1, -1, -1, -1, -1, 115, 116,
+ 117, 118, -1, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, -1, -1,
+ -1, -1, -1, 45, 46, 47, 48, 49, 50, -1,
+ -1, -1, 54, 55, -1, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, -1,
+ 72, 73, 74, -1, 76, 77, 78, 79, 80, 81,
+ 82, -1, -1, 85, 86, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 3, 4,
+ 5, 6, 104, 8, 9, 10, 11, 12, 13, -1,
+ -1, -1, -1, 115, 116, 117, 118, -1, -1, -1,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, -1, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, -1, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, 70, -1, 72, 73, 74,
+ 75, -1, 77, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 3, 4, 5, 6, -1, 8, 9,
+ 10, 11, 12, 13, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 109, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, -1, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, -1, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, -1, 72, 73, 74, 75, -1, 77, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 3, 4,
+ 5, 6, -1, 8, 9, 10, 11, 12, 13, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 109,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, -1, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, -1, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, 70, -1, 72, 73, 74,
+ 75, -1, 77, -1, -1, -1, -1, -1, -1, -1,
+ 0, -1, -1, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 109, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, -1, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, -1, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, -1, 72, 73, 74, 75, -1, 77, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, -1, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, -1, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, 70, -1, 72, 73, 74,
+ 75, -1, 77, 3, 4, 5, 6, -1, 8, 9,
+ 10, 11, 12, 13, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, -1, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, -1, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, -1, 72, 73, 74, 75, -1, 77, 4, 5,
+ 6, -1, -1, -1, 10, 11, 12, 13, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, -1, -1, -1, -1, -1, 45,
46, 47, 48, 49, 50, -1, -1, -1, 54, 55,
-1, 57, 58, 59, 60, 61, 62, 63, 64, 65,
66, 67, 68, 69, 70, -1, 72, 73, 74, -1,
- 76, 77, 78, 79, 80, 81, 82, -1, -1, 85,
- 86, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 104, -1,
- -1, 107, 10, 11, 12, 13, -1, -1, -1, 115,
- 116, 117, 118, -1, -1, -1, -1, 25, 26, 27,
+ -1, 77, 10, 11, 12, 13, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, -1, -1, -1, -1, -1, 45, 46, 47,
48, 49, 50, -1, -1, -1, 54, 55, -1, 57,
58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
68, 69, 70, -1, 72, 73, 74, -1, 76, 77,
- 78, 79, 80, 81, 82, -1, -1, 85, 86, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 104, 10, 11, 12,
- 13, -1, -1, -1, -1, -1, -1, 115, 116, 117,
- 118, -1, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, -1, -1, -1,
- -1, -1, 45, 46, 47, 48, 49, 50, -1, -1,
- -1, 54, 55, -1, 57, 58, 59, 60, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, 70, -1, 72,
- 73, 74, -1, 76, 77, 78, 79, 80, 81, 82,
- -1, -1, 85, 86, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 3, 4, 5,
- 6, 104, 8, 9, 10, 11, 12, 13, -1, -1,
- -1, -1, 115, 116, 117, 118, -1, -1, -1, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, -1, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- -1, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, -1, 72, 73, 74, 75,
- -1, 77, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 3, 4, 5, 6, -1, 8, 9, 10,
- 11, 12, 13, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 109, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, -1, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, -1, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- -1, 72, 73, 74, 75, -1, 77, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 3, 4, 5,
- 6, -1, 8, 9, 10, 11, 12, 13, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 109, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, -1, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- -1, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, -1, 72, 73, 74, 75,
- -1, 77, -1, -1, -1, -1, -1, -1, -1, 0,
- -1, -1, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 109, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, -1, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, -1, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- -1, 72, 73, 74, 75, -1, 77, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, -1, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- -1, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, -1, 72, 73, 74, 75,
- -1, 77, 3, 4, 5, 6, -1, 8, 9, 10,
- 11, 12, 13, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, -1, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, -1, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- -1, 72, 73, 74, 75, -1, 77, 4, 5, 6,
- -1, -1, -1, 10, 11, 12, 13, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, -1, -1, -1, -1, -1, 45, 46,
- 47, 48, 49, 50, -1, -1, -1, 54, 55, -1,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, -1, 72, 73, 74, -1, -1,
- 77, 10, 11, 12, 13, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, -1, -1, -1, -1, -1, 45, 46, 47, 48,
- 49, 50, -1, -1, -1, 54, 55, -1, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 70, -1, 72, 73, 74, -1, 76, 77, 10,
- 11, 12, 13, 82, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, -1,
- -1, -1, -1, -1, 45, 46, 47, 48, 49, 50,
- -1, -1, -1, 54, 55, -1, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- -1, 72, 73, 74, -1, -1, 77
+ 10, 11, 12, 13, 82, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ -1, -1, -1, -1, -1, 45, 46, 47, 48, 49,
+ 50, -1, -1, -1, 54, 55, -1, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, -1, 72, 73, 74, -1, -1, 77
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1454,17 +1447,17 @@
180, 114, 114, 212, 104, 104, 114, 114, 157, 104,
158, 112, 104, 109, 195, 94, 95, 96, 97, 98,
99, 100, 101, 102, 103, 113, 156, 111, 114, 109,
- 192, 106, 107, 158, 190, 107, 188, 106, 111, 114,
- 76, 114, 105, 133, 157, 76, 82, 136, 155, 141,
- 141, 141, 143, 143, 144, 144, 145, 145, 145, 145,
- 146, 146, 147, 148, 149, 150, 151, 152, 157, 109,
- 198, 199, 200, 213, 157, 114, 157, 112, 211, 202,
- 155, 155, 158, 107, 114, 158, 189, 106, 114, 107,
- 112, 56, 201, 193, 191, 203, 214, 105, 105, 157,
- 171, 174, 209, 196, 107, 107, 158, 155, 104, 209,
- 215, 216, 198, 205, 207, 129, 105, 109, 107, 157,
- 114, 105, 17, 194, 113, 193, 197, 201, 114, 105,
- 157, 197, 198, 190, 114
+ 192, 106, 158, 190, 107, 188, 106, 111, 114, 76,
+ 114, 105, 133, 157, 76, 82, 136, 155, 141, 141,
+ 141, 143, 143, 144, 144, 145, 145, 145, 145, 146,
+ 146, 147, 148, 149, 150, 151, 152, 157, 109, 198,
+ 199, 200, 213, 157, 114, 157, 112, 211, 202, 155,
+ 155, 158, 107, 114, 158, 189, 106, 114, 107, 112,
+ 56, 201, 193, 191, 203, 214, 105, 105, 157, 171,
+ 174, 209, 196, 107, 107, 158, 155, 104, 209, 215,
+ 216, 198, 205, 207, 129, 105, 109, 107, 157, 114,
+ 105, 17, 194, 113, 193, 197, 201, 114, 105, 157,
+ 197, 198, 190, 114
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
@@ -1481,23 +1474,22 @@
156, 156, 156, 156, 157, 157, 158, 159, 160, 160,
160, 160, 160, 160, 160, 161, 162, 162, 163, 163,
164, 165, 165, 166, 166, 166, 166, 167, 167, 167,
- 167, 168, 169, 169, 169, 169, 169, 170, 170, 170,
- 170, 170, 170, 171, 171, 172, 172, 173, 174, 174,
- 174, 174, 174, 174, 174, 174, 175, 175, 175, 175,
- 175, 175, 176, 176, 177, 177, 177, 178, 179, 179,
- 180, 180, 180, 181, 181, 182, 182, 182, 182, 182,
+ 167, 168, 169, 169, 169, 169, 170, 170, 170, 170,
+ 170, 170, 171, 171, 172, 172, 173, 174, 174, 174,
+ 174, 174, 174, 174, 174, 175, 175, 175, 175, 175,
+ 175, 176, 176, 177, 177, 177, 178, 179, 179, 180,
+ 180, 180, 181, 181, 182, 182, 182, 182, 182, 182,
182, 182, 182, 182, 182, 182, 182, 182, 182, 182,
182, 182, 182, 182, 182, 182, 182, 182, 182, 182,
182, 182, 182, 182, 182, 182, 182, 182, 182, 182,
- 182, 182, 182, 182, 182, 182, 182, 182, 182, 182,
- 184, 183, 185, 183, 186, 186, 187, 187, 188, 188,
- 189, 189, 190, 191, 192, 192, 193, 193, 193, 193,
- 193, 193, 193, 194, 195, 196, 194, 197, 197, 199,
- 198, 200, 198, 201, 201, 202, 202, 203, 203, 204,
- 205, 205, 207, 206, 208, 208, 209, 209, 211, 210,
- 212, 210, 213, 210, 214, 214, 215, 215, 216, 216,
- 217, 217, 217, 217, 217, 218, 218, 219, 219, 221,
- 220
+ 182, 182, 182, 182, 182, 182, 182, 182, 182, 184,
+ 183, 185, 183, 186, 186, 187, 187, 188, 188, 189,
+ 189, 190, 191, 192, 192, 193, 193, 193, 193, 193,
+ 193, 193, 194, 195, 196, 194, 197, 197, 199, 198,
+ 200, 198, 201, 201, 202, 202, 203, 203, 204, 205,
+ 205, 207, 206, 208, 208, 209, 209, 211, 210, 212,
+ 210, 213, 210, 214, 214, 215, 215, 216, 216, 217,
+ 217, 217, 217, 217, 218, 218, 219, 219, 221, 220
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -1514,23 +1506,22 @@
1, 1, 1, 1, 1, 3, 1, 2, 2, 2,
4, 5, 6, 9, 2, 2, 1, 1, 2, 3,
3, 2, 5, 3, 2, 3, 2, 0, 1, 1,
- 1, 1, 1, 3, 5, 6, 5, 1, 2, 4,
- 5, 4, 2, 1, 2, 1, 1, 1, 1, 1,
- 2, 1, 2, 1, 1, 2, 1, 1, 1, 2,
- 2, 1, 1, 2, 1, 1, 1, 4, 1, 3,
- 1, 3, 3, 1, 4, 1, 1, 1, 1, 1,
+ 1, 1, 1, 3, 6, 5, 1, 2, 4, 5,
+ 4, 2, 1, 2, 1, 1, 1, 1, 1, 2,
+ 1, 2, 1, 1, 2, 1, 1, 1, 2, 2,
+ 1, 1, 2, 1, 1, 1, 4, 1, 3, 1,
+ 3, 3, 1, 4, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 6, 0, 5, 1, 2, 3, 4, 1, 3,
- 1, 4, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 2, 0, 0, 5, 1, 1, 0,
- 2, 0, 2, 2, 3, 1, 2, 1, 2, 5,
- 3, 1, 0, 6, 3, 2, 1, 4, 0, 6,
- 0, 8, 0, 7, 1, 1, 1, 0, 2, 3,
- 2, 2, 2, 3, 2, 1, 2, 1, 1, 0,
- 3
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+ 6, 0, 5, 1, 2, 3, 4, 1, 3, 1,
+ 4, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 2, 0, 0, 5, 1, 1, 0, 2,
+ 0, 2, 2, 3, 1, 2, 1, 2, 5, 3,
+ 1, 0, 6, 3, 2, 1, 4, 0, 6, 0,
+ 8, 0, 7, 1, 1, 1, 0, 2, 3, 2,
+ 2, 2, 3, 2, 1, 2, 1, 1, 0, 3
};
@@ -3400,22 +3391,13 @@
case 114:
{
- (yyval.interm) = (yyvsp[-4].interm);
- context->parseArrayDeclarator((yyval.interm).type, (yylsp[-2]), *(yyvsp[-2].lex).string, (yylsp[-1]), NULL, NULL);
- }
-
- break;
-
- case 115:
-
- {
(yyval.interm) = (yyvsp[-5].interm);
(yyval.interm).intermAggregate = context->parseArrayDeclarator((yyval.interm).type, (yylsp[-3]), *(yyvsp[-3].lex).string, (yylsp[-2]), (yyvsp[-5].interm).intermNode, (yyvsp[-1].interm.intermTypedNode));
}
break;
- case 116:
+ case 115:
{
(yyval.interm) = (yyvsp[-4].interm);
@@ -3424,7 +3406,7 @@
break;
- case 117:
+ case 116:
{
(yyval.interm).type = (yyvsp[0].interm.type);
@@ -3433,7 +3415,7 @@
break;
- case 118:
+ case 117:
{
(yyval.interm).type = (yyvsp[-1].interm.type);
@@ -3442,7 +3424,7 @@
break;
- case 119:
+ case 118:
{
context->error((yylsp[-2]), "unsized array declarations not supported", (yyvsp[-2].lex).string->c_str());
@@ -3454,7 +3436,7 @@
break;
- case 120:
+ case 119:
{
(yyval.interm).type = (yyvsp[-4].interm.type);
@@ -3463,7 +3445,7 @@
break;
- case 121:
+ case 120:
{
(yyval.interm).type = (yyvsp[-3].interm.type);
@@ -3472,7 +3454,7 @@
break;
- case 122:
+ case 121:
{
// $$.type is not used in invariant declarations.
@@ -3481,7 +3463,7 @@
break;
- case 123:
+ case 122:
{
(yyval.interm.type) = (yyvsp[0].interm.type);
@@ -3496,7 +3478,7 @@
break;
- case 124:
+ case 123:
{
(yyval.interm.type) = context->addFullySpecifiedType((yyvsp[-1].interm.type).qualifier, (yyvsp[-1].interm.type).layoutQualifier, (yyvsp[0].interm.type));
@@ -3504,7 +3486,7 @@
break;
- case 125:
+ case 124:
{
(yyval.interm.type).qualifier = EvqSmooth;
@@ -3512,7 +3494,7 @@
break;
- case 126:
+ case 125:
{
(yyval.interm.type).qualifier = EvqFlat;
@@ -3520,7 +3502,7 @@
break;
- case 127:
+ case 126:
{
(yyval.interm.qualifier) = EvqConst;
@@ -3528,7 +3510,7 @@
break;
- case 128:
+ case 127:
{
VERTEX_ONLY("attribute", (yylsp[0]));
@@ -3540,7 +3522,7 @@
break;
- case 129:
+ case 128:
{
ES2_ONLY("varying", (yylsp[0]));
@@ -3554,7 +3536,7 @@
break;
- case 130:
+ case 129:
{
ES2_ONLY("varying", (yylsp[-1]));
@@ -3568,7 +3550,7 @@
break;
- case 131:
+ case 130:
{
if ((yyvsp[0].interm.type).qualifier != EvqConst && !context->symbolTable.atGlobalLevel()) {
@@ -3581,7 +3563,7 @@
break;
- case 132:
+ case 131:
{
(yyval.interm.type) = context->joinInterpolationQualifiers((yylsp[-1]), (yyvsp[-1].interm.type).qualifier, (yylsp[0]), (yyvsp[0].interm.type).qualifier);
@@ -3589,7 +3571,7 @@
break;
- case 133:
+ case 132:
{
context->error((yylsp[0]), "interpolation qualifier requires a fragment 'in' or vertex 'out' storage qualifier", getInterpolationString((yyvsp[0].interm.type).qualifier));
@@ -3601,7 +3583,7 @@
break;
- case 134:
+ case 133:
{
(yyval.interm.type).qualifier = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -3610,7 +3592,7 @@
break;
- case 135:
+ case 134:
{
(yyval.interm.type).setBasic(EbtVoid, (yyvsp[0].interm.type).qualifier, (yylsp[0]));
@@ -3619,7 +3601,7 @@
break;
- case 136:
+ case 135:
{
(yyval.interm.type).qualifier = EvqConst;
@@ -3627,7 +3609,7 @@
break;
- case 137:
+ case 136:
{
ES3_ONLY("in", (yylsp[0]), "storage qualifier");
@@ -3636,7 +3618,7 @@
break;
- case 138:
+ case 137:
{
ES3_ONLY("out", (yylsp[0]), "storage qualifier");
@@ -3645,7 +3627,7 @@
break;
- case 139:
+ case 138:
{
ES3_ONLY("centroid in", (yylsp[-1]), "storage qualifier");
@@ -3659,7 +3641,7 @@
break;
- case 140:
+ case 139:
{
ES3_ONLY("centroid out", (yylsp[-1]), "storage qualifier");
@@ -3673,7 +3655,7 @@
break;
- case 141:
+ case 140:
{
if (context->globalErrorCheck((yylsp[0]), context->symbolTable.atGlobalLevel(), "uniform"))
@@ -3683,7 +3665,7 @@
break;
- case 142:
+ case 141:
{
(yyval.interm.type) = (yyvsp[0].interm.type);
@@ -3698,7 +3680,7 @@
break;
- case 143:
+ case 142:
{
(yyval.interm.type) = (yyvsp[0].interm.type);
@@ -3712,7 +3694,7 @@
break;
- case 144:
+ case 143:
{
(yyval.interm.precision) = EbpHigh;
@@ -3720,7 +3702,7 @@
break;
- case 145:
+ case 144:
{
(yyval.interm.precision) = EbpMedium;
@@ -3728,7 +3710,7 @@
break;
- case 146:
+ case 145:
{
(yyval.interm.precision) = EbpLow;
@@ -3736,7 +3718,7 @@
break;
- case 147:
+ case 146:
{
ES3_ONLY("layout", (yylsp[-3]), "qualifier");
@@ -3745,7 +3727,7 @@
break;
- case 148:
+ case 147:
{
(yyval.interm.layoutQualifier) = (yyvsp[0].interm.layoutQualifier);
@@ -3753,7 +3735,7 @@
break;
- case 149:
+ case 148:
{
(yyval.interm.layoutQualifier) = context->joinLayoutQualifiers((yyvsp[-2].interm.layoutQualifier), (yyvsp[0].interm.layoutQualifier));
@@ -3761,7 +3743,7 @@
break;
- case 150:
+ case 149:
{
(yyval.interm.layoutQualifier) = context->parseLayoutQualifier(*(yyvsp[0].lex).string, (yylsp[0]));
@@ -3769,6 +3751,14 @@
break;
+ case 150:
+
+ {
+ (yyval.interm.layoutQualifier) = context->parseLayoutQualifier(*(yyvsp[-2].lex).string, (yylsp[-2]), *(yyvsp[0].lex).string, (yyvsp[0].lex).i, (yylsp[0]));
+ }
+
+ break;
+
case 151:
{
@@ -3780,20 +3770,12 @@
case 152:
{
- (yyval.interm.layoutQualifier) = context->parseLayoutQualifier(*(yyvsp[-2].lex).string, (yylsp[-2]), *(yyvsp[0].lex).string, (yyvsp[0].lex).i, (yylsp[0]));
- }
-
- break;
-
- case 153:
-
- {
(yyval.interm.type) = (yyvsp[0].interm.type);
}
break;
- case 154:
+ case 153:
{
(yyval.interm.type) = (yyvsp[-3].interm.type);
@@ -3810,7 +3792,7 @@
break;
- case 155:
+ case 154:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -3819,7 +3801,7 @@
break;
- case 156:
+ case 155:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -3828,7 +3810,7 @@
break;
- case 157:
+ case 156:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -3837,7 +3819,7 @@
break;
- case 158:
+ case 157:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -3846,7 +3828,7 @@
break;
- case 159:
+ case 158:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -3855,12 +3837,22 @@
break;
+ case 159:
+
+ {
+ TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
+ (yyval.interm.type).setBasic(EbtFloat, qual, (yylsp[0]));
+ (yyval.interm.type).setAggregate(2);
+ }
+
+ break;
+
case 160:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtFloat, qual, (yylsp[0]));
- (yyval.interm.type).setAggregate(2);
+ (yyval.interm.type).setAggregate(3);
}
break;
@@ -3870,7 +3862,7 @@
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtFloat, qual, (yylsp[0]));
- (yyval.interm.type).setAggregate(3);
+ (yyval.interm.type).setAggregate(4);
}
break;
@@ -3879,8 +3871,8 @@
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
- (yyval.interm.type).setBasic(EbtFloat, qual, (yylsp[0]));
- (yyval.interm.type).setAggregate(4);
+ (yyval.interm.type).setBasic(EbtBool, qual, (yylsp[0]));
+ (yyval.interm.type).setAggregate(2);
}
break;
@@ -3890,7 +3882,7 @@
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtBool, qual, (yylsp[0]));
- (yyval.interm.type).setAggregate(2);
+ (yyval.interm.type).setAggregate(3);
}
break;
@@ -3900,7 +3892,7 @@
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtBool, qual, (yylsp[0]));
- (yyval.interm.type).setAggregate(3);
+ (yyval.interm.type).setAggregate(4);
}
break;
@@ -3909,8 +3901,8 @@
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
- (yyval.interm.type).setBasic(EbtBool, qual, (yylsp[0]));
- (yyval.interm.type).setAggregate(4);
+ (yyval.interm.type).setBasic(EbtInt, qual, (yylsp[0]));
+ (yyval.interm.type).setAggregate(2);
}
break;
@@ -3920,7 +3912,7 @@
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtInt, qual, (yylsp[0]));
- (yyval.interm.type).setAggregate(2);
+ (yyval.interm.type).setAggregate(3);
}
break;
@@ -3930,22 +3922,12 @@
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtInt, qual, (yylsp[0]));
- (yyval.interm.type).setAggregate(3);
- }
-
- break;
-
- case 168:
-
- {
- TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
- (yyval.interm.type).setBasic(EbtInt, qual, (yylsp[0]));
(yyval.interm.type).setAggregate(4);
}
break;
- case 169:
+ case 168:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -3955,7 +3937,7 @@
break;
- case 170:
+ case 169:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -3965,7 +3947,7 @@
break;
- case 171:
+ case 170:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -3975,7 +3957,7 @@
break;
- case 172:
+ case 171:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -3985,7 +3967,7 @@
break;
- case 173:
+ case 172:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -3995,7 +3977,7 @@
break;
- case 174:
+ case 173:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4005,7 +3987,7 @@
break;
- case 175:
+ case 174:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4015,7 +3997,7 @@
break;
- case 176:
+ case 175:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4025,7 +4007,7 @@
break;
- case 177:
+ case 176:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4035,7 +4017,7 @@
break;
- case 178:
+ case 177:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4045,7 +4027,7 @@
break;
- case 179:
+ case 178:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4055,7 +4037,7 @@
break;
- case 180:
+ case 179:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4065,7 +4047,7 @@
break;
- case 181:
+ case 180:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4074,7 +4056,7 @@
break;
- case 182:
+ case 181:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4083,7 +4065,7 @@
break;
- case 183:
+ case 182:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4092,7 +4074,7 @@
break;
- case 184:
+ case 183:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4101,7 +4083,7 @@
break;
- case 185:
+ case 184:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4110,7 +4092,7 @@
break;
- case 186:
+ case 185:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4119,7 +4101,7 @@
break;
- case 187:
+ case 186:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4128,7 +4110,7 @@
break;
- case 188:
+ case 187:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4137,7 +4119,7 @@
break;
- case 189:
+ case 188:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4146,7 +4128,7 @@
break;
- case 190:
+ case 189:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4155,7 +4137,7 @@
break;
- case 191:
+ case 190:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4164,7 +4146,7 @@
break;
- case 192:
+ case 191:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4173,7 +4155,7 @@
break;
- case 193:
+ case 192:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4182,7 +4164,7 @@
break;
- case 194:
+ case 193:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4191,7 +4173,7 @@
break;
- case 195:
+ case 194:
{
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -4200,7 +4182,7 @@
break;
- case 196:
+ case 195:
{
if (!context->supportsExtension("GL_OES_EGL_image_external")) {
@@ -4213,7 +4195,7 @@
break;
- case 197:
+ case 196:
{
if (!context->supportsExtension("GL_ARB_texture_rectangle")) {
@@ -4226,7 +4208,7 @@
break;
- case 198:
+ case 197:
{
(yyval.interm.type) = (yyvsp[0].interm.type);
@@ -4235,7 +4217,7 @@
break;
- case 199:
+ case 198:
{
//
@@ -4250,13 +4232,13 @@
break;
- case 200:
+ case 199:
{ if (context->enterStructDeclaration((yylsp[-1]), *(yyvsp[-1].lex).string)) context->recover(); }
break;
- case 201:
+ case 200:
{
(yyval.interm.type) = context->addStructure((yylsp[-5]), (yylsp[-4]), (yyvsp[-4].lex).string, (yyvsp[-1].interm.fieldList));
@@ -4264,13 +4246,13 @@
break;
- case 202:
+ case 201:
{ if (context->enterStructDeclaration((yylsp[0]), *(yyvsp[0].lex).string)) context->recover(); }
break;
- case 203:
+ case 202:
{
(yyval.interm.type) = context->addStructure((yylsp[-4]), (yyloc), NewPoolTString(""), (yyvsp[-1].interm.fieldList));
@@ -4278,7 +4260,7 @@
break;
- case 204:
+ case 203:
{
(yyval.interm.fieldList) = (yyvsp[0].interm.fieldList);
@@ -4286,7 +4268,7 @@
break;
- case 205:
+ case 204:
{
(yyval.interm.fieldList) = (yyvsp[-1].interm.fieldList);
@@ -4304,7 +4286,7 @@
break;
- case 206:
+ case 205:
{
(yyval.interm.fieldList) = context->addStructDeclaratorList((yyvsp[-2].interm.type), (yyvsp[-1].interm.fieldList));
@@ -4312,7 +4294,7 @@
break;
- case 207:
+ case 206:
{
// ES3 Only, but errors should be handled elsewhere
@@ -4323,7 +4305,7 @@
break;
- case 208:
+ case 207:
{
(yyval.interm.fieldList) = NewPoolTFieldList();
@@ -4332,7 +4314,7 @@
break;
- case 209:
+ case 208:
{
(yyval.interm.fieldList)->push_back((yyvsp[0].interm.field));
@@ -4340,7 +4322,7 @@
break;
- case 210:
+ case 209:
{
if (context->reservedErrorCheck((yylsp[0]), *(yyvsp[0].lex).string))
@@ -4352,7 +4334,7 @@
break;
- case 211:
+ case 210:
{
if (context->reservedErrorCheck((yylsp[-3]), *(yyvsp[-3].lex).string))
@@ -4369,24 +4351,30 @@
break;
- case 212:
+ case 211:
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
break;
- case 213:
+ case 212:
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
break;
- case 214:
+ case 213:
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermAggregate); }
break;
+ case 214:
+
+ { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
+
+ break;
+
case 215:
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
@@ -4407,19 +4395,19 @@
case 218:
- { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
+ { (yyval.interm.intermNode) = (yyvsp[0].interm.intermSwitch); }
break;
case 219:
- { (yyval.interm.intermNode) = (yyvsp[0].interm.intermSwitch); }
+ { (yyval.interm.intermNode) = (yyvsp[0].interm.intermCase); }
break;
case 220:
- { (yyval.interm.intermNode) = (yyvsp[0].interm.intermCase); }
+ { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
break;
@@ -4431,29 +4419,23 @@
case 222:
- { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
+ { (yyval.interm.intermAggregate) = 0; }
break;
case 223:
- { (yyval.interm.intermAggregate) = 0; }
+ { context->symbolTable.push(); }
break;
case 224:
- { context->symbolTable.push(); }
-
- break;
-
- case 225:
-
{ context->symbolTable.pop(); }
break;
- case 226:
+ case 225:
{
if ((yyvsp[-2].interm.intermAggregate) != 0) {
@@ -4465,6 +4447,12 @@
break;
+ case 226:
+
+ { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
+
+ break;
+
case 227:
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
@@ -4473,35 +4461,29 @@
case 228:
- { (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
+ { context->symbolTable.push(); }
break;
case 229:
- { context->symbolTable.push(); }
+ { context->symbolTable.pop(); (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
break;
case 230:
- { context->symbolTable.pop(); (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
+ { context->symbolTable.push(); }
break;
case 231:
- { context->symbolTable.push(); }
-
- break;
-
- case 232:
-
{ context->symbolTable.pop(); (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
break;
- case 233:
+ case 232:
{
(yyval.interm.intermNode) = 0;
@@ -4509,7 +4491,7 @@
break;
- case 234:
+ case 233:
{
if ((yyvsp[-1].interm.intermAggregate)) {
@@ -4521,7 +4503,7 @@
break;
- case 235:
+ case 234:
{
(yyval.interm.intermAggregate) = context->intermediate.makeAggregate((yyvsp[0].interm.intermNode), (yyloc));
@@ -4529,7 +4511,7 @@
break;
- case 236:
+ case 235:
{
(yyval.interm.intermAggregate) = context->intermediate.growAggregate((yyvsp[-1].interm.intermAggregate), (yyvsp[0].interm.intermNode), (yyloc));
@@ -4537,19 +4519,19 @@
break;
- case 237:
+ case 236:
{ (yyval.interm.intermNode) = 0; }
break;
- case 238:
+ case 237:
{ (yyval.interm.intermNode) = static_cast<TIntermNode*>((yyvsp[-1].interm.intermTypedNode)); }
break;
- case 239:
+ case 238:
{
if (context->boolErrorCheck((yylsp[-4]), (yyvsp[-2].interm.intermTypedNode)))
@@ -4559,7 +4541,7 @@
break;
- case 240:
+ case 239:
{
(yyval.interm.nodePair).node1 = (yyvsp[-2].interm.intermNode);
@@ -4568,7 +4550,7 @@
break;
- case 241:
+ case 240:
{
(yyval.interm.nodePair).node1 = (yyvsp[0].interm.intermNode);
@@ -4577,13 +4559,13 @@
break;
- case 242:
+ case 241:
{ ++context->mSwitchNestingLevel; }
break;
- case 243:
+ case 242:
{
(yyval.interm.intermSwitch) = context->addSwitch((yyvsp[-3].interm.intermTypedNode), (yyvsp[0].interm.intermAggregate), (yylsp[-5]));
@@ -4592,7 +4574,7 @@
break;
- case 244:
+ case 243:
{
(yyval.interm.intermCase) = context->addCase((yyvsp[-1].interm.intermTypedNode), (yylsp[-2]));
@@ -4600,7 +4582,7 @@
break;
- case 245:
+ case 244:
{
(yyval.interm.intermCase) = context->addDefault((yylsp[-1]));
@@ -4608,7 +4590,7 @@
break;
- case 246:
+ case 245:
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
@@ -4618,7 +4600,7 @@
break;
- case 247:
+ case 246:
{
TIntermNode* intermNode;
@@ -4637,13 +4619,13 @@
break;
- case 248:
+ case 247:
{ context->symbolTable.push(); ++context->mLoopNestingLevel; }
break;
- case 249:
+ case 248:
{
context->symbolTable.pop();
@@ -4653,13 +4635,13 @@
break;
- case 250:
+ case 249:
{ ++context->mLoopNestingLevel; }
break;
- case 251:
+ case 250:
{
if (context->boolErrorCheck((yylsp[0]), (yyvsp[-2].interm.intermTypedNode)))
@@ -4671,18 +4653,26 @@
break;
- case 252:
+ case 251:
{ context->symbolTable.push(); ++context->mLoopNestingLevel; }
break;
+ case 252:
+
+ {
+ context->symbolTable.pop();
+ (yyval.interm.intermNode) = context->intermediate.addLoop(ELoopFor, (yyvsp[-3].interm.intermNode), reinterpret_cast<TIntermTyped*>((yyvsp[-2].interm.nodePair).node1), reinterpret_cast<TIntermTyped*>((yyvsp[-2].interm.nodePair).node2), (yyvsp[0].interm.intermNode), (yylsp[-6]));
+ --context->mLoopNestingLevel;
+ }
+
+ break;
+
case 253:
{
- context->symbolTable.pop();
- (yyval.interm.intermNode) = context->intermediate.addLoop(ELoopFor, (yyvsp[-3].interm.intermNode), reinterpret_cast<TIntermTyped*>((yyvsp[-2].interm.nodePair).node1), reinterpret_cast<TIntermTyped*>((yyvsp[-2].interm.nodePair).node2), (yyvsp[0].interm.intermNode), (yylsp[-6]));
- --context->mLoopNestingLevel;
+ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
break;
@@ -4698,7 +4688,7 @@
case 255:
{
- (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
+ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
break;
@@ -4706,20 +4696,12 @@
case 256:
{
- (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
- }
-
- break;
-
- case 257:
-
- {
(yyval.interm.intermTypedNode) = 0;
}
break;
- case 258:
+ case 257:
{
(yyval.interm.nodePair).node1 = (yyvsp[-1].interm.intermTypedNode);
@@ -4728,7 +4710,7 @@
break;
- case 259:
+ case 258:
{
(yyval.interm.nodePair).node1 = (yyvsp[-2].interm.intermTypedNode);
@@ -4737,7 +4719,7 @@
break;
- case 260:
+ case 259:
{
(yyval.interm.intermNode) = context->addBranch(EOpContinue, (yylsp[-1]));
@@ -4745,7 +4727,7 @@
break;
- case 261:
+ case 260:
{
(yyval.interm.intermNode) = context->addBranch(EOpBreak, (yylsp[-1]));
@@ -4753,7 +4735,7 @@
break;
- case 262:
+ case 261:
{
(yyval.interm.intermNode) = context->addBranch(EOpReturn, (yylsp[-1]));
@@ -4761,7 +4743,7 @@
break;
- case 263:
+ case 262:
{
(yyval.interm.intermNode) = context->addBranch(EOpReturn, (yyvsp[-1].interm.intermTypedNode), (yylsp[-2]));
@@ -4769,7 +4751,7 @@
break;
- case 264:
+ case 263:
{
FRAG_ONLY("discard", (yylsp[-1]));
@@ -4778,7 +4760,7 @@
break;
- case 265:
+ case 264:
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
@@ -4787,7 +4769,7 @@
break;
- case 266:
+ case 265:
{
(yyval.interm.intermNode) = context->intermediate.growAggregate((yyvsp[-1].interm.intermNode), (yyvsp[0].interm.intermNode), (yyloc));
@@ -4796,6 +4778,14 @@
break;
+ case 266:
+
+ {
+ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
+ }
+
+ break;
+
case 267:
{
@@ -4807,14 +4797,6 @@
case 268:
{
- (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
- }
-
- break;
-
- case 269:
-
- {
TFunction* function = (yyvsp[0].interm).function;
const TSymbol *builtIn = context->symbolTable.findBuiltIn(function->getMangledName(), context->shaderVersion);
@@ -4902,7 +4884,7 @@
break;
- case 270:
+ case 269:
{
//?? Check that all paths return a value if return type != void ?
diff --git a/src/tests/compiler_tests/MalformedShader_test.cpp b/src/tests/compiler_tests/MalformedShader_test.cpp
index 9517570..b144e0c 100644
--- a/src/tests/compiler_tests/MalformedShader_test.cpp
+++ b/src/tests/compiler_tests/MalformedShader_test.cpp
@@ -197,3 +197,19 @@
FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
}
}
+
+// This is a regression test for a particular bug that was in ANGLE.
+// It also verifies that ESSL3 functionality doesn't leak to ESSL1.
+TEST_F(MalformedShaderTest, ArrayWithNoSizeInInitializerList)
+{
+ const std::string &shaderString =
+ "precision mediump float;\n"
+ "void main() {\n"
+ " float a[2], b[];\n"
+ " gl_FragColor = vec4(1.0);\n"
+ "}\n";
+ if (compile(shaderString))
+ {
+ FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
+ }
+}