summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/shader/lex.yy.c1351
-rw-r--r--src/mesa/shader/program_lexer.l2
2 files changed, 686 insertions, 667 deletions
diff --git a/src/mesa/shader/lex.yy.c b/src/mesa/shader/lex.yy.c
index 3c4e97b650..3c86913fdf 100644
--- a/src/mesa/shader/lex.yy.c
+++ b/src/mesa/shader/lex.yy.c
@@ -357,8 +357,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 168
-#define YY_END_OF_BUFFER 169
+#define YY_NUM_RULES 170
+#define YY_END_OF_BUFFER 171
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -366,100 +366,101 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[836] =
+static yyconst flex_int16_t yy_accept[850] =
{ 0,
- 0, 0, 169, 167, 165, 164, 167, 167, 137, 163,
- 139, 139, 139, 139, 137, 137, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 165, 0, 0, 166, 137,
- 0, 138, 140, 160, 160, 0, 0, 0, 0, 160,
- 0, 0, 0, 0, 0, 0, 0, 117, 161, 118,
- 119, 151, 151, 151, 151, 0, 139, 0, 125, 126,
- 127, 137, 137, 137, 137, 137, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
-
- 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 137, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 159, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 158, 158, 0, 0, 0,
+ 0, 0, 171, 169, 167, 166, 169, 169, 139, 165,
+ 141, 141, 141, 141, 139, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 139, 167, 0, 0, 168, 139,
+ 0, 140, 142, 162, 162, 0, 0, 0, 0, 162,
+ 0, 0, 0, 0, 0, 0, 0, 119, 163, 120,
+ 121, 153, 153, 153, 153, 0, 141, 0, 127, 128,
+ 129, 139, 139, 139, 139, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
+
+ 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 139, 139, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 161, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 160, 160, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 157, 157, 157, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 148, 148, 148, 149, 149, 150, 141,
- 140, 141, 0, 142, 11, 12, 137, 13, 137, 137,
- 14, 15, 137, 16, 17, 18, 19, 20, 21, 6,
+ 159, 159, 159, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 150, 150, 150, 151, 151, 152, 143,
+ 142, 143, 0, 144, 11, 12, 139, 13, 139, 139,
+ 14, 15, 139, 16, 17, 18, 19, 20, 21, 6,
22, 23, 24, 25, 26, 28, 27, 29, 30, 31,
- 32, 33, 34, 35, 137, 137, 137, 137, 137, 40,
- 41, 137, 42, 43, 44, 45, 46, 47, 48, 137,
- 49, 50, 51, 52, 53, 54, 55, 137, 56, 57,
- 58, 59, 137, 62, 63, 137, 137, 137, 137, 137,
- 137, 0, 0, 0, 0, 140, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 78, 79, 81, 0,
- 156, 0, 0, 0, 0, 0, 0, 95, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 155, 154,
- 154, 107, 0, 0, 0, 0, 0, 0, 0, 0,
-
- 0, 0, 145, 145, 146, 147, 0, 143, 11, 11,
- 137, 12, 12, 12, 137, 137, 137, 137, 137, 15,
- 15, 137, 128, 16, 16, 137, 17, 17, 137, 18,
- 18, 137, 19, 19, 137, 20, 20, 137, 21, 21,
- 137, 22, 22, 137, 24, 24, 137, 25, 25, 137,
- 28, 28, 137, 27, 27, 137, 30, 30, 137, 31,
- 31, 137, 32, 32, 137, 33, 33, 137, 34, 34,
- 137, 35, 35, 137, 137, 137, 137, 36, 137, 38,
- 137, 40, 40, 137, 41, 41, 137, 129, 42, 42,
- 137, 43, 43, 137, 137, 45, 45, 137, 46, 46,
-
- 137, 47, 47, 137, 48, 48, 137, 137, 49, 49,
- 137, 50, 50, 137, 51, 51, 137, 52, 52, 137,
- 53, 53, 137, 54, 54, 137, 137, 10, 56, 137,
- 57, 137, 58, 137, 59, 137, 60, 137, 62, 62,
- 137, 137, 137, 137, 137, 137, 137, 137, 0, 162,
- 0, 0, 0, 71, 72, 0, 0, 0, 0, 0,
- 0, 0, 83, 0, 0, 0, 0, 0, 0, 0,
+ 32, 33, 34, 35, 139, 139, 139, 139, 139, 40,
+ 41, 139, 42, 43, 44, 45, 46, 47, 48, 139,
+ 49, 50, 51, 52, 53, 54, 55, 139, 56, 57,
+ 58, 59, 139, 139, 64, 65, 139, 139, 139, 139,
+ 139, 139, 0, 0, 0, 0, 142, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 80, 81, 83,
+ 0, 158, 0, 0, 0, 0, 0, 0, 97, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 157,
+ 156, 156, 109, 0, 0, 0, 0, 0, 0, 0,
+
+ 0, 0, 0, 147, 147, 148, 149, 0, 145, 11,
+ 11, 139, 12, 12, 12, 139, 139, 139, 139, 139,
+ 15, 15, 139, 130, 16, 16, 139, 17, 17, 139,
+ 18, 18, 139, 19, 19, 139, 20, 20, 139, 21,
+ 21, 139, 22, 22, 139, 24, 24, 139, 25, 25,
+ 139, 28, 28, 139, 27, 27, 139, 30, 30, 139,
+ 31, 31, 139, 32, 32, 139, 33, 33, 139, 34,
+ 34, 139, 35, 35, 139, 139, 139, 139, 36, 139,
+ 38, 139, 40, 40, 139, 41, 41, 139, 131, 42,
+ 42, 139, 43, 43, 139, 139, 45, 45, 139, 46,
+
+ 46, 139, 47, 47, 139, 48, 48, 139, 139, 49,
+ 49, 139, 50, 50, 139, 51, 51, 139, 52, 52,
+ 139, 53, 53, 139, 54, 54, 139, 139, 10, 56,
+ 139, 57, 139, 58, 139, 59, 139, 60, 139, 62,
+ 139, 64, 64, 139, 139, 139, 139, 139, 139, 139,
+ 139, 0, 164, 0, 0, 0, 73, 74, 0, 0,
+ 0, 0, 0, 0, 0, 85, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 153, 0, 0, 0, 111, 0, 113, 0, 0,
- 0, 0, 0, 0, 152, 144, 137, 137, 137, 4,
-
- 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
- 137, 137, 137, 9, 37, 39, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 137, 137, 60, 137, 61,
- 137, 137, 137, 137, 137, 67, 137, 137, 0, 0,
- 0, 0, 0, 73, 74, 0, 0, 0, 0, 82,
- 0, 0, 86, 89, 0, 0, 0, 0, 0, 0,
- 0, 100, 101, 0, 0, 0, 0, 106, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 137, 137,
-
- 137, 137, 137, 137, 5, 137, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
- 137, 137, 137, 137, 7, 8, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 137, 137, 137, 137, 137,
- 137, 137, 137, 137, 137, 137, 137, 137, 61, 137,
- 137, 137, 137, 137, 68, 137, 64, 0, 0, 0,
- 0, 122, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 92, 0, 96, 97, 0, 99, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 115, 116, 0,
- 0, 123, 11, 3, 12, 133, 134, 137, 14, 15,
-
- 16, 17, 18, 19, 20, 21, 22, 24, 25, 28,
- 27, 30, 31, 32, 33, 34, 35, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 137, 137, 137, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 137, 137, 62, 63, 137, 66, 124, 0, 0, 69,
- 0, 75, 0, 0, 0, 84, 0, 0, 0, 0,
- 0, 0, 98, 0, 0, 104, 91, 0, 0, 0,
- 0, 0, 0, 120, 0, 137, 130, 131, 137, 60,
- 137, 65, 0, 0, 0, 0, 77, 80, 85, 0,
- 0, 90, 0, 0, 0, 103, 0, 0, 0, 0,
-
- 112, 114, 0, 137, 137, 61, 2, 1, 0, 76,
- 0, 88, 0, 94, 102, 0, 0, 109, 110, 121,
- 137, 132, 0, 87, 0, 105, 108, 137, 70, 93,
- 137, 137, 135, 136, 0
+ 0, 0, 0, 0, 155, 0, 0, 0, 113, 0,
+ 115, 0, 0, 0, 0, 0, 0, 154, 146, 139,
+
+ 139, 139, 4, 139, 139, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 139, 139, 9, 37, 39, 139,
+ 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
+ 60, 139, 61, 62, 139, 63, 139, 139, 139, 139,
+ 139, 69, 139, 139, 0, 0, 0, 0, 0, 75,
+ 76, 0, 0, 0, 0, 84, 0, 0, 88, 91,
+ 0, 0, 0, 0, 0, 0, 0, 102, 103, 0,
+ 0, 0, 0, 108, 0, 0, 0, 0, 0, 0,
+
+ 0, 0, 0, 0, 139, 139, 139, 139, 139, 139,
+ 5, 139, 139, 139, 139, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
+ 7, 8, 139, 139, 139, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
+ 139, 139, 139, 139, 61, 139, 139, 63, 139, 139,
+ 139, 139, 139, 70, 139, 66, 0, 0, 0, 0,
+ 124, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 94, 0, 98, 99, 0, 101, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 117, 118, 0, 0,
+
+ 125, 11, 3, 12, 135, 136, 139, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 24, 25, 28, 27,
+ 30, 31, 32, 33, 34, 35, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 139, 139, 139, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 139,
+ 139, 139, 139, 64, 65, 139, 68, 126, 0, 0,
+ 71, 0, 77, 0, 0, 0, 86, 0, 0, 0,
+ 0, 0, 0, 100, 0, 0, 106, 93, 0, 0,
+ 0, 0, 0, 0, 122, 0, 139, 132, 133, 139,
+ 60, 139, 62, 139, 67, 0, 0, 0, 0, 79,
+
+ 82, 87, 0, 0, 92, 0, 0, 0, 105, 0,
+ 0, 0, 0, 114, 116, 0, 139, 139, 61, 63,
+ 2, 1, 0, 78, 0, 90, 0, 96, 104, 0,
+ 0, 111, 112, 123, 139, 134, 0, 89, 0, 107,
+ 110, 139, 72, 95, 139, 139, 137, 138, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -505,199 +506,203 @@ static yyconst flex_int32_t yy_meta[68] =
2, 2, 2, 2, 2, 2, 2
} ;
-static yyconst flex_int16_t yy_base[839] =
+static yyconst flex_int16_t yy_base[853] =
{ 0,
- 0, 0, 1283, 1284, 66, 1284, 1277, 1278, 0, 69,
- 85, 128, 140, 152, 151, 58, 56, 63, 76, 1256,
- 158, 160, 39, 163, 173, 189, 52, 1249, 76, 1219,
- 1218, 1230, 1214, 1228, 1227, 105, 1256, 1268, 1284, 0,
- 225, 1284, 218, 160, 157, 20, 123, 66, 119, 192,
- 1228, 1214, 54, 162, 1212, 1224, 194, 1284, 200, 195,
- 98, 227, 196, 231, 235, 293, 305, 316, 1284, 1284,
- 1284, 1233, 1246, 1240, 223, 1229, 1232, 1228, 1243, 107,
- 298, 1225, 1239, 246, 1225, 1238, 1229, 1242, 1219, 1230,
- 1221, 182, 1222, 1213, 1222, 1213, 1212, 1213, 144, 1207,
-
- 1213, 1224, 1215, 1209, 1206, 1207, 1211, 289, 1220, 1207,
- 302, 1214, 1201, 1215, 1191, 65, 315, 1218, 1210, 1209,
- 1185, 1170, 1165, 1182, 1158, 1163, 1189, 279, 1178, 293,
- 1173, 342, 299, 1175, 1156, 317, 1166, 1162, 1157, 207,
- 1163, 1149, 1165, 1162, 1153, 320, 324, 1155, 1144, 1158,
- 1161, 1143, 1158, 1145, 1142, 1149, 284, 1157, 227, 288,
- 327, 342, 345, 1134, 1151, 1152, 1145, 1127, 318, 1128,
- 1150, 1141, 330, 341, 345, 349, 353, 357, 361, 1284,
- 419, 430, 436, 442, 440, 441, 1174, 0, 1173, 1156,
- 1146, 443, 1166, 444, 451, 468, 470, 472, 471, 0,
+ 0, 0, 1299, 1300, 66, 1300, 1293, 1294, 0, 69,
+ 85, 128, 140, 152, 151, 58, 56, 63, 76, 1272,
+ 158, 160, 39, 163, 173, 189, 52, 1265, 76, 1235,
+ 1234, 1246, 1230, 1244, 1243, 105, 1272, 1284, 1300, 0,
+ 225, 1300, 218, 160, 157, 20, 123, 66, 119, 192,
+ 1244, 1230, 54, 162, 1228, 1240, 194, 1300, 200, 195,
+ 98, 227, 196, 231, 235, 293, 305, 316, 1300, 1300,
+ 1300, 1249, 1262, 1256, 223, 1245, 1248, 1244, 1259, 107,
+ 298, 1241, 1255, 246, 1241, 1254, 1245, 1258, 1235, 1246,
+ 1237, 182, 1238, 1229, 1238, 1229, 1228, 1229, 144, 1223,
+
+ 1229, 1240, 1231, 1225, 1222, 1223, 1227, 289, 1236, 1223,
+ 302, 1230, 1217, 1231, 1207, 65, 315, 276, 1227, 1226,
+ 1202, 1187, 1182, 1199, 1175, 1180, 1206, 279, 1195, 293,
+ 1190, 342, 299, 1192, 1173, 317, 1183, 1179, 1174, 207,
+ 1180, 1166, 1182, 1179, 1170, 320, 324, 1172, 1161, 1175,
+ 1178, 1160, 1175, 1162, 1159, 1166, 284, 1174, 227, 288,
+ 327, 342, 345, 1151, 1168, 1169, 1162, 1144, 318, 1145,
+ 1167, 1158, 330, 341, 345, 349, 353, 357, 361, 1300,
+ 419, 430, 436, 442, 440, 441, 1191, 0, 1190, 1173,
+ 1163, 443, 1183, 444, 451, 468, 470, 472, 471, 0,
496, 0, 497, 498, 0, 499, 500, 0, 524, 525,
- 526, 536, 537, 553, 1161, 1154, 1167, 354, 356, 561,
- 563, 1148, 564, 565, 1140, 580, 590, 591, 592, 1161,
- 593, 617, 618, 619, 629, 630, 1138, 1148, 247, 330,
- 362, 419, 445, 646, 1136, 1128, 1127, 1112, 1112, 1111,
- 1110, 1153, 1125, 1113, 662, 669, 643, 1117, 487, 1114,
- 1108, 1108, 1102, 1115, 1115, 1100, 1284, 1284, 1115, 1103,
- 646, 1110, 135, 1107, 1113, 561, 1108, 1284, 1099, 1106,
- 1105, 1108, 1094, 1093, 1097, 1092, 330, 1097, 650, 653,
- 665, 1284, 1089, 1087, 1087, 1095, 1096, 1078, 670, 1083,
-
- 1089, 432, 460, 486, 579, 655, 715, 722, 1095, 682,
- 1102, 1093, 697, 721, 1100, 1099, 1092, 1106, 1096, 1087,
- 699, 1094, 0, 1085, 724, 1092, 1083, 725, 1090, 1081,
- 726, 1088, 1079, 727, 1086, 1077, 728, 1084, 1075, 729,
- 1082, 1073, 730, 1080, 1071, 731, 1078, 1069, 732, 1076,
- 1067, 733, 1074, 1065, 734, 1072, 1063, 735, 1070, 1061,
- 736, 1068, 1059, 737, 1066, 1057, 738, 1064, 1055, 739,
- 1062, 1053, 740, 1060, 1063, 1056, 1063, 0, 1056, 0,
- 1071, 1046, 741, 1053, 1044, 742, 1051, 0, 1042, 743,
- 1049, 1040, 745, 1047, 1046, 1037, 746, 1044, 1035, 767,
-
- 1042, 1033, 770, 1040, 1031, 771, 1038, 1041, 1028, 772,
- 1035, 1026, 773, 1033, 1024, 774, 1031, 1022, 775, 1029,
- 1020, 776, 1027, 1018, 777, 1025, 1024, 0, 1015, 1022,
- 1013, 1020, 1011, 1018, 1009, 1016, 778, 1015, 1006, 779,
- 1013, 1012, 990, 984, 989, 995, 978, 993, 424, 1284,
- 992, 982, 986, 1284, 1284, 976, 985, 971, 988, 971,
- 974, 968, 1284, 969, 968, 965, 972, 965, 973, 969,
- 979, 976, 958, 964, 971, 955, 954, 972, 954, 966,
- 965, 1284, 964, 954, 958, 1284, 945, 1284, 950, 950,
- 958, 941, 942, 952, 1284, 1284, 984, 966, 982, 0,
-
- 788, 980, 980, 979, 978, 977, 976, 975, 974, 973,
- 972, 971, 970, 969, 968, 967, 966, 965, 964, 963,
- 962, 949, 942, 0, 0, 0, 959, 958, 957, 956,
- 955, 954, 953, 952, 951, 929, 949, 948, 947, 946,
- 945, 944, 943, 942, 941, 940, 939, 913, 920, 783,
- 936, 935, 904, 907, 887, 0, 888, 881, 888, 887,
- 888, 880, 898, 1284, 1284, 880, 878, 888, 881, 1284,
- 876, 893, 345, 1284, 884, 868, 869, 878, 869, 868,
- 868, 1284, 867, 876, 866, 882, 879, 1284, 878, 876,
- 865, 866, 862, 854, 861, 856, 857, 852, 878, 878,
-
- 876, 890, 889, 884, 0, 872, 871, 870, 869, 868,
- 867, 866, 865, 864, 863, 862, 861, 860, 859, 858,
- 857, 856, 855, 854, 0, 0, 853, 852, 851, 850,
- 849, 848, 847, 846, 845, 791, 844, 843, 842, 841,
- 840, 839, 838, 837, 836, 835, 834, 851, 825, 832,
- 830, 829, 807, 807, 0, 814, 0, 848, 847, 796,
- 814, 1284, 809, 804, 797, 793, 805, 795, 793, 789,
- 805, 796, 795, 1284, 1284, 798, 1284, 793, 786, 775,
- 786, 778, 782, 795, 790, 793, 775, 1284, 1284, 787,
- 776, 1284, 0, 0, 0, 0, 0, 815, 0, 0,
-
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 526, 536, 537, 553, 1178, 1171, 1184, 354, 356, 561,
+ 563, 1165, 564, 565, 1157, 580, 590, 591, 592, 1178,
+ 593, 617, 618, 619, 629, 630, 1155, 1165, 330, 362,
+ 419, 483, 445, 364, 646, 1153, 1145, 1144, 1129, 1129,
+ 1128, 1127, 1170, 1142, 1130, 662, 669, 643, 1134, 487,
+ 1131, 1125, 1125, 1119, 1132, 1132, 1117, 1300, 1300, 1132,
+ 1120, 646, 1127, 135, 1124, 1130, 561, 1125, 1300, 1116,
+ 1123, 1122, 1125, 1111, 1110, 1114, 1109, 448, 1114, 650,
+ 653, 665, 1300, 1106, 1104, 1104, 1112, 1113, 1095, 670,
+
+ 1100, 1106, 486, 579, 655, 661, 668, 726, 732, 1112,
+ 682, 1119, 1110, 688, 730, 1117, 1116, 1109, 1123, 1113,
+ 1104, 712, 1111, 0, 1102, 731, 1109, 1100, 733, 1107,
+ 1098, 734, 1105, 1096, 736, 1103, 1094, 737, 1101, 1092,
+ 738, 1099, 1090, 739, 1097, 1088, 740, 1095, 1086, 741,
+ 1093, 1084, 742, 1091, 1082, 743, 1089, 1080, 744, 1087,
+ 1078, 745, 1085, 1076, 746, 1083, 1074, 747, 1081, 1072,
+ 748, 1079, 1070, 749, 1077, 1080, 1073, 1080, 0, 1073,
+ 0, 1088, 1063, 750, 1070, 1061, 751, 1068, 0, 1059,
+ 752, 1066, 1057, 755, 1064, 1063, 1054, 758, 1061, 1052,
+
+ 776, 1059, 1050, 777, 1057, 1048, 779, 1055, 1058, 1045,
+ 780, 1052, 1043, 782, 1050, 1041, 783, 1048, 1039, 784,
+ 1046, 1037, 785, 1044, 1035, 786, 1042, 1041, 0, 1032,
+ 1039, 1030, 1037, 1028, 1035, 1026, 1033, 787, 1032, 788,
+ 1047, 1022, 789, 1029, 1028, 1006, 1000, 1005, 1011, 994,
+ 1009, 424, 1300, 1008, 998, 1002, 1300, 1300, 992, 1001,
+ 987, 1004, 987, 990, 984, 1300, 985, 984, 981, 988,
+ 981, 989, 985, 995, 992, 974, 980, 987, 971, 970,
+ 988, 970, 982, 981, 1300, 980, 970, 974, 1300, 961,
+ 1300, 966, 966, 974, 957, 958, 968, 1300, 1300, 1000,
+
+ 982, 998, 0, 798, 996, 996, 995, 994, 993, 992,
+ 991, 990, 989, 988, 987, 986, 985, 984, 983, 982,
+ 981, 980, 979, 978, 965, 958, 0, 0, 0, 975,
+ 974, 973, 972, 971, 970, 969, 968, 967, 945, 965,
+ 964, 963, 962, 961, 960, 959, 958, 957, 956, 955,
+ 929, 936, 793, 927, 934, 794, 950, 949, 918, 921,
+ 901, 0, 902, 895, 902, 901, 902, 894, 912, 1300,
+ 1300, 894, 892, 902, 895, 1300, 890, 907, 516, 1300,
+ 898, 882, 883, 892, 883, 882, 882, 1300, 881, 890,
+ 880, 896, 893, 1300, 892, 890, 879, 880, 876, 868,
+
+ 875, 870, 871, 866, 892, 892, 890, 904, 903, 898,
+ 0, 886, 885, 884, 883, 882, 881, 880, 879, 878,
+ 877, 876, 875, 874, 873, 872, 871, 870, 869, 868,
+ 0, 0, 867, 866, 865, 864, 863, 862, 861, 860,
+ 859, 804, 858, 857, 856, 855, 854, 853, 852, 851,
+ 850, 849, 848, 865, 839, 846, 862, 836, 843, 841,
+ 840, 818, 818, 0, 825, 0, 859, 858, 807, 825,
+ 1300, 820, 815, 808, 804, 816, 806, 804, 800, 816,
+ 807, 806, 1300, 1300, 809, 1300, 804, 797, 786, 797,
+ 789, 793, 806, 801, 804, 786, 1300, 1300, 798, 787,
+
+ 1300, 0, 0, 0, 0, 0, 826, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 811, 803, 790, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 775, 791, 0, 0, 745, 0, 0, 796, 795, 1284,
- 737, 1284, 655, 655, 661, 1284, 644, 658, 643, 644,
- 635, 620, 1284, 598, 608, 1284, 1284, 604, 586, 579,
- 567, 567, 574, 1284, 557, 582, 0, 0, 582, 0,
- 565, 0, 582, 580, 539, 525, 1284, 1284, 1284, 527,
- 527, 1284, 525, 497, 499, 1284, 478, 451, 439, 441,
-
- 1284, 1284, 431, 441, 366, 0, 1284, 1284, 21, 1284,
- 144, 1284, 176, 1284, 1284, 182, 187, 1284, 1284, 1284,
- 220, 0, 235, 1284, 245, 1284, 1284, 424, 1284, 1284,
- 327, 373, 0, 0, 1284, 824, 396, 827
+ 0, 0, 0, 0, 0, 814, 813, 802, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 785,
+ 798, 779, 792, 0, 0, 656, 0, 0, 706, 702,
+ 1300, 649, 1300, 648, 648, 654, 1300, 637, 645, 610,
+ 612, 608, 608, 1300, 572, 583, 1300, 1300, 577, 573,
+ 560, 557, 542, 555, 1300, 539, 573, 0, 0, 572,
+ 0, 555, 0, 546, 0, 562, 551, 495, 479, 1300,
+
+ 1300, 1300, 481, 481, 1300, 480, 443, 31, 1300, 141,
+ 166, 171, 186, 1300, 1300, 211, 236, 276, 0, 0,
+ 1300, 1300, 290, 1300, 325, 1300, 346, 1300, 1300, 343,
+ 341, 1300, 1300, 1300, 365, 0, 380, 1300, 371, 1300,
+ 1300, 486, 1300, 1300, 451, 458, 0, 0, 1300, 836,
+ 503, 839
} ;
-static yyconst flex_int16_t yy_def[839] =
+static yyconst flex_int16_t yy_def[853] =
{ 0,
- 835, 1, 835, 835, 835, 835, 835, 836, 837, 835,
- 835, 835, 835, 835, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 835, 835, 836, 835, 837,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 838, 835, 835, 835, 835,
- 835, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
-
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
-
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
-
- 835, 835, 835, 835, 835, 835, 835, 835, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
-
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 837, 837, 837, 837,
-
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 837, 837,
-
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 837, 837, 837, 837, 837, 837, 837, 837,
-
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 837, 837, 837,
- 837, 837, 837, 837, 837, 837, 837, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 837, 837, 837, 837, 837,
- 837, 837, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
-
- 835, 835, 835, 837, 837, 837, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 837, 837, 835, 835, 835, 835, 835, 837, 835, 835,
- 837, 837, 837, 837, 0, 835, 835, 835
+ 849, 1, 849, 849, 849, 849, 849, 850, 851, 849,
+ 849, 849, 849, 849, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 849, 849, 850, 849, 851,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 852, 849, 849, 849, 849,
+ 849, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 851,
+
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+
+ 849, 849, 849, 849, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+
+ 849, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 851, 851, 851, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 851, 851, 851, 851,
+ 851, 851, 851, 851, 851, 849, 849, 849, 849, 849,
+
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 851, 851, 851, 851,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 851, 851, 849, 849, 849, 849,
+ 849, 851, 849, 849, 851, 851, 851, 851, 0, 849,
+ 849, 849
} ;
-static yyconst flex_int16_t yy_nxt[1352] =
+static yyconst flex_int16_t yy_nxt[1368] =
{ 0,
4, 5, 6, 5, 7, 8, 9, 4, 10, 11,
12, 13, 14, 11, 11, 15, 9, 16, 17, 18,
@@ -706,7 +711,7 @@ static yyconst flex_int16_t yy_nxt[1352] =
9, 9, 9, 9, 9, 9, 30, 9, 9, 9,
9, 9, 9, 9, 9, 9, 31, 9, 32, 33,
34, 9, 35, 9, 9, 9, 9, 36, 96, 36,
- 41, 116, 137, 97, 80, 138, 823, 42, 43, 43,
+ 41, 116, 137, 97, 80, 138, 829, 42, 43, 43,
43, 43, 43, 43, 77, 81, 78, 119, 82, 117,
83, 238, 79, 66, 67, 67, 67, 67, 67, 67,
@@ -718,139 +723,140 @@ static yyconst flex_int16_t yy_nxt[1352] =
67, 67, 67, 67, 67, 218, 171, 219, 70, 68,
66, 67, 67, 67, 67, 67, 67, 72, 139, 73,
71, 68, 140, 68, 144, 92, 74, 145, 98, 88,
- 464, 89, 75, 93, 76, 68, 90, 99, 94, 91,
- 101, 100, 102, 103, 95, 465, 824, 68, 136, 133,
+ 467, 89, 75, 93, 76, 68, 90, 99, 94, 91,
+ 101, 100, 102, 103, 95, 468, 830, 68, 136, 133,
210, 133, 133, 152, 133, 104, 105, 133, 106, 107,
108, 109, 110, 134, 111, 133, 112, 153, 133, 211,
- 135, 825, 113, 114, 154, 115, 41, 43, 43, 43,
- 43, 43, 43, 146, 147, 157, 826, 132, 165, 133,
- 166, 161, 162, 167, 168, 827, 158, 163, 188, 159,
- 133, 169, 160, 264, 189, 164, 828, 201, 133, 174,
- 173, 175, 176, 132, 429, 265, 128, 129, 46, 47,
- 48, 49, 172, 51, 52, 202, 284, 53, 54, 55,
- 56, 57, 58, 130, 60, 61, 285, 430, 131, 829,
+ 135, 831, 113, 114, 154, 115, 41, 43, 43, 43,
+ 43, 43, 43, 146, 147, 157, 832, 132, 165, 133,
+ 166, 161, 162, 167, 168, 833, 158, 163, 188, 159,
+ 133, 169, 160, 265, 189, 164, 834, 201, 133, 174,
+ 173, 175, 176, 132, 835, 266, 128, 129, 46, 47,
+ 48, 49, 172, 51, 52, 202, 285, 53, 54, 55,
+ 56, 57, 58, 130, 60, 61, 286, 243, 131, 244,
173, 173, 173, 173, 177, 173, 173, 178, 179, 173,
- 173, 173, 181, 181, 181, 181, 181, 181, 228, 830,
+ 173, 173, 181, 181, 181, 181, 181, 181, 228, 836,
196, 197, 182, 66, 67, 67, 67, 67, 67, 67,
198, 232, 229, 183, 68, 184, 184, 184, 184, 184,
- 184, 240, 134, 241, 254, 233, 281, 286, 182, 135,
- 257, 257, 282, 287, 242, 833, 257, 431, 164, 255,
- 68, 256, 256, 256, 256, 256, 256, 257, 257, 257,
- 260, 257, 257, 297, 257, 271, 257, 257, 257, 257,
- 432, 257, 380, 298, 257, 257, 378, 479, 257, 433,
- 480, 288, 257, 289, 257, 257, 290, 291, 379, 257,
- 381, 834, 257, 302, 302, 302, 302, 40, 669, 822,
-
- 257, 670, 434, 257, 302, 302, 302, 302, 303, 302,
- 302, 304, 305, 302, 302, 302, 302, 302, 302, 302,
- 306, 302, 302, 302, 302, 302, 302, 302, 43, 43,
- 43, 43, 43, 43, 831, 832, 435, 307, 132, 308,
- 308, 308, 308, 308, 308, 184, 184, 184, 184, 184,
- 184, 184, 184, 184, 184, 184, 184, 309, 312, 436,
- 320, 324, 310, 313, 132, 321, 325, 437, 327, 821,
- 559, 310, 314, 328, 321, 325, 820, 310, 313, 438,
- 311, 315, 328, 322, 326, 330, 560, 333, 339, 336,
- 331, 329, 334, 340, 337, 495, 495, 495, 495, 331,
-
- 819, 334, 340, 337, 818, 331, 817, 334, 332, 337,
- 335, 341, 338, 342, 345, 348, 351, 354, 343, 346,
- 349, 352, 355, 495, 495, 495, 495, 343, 346, 349,
- 352, 355, 452, 816, 346, 349, 344, 347, 350, 353,
- 356, 357, 360, 363, 815, 453, 358, 361, 364, 496,
- 495, 495, 495, 366, 369, 358, 361, 364, 367, 370,
- 814, 358, 361, 364, 359, 362, 365, 367, 370, 813,
- 372, 812, 811, 367, 370, 373, 368, 371, 382, 810,
- 385, 389, 392, 383, 373, 386, 390, 393, 809, 808,
- 373, 807, 383, 374, 386, 390, 393, 396, 806, 805,
-
- 804, 384, 397, 387, 391, 394, 468, 399, 402, 405,
- 409, 397, 400, 403, 406, 410, 803, 397, 802, 469,
- 398, 400, 403, 406, 410, 801, 800, 400, 403, 406,
- 401, 404, 407, 411, 412, 415, 418, 799, 798, 413,
- 416, 419, 495, 495, 495, 495, 421, 424, 413, 416,
- 419, 422, 425, 797, 413, 416, 419, 414, 417, 420,
- 422, 425, 796, 439, 795, 794, 422, 425, 440, 423,
- 426, 256, 256, 256, 256, 256, 256, 440, 256, 256,
- 256, 256, 256, 256, 450, 450, 441, 450, 450, 793,
- 450, 450, 450, 450, 450, 450, 792, 450, 791, 309,
-
- 450, 450, 790, 789, 450, 788, 482, 450, 450, 787,
- 786, 450, 450, 489, 312, 490, 320, 491, 495, 495,
- 495, 495, 311, 450, 308, 308, 308, 308, 308, 308,
- 492, 308, 308, 308, 308, 308, 308, 315, 312, 322,
- 498, 324, 327, 330, 333, 336, 339, 342, 345, 348,
- 351, 354, 357, 360, 363, 366, 369, 372, 382, 385,
- 389, 315, 392, 396, 326, 329, 332, 335, 338, 341,
- 344, 347, 350, 353, 356, 359, 362, 365, 368, 371,
- 374, 384, 387, 391, 399, 394, 398, 402, 405, 409,
- 412, 415, 418, 421, 424, 548, 439, 785, 602, 603,
-
- 649, 727, 728, 784, 783, 782, 781, 401, 780, 779,
- 404, 407, 411, 414, 417, 420, 423, 426, 549, 441,
- 604, 778, 729, 650, 38, 38, 38, 180, 180, 777,
- 776, 775, 774, 773, 772, 771, 770, 769, 768, 767,
- 766, 765, 764, 763, 762, 761, 760, 759, 758, 757,
- 756, 755, 754, 753, 752, 751, 750, 749, 748, 747,
- 746, 745, 744, 743, 742, 650, 741, 740, 739, 738,
- 737, 736, 735, 734, 733, 732, 731, 730, 726, 725,
- 724, 723, 722, 721, 720, 719, 718, 717, 716, 715,
- 714, 713, 712, 711, 710, 709, 708, 707, 706, 705,
-
- 704, 703, 702, 701, 700, 699, 698, 697, 696, 695,
- 694, 693, 692, 691, 690, 689, 688, 687, 686, 685,
- 684, 683, 682, 681, 680, 679, 678, 677, 676, 675,
- 674, 673, 672, 671, 668, 667, 666, 665, 664, 663,
- 662, 661, 660, 659, 658, 657, 656, 655, 654, 653,
- 652, 651, 648, 549, 647, 646, 645, 644, 643, 642,
- 641, 640, 639, 638, 637, 636, 635, 634, 633, 632,
- 631, 630, 629, 628, 627, 626, 625, 624, 623, 622,
- 621, 620, 619, 618, 617, 616, 615, 614, 613, 612,
- 611, 610, 609, 608, 607, 606, 605, 601, 600, 599,
-
- 598, 597, 596, 595, 594, 593, 592, 591, 590, 589,
- 588, 587, 586, 585, 584, 583, 582, 581, 580, 579,
- 578, 577, 576, 575, 574, 573, 572, 571, 570, 569,
- 568, 567, 566, 565, 564, 563, 562, 561, 558, 557,
- 556, 555, 554, 553, 552, 551, 441, 550, 547, 436,
- 546, 434, 545, 432, 544, 430, 543, 542, 426, 541,
- 423, 540, 420, 539, 417, 538, 414, 537, 411, 536,
- 535, 407, 534, 404, 533, 401, 532, 398, 531, 530,
- 394, 529, 391, 528, 387, 527, 384, 526, 525, 524,
- 523, 522, 521, 374, 520, 371, 519, 368, 518, 365,
-
- 517, 362, 516, 359, 515, 356, 514, 353, 513, 350,
- 512, 347, 511, 344, 510, 341, 509, 338, 508, 335,
- 507, 332, 506, 329, 505, 326, 504, 322, 503, 502,
- 501, 500, 499, 315, 497, 311, 494, 493, 488, 487,
- 486, 485, 484, 483, 481, 478, 477, 476, 475, 474,
- 473, 472, 471, 470, 467, 466, 463, 462, 461, 460,
- 459, 458, 457, 456, 455, 454, 451, 288, 260, 449,
- 448, 447, 446, 445, 444, 443, 442, 428, 427, 408,
- 395, 388, 377, 376, 375, 323, 319, 318, 317, 316,
- 301, 300, 299, 296, 295, 294, 293, 292, 283, 280,
-
- 279, 278, 277, 276, 275, 274, 273, 272, 270, 269,
- 268, 267, 266, 263, 262, 261, 259, 258, 172, 253,
- 252, 251, 250, 249, 248, 247, 246, 245, 244, 243,
- 237, 236, 235, 234, 231, 230, 227, 226, 225, 224,
- 223, 222, 221, 220, 217, 216, 215, 214, 213, 212,
- 209, 208, 207, 206, 205, 204, 203, 200, 199, 193,
- 192, 191, 190, 187, 186, 185, 156, 155, 149, 148,
- 39, 127, 126, 125, 124, 123, 122, 121, 118, 87,
- 39, 37, 835, 3, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
-
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835
+ 184, 240, 134, 241, 255, 233, 282, 287, 182, 135,
+ 258, 258, 283, 288, 242, 837, 258, 430, 164, 256,
+ 68, 257, 257, 257, 257, 257, 257, 258, 258, 258,
+ 261, 258, 258, 298, 258, 272, 258, 258, 258, 258,
+ 431, 258, 381, 299, 258, 258, 379, 838, 258, 432,
+ 440, 289, 258, 290, 258, 258, 291, 292, 380, 258,
+ 382, 839, 258, 303, 303, 303, 303, 840, 441, 841,
+
+ 258, 842, 433, 258, 303, 303, 303, 303, 304, 303,
+ 303, 305, 306, 303, 303, 303, 303, 303, 303, 303,
+ 307, 303, 303, 303, 303, 303, 303, 303, 43, 43,
+ 43, 43, 43, 43, 843, 844, 434, 308, 132, 309,
+ 309, 309, 309, 309, 309, 184, 184, 184, 184, 184,
+ 184, 184, 184, 184, 184, 184, 184, 310, 313, 435,
+ 321, 325, 311, 314, 132, 322, 326, 438, 328, 847,
+ 565, 311, 315, 329, 322, 326, 848, 311, 314, 439,
+ 312, 316, 329, 323, 327, 331, 566, 334, 340, 337,
+ 332, 330, 335, 341, 338, 482, 845, 846, 483, 332,
+
+ 436, 335, 341, 338, 40, 332, 828, 335, 333, 338,
+ 336, 342, 339, 343, 346, 349, 352, 355, 344, 347,
+ 350, 353, 356, 437, 827, 826, 825, 344, 347, 350,
+ 353, 356, 455, 824, 347, 350, 345, 348, 351, 354,
+ 357, 358, 361, 364, 823, 456, 359, 362, 365, 498,
+ 498, 498, 498, 367, 370, 359, 362, 365, 368, 371,
+ 822, 359, 362, 365, 360, 363, 366, 368, 371, 678,
+ 373, 821, 679, 368, 371, 374, 369, 372, 383, 820,
+ 386, 390, 393, 384, 374, 387, 391, 394, 819, 818,
+ 374, 817, 384, 375, 387, 391, 394, 397, 816, 815,
+
+ 814, 385, 398, 388, 392, 395, 471, 400, 403, 406,
+ 410, 398, 401, 404, 407, 411, 813, 398, 812, 472,
+ 399, 401, 404, 407, 411, 811, 810, 401, 404, 407,
+ 402, 405, 408, 412, 413, 416, 419, 809, 808, 414,
+ 417, 420, 498, 498, 498, 498, 422, 425, 414, 417,
+ 420, 423, 426, 807, 414, 417, 420, 415, 418, 421,
+ 423, 426, 806, 442, 805, 804, 423, 426, 443, 424,
+ 427, 257, 257, 257, 257, 257, 257, 443, 257, 257,
+ 257, 257, 257, 257, 453, 453, 444, 453, 453, 803,
+ 453, 453, 453, 453, 453, 453, 802, 453, 801, 310,
+
+ 453, 453, 800, 799, 453, 313, 485, 453, 453, 798,
+ 797, 453, 453, 492, 796, 493, 795, 494, 499, 498,
+ 498, 498, 312, 453, 498, 498, 498, 498, 316, 321,
+ 495, 498, 498, 498, 498, 309, 309, 309, 309, 309,
+ 309, 309, 309, 309, 309, 309, 309, 313, 325, 501,
+ 328, 331, 323, 334, 337, 340, 343, 346, 349, 352,
+ 355, 358, 361, 364, 367, 370, 373, 383, 386, 390,
+ 316, 327, 393, 330, 333, 397, 336, 339, 342, 345,
+ 348, 351, 354, 357, 360, 363, 366, 369, 372, 375,
+ 385, 388, 392, 400, 403, 395, 406, 410, 399, 413,
+
+ 416, 419, 422, 425, 551, 554, 442, 794, 608, 609,
+ 655, 658, 793, 792, 736, 737, 402, 405, 791, 408,
+ 412, 790, 415, 418, 421, 424, 427, 552, 555, 444,
+ 610, 789, 788, 656, 659, 738, 38, 38, 38, 180,
+ 180, 787, 786, 785, 784, 783, 782, 781, 780, 779,
+ 778, 777, 776, 775, 774, 773, 772, 771, 770, 769,
+ 768, 767, 766, 765, 764, 763, 762, 761, 760, 759,
+ 758, 757, 756, 755, 754, 753, 659, 752, 751, 656,
+ 750, 749, 748, 747, 746, 745, 744, 743, 742, 741,
+ 740, 739, 735, 734, 733, 732, 731, 730, 729, 728,
+
+ 727, 726, 725, 724, 723, 722, 721, 720, 719, 718,
+ 717, 716, 715, 714, 713, 712, 711, 710, 709, 708,
+ 707, 706, 705, 704, 703, 702, 701, 700, 699, 698,
+ 697, 696, 695, 694, 693, 692, 691, 690, 689, 688,
+ 687, 686, 685, 684, 683, 682, 681, 680, 677, 676,
+ 675, 674, 673, 672, 671, 670, 669, 668, 667, 666,
+ 665, 664, 663, 662, 661, 660, 657, 555, 654, 552,
+ 653, 652, 651, 650, 649, 648, 647, 646, 645, 644,
+ 643, 642, 641, 640, 639, 638, 637, 636, 635, 634,
+ 633, 632, 631, 630, 629, 628, 627, 626, 625, 624,
+
+ 623, 622, 621, 620, 619, 618, 617, 616, 615, 614,
+ 613, 612, 611, 607, 606, 605, 604, 603, 602, 601,
+ 600, 599, 598, 597, 596, 595, 594, 593, 592, 591,
+ 590, 589, 588, 587, 586, 585, 584, 583, 582, 581,
+ 580, 579, 578, 577, 576, 575, 574, 573, 572, 571,
+ 570, 569, 568, 567, 564, 563, 562, 561, 560, 559,
+ 558, 557, 444, 556, 553, 550, 437, 549, 435, 548,
+ 433, 547, 431, 546, 545, 427, 544, 424, 543, 421,
+ 542, 418, 541, 415, 540, 412, 539, 538, 408, 537,
+ 405, 536, 402, 535, 399, 534, 533, 395, 532, 392,
+
+ 531, 388, 530, 385, 529, 528, 527, 526, 525, 524,
+ 375, 523, 372, 522, 369, 521, 366, 520, 363, 519,
+ 360, 518, 357, 517, 354, 516, 351, 515, 348, 514,
+ 345, 513, 342, 512, 339, 511, 336, 510, 333, 509,
+ 330, 508, 327, 507, 323, 506, 505, 504, 503, 502,
+ 316, 500, 312, 497, 496, 491, 490, 489, 488, 487,
+ 486, 484, 481, 480, 479, 478, 477, 476, 475, 474,
+ 473, 470, 469, 466, 465, 464, 463, 462, 461, 460,
+ 459, 458, 457, 454, 289, 261, 452, 451, 450, 449,
+ 448, 447, 446, 445, 429, 428, 409, 396, 389, 378,
+
+ 377, 376, 324, 320, 319, 318, 317, 302, 301, 300,
+ 297, 296, 295, 294, 293, 284, 281, 280, 279, 278,
+ 277, 276, 275, 274, 273, 271, 270, 269, 268, 267,
+ 264, 263, 262, 260, 259, 172, 254, 253, 252, 251,
+ 250, 249, 248, 247, 246, 245, 237, 236, 235, 234,
+ 231, 230, 227, 226, 225, 224, 223, 222, 221, 220,
+ 217, 216, 215, 214, 213, 212, 209, 208, 207, 206,
+ 205, 204, 203, 200, 199, 193, 192, 191, 190, 187,
+ 186, 185, 156, 155, 149, 148, 39, 127, 126, 125,
+ 124, 123, 122, 121, 118, 87, 39, 37, 849, 3,
+
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849
} ;
-static yyconst flex_int16_t yy_chk[1352] =
+static yyconst flex_int16_t yy_chk[1368] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -859,7 +865,7 @@ static yyconst flex_int16_t yy_chk[1352] =
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, 5, 23, 5,
- 10, 27, 46, 23, 17, 46, 809, 10, 10, 10,
+ 10, 27, 46, 23, 17, 46, 808, 10, 10, 10,
10, 10, 10, 10, 16, 17, 16, 29, 17, 27,
18, 116, 16, 11, 11, 11, 11, 11, 11, 11,
@@ -871,136 +877,137 @@ static yyconst flex_int16_t yy_chk[1352] =
13, 13, 13, 13, 13, 99, 61, 99, 13, 13,
14, 14, 14, 14, 14, 14, 14, 15, 47, 15,
14, 14, 47, 12, 49, 22, 15, 49, 24, 21,
- 273, 21, 15, 22, 15, 13, 21, 24, 22, 21,
- 25, 24, 25, 25, 22, 273, 811, 14, 45, 45,
+ 274, 21, 15, 22, 15, 13, 21, 24, 22, 21,
+ 25, 24, 25, 25, 22, 274, 810, 14, 45, 45,
92, 44, 44, 54, 45, 25, 26, 44, 26, 26,
26, 26, 26, 44, 26, 45, 26, 54, 44, 92,
- 44, 813, 26, 26, 54, 26, 41, 43, 43, 43,
- 43, 43, 43, 50, 50, 57, 816, 43, 60, 50,
- 60, 59, 59, 60, 60, 817, 57, 59, 75, 57,
- 50, 60, 57, 140, 75, 59, 821, 84, 59, 63,
- 63, 63, 63, 43, 239, 140, 41, 41, 41, 41,
+ 44, 811, 26, 26, 54, 26, 41, 43, 43, 43,
+ 43, 43, 43, 50, 50, 57, 812, 43, 60, 50,
+ 60, 59, 59, 60, 60, 813, 57, 59, 75, 57,
+ 50, 60, 57, 140, 75, 59, 816, 84, 59, 63,
+ 63, 63, 63, 43, 817, 140, 41, 41, 41, 41,
41, 41, 62, 41, 41, 84, 159, 41, 41, 41,
- 41, 41, 41, 41, 41, 41, 159, 239, 41, 823,
+ 41, 41, 41, 41, 41, 41, 159, 118, 41, 118,
62, 62, 62, 62, 64, 64, 64, 64, 65, 65,
- 65, 65, 66, 66, 66, 66, 66, 66, 108, 825,
+ 65, 65, 66, 66, 66, 66, 66, 66, 108, 818,
81, 81, 66, 67, 67, 67, 67, 67, 67, 67,
81, 111, 108, 68, 67, 68, 68, 68, 68, 68,
68, 117, 128, 117, 130, 111, 157, 160, 66, 128,
- 133, 133, 157, 160, 117, 831, 133, 240, 130, 132,
+ 133, 133, 157, 160, 117, 823, 133, 239, 130, 132,
67, 132, 132, 132, 132, 132, 132, 133, 136, 136,
136, 146, 146, 169, 136, 147, 147, 146, 161, 161,
- 240, 147, 219, 169, 161, 136, 218, 287, 146, 241,
- 287, 161, 147, 162, 162, 161, 163, 163, 218, 162,
- 219, 832, 163, 173, 173, 173, 173, 837, 573, 805,
+ 239, 147, 219, 169, 161, 136, 218, 825, 146, 240,
+ 244, 161, 147, 162, 162, 161, 163, 163, 218, 162,
+ 219, 827, 163, 173, 173, 173, 173, 830, 244, 831,
- 162, 573, 241, 163, 174, 174, 174, 174, 175, 175,
+ 162, 835, 240, 163, 174, 174, 174, 174, 175, 175,
175, 175, 176, 176, 176, 176, 177, 177, 177, 177,
178, 178, 178, 178, 179, 179, 179, 179, 181, 181,
- 181, 181, 181, 181, 828, 828, 242, 182, 181, 182,
+ 181, 181, 181, 181, 837, 839, 241, 182, 181, 182,
182, 182, 182, 182, 182, 183, 183, 183, 183, 183,
- 183, 184, 184, 184, 184, 184, 184, 185, 186, 242,
- 192, 194, 185, 186, 181, 192, 194, 243, 195, 804,
- 449, 185, 186, 195, 192, 194, 803, 185, 186, 243,
- 185, 186, 195, 192, 194, 196, 449, 197, 199, 198,
- 196, 195, 197, 199, 198, 302, 302, 302, 302, 196,
+ 183, 184, 184, 184, 184, 184, 184, 185, 186, 241,
+ 192, 194, 185, 186, 181, 192, 194, 243, 195, 845,
+ 452, 185, 186, 195, 192, 194, 846, 185, 186, 243,
+ 185, 186, 195, 192, 194, 196, 452, 197, 199, 198,
+ 196, 195, 197, 199, 198, 288, 842, 842, 288, 196,
- 800, 197, 199, 198, 799, 196, 798, 197, 196, 198,
+ 242, 197, 199, 198, 851, 196, 807, 197, 196, 198,
197, 199, 198, 201, 203, 204, 206, 207, 201, 203,
- 204, 206, 207, 303, 303, 303, 303, 201, 203, 204,
- 206, 207, 259, 797, 203, 204, 201, 203, 204, 206,
- 207, 209, 210, 211, 795, 259, 209, 210, 211, 304,
- 304, 304, 304, 212, 213, 209, 210, 211, 212, 213,
- 794, 209, 210, 211, 209, 210, 211, 212, 213, 793,
- 214, 791, 790, 212, 213, 214, 212, 213, 220, 786,
- 221, 223, 224, 220, 214, 221, 223, 224, 785, 784,
- 214, 783, 220, 214, 221, 223, 224, 226, 781, 779,
-
- 776, 220, 226, 221, 223, 224, 276, 227, 228, 229,
- 231, 226, 227, 228, 229, 231, 775, 226, 773, 276,
- 226, 227, 228, 229, 231, 772, 771, 227, 228, 229,
- 227, 228, 229, 231, 232, 233, 234, 770, 769, 232,
- 233, 234, 305, 305, 305, 305, 235, 236, 232, 233,
- 234, 235, 236, 768, 232, 233, 234, 232, 233, 234,
- 235, 236, 765, 244, 764, 762, 235, 236, 244, 235,
- 236, 255, 255, 255, 255, 255, 255, 244, 256, 256,
- 256, 256, 256, 256, 257, 257, 244, 271, 271, 761,
- 257, 289, 289, 271, 290, 290, 760, 289, 759, 310,
-
- 290, 257, 758, 757, 271, 755, 291, 291, 289, 754,
- 753, 290, 291, 299, 313, 299, 321, 299, 306, 306,
- 306, 306, 310, 291, 307, 307, 307, 307, 307, 307,
- 299, 308, 308, 308, 308, 308, 308, 313, 314, 321,
- 314, 325, 328, 331, 334, 337, 340, 343, 346, 349,
- 352, 355, 358, 361, 364, 367, 370, 373, 383, 386,
- 390, 314, 393, 397, 325, 328, 331, 334, 337, 340,
- 343, 346, 349, 352, 355, 358, 361, 364, 367, 370,
- 373, 383, 386, 390, 400, 393, 397, 403, 406, 410,
- 413, 416, 419, 422, 425, 437, 440, 751, 501, 501,
-
- 550, 636, 636, 749, 748, 745, 742, 400, 741, 729,
- 403, 406, 410, 413, 416, 419, 422, 425, 437, 440,
- 501, 728, 636, 550, 836, 836, 836, 838, 838, 727,
- 698, 691, 690, 687, 686, 685, 684, 683, 682, 681,
- 680, 679, 678, 676, 673, 672, 671, 670, 669, 668,
- 667, 666, 665, 664, 663, 661, 660, 659, 658, 656,
+ 204, 206, 207, 242, 806, 804, 803, 201, 203, 204,
+ 206, 207, 260, 799, 203, 204, 201, 203, 204, 206,
+ 207, 209, 210, 211, 798, 260, 209, 210, 211, 303,
+ 303, 303, 303, 212, 213, 209, 210, 211, 212, 213,
+ 797, 209, 210, 211, 209, 210, 211, 212, 213, 579,
+ 214, 796, 579, 212, 213, 214, 212, 213, 220, 794,
+ 221, 223, 224, 220, 214, 221, 223, 224, 792, 790,
+ 214, 787, 220, 214, 221, 223, 224, 226, 786, 784,
+
+ 783, 220, 226, 221, 223, 224, 277, 227, 228, 229,
+ 231, 226, 227, 228, 229, 231, 782, 226, 781, 277,
+ 226, 227, 228, 229, 231, 780, 779, 227, 228, 229,
+ 227, 228, 229, 231, 232, 233, 234, 776, 775, 232,
+ 233, 234, 304, 304, 304, 304, 235, 236, 232, 233,
+ 234, 235, 236, 773, 232, 233, 234, 232, 233, 234,
+ 235, 236, 772, 245, 771, 770, 235, 236, 245, 235,
+ 236, 256, 256, 256, 256, 256, 256, 245, 257, 257,
+ 257, 257, 257, 257, 258, 258, 245, 272, 272, 769,
+ 258, 290, 290, 272, 291, 291, 768, 290, 766, 311,
+
+ 291, 258, 765, 764, 272, 314, 292, 292, 290, 762,
+ 760, 291, 292, 300, 759, 300, 756, 300, 305, 305,
+ 305, 305, 311, 292, 306, 306, 306, 306, 314, 322,
+ 300, 307, 307, 307, 307, 308, 308, 308, 308, 308,
+ 308, 309, 309, 309, 309, 309, 309, 315, 326, 315,
+ 329, 332, 322, 335, 338, 341, 344, 347, 350, 353,
+ 356, 359, 362, 365, 368, 371, 374, 384, 387, 391,
+ 315, 326, 394, 329, 332, 398, 335, 338, 341, 344,
+ 347, 350, 353, 356, 359, 362, 365, 368, 371, 374,
+ 384, 387, 391, 401, 404, 394, 407, 411, 398, 414,
+
+ 417, 420, 423, 426, 438, 440, 443, 753, 504, 504,
+ 553, 556, 752, 751, 642, 642, 401, 404, 750, 407,
+ 411, 738, 414, 417, 420, 423, 426, 438, 440, 443,
+ 504, 737, 736, 553, 556, 642, 850, 850, 850, 852,
+ 852, 707, 700, 699, 696, 695, 694, 693, 692, 691,
+ 690, 689, 688, 687, 685, 682, 681, 680, 679, 678,
+ 677, 676, 675, 674, 673, 672, 670, 669, 668, 667,
+ 665, 663, 662, 661, 660, 659, 658, 657, 656, 655,
654, 653, 652, 651, 650, 649, 648, 647, 646, 645,
- 644, 643, 642, 641, 640, 639, 638, 637, 635, 634,
- 633, 632, 631, 630, 629, 628, 627, 624, 623, 622,
- 621, 620, 619, 618, 617, 616, 615, 614, 613, 612,
+ 644, 643, 641, 640, 639, 638, 637, 636, 635, 634,
- 611, 610, 609, 608, 607, 606, 604, 603, 602, 601,
- 600, 599, 598, 597, 596, 595, 594, 593, 592, 591,
- 590, 589, 587, 586, 585, 584, 583, 581, 580, 579,
- 578, 577, 576, 575, 572, 571, 569, 568, 567, 566,
- 563, 562, 561, 560, 559, 558, 557, 555, 554, 553,
- 552, 551, 549, 548, 547, 546, 545, 544, 543, 542,
- 541, 540, 539, 538, 537, 536, 535, 534, 533, 532,
- 531, 530, 529, 528, 527, 523, 522, 521, 520, 519,
- 518, 517, 516, 515, 514, 513, 512, 511, 510, 509,
- 508, 507, 506, 505, 504, 503, 502, 499, 498, 497,
-
- 494, 493, 492, 491, 490, 489, 487, 485, 484, 483,
- 481, 480, 479, 478, 477, 476, 475, 474, 473, 472,
- 471, 470, 469, 468, 467, 466, 465, 464, 462, 461,
- 460, 459, 458, 457, 456, 453, 452, 451, 448, 447,
- 446, 445, 444, 443, 442, 441, 439, 438, 436, 435,
- 434, 433, 432, 431, 430, 429, 427, 426, 424, 423,
- 421, 420, 418, 417, 415, 414, 412, 411, 409, 408,
- 407, 405, 404, 402, 401, 399, 398, 396, 395, 394,
- 392, 391, 389, 387, 385, 384, 382, 381, 379, 377,
- 376, 375, 374, 372, 371, 369, 368, 366, 365, 363,
-
- 362, 360, 359, 357, 356, 354, 353, 351, 350, 348,
- 347, 345, 344, 342, 341, 339, 338, 336, 335, 333,
- 332, 330, 329, 327, 326, 324, 322, 320, 319, 318,
- 317, 316, 315, 312, 311, 309, 301, 300, 298, 297,
- 296, 295, 294, 293, 288, 286, 285, 284, 283, 282,
- 281, 280, 279, 277, 275, 274, 272, 270, 269, 266,
- 265, 264, 263, 262, 261, 260, 258, 254, 253, 252,
- 251, 250, 249, 248, 247, 246, 245, 238, 237, 230,
- 225, 222, 217, 216, 215, 193, 191, 190, 189, 187,
- 172, 171, 170, 168, 167, 166, 165, 164, 158, 156,
-
- 155, 154, 153, 152, 151, 150, 149, 148, 145, 144,
- 143, 142, 141, 139, 138, 137, 135, 134, 131, 129,
- 127, 126, 125, 124, 123, 122, 121, 120, 119, 118,
- 115, 114, 113, 112, 110, 109, 107, 106, 105, 104,
- 103, 102, 101, 100, 98, 97, 96, 95, 94, 93,
- 91, 90, 89, 88, 87, 86, 85, 83, 82, 79,
- 78, 77, 76, 74, 73, 72, 56, 55, 52, 51,
- 38, 37, 35, 34, 33, 32, 31, 30, 28, 20,
- 8, 7, 3, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
-
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835
+ 633, 630, 629, 628, 627, 626, 625, 624, 623, 622,
+ 621, 620, 619, 618, 617, 616, 615, 614, 613, 612,
+ 610, 609, 608, 607, 606, 605, 604, 603, 602, 601,
+ 600, 599, 598, 597, 596, 595, 593, 592, 591, 590,
+ 589, 587, 586, 585, 584, 583, 582, 581, 578, 577,
+ 575, 574, 573, 572, 569, 568, 567, 566, 565, 564,
+ 563, 561, 560, 559, 558, 557, 555, 554, 552, 551,
+ 550, 549, 548, 547, 546, 545, 544, 543, 542, 541,
+ 540, 539, 538, 537, 536, 535, 534, 533, 532, 531,
+ 530, 526, 525, 524, 523, 522, 521, 520, 519, 518,
+
+ 517, 516, 515, 514, 513, 512, 511, 510, 509, 508,
+ 507, 506, 505, 502, 501, 500, 497, 496, 495, 494,
+ 493, 492, 490, 488, 487, 486, 484, 483, 482, 481,
+ 480, 479, 478, 477, 476, 475, 474, 473, 472, 471,
+ 470, 469, 468, 467, 465, 464, 463, 462, 461, 460,
+ 459, 456, 455, 454, 451, 450, 449, 448, 447, 446,
+ 445, 444, 442, 441, 439, 437, 436, 435, 434, 433,
+ 432, 431, 430, 428, 427, 425, 424, 422, 421, 419,
+ 418, 416, 415, 413, 412, 410, 409, 408, 406, 405,
+ 403, 402, 400, 399, 397, 396, 395, 393, 392, 390,
+
+ 388, 386, 385, 383, 382, 380, 378, 377, 376, 375,
+ 373, 372, 370, 369, 367, 366, 364, 363, 361, 360,
+ 358, 357, 355, 354, 352, 351, 349, 348, 346, 345,
+ 343, 342, 340, 339, 337, 336, 334, 333, 331, 330,
+ 328, 327, 325, 323, 321, 320, 319, 318, 317, 316,
+ 313, 312, 310, 302, 301, 299, 298, 297, 296, 295,
+ 294, 289, 287, 286, 285, 284, 283, 282, 281, 280,
+ 278, 276, 275, 273, 271, 270, 267, 266, 265, 264,
+ 263, 262, 261, 259, 255, 254, 253, 252, 251, 250,
+ 249, 248, 247, 246, 238, 237, 230, 225, 222, 217,
+
+ 216, 215, 193, 191, 190, 189, 187, 172, 171, 170,
+ 168, 167, 166, 165, 164, 158, 156, 155, 154, 153,
+ 152, 151, 150, 149, 148, 145, 144, 143, 142, 141,
+ 139, 138, 137, 135, 134, 131, 129, 127, 126, 125,
+ 124, 123, 122, 121, 120, 119, 115, 114, 113, 112,
+ 110, 109, 107, 106, 105, 104, 103, 102, 101, 100,
+ 98, 97, 96, 95, 94, 93, 91, 90, 89, 88,
+ 87, 86, 85, 83, 82, 79, 78, 77, 76, 74,
+ 73, 72, 56, 55, 52, 51, 38, 37, 35, 34,
+ 33, 32, 31, 30, 28, 20, 8, 7, 3, 849,
+
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
+ 849, 849, 849, 849, 849, 849, 849
} ;
/* The intent behind this definition is that it'll catch
@@ -1153,7 +1160,7 @@ handle_ident(struct asm_parser_state *state, const char *text, YYSTYPE *lval)
} while(0);
#define YY_EXTRA_TYPE struct asm_parser_state *
-#line 1157 "lex.yy.c"
+#line 1164 "lex.yy.c"
#define INITIAL 0
@@ -1402,7 +1409,7 @@ YY_DECL
#line 156 "program_lexer.l"
-#line 1406 "lex.yy.c"
+#line 1413 "lex.yy.c"
yylval = yylval_param;
@@ -1459,13 +1466,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 836 )
+ if ( yy_current_state >= 850 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 1284 );
+ while ( yy_base[yy_current_state] != 1300 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -1799,445 +1806,455 @@ YY_RULE_SETUP
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 236 "program_lexer.l"
-{ return_opcode(require_NV_fp, TRI_OP, X2D, 3); }
+#line 235 "program_lexer.l"
+{ return_opcode(require_NV_fp, SCALAR_OP, UP4B, 4); }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 237 "program_lexer.l"
-{ return_opcode( 1, BIN_OP, XPD, 3); }
+#line 236 "program_lexer.l"
+{ return_opcode(require_NV_fp, SCALAR_OP, UP4UB, 5); }
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 239 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_vp, VERTEX); }
+#line 238 "program_lexer.l"
+{ return_opcode(require_NV_fp, TRI_OP, X2D, 3); }
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 240 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, FRAGMENT); }
+#line 239 "program_lexer.l"
+{ return_opcode( 1, BIN_OP, XPD, 3); }
YY_BREAK
case 66:
YY_RULE_SETUP
#line 241 "program_lexer.l"
-{ return PROGRAM; }
+{ return_token_or_IDENTIFIER(require_ARB_vp, VERTEX); }
YY_BREAK
case 67:
YY_RULE_SETUP
#line 242 "program_lexer.l"
-{ return STATE; }
+{ return_token_or_IDENTIFIER(require_ARB_fp, FRAGMENT); }
YY_BREAK
case 68:
YY_RULE_SETUP
#line 243 "program_lexer.l"
-{ return RESULT; }
+{ return PROGRAM; }
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 245 "program_lexer.l"
-{ return AMBIENT; }
+#line 244 "program_lexer.l"
+{ return STATE; }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 246 "program_lexer.l"
-{ return ATTENUATION; }
+#line 245 "program_lexer.l"
+{ return RESULT; }
YY_BREAK
case 71:
YY_RULE_SETUP
#line 247 "program_lexer.l"
-{ return BACK; }
+{ return AMBIENT; }
YY_BREAK
case 72:
YY_RULE_SETUP
#line 248 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, CLIP); }
+{ return ATTENUATION; }
YY_BREAK
case 73:
YY_RULE_SETUP
#line 249 "program_lexer.l"
-{ return COLOR; }
+{ return BACK; }
YY_BREAK
case 74:
YY_RULE_SETUP
#line 250 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_fp, DEPTH); }
+{ return_token_or_DOT(require_ARB_vp, CLIP); }
YY_BREAK
case 75:
YY_RULE_SETUP
#line 251 "program_lexer.l"
-{ return DIFFUSE; }
+{ return COLOR; }
YY_BREAK
case 76:
YY_RULE_SETUP
#line 252 "program_lexer.l"
-{ return DIRECTION; }
+{ return_token_or_DOT(require_ARB_fp, DEPTH); }
YY_BREAK
case 77:
YY_RULE_SETUP
#line 253 "program_lexer.l"
-{ return EMISSION; }
+{ return DIFFUSE; }
YY_BREAK
case 78:
YY_RULE_SETUP
#line 254 "program_lexer.l"
-{ return ENV; }
+{ return DIRECTION; }
YY_BREAK
case 79:
YY_RULE_SETUP
#line 255 "program_lexer.l"
-{ return EYE; }
+{ return EMISSION; }
YY_BREAK
case 80:
YY_RULE_SETUP
#line 256 "program_lexer.l"
-{ return FOGCOORD; }
+{ return ENV; }
YY_BREAK
case 81:
YY_RULE_SETUP
#line 257 "program_lexer.l"
-{ return FOG; }
+{ return EYE; }
YY_BREAK
case 82:
YY_RULE_SETUP
#line 258 "program_lexer.l"
-{ return FRONT; }
+{ return FOGCOORD; }
YY_BREAK
case 83:
YY_RULE_SETUP
#line 259 "program_lexer.l"
-{ return HALF; }
+{ return FOG; }
YY_BREAK
case 84:
YY_RULE_SETUP
#line 260 "program_lexer.l"
-{ return INVERSE; }
+{ return FRONT; }
YY_BREAK
case 85:
YY_RULE_SETUP
#line 261 "program_lexer.l"
-{ return INVTRANS; }
+{ return HALF; }
YY_BREAK
case 86:
YY_RULE_SETUP
#line 262 "program_lexer.l"
-{ return LIGHT; }
+{ return INVERSE; }
YY_BREAK
case 87:
YY_RULE_SETUP
#line 263 "program_lexer.l"
-{ return LIGHTMODEL; }
+{ return INVTRANS; }
YY_BREAK
case 88:
YY_RULE_SETUP
#line 264 "program_lexer.l"
-{ return LIGHTPROD; }
+{ return LIGHT; }
YY_BREAK
case 89:
YY_RULE_SETUP
#line 265 "program_lexer.l"
-{ return LOCAL; }
+{ return LIGHTMODEL; }
YY_BREAK
case 90:
YY_RULE_SETUP
#line 266 "program_lexer.l"
-{ return MATERIAL; }
+{ return LIGHTPROD; }
YY_BREAK
case 91:
YY_RULE_SETUP
#line 267 "program_lexer.l"
-{ return MAT_PROGRAM; }
+{ return LOCAL; }
YY_BREAK
case 92:
YY_RULE_SETUP
#line 268 "program_lexer.l"
-{ return MATRIX; }
+{ return MATERIAL; }
YY_BREAK
case 93:
YY_RULE_SETUP
#line 269 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, MATRIXINDEX); }
+{ return MAT_PROGRAM; }
YY_BREAK
case 94:
YY_RULE_SETUP
#line 270 "program_lexer.l"
-{ return MODELVIEW; }
+{ return MATRIX; }
YY_BREAK
case 95:
YY_RULE_SETUP
#line 271 "program_lexer.l"
-{ return MVP; }
+{ return_token_or_DOT(require_ARB_vp, MATRIXINDEX); }
YY_BREAK
case 96:
YY_RULE_SETUP
#line 272 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, NORMAL); }
+{ return MODELVIEW; }
YY_BREAK
case 97:
YY_RULE_SETUP
#line 273 "program_lexer.l"
-{ return OBJECT; }
+{ return MVP; }
YY_BREAK
case 98:
YY_RULE_SETUP
#line 274 "program_lexer.l"
-{ return PALETTE; }
+{ return_token_or_DOT(require_ARB_vp, NORMAL); }
YY_BREAK
case 99:
YY_RULE_SETUP
#line 275 "program_lexer.l"
-{ return PARAMS; }
+{ return OBJECT; }
YY_BREAK
case 100:
YY_RULE_SETUP
#line 276 "program_lexer.l"
-{ return PLANE; }
+{ return PALETTE; }
YY_BREAK
case 101:
YY_RULE_SETUP
#line 277 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, POINT_TOK); }
+{ return PARAMS; }
YY_BREAK
case 102:
YY_RULE_SETUP
#line 278 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, POINTSIZE); }
+{ return PLANE; }
YY_BREAK
case 103:
YY_RULE_SETUP
#line 279 "program_lexer.l"
-{ return POSITION; }
+{ return_token_or_DOT(require_ARB_vp, POINT_TOK); }
YY_BREAK
case 104:
YY_RULE_SETUP
#line 280 "program_lexer.l"
-{ return PRIMARY; }
+{ return_token_or_DOT(require_ARB_vp, POINTSIZE); }
YY_BREAK
case 105:
YY_RULE_SETUP
#line 281 "program_lexer.l"
-{ return PROJECTION; }
+{ return POSITION; }
YY_BREAK
case 106:
YY_RULE_SETUP
#line 282 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_fp, RANGE); }
+{ return PRIMARY; }
YY_BREAK
case 107:
YY_RULE_SETUP
#line 283 "program_lexer.l"
-{ return ROW; }
+{ return PROJECTION; }
YY_BREAK
case 108:
YY_RULE_SETUP
#line 284 "program_lexer.l"
-{ return SCENECOLOR; }
+{ return_token_or_DOT(require_ARB_fp, RANGE); }
YY_BREAK
case 109:
YY_RULE_SETUP
#line 285 "program_lexer.l"
-{ return SECONDARY; }
+{ return ROW; }
YY_BREAK
case 110:
YY_RULE_SETUP
#line 286 "program_lexer.l"
-{ return SHININESS; }
+{ return SCENECOLOR; }
YY_BREAK
case 111:
YY_RULE_SETUP
#line 287 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
+{ return SECONDARY; }
YY_BREAK
case 112:
YY_RULE_SETUP
#line 288 "program_lexer.l"
-{ return SPECULAR; }
+{ return SHININESS; }
YY_BREAK
case 113:
YY_RULE_SETUP
#line 289 "program_lexer.l"
-{ return SPOT; }
+{ return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
YY_BREAK
case 114:
YY_RULE_SETUP
#line 290 "program_lexer.l"
-{ return TEXCOORD; }
+{ return SPECULAR; }
YY_BREAK
case 115:
YY_RULE_SETUP
#line 291 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_fp, TEXENV); }
+{ return SPOT; }
YY_BREAK
case 116:
YY_RULE_SETUP
#line 292 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN); }
+{ return TEXCOORD; }
YY_BREAK
case 117:
YY_RULE_SETUP
#line 293 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN_Q); }
+{ return_token_or_DOT(require_ARB_fp, TEXENV); }
YY_BREAK
case 118:
YY_RULE_SETUP
#line 294 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN_S); }
+{ return_token_or_DOT(require_ARB_vp, TEXGEN); }
YY_BREAK
case 119:
YY_RULE_SETUP
#line 295 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN_T); }
+{ return_token_or_DOT(require_ARB_vp, TEXGEN_Q); }
YY_BREAK
case 120:
YY_RULE_SETUP
#line 296 "program_lexer.l"
-{ return TEXTURE; }
+{ return_token_or_DOT(require_ARB_vp, TEXGEN_S); }
YY_BREAK
case 121:
YY_RULE_SETUP
#line 297 "program_lexer.l"
-{ return TRANSPOSE; }
+{ return_token_or_DOT(require_ARB_vp, TEXGEN_T); }
YY_BREAK
case 122:
YY_RULE_SETUP
#line 298 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, VTXATTRIB); }
+{ return TEXTURE; }
YY_BREAK
case 123:
YY_RULE_SETUP
#line 299 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, WEIGHT); }
+{ return TRANSPOSE; }
YY_BREAK
case 124:
YY_RULE_SETUP
-#line 301 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEXTURE_UNIT); }
+#line 300 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, VTXATTRIB); }
YY_BREAK
case 125:
YY_RULE_SETUP
-#line 302 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_1D); }
+#line 301 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, WEIGHT); }
YY_BREAK
case 126:
YY_RULE_SETUP
#line 303 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_2D); }
+{ return_token_or_IDENTIFIER(require_ARB_fp, TEXTURE_UNIT); }
YY_BREAK
case 127:
YY_RULE_SETUP
#line 304 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_3D); }
+{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_1D); }
YY_BREAK
case 128:
YY_RULE_SETUP
#line 305 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_CUBE); }
+{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_2D); }
YY_BREAK
case 129:
YY_RULE_SETUP
#line 306 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_rect, TEX_RECT); }
+{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_3D); }
YY_BREAK
case 130:
YY_RULE_SETUP
#line 307 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW1D); }
+{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_CUBE); }
YY_BREAK
case 131:
YY_RULE_SETUP
#line 308 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW2D); }
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_rect, TEX_RECT); }
YY_BREAK
case 132:
YY_RULE_SETUP
#line 309 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_rect, TEX_SHADOWRECT); }
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW1D); }
YY_BREAK
case 133:
YY_RULE_SETUP
#line 310 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY1D); }
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW2D); }
YY_BREAK
case 134:
YY_RULE_SETUP
#line 311 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY2D); }
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_rect, TEX_SHADOWRECT); }
YY_BREAK
case 135:
YY_RULE_SETUP
#line 312 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW1D); }
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY1D); }
YY_BREAK
case 136:
YY_RULE_SETUP
#line 313 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW2D); }
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY2D); }
YY_BREAK
case 137:
YY_RULE_SETUP
-#line 315 "program_lexer.l"
-{ return handle_ident(yyextra, yytext, yylval); }
+#line 314 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW1D); }
YY_BREAK
case 138:
YY_RULE_SETUP
-#line 317 "program_lexer.l"
-{ return DOT_DOT; }
+#line 315 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW2D); }
YY_BREAK
case 139:
YY_RULE_SETUP
+#line 317 "program_lexer.l"
+{ return handle_ident(yyextra, yytext, yylval); }
+ YY_BREAK
+case 140:
+YY_RULE_SETUP
#line 319 "program_lexer.l"
+{ return DOT_DOT; }
+ YY_BREAK
+case 141:
+YY_RULE_SETUP
+#line 321 "program_lexer.l"
{
yylval->integer = strtol(yytext, NULL, 10);
return INTEGER;
}
YY_BREAK
-case 140:
+case 142:
YY_RULE_SETUP
-#line 323 "program_lexer.l"
+#line 325 "program_lexer.l"
{
yylval->real = strtod(yytext, NULL);
return REAL;
}
YY_BREAK
-case 141:
-/* rule 141 can match eol */
+case 143:
+/* rule 143 can match eol */
*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 327 "program_lexer.l"
+#line 329 "program_lexer.l"
{
yylval->real = strtod(yytext, NULL);
return REAL;
}
YY_BREAK
-case 142:
+case 144:
YY_RULE_SETUP
-#line 331 "program_lexer.l"
+#line 333 "program_lexer.l"
{
yylval->real = strtod(yytext, NULL);
return REAL;
}
YY_BREAK
-case 143:
+case 145:
YY_RULE_SETUP
-#line 335 "program_lexer.l"
+#line 337 "program_lexer.l"
{
yylval->real = strtod(yytext, NULL);
return REAL;
}
YY_BREAK
-case 144:
+case 146:
YY_RULE_SETUP
-#line 340 "program_lexer.l"
+#line 342 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_NOOP;
yylval->swiz_mask.mask = WRITEMASK_XYZW;
return MASK4;
}
YY_BREAK
-case 145:
+case 147:
YY_RULE_SETUP
-#line 346 "program_lexer.l"
+#line 348 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_XY
@@ -2245,27 +2262,27 @@ YY_RULE_SETUP
return MASK3;
}
YY_BREAK
-case 146:
+case 148:
YY_RULE_SETUP
-#line 352 "program_lexer.l"
+#line 354 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_XZW;
return MASK3;
}
YY_BREAK
-case 147:
+case 149:
YY_RULE_SETUP
-#line 357 "program_lexer.l"
+#line 359 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_YZW;
return MASK3;
}
YY_BREAK
-case 148:
+case 150:
YY_RULE_SETUP
-#line 363 "program_lexer.l"
+#line 365 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_X
@@ -2273,9 +2290,9 @@ YY_RULE_SETUP
return MASK2;
}
YY_BREAK
-case 149:
+case 151:
YY_RULE_SETUP
-#line 369 "program_lexer.l"
+#line 371 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_Y
@@ -2283,18 +2300,18 @@ YY_RULE_SETUP
return MASK2;
}
YY_BREAK
-case 150:
+case 152:
YY_RULE_SETUP
-#line 375 "program_lexer.l"
+#line 377 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_ZW;
return MASK2;
}
YY_BREAK
-case 151:
+case 153:
YY_RULE_SETUP
-#line 381 "program_lexer.l"
+#line 383 "program_lexer.l"
{
const unsigned s = swiz_from_char(yytext[1]);
yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(s, s, s, s);
@@ -2302,9 +2319,9 @@ YY_RULE_SETUP
return MASK1;
}
YY_BREAK
-case 152:
+case 154:
YY_RULE_SETUP
-#line 388 "program_lexer.l"
+#line 390 "program_lexer.l"
{
yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(swiz_from_char(yytext[1]),
swiz_from_char(yytext[2]),
@@ -2314,18 +2331,18 @@ YY_RULE_SETUP
return SWIZZLE;
}
YY_BREAK
-case 153:
+case 155:
YY_RULE_SETUP
-#line 397 "program_lexer.l"
+#line 399 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_NOOP;
yylval->swiz_mask.mask = WRITEMASK_XYZW;
return_token_or_DOT(require_ARB_fp, MASK4);
}
YY_BREAK
-case 154:
+case 156:
YY_RULE_SETUP
-#line 403 "program_lexer.l"
+#line 405 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_XY
@@ -2333,27 +2350,27 @@ YY_RULE_SETUP
return_token_or_DOT(require_ARB_fp, MASK3);
}
YY_BREAK
-case 155:
+case 157:
YY_RULE_SETUP
-#line 409 "program_lexer.l"
+#line 411 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_XZW;
return_token_or_DOT(require_ARB_fp, MASK3);
}
YY_BREAK
-case 156:
+case 158:
YY_RULE_SETUP
-#line 414 "program_lexer.l"
+#line 416 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_YZW;
return_token_or_DOT(require_ARB_fp, MASK3);
}
YY_BREAK
-case 157:
+case 159:
YY_RULE_SETUP
-#line 420 "program_lexer.l"
+#line 422 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_X
@@ -2361,9 +2378,9 @@ YY_RULE_SETUP
return_token_or_DOT(require_ARB_fp, MASK2);
}
YY_BREAK
-case 158:
+case 160:
YY_RULE_SETUP
-#line 426 "program_lexer.l"
+#line 428 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_Y
@@ -2371,18 +2388,18 @@ YY_RULE_SETUP
return_token_or_DOT(require_ARB_fp, MASK2);
}
YY_BREAK
-case 159:
+case 161:
YY_RULE_SETUP
-#line 432 "program_lexer.l"
+#line 434 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_ZW;
return_token_or_DOT(require_ARB_fp, MASK2);
}
YY_BREAK
-case 160:
+case 162:
YY_RULE_SETUP
-#line 438 "program_lexer.l"
+#line 440 "program_lexer.l"
{
const unsigned s = swiz_from_char(yytext[1]);
yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(s, s, s, s);
@@ -2390,9 +2407,9 @@ YY_RULE_SETUP
return_token_or_DOT(require_ARB_fp, MASK1);
}
YY_BREAK
-case 161:
+case 163:
YY_RULE_SETUP
-#line 446 "program_lexer.l"
+#line 448 "program_lexer.l"
{
if (require_ARB_vp) {
return TEXGEN_R;
@@ -2404,9 +2421,9 @@ YY_RULE_SETUP
}
}
YY_BREAK
-case 162:
+case 164:
YY_RULE_SETUP
-#line 457 "program_lexer.l"
+#line 459 "program_lexer.l"
{
yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(swiz_from_char(yytext[1]),
swiz_from_char(yytext[2]),
@@ -2416,15 +2433,15 @@ YY_RULE_SETUP
return_token_or_DOT(require_ARB_fp, SWIZZLE);
}
YY_BREAK
-case 163:
+case 165:
YY_RULE_SETUP
-#line 466 "program_lexer.l"
+#line 468 "program_lexer.l"
{ return DOT; }
YY_BREAK
-case 164:
-/* rule 164 can match eol */
+case 166:
+/* rule 166 can match eol */
YY_RULE_SETUP
-#line 468 "program_lexer.l"
+#line 470 "program_lexer.l"
{
yylloc->first_line++;
yylloc->first_column = 1;
@@ -2433,30 +2450,30 @@ YY_RULE_SETUP
yylloc->position++;
}
YY_BREAK
-case 165:
+case 167:
YY_RULE_SETUP
-#line 475 "program_lexer.l"
+#line 477 "program_lexer.l"
/* eat whitespace */ ;
YY_BREAK
-case 166:
+case 168:
*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 476 "program_lexer.l"
+#line 478 "program_lexer.l"
/* eat comments */ ;
YY_BREAK
-case 167:
+case 169:
YY_RULE_SETUP
-#line 477 "program_lexer.l"
+#line 479 "program_lexer.l"
{ return yytext[0]; }
YY_BREAK
-case 168:
+case 170:
YY_RULE_SETUP
-#line 478 "program_lexer.l"
+#line 480 "program_lexer.l"
ECHO;
YY_BREAK
-#line 2460 "lex.yy.c"
+#line 2477 "lex.yy.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2750,7 +2767,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 836 )
+ if ( yy_current_state >= 850 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2779,11 +2796,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 836 )
+ if ( yy_current_state >= 850 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 835);
+ yy_is_jam = (yy_current_state == 849);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -3631,7 +3648,7 @@ void yyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 478 "program_lexer.l"
+#line 480 "program_lexer.l"
diff --git a/src/mesa/shader/program_lexer.l b/src/mesa/shader/program_lexer.l
index 750c6acf42..8498c3d8fc 100644
--- a/src/mesa/shader/program_lexer.l
+++ b/src/mesa/shader/program_lexer.l
@@ -232,6 +232,8 @@ TXP{cc}{sat} { return_opcode(require_ARB_fp, SAMPLE_OP, TXP, 3); }
UP2H{cc}{sat} { return_opcode(require_NV_fp, SCALAR_OP, UP2H, 4); }
UP2US{cc}{sat} { return_opcode(require_NV_fp, SCALAR_OP, UP2US, 5); }
+UP4B{cc}{sat} { return_opcode(require_NV_fp, SCALAR_OP, UP4B, 4); }
+UP4UB{cc}{sat} { return_opcode(require_NV_fp, SCALAR_OP, UP4UB, 5); }
X2D{szf}{cc}{sat} { return_opcode(require_NV_fp, TRI_OP, X2D, 3); }
XPD{sat} { return_opcode( 1, BIN_OP, XPD, 3); }