summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2010-09-07 12:56:18 -0700
committerKenneth Graunke <[email protected]>2010-09-07 13:17:05 -0700
commit0427228bbc241d0b76df853812d023273b496637 (patch)
tree0dd7e979d74d0e6c6c178f8780e1da92dd14c1f6
parent24c12e6c7f8aa8c2f4c163d23d740b070bfabfc3 (diff)
glsl: Change grammar rules for selection statements to match the spec.
Fixes piglit test case loop-06.vert. Unfortunately, causes 1 shift/reduce conflict.
Diffstat
-rw-r--r--src/glsl/glsl_parser.cpp1793
-rw-r--r--src/glsl/glsl_parser.h18
-rw-r--r--src/glsl/glsl_parser.ypp52
3 files changed, 913 insertions, 950 deletions
diff --git a/src/glsl/glsl_parser.cpp b/src/glsl/glsl_parser.cpp
index e36bb03c434..a158b41ed43 100644
--- a/src/glsl/glsl_parser.cpp
+++ b/src/glsl/glsl_parser.cpp
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1. */
+/* A Bison parser, made by GNU Bison 2.4.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2009, 2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -46,7 +45,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.4.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -114,7 +113,7 @@
/* Line 189 of yacc.c */
-#line 118 "glsl_parser.cpp"
+#line 117 "glsl_parser.cpp"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -367,10 +366,15 @@ typedef union YYSTYPE
ast_expression *rest;
} for_rest_statement;
+ struct {
+ ast_node *then_statement;
+ ast_node *else_statement;
+ } selection_rest_statement;
+
/* Line 214 of yacc.c */
-#line 374 "glsl_parser.cpp"
+#line 378 "glsl_parser.cpp"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -395,7 +399,7 @@ typedef struct YYLTYPE
/* Line 264 of yacc.c */
-#line 399 "glsl_parser.cpp"
+#line 403 "glsl_parser.cpp"
#ifdef short
# undef short
@@ -445,7 +449,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -612,16 +616,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 5
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 4115
+#define YYLAST 4005
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 215
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 90
+#define YYNNTS 88
/* YYNRULES -- Number of rules. */
-#define YYNRULES 278
+#define YYNRULES 274
/* YYNRULES -- Number of states. */
-#define YYNSTATES 419
+#define YYNSTATES 409
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -709,10 +713,10 @@ static const yytype_uint16 yyprhs[] =
588, 590, 592, 594, 596, 598, 600, 602, 604, 606,
612, 617, 619, 622, 626, 628, 632, 634, 639, 641,
643, 645, 647, 649, 651, 653, 655, 657, 659, 661,
- 663, 665, 667, 670, 674, 676, 678, 681, 685, 687,
- 690, 692, 695, 703, 709, 715, 723, 725, 730, 736,
- 740, 743, 749, 757, 764, 766, 768, 770, 771, 774,
- 778, 781, 784, 787, 791, 794, 796, 798, 800
+ 664, 668, 670, 672, 675, 679, 681, 684, 686, 689,
+ 695, 699, 701, 703, 708, 714, 718, 721, 727, 735,
+ 742, 744, 746, 748, 749, 752, 756, 759, 762, 765,
+ 769, 772, 774, 776, 778
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -721,7 +725,7 @@ static const yytype_int16 yyrhs[] =
216, 0, -1, -1, 218, 220, 217, 222, -1, -1,
109, 78, 113, -1, 116, 113, -1, 117, 113, -1,
118, 113, -1, 119, 113, -1, -1, 220, 221, -1,
- 110, 76, 112, 76, 113, -1, 303, -1, 222, 303,
+ 110, 76, 112, 76, 113, -1, 301, -1, 222, 301,
-1, 76, -1, 223, -1, 78, -1, 79, -1, 77,
-1, 80, -1, 191, 250, 192, -1, 224, -1, 225,
193, 226, 194, -1, 227, -1, 225, 195, 76, -1,
@@ -782,56 +786,54 @@ static const yytype_int16 yyrhs[] =
214, -1, 73, 213, 278, 214, -1, 279, -1, 278,
279, -1, 272, 280, 212, -1, 281, -1, 280, 196,
281, -1, 76, -1, 76, 193, 251, 194, -1, 248,
- -1, 252, -1, 285, -1, 286, -1, 288, -1, 287,
- -1, 294, -1, 283, -1, 292, -1, 293, -1, 296,
- -1, 297, -1, 298, -1, 302, -1, 213, 214, -1,
- 213, 291, 214, -1, 290, -1, 287, -1, 213, 214,
- -1, 213, 291, 214, -1, 284, -1, 291, 284, -1,
- 212, -1, 250, 212, -1, 14, 191, 250, 192, 285,
- 12, 285, -1, 14, 191, 250, 192, 285, -1, 14,
- 191, 250, 192, 286, -1, 14, 191, 250, 192, 285,
- 12, 286, -1, 250, -1, 263, 76, 211, 282, -1,
- 17, 191, 250, 192, 288, -1, 18, 250, 210, -1,
- 19, 210, -1, 75, 191, 295, 192, 289, -1, 11,
- 284, 75, 191, 250, 192, 212, -1, 13, 191, 299,
- 301, 192, 289, -1, 292, -1, 283, -1, 295, -1,
- -1, 300, 212, -1, 300, 212, 250, -1, 10, 212,
- -1, 9, 212, -1, 16, 212, -1, 16, 250, 212,
- -1, 15, 212, -1, 304, -1, 252, -1, 219, -1,
- 253, 290, -1
+ -1, 252, -1, 286, -1, 285, -1, 283, -1, 290,
+ -1, 291, -1, 294, -1, 295, -1, 296, -1, 300,
+ -1, 213, 214, -1, 213, 289, 214, -1, 288, -1,
+ 285, -1, 213, 214, -1, 213, 289, 214, -1, 284,
+ -1, 289, 284, -1, 212, -1, 250, 212, -1, 14,
+ 191, 250, 192, 292, -1, 284, 12, 284, -1, 284,
+ -1, 250, -1, 263, 76, 211, 282, -1, 17, 191,
+ 250, 192, 286, -1, 18, 250, 210, -1, 19, 210,
+ -1, 75, 191, 293, 192, 287, -1, 11, 284, 75,
+ 191, 250, 192, 212, -1, 13, 191, 297, 299, 192,
+ 287, -1, 290, -1, 283, -1, 293, -1, -1, 298,
+ 212, -1, 298, 212, 250, -1, 10, 212, -1, 9,
+ 212, -1, 16, 212, -1, 16, 250, 212, -1, 15,
+ 212, -1, 302, -1, 252, -1, 219, -1, 253, 288,
+ -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 211, 211, 210, 219, 223, 242, 243, 244, 245,
- 248, 250, 254, 263, 271, 282, 286, 293, 300, 307,
- 314, 321, 328, 329, 335, 339, 346, 352, 361, 365,
- 369, 370, 379, 380, 384, 385, 389, 395, 407, 411,
- 417, 424, 435, 436, 442, 448, 458, 459, 460, 461,
- 465, 466, 472, 478, 487, 488, 494, 503, 504, 510,
- 519, 520, 526, 532, 538, 547, 548, 554, 563, 564,
- 573, 574, 583, 584, 593, 594, 603, 604, 613, 614,
- 623, 624, 633, 634, 643, 644, 645, 646, 647, 648,
- 649, 650, 651, 652, 653, 657, 661, 677, 681, 685,
- 689, 703, 707, 708, 712, 717, 725, 736, 746, 761,
- 768, 773, 784, 796, 797, 798, 799, 803, 807, 808,
- 817, 826, 835, 844, 853, 866, 877, 886, 895, 904,
- 913, 922, 931, 945, 952, 963, 964, 968, 975, 976,
- 983, 1017, 1018, 1019, 1023, 1027, 1028, 1032, 1040, 1041,
- 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1052, 1053, 1061,
- 1062, 1068, 1077, 1083, 1089, 1098, 1099, 1100, 1101, 1102,
- 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112,
- 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122,
- 1123, 1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132,
- 1133, 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142,
- 1143, 1144, 1145, 1146, 1147, 1148, 1152, 1163, 1174, 1188,
- 1194, 1203, 1208, 1216, 1231, 1236, 1244, 1250, 1259, 1263,
- 1269, 1270, 1274, 1275, 1279, 1283, 1284, 1285, 1286, 1287,
- 1288, 1289, 1293, 1299, 1308, 1309, 1313, 1319, 1328, 1338,
- 1350, 1356, 1365, 1374, 1380, 1386, 1395, 1399, 1413, 1417,
- 1418, 1422, 1429, 1436, 1446, 1447, 1451, 1453, 1459, 1464,
- 1473, 1479, 1485, 1491, 1497, 1506, 1507, 1508, 1512
+ 0, 214, 214, 213, 222, 226, 245, 246, 247, 248,
+ 251, 253, 257, 266, 274, 285, 289, 296, 303, 310,
+ 317, 324, 331, 332, 338, 342, 349, 355, 364, 368,
+ 372, 373, 382, 383, 387, 388, 392, 398, 410, 414,
+ 420, 427, 438, 439, 445, 451, 461, 462, 463, 464,
+ 468, 469, 475, 481, 490, 491, 497, 506, 507, 513,
+ 522, 523, 529, 535, 541, 550, 551, 557, 566, 567,
+ 576, 577, 586, 587, 596, 597, 606, 607, 616, 617,
+ 626, 627, 636, 637, 646, 647, 648, 649, 650, 651,
+ 652, 653, 654, 655, 656, 660, 664, 680, 684, 688,
+ 692, 706, 710, 711, 715, 720, 728, 739, 749, 764,
+ 771, 776, 787, 799, 800, 801, 802, 806, 810, 811,
+ 820, 829, 838, 847, 856, 869, 880, 889, 898, 907,
+ 916, 925, 934, 948, 955, 966, 967, 971, 978, 979,
+ 986, 1020, 1021, 1022, 1026, 1030, 1031, 1035, 1043, 1044,
+ 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1055, 1056, 1064,
+ 1065, 1071, 1080, 1086, 1092, 1101, 1102, 1103, 1104, 1105,
+ 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115,
+ 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125,
+ 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134, 1135,
+ 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145,
+ 1146, 1147, 1148, 1149, 1150, 1151, 1155, 1166, 1177, 1191,
+ 1197, 1206, 1211, 1219, 1234, 1239, 1247, 1253, 1262, 1266,
+ 1272, 1273, 1277, 1278, 1279, 1280, 1281, 1282, 1283, 1287,
+ 1293, 1302, 1303, 1307, 1313, 1322, 1332, 1344, 1350, 1359,
+ 1368, 1373, 1381, 1385, 1399, 1403, 1404, 1408, 1415, 1422,
+ 1432, 1433, 1437, 1439, 1445, 1450, 1459, 1465, 1471, 1477,
+ 1483, 1492, 1493, 1494, 1498
};
#endif
@@ -904,11 +906,11 @@ static const char *const yytname[] =
"basic_type_specifier_nonarray", "precision_qualifier",
"struct_specifier", "struct_declaration_list", "struct_declaration",
"struct_declarator_list", "struct_declarator", "initializer",
- "declaration_statement", "statement", "statement_matched",
- "statement_unmatched", "simple_statement", "compound_statement",
- "statement_no_new_scope", "compound_statement_no_new_scope",
- "statement_list", "expression_statement", "selection_statement_matched",
- "selection_statement_unmatched", "condition", "switch_statement",
+ "declaration_statement", "statement", "simple_statement",
+ "compound_statement", "statement_no_new_scope",
+ "compound_statement_no_new_scope", "statement_list",
+ "expression_statement", "selection_statement",
+ "selection_rest_statement", "condition", "switch_statement",
"case_label", "iteration_statement", "for_init_statement",
"conditionopt", "for_rest_statement", "jump_statement",
"external_declaration", "function_definition", 0
@@ -971,11 +973,11 @@ static const yytype_uint16 yyr1[] =
275, 275, 275, 275, 275, 275, 275, 275, 275, 275,
275, 275, 275, 275, 275, 275, 276, 276, 276, 277,
277, 278, 278, 279, 280, 280, 281, 281, 282, 283,
- 284, 284, 285, 285, 286, 287, 287, 287, 287, 287,
- 287, 287, 288, 288, 289, 289, 290, 290, 291, 291,
- 292, 292, 293, 294, 294, 294, 295, 295, 296, 297,
- 297, 298, 298, 298, 299, 299, 300, 300, 301, 301,
- 302, 302, 302, 302, 302, 303, 303, 303, 304
+ 284, 284, 285, 285, 285, 285, 285, 285, 285, 286,
+ 286, 287, 287, 288, 288, 289, 289, 290, 290, 291,
+ 292, 292, 293, 293, 294, 295, 295, 296, 296, 296,
+ 297, 297, 298, 298, 299, 299, 300, 300, 300, 300,
+ 300, 301, 301, 301, 302
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -1004,11 +1006,11 @@ static const yytype_uint8 yyr2[] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 5,
4, 1, 2, 3, 1, 3, 1, 4, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 2, 3, 1, 1, 2, 3, 1, 2,
- 1, 2, 7, 5, 5, 7, 1, 4, 5, 3,
- 2, 5, 7, 6, 1, 1, 1, 0, 2, 3,
- 2, 2, 2, 3, 2, 1, 1, 1, 2
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
+ 3, 1, 1, 2, 3, 1, 2, 1, 2, 5,
+ 3, 1, 1, 4, 5, 3, 2, 5, 7, 6,
+ 1, 1, 1, 0, 2, 3, 2, 2, 2, 3,
+ 2, 1, 1, 1, 2
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1024,262 +1026,249 @@ static const yytype_uint16 yydefact[] =
197, 199, 200, 201, 202, 203, 204, 205, 206, 207,
208, 209, 210, 211, 212, 213, 214, 215, 0, 165,
164, 135, 218, 217, 216, 0, 0, 0, 0, 0,
- 0, 193, 198, 277, 135, 276, 0, 0, 103, 113,
+ 0, 193, 198, 273, 135, 272, 0, 0, 103, 113,
0, 118, 125, 0, 136, 135, 0, 145, 133, 157,
- 159, 162, 0, 163, 13, 275, 0, 154, 155, 151,
+ 159, 162, 0, 163, 13, 271, 0, 154, 155, 151,
0, 0, 132, 135, 147, 0, 6, 7, 8, 9,
- 0, 14, 98, 135, 278, 101, 113, 144, 114, 115,
+ 0, 14, 98, 135, 274, 101, 113, 144, 114, 115,
116, 104, 0, 113, 0, 99, 126, 152, 150, 146,
134, 0, 158, 0, 0, 0, 0, 221, 0, 140,
0, 138, 0, 0, 135, 0, 0, 0, 0, 0,
0, 0, 0, 15, 19, 17, 18, 20, 41, 0,
- 0, 0, 46, 47, 48, 49, 250, 135, 246, 16,
+ 0, 0, 46, 47, 48, 49, 247, 135, 243, 16,
22, 42, 24, 29, 30, 0, 0, 35, 0, 50,
0, 54, 57, 60, 65, 68, 70, 72, 74, 76,
- 78, 80, 82, 95, 0, 229, 0, 133, 235, 248,
- 230, 231, 233, 232, 135, 236, 237, 234, 238, 239,
- 240, 241, 105, 110, 112, 117, 0, 119, 106, 0,
- 0, 160, 50, 97, 0, 39, 12, 0, 226, 0,
- 224, 220, 222, 100, 137, 0, 271, 270, 0, 135,
- 0, 274, 272, 0, 0, 0, 260, 135, 43, 44,
- 0, 242, 135, 26, 27, 0, 0, 33, 32, 0,
- 165, 36, 38, 85, 86, 88, 87, 90, 91, 92,
- 93, 94, 89, 84, 0, 45, 0, 0, 0, 0,
+ 78, 80, 82, 95, 0, 229, 0, 133, 232, 245,
+ 231, 230, 135, 233, 234, 235, 236, 237, 238, 105,
+ 110, 112, 117, 0, 119, 106, 0, 0, 160, 50,
+ 97, 0, 39, 12, 0, 226, 0, 224, 220, 222,
+ 100, 137, 0, 267, 266, 0, 135, 0, 270, 268,
+ 0, 0, 0, 256, 135, 43, 44, 0, 239, 135,
+ 26, 27, 0, 0, 33, 32, 0, 165, 36, 38,
+ 85, 86, 88, 87, 90, 91, 92, 93, 94, 89,
+ 84, 0, 45, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 251, 247, 249,
- 107, 109, 111, 0, 0, 127, 0, 228, 131, 161,
- 219, 0, 0, 223, 139, 0, 265, 264, 135, 0,
- 273, 0, 259, 256, 0, 0, 21, 243, 0, 28,
- 25, 31, 37, 83, 51, 52, 53, 55, 56, 58,
- 59, 63, 64, 61, 62, 66, 67, 69, 71, 73,
- 75, 77, 79, 0, 96, 0, 120, 0, 124, 0,
- 128, 0, 225, 0, 266, 0, 0, 135, 0, 0,
- 135, 23, 0, 0, 0, 121, 129, 0, 227, 0,
- 268, 135, 253, 254, 258, 0, 0, 245, 261, 244,
- 81, 108, 122, 0, 130, 0, 269, 263, 135, 257,
- 0, 123, 262, 252, 255, 0, 135, 0, 135
+ 0, 0, 0, 0, 248, 244, 246, 107, 109, 111,
+ 0, 0, 127, 0, 228, 131, 161, 219, 0, 0,
+ 223, 139, 0, 261, 260, 135, 0, 269, 0, 255,
+ 252, 0, 0, 21, 240, 0, 28, 25, 31, 37,
+ 83, 51, 52, 53, 55, 56, 58, 59, 63, 64,
+ 61, 62, 66, 67, 69, 71, 73, 75, 77, 79,
+ 0, 96, 0, 120, 0, 124, 0, 128, 0, 225,
+ 0, 262, 0, 0, 135, 0, 0, 135, 23, 0,
+ 0, 0, 121, 129, 0, 227, 0, 264, 135, 251,
+ 249, 254, 0, 242, 257, 241, 81, 108, 122, 0,
+ 130, 0, 265, 259, 135, 253, 123, 258, 250
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
-1, 2, 9, 3, 83, 6, 10, 84, 179, 180,
- 181, 338, 182, 183, 184, 185, 186, 187, 188, 189,
+ 181, 335, 182, 183, 184, 185, 186, 187, 188, 189,
190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
- 200, 201, 202, 203, 284, 204, 234, 205, 206, 87,
- 88, 89, 223, 131, 132, 224, 90, 91, 92, 93,
- 94, 150, 151, 95, 133, 96, 97, 235, 99, 100,
- 101, 102, 103, 146, 147, 239, 240, 318, 208, 209,
- 210, 211, 212, 213, 398, 399, 214, 215, 216, 217,
- 335, 218, 219, 220, 328, 375, 376, 221, 104, 105
+ 200, 201, 202, 203, 281, 204, 231, 205, 206, 87,
+ 88, 89, 220, 131, 132, 221, 90, 91, 92, 93,
+ 94, 150, 151, 95, 133, 96, 97, 232, 99, 100,
+ 101, 102, 103, 146, 147, 236, 237, 315, 208, 209,
+ 210, 211, 394, 395, 212, 213, 214, 390, 332, 215,
+ 216, 217, 325, 372, 373, 218, 104, 105
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -367
+#define YYPACT_NINF -329
static const yytype_int16 yypact[] =
{
- -88, -21, 24, -367, -53, -367, -3, -367, 9, 3699,
- -367, 0, -367, -367, -367, -367, -367, -367, -367, -367,
- -367, -367, -367, -367, -367, -367, -367, -367, -367, -367,
- 126, -367, -367, -367, -367, -367, -367, -367, -367, -367,
- -367, -367, -367, -367, -367, -367, -367, -367, -367, -367,
- -367, -367, -367, -367, -367, -367, -367, -367, -367, -367,
- -367, -367, -367, -367, -367, -367, -367, -367, -75, -367,
- -367, 29, -367, -367, -367, 92, 4, 12, 20, 26,
- -49, -367, -367, -367, 3580, -367, -197, -45, -46, 3,
- -134, -367, 82, 71, -367, 52, 3887, -367, -367, -367,
- -29, -367, 3959, -367, -367, -367, 97, -367, -367, -367,
- -19, 3887, -367, 52, -367, 3959, -367, -367, -367, -367,
- 130, -367, -367, 282, -367, -367, 47, -367, -367, -367,
- -367, -367, 3887, 187, 139, -367, -162, -367, -367, -367,
- -367, 2675, -367, 105, 3887, 154, 2064, -367, 23, -367,
- -62, -367, 27, 31, 1130, 50, 53, 33, 2296, 55,
- 3218, 37, 58, -67, -367, -367, -367, -367, -367, 3218,
- 3218, 3218, -367, -367, -367, -367, -367, 494, -367, -367,
- -367, -66, -367, -367, -367, 60, -56, 3399, 64, -54,
- 3218, 22, 6, 118, -84, 120, 51, 54, 56, 168,
- 167, -83, -367, -367, -103, -367, 48, 72, -367, -367,
- -367, -367, -367, -367, 706, -367, -367, -367, -367, -367,
- -367, -367, -367, -367, -367, 186, 3887, -139, -367, 2856,
- 3218, -367, -367, -367, 73, -367, -367, 2180, 75, -102,
- -367, -367, -367, -367, -367, 130, -367, -367, 190, 1750,
- 3218, -367, -367, -90, 3218, -146, -367, 2494, -367, -367,
- -48, -367, 918, -367, -367, 3218, 3815, -367, -367, 3218,
- 74, -367, -367, -367, -367, -367, -367, -367, -367, -367,
- -367, -367, -367, -367, 3218, -367, 3218, 3218, 3218, 3218,
- 3218, 3218, 3218, 3218, 3218, 3218, 3218, 3218, 3218, 3218,
- 3218, 3218, 3218, 3218, 3218, 3218, 3218, -367, -367, -367,
- 76, -367, -367, 3037, 3218, 59, 77, -367, -367, -367,
- -367, 3218, 154, -367, -367, 81, -367, -367, 1948, -40,
- -367, -27, -367, 78, 197, 83, -367, -367, 84, 78,
- 85, -367, -367, -367, -367, -367, -367, 22, 22, 6,
- 6, 118, 118, 118, 118, -84, -84, 120, 51, 54,
- 56, 168, 167, -97, -367, 3218, 66, 86, -367, 3218,
- 68, 87, -367, 3218, -367, 70, 91, 1130, 102, 106,
- 1341, -367, 3218, 90, 3218, 153, -367, 3218, -367, -26,
- 3218, 1341, 353, -367, -367, 3218, 103, -367, -367, -367,
- -367, -367, -367, 3218, -367, 157, 78, -367, 1130, -367,
- 3218, -367, -367, -367, -367, -25, 1552, 358, 1552
+ -58, -22, 72, -329, -28, -329, -15, -329, 22, 3589,
+ -329, -4, -329, -329, -329, -329, -329, -329, -329, -329,
+ -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
+ 44, -329, -329, -329, -329, -329, -329, -329, -329, -329,
+ -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
+ -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
+ -329, -329, -329, -329, -329, -329, -329, -329, -72, -329,
+ -329, 6, -329, -329, -329, 14, -8, 9, 11, 26,
+ -64, -329, -329, -329, 3470, -329, -159, -23, -12, -2,
+ -149, -329, 105, 57, -329, 140, 3777, -329, -329, -329,
+ 15, -329, 3849, -329, -329, -329, 131, -329, -329, -329,
+ -3, 3777, -329, 140, -329, 3849, -329, -329, -329, -329,
+ 133, -329, -329, 383, -329, -329, 32, -329, -329, -329,
+ -329, -329, 3777, 158, 135, -329, -150, -329, -329, -329,
+ -329, 2565, -329, 100, 3777, 141, 1954, -329, 4, -329,
+ -95, -329, 7, 8, 1231, 27, 31, 12, 2186, 37,
+ 3108, 13, 39, -59, -329, -329, -329, -329, -329, 3108,
+ 3108, 3108, -329, -329, -329, -329, -329, 595, -329, -329,
+ -329, -55, -329, -329, -329, 41, -92, 3289, 40, -75,
+ 3108, -7, -118, 51, -74, 109, 28, 29, 30, 145,
+ 147, -84, -329, -329, -148, -329, 34, 49, -329, -329,
+ -329, -329, 807, -329, -329, -329, -329, -329, -329, -329,
+ -329, -329, 166, 3777, -143, -329, 2746, 3108, -329, -329,
+ -329, 53, -329, -329, 2070, 55, -139, -329, -329, -329,
+ -329, -329, 133, -329, -329, 174, 1640, 3108, -329, -329,
+ -138, 3108, -134, -329, 2384, -329, -329, -81, -329, 1019,
+ -329, -329, 3108, 3705, -329, -329, 3108, 61, -329, -329,
+ -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
+ -329, 3108, -329, 3108, 3108, 3108, 3108, 3108, 3108, 3108,
+ 3108, 3108, 3108, 3108, 3108, 3108, 3108, 3108, 3108, 3108,
+ 3108, 3108, 3108, 3108, -329, -329, -329, 62, -329, -329,
+ 2927, 3108, 43, 63, -329, -329, -329, -329, 3108, 141,
+ -329, -329, 65, -329, -329, 1838, -80, -329, -79, -329,
+ 66, 182, 69, -329, -329, 70, 66, 74, -329, -329,
+ -329, -329, -329, -329, -7, -7, -118, -118, 51, 51,
+ 51, 51, -74, -74, 109, 28, 29, 30, 145, 147,
+ -127, -329, 3108, 52, 75, -329, 3108, 59, 77, -329,
+ 3108, -329, 54, 76, 1231, 60, 64, 1442, -329, 3108,
+ 78, 3108, 67, -329, 3108, -329, -50, 3108, 1442, 262,
+ -329, -329, 3108, -329, -329, -329, -329, -329, -329, 3108,
+ -329, 71, 66, -329, 1231, -329, -329, -329, -329
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -367, -367, -367, -367, -367, -367, -367, -367, -367, -367,
- -367, -367, -367, -367, 107, -367, -367, -367, -367, -111,
- -367, -63, -59, -82, -60, 79, 80, 88, 89, 69,
- 93, -367, -114, -153, -367, -154, -224, 11, 14, -367,
- -367, -367, 148, 249, 243, 151, -367, -367, -245, -367,
- -367, -367, 134, -367, -367, -43, -367, -9, -89, -367,
- -367, 306, -367, 239, -136, -367, 62, -241, 143, -143,
- -342, -355, -366, 15, 5, 308, 218, 149, -367, -367,
- 94, -367, -367, -367, -367, -367, -367, -367, 316, -367
+ -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
+ -329, -329, -329, -329, 16, -329, -329, -329, -329, -135,
+ -329, -87, -83, -104, -93, -20, -16, -21, -13, -11,
+ -17, -329, -133, -99, -329, -155, -189, 2, 5, -329,
+ -329, -329, 68, 161, 155, 73, -329, -329, -215, -329,
+ -329, -329, 48, -329, -329, -43, -329, -9, -31, -329,
+ -329, 217, -329, 150, -131, -329, -24, -140, 56, -153,
+ -328, -78, -90, 213, 124, 58, -329, -329, -19, -329,
+ -329, -329, -329, -329, -329, -329, 219, -329
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -268
+#define YYTABLE_NINF -264
static const yytype_int16 yytable[] =
{
- 98, 110, 293, 294, 253, 316, 255, 127, 304, -164,
- 242, 248, 334, 142, 397, 122, 123, 260, 263, 264,
- 85, 1, 393, 86, 5, 397, 148, 233, 114, 228,
- 232, 229, 12, 13, 271, 392, 128, 129, 130, 273,
- 274, 275, 276, 277, 278, 279, 280, 281, 282, 230,
- 306, 127, 139, 414, 313, 12, 13, 4, 258, 259,
- 7, 30, 134, 31, 332, 32, 413, 33, 34, 35,
- 114, 309, 314, 368, 417, 98, 413, 317, 135, 285,
- 128, 129, 130, 334, 30, 11, 31, 140, 32, 367,
- 33, 34, 35, 306, 322, 85, 329, 371, 86, 306,
- 331, 242, 145, 333, 137, 112, 306, 8, 138, 307,
- 323, 339, 106, 382, 207, 233, 342, 116, 232, 309,
- 295, 296, 330, 225, -40, 117, 305, 265, 386, 266,
- 244, 343, 113, 118, 245, 145, 268, 145, 111, 119,
- 269, 383, 120, 402, 336, 207, 404, 125, 306, 80,
- 126, 363, 377, 364, 409, 113, 306, 283, 136, 107,
- 108, 317, 411, 109, 141, 378, 405, 416, 207, 306,
- 306, 306, 80, 143, 333, 344, 345, 346, 232, 232,
- 232, 232, 232, 232, 232, 232, 232, 232, 232, 232,
- 232, 232, 232, 232, 144, -102, 72, 73, 74, 233,
- 291, 292, 232, 289, 290, 207, 149, 233, 297, 298,
- 232, 351, 352, 353, 354, 227, 317, 225, 236, 389,
- 128, 129, 130, 286, 287, 288, 347, 348, 145, 400,
- 238, 317, 349, 350, 317, 243, 406, 355, 356, 246,
- 207, 249, 317, 247, 250, 251, 254, 256, 207, 257,
- 317, 233, 267, 207, 232, 272, 415, 299, 302, 303,
- 122, 300, 310, -39, 301, 325, -34, 319, 321, 365,
- 369, 370, 373, 379, 306, 380, -40, 384, 381, 387,
- 385, 388, 390, 391, 401, 12, 13, 14, 15, 16,
- 17, 152, 153, 154, 410, 155, 156, 157, 158, 159,
- 160, 161, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 177, 31, 395, 32, 207,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 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, 162, 163, 164,
- 165, 166, 167, 168, 403, 408, 169, 170, 207, 412,
- 418, 207, 361, 341, 311, 222, 226, 312, 357, 324,
- 358, 115, 207, 237, 372, 71, 72, 73, 74, 359,
- 75, 360, 326, 394, 124, 262, 407, 362, 327, 207,
- 121, 0, 80, 0, 0, 0, 0, 207, 0, 207,
+ 98, 245, 127, 250, 110, 252, 229, 301, 230, 12,
+ 13, 85, 290, 291, 86, 239, 257, -164, 270, 271,
+ 272, 273, 274, 275, 276, 277, 278, 279, 114, 260,
+ 261, 128, 129, 130, 255, 256, 127, 313, 30, 331,
+ 31, 225, 32, 226, 33, 34, 35, 134, 303, 393,
+ 310, 1, 139, 122, 123, 282, 4, 319, 303, 306,
+ 393, 227, 303, 135, 304, 128, 129, 130, 311, 303,
+ 114, 142, 5, 320, 327, 98, 329, 107, 108, 286,
+ 287, 109, 112, 379, 148, 7, 85, 140, 268, 86,
+ 137, 229, 326, 230, 138, 8, 328, 241, 11, 330,
+ 265, 242, 145, 239, 266, 116, 306, 336, 106, 113,
+ 331, 333, 374, 375, 207, 303, 303, 303, 72, 73,
+ 74, 364, 117, 222, 118, 302, 80, 120, 314, 368,
+ 292, 293, -40, 288, 289, 145, 280, 145, 262, 119,
+ 263, 111, 401, 12, 13, 207, 303, 360, 341, 342,
+ 343, 229, 229, 229, 229, 229, 229, 229, 229, 229,
+ 229, 229, 229, 229, 229, 229, 229, 339, 207, 125,
+ 330, 365, 30, 380, 31, 229, 32, 230, 33, 34,
+ 35, 136, 340, 229, 126, 230, 348, 349, 350, 351,
+ -102, 128, 129, 130, 283, 284, 285, 294, 295, 344,
+ 345, 352, 353, 207, 361, 346, 347, 143, 141, 149,
+ 144, 224, 314, 233, 222, 386, 240, 235, 246, 243,
+ 244, 389, 247, 253, 248, 145, 383, 229, 251, 230,
+ 254, 269, 402, 264, 296, 299, 297, 207, 298, 300,
+ -39, 398, 307, 113, 400, 207, 122, 316, 318, 322,
+ 207, 408, 405, -34, 366, 362, 370, 367, 376, 406,
+ 80, 377, 303, 381, 378, -40, 387, 314, 388, 382,
+ 384, 385, 397, 177, 404, 392, 354, 356, 399, 338,
+ 396, 355, 314, 407, 359, 314, 357, 219, 223, 358,
+ 321, 308, 115, 314, 234, 369, 309, 391, 403, 124,
+ 314, 259, 323, 121, 324, 0, 371, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 207, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 374, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 81, 0, 82, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 171, 0, 0, 0, 0, 0, 172,
- 173, 174, 175, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 176, 177, 178, 12, 13, 14,
- 15, 16, 17, 152, 153, 154, 0, 155, 156, 157,
- 158, 159, 160, 161, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 0, 31, 0,
- 32, 0, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 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, 162,
- 163, 164, 165, 166, 167, 168, 0, 0, 169, 170,
+ 0, 0, 0, 0, 0, 207, 0, 0, 207, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 207,
+ 0, 0, 0, 0, 0, 0, 12, 13, 14, 15,
+ 16, 17, 152, 153, 154, 207, 155, 156, 157, 158,
+ 159, 160, 161, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 0, 31, 0, 32,
+ 0, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 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, 162, 163,
+ 164, 165, 166, 167, 168, 0, 0, 169, 170, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 71, 72, 73,
- 74, 0, 75, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 80, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 71, 72, 73, 74,
+ 0, 75, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 80, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 81, 0,
- 82, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 81, 0, 82,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 171, 0, 0, 0, 0,
- 0, 172, 173, 174, 175, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 176, 177, 261, 12,
- 13, 14, 15, 16, 17, 152, 153, 154, 0, 155,
- 156, 157, 158, 159, 160, 161, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 0,
- 31, 0, 32, 0, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 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, 162, 163, 164, 165, 166, 167, 168, 0, 0,
- 169, 170, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 71,
- 72, 73, 74, 0, 75, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 80, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 171, 0, 0, 0, 0, 0,
+ 172, 173, 174, 175, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 176, 177, 178, 12, 13,
+ 14, 15, 16, 17, 152, 153, 154, 0, 155, 156,
+ 157, 158, 159, 160, 161, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 0, 31,
+ 0, 32, 0, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 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,
+ 162, 163, 164, 165, 166, 167, 168, 0, 0, 169,
+ 170, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 71, 72,
+ 73, 74, 0, 75, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 80, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 81, 0, 82, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 81,
+ 0, 82, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 171, 0, 0,
- 0, 0, 0, 172, 173, 174, 175, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 176, 177,
- 308, 12, 13, 14, 15, 16, 17, 152, 153, 154,
- 0, 155, 156, 157, 158, 159, 160, 161, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 0, 31, 0, 32, 0, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 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, 162, 163, 164, 165, 166, 167, 168,
- 0, 0, 169, 170, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 171, 0, 0, 0,
+ 0, 0, 172, 173, 174, 175, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 176, 177, 258,
+ 12, 13, 14, 15, 16, 17, 152, 153, 154, 0,
+ 155, 156, 157, 158, 159, 160, 161, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 0, 31, 0, 32, 0, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 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, 162, 163, 164, 165, 166, 167, 168, 0,
+ 0, 169, 170, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 71, 72, 73, 74, 0, 75, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 80, 0,
+ 71, 72, 73, 74, 0, 75, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 80, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 81, 0, 82, 0, 0, 0, 0, 0,
+ 0, 81, 0, 82, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 171,
- 0, 0, 0, 0, 0, 172, 173, 174, 175, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 171, 0,
+ 0, 0, 0, 0, 172, 173, 174, 175, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 176,
+ 177, 305, 12, 13, 14, 15, 16, 17, 152, 153,
+ 154, 0, 155, 156, 157, 158, 159, 160, 161, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 0, 31, 0, 32, 0, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 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, 162, 163, 164, 165, 166, 167,
+ 168, 0, 0, 169, 170, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 176, 177, 337, 12, 13, 14, 15, 16, 17, 152,
- 153, 154, 0, 155, 156, 157, 158, 159, 160, 161,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 0, 31, 0, 32, 0, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 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, 162, 163, 164, 165, 166,
- 167, 168, 0, 0, 169, 170, 0, 0, 0, 0,
+ 0, 0, 71, 72, 73, 74, 0, 75, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 80,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 71, 72, 73, 74, 0, 75, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 80, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 81, 0, 82, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 81, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 171, 0, 0, 0, 0, 0, 172, 173, 174, 175,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 171, 0, 0, 0, 0, 0, 172, 173, 174,
- 175, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 176, 177, 12, 13, 14, 15, 16, 17,
- 152, 153, 154, 0, 155, 396, 157, 158, 159, 160,
+ 0, 176, 177, 334, 12, 13, 14, 15, 16, 17,
+ 152, 153, 154, 0, 155, 156, 157, 158, 159, 160,
161, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 0, 31, 0, 32, 0, 33,
34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
@@ -1299,8 +1288,8 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 171, 0, 0, 0, 0, 0, 172, 173,
174, 175, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 176, 123, 12, 13, 14, 15, 16,
- 17, 152, 153, 154, 0, 155, 396, 157, 158, 159,
+ 0, 0, 0, 176, 177, 12, 13, 14, 15, 16,
+ 17, 152, 153, 154, 0, 155, 156, 157, 158, 159,
160, 161, 18, 19, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 0, 31, 0, 32, 0,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
@@ -1320,7 +1309,7 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 171, 0, 0, 0, 0, 0, 172,
173, 174, 175, 12, 13, 14, 15, 16, 17, 0,
- 0, 0, 0, 0, 176, 177, 0, 0, 0, 0,
+ 0, 0, 0, 0, 176, 123, 0, 0, 0, 0,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 0, 31, 0, 32, 0, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
@@ -1360,7 +1349,7 @@ static const yytype_int16 yytable[] =
61, 62, 63, 64, 65, 66, 67, 68, 69, 171,
70, 0, 0, 0, 0, 172, 173, 174, 175, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- -267, 0, 0, 0, 0, 0, 0, 0, 72, 73,
+ -263, 0, 0, 0, 0, 0, 0, 0, 72, 73,
74, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 14, 15, 16, 17, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1371,7 +1360,7 @@ static const yytype_int16 yytable[] =
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
65, 66, 67, 68, 69, 0, 70, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 241, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 238, 0,
0, 0, 0, 0, 72, 73, 74, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 14, 15, 16, 17, 0, 0, 0, 0, 0,
@@ -1383,7 +1372,7 @@ static const yytype_int16 yytable[] =
59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
69, 0, 163, 164, 165, 166, 167, 168, 0, 0,
169, 170, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 320, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 317, 0, 0, 0, 0, 0,
72, 73, 74, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1394,7 +1383,7 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 171, 0, 0,
0, 0, 0, 172, 173, 174, 175, 12, 13, 14,
- 15, 16, 17, 0, 0, 0, 0, 0, 252, 0,
+ 15, 16, 17, 0, 0, 0, 0, 0, 249, 0,
0, 0, 0, 0, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 0, 31, 0,
32, 0, 33, 34, 35, 36, 37, 38, 39, 40,
@@ -1430,7 +1419,7 @@ static const yytype_int16 yytable[] =
0, 82, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 14, 15, 16, 17, 0, 171, 0, 0, 231,
+ 0, 14, 15, 16, 17, 0, 171, 0, 0, 228,
0, 0, 172, 173, 174, 175, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 0, 0,
0, 0, 0, 0, 0, 0, 0, 36, 37, 38,
@@ -1449,7 +1438,7 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 14, 15, 16, 17, 0, 171, 0, 0,
- 315, 0, 0, 172, 173, 174, 175, 18, 19, 20,
+ 312, 0, 0, 172, 173, 174, 175, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 0,
0, 0, 0, 0, 0, 0, 0, 0, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
@@ -1467,7 +1456,7 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 14, 15, 16, 17, 0, 171, 0,
- 0, 366, 0, 0, 172, 173, 174, 175, 18, 19,
+ 0, 363, 0, 0, 172, 173, 174, 175, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
0, 0, 0, 0, 0, 0, 0, 0, 0, 36,
37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
@@ -1491,7 +1480,7 @@ static const yytype_int16 yytable[] =
36, 37, 38, 39, 40, 41, 42, 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, 270, 0, 163, 164, 165, 166, 167,
+ 66, 67, 68, 267, 0, 163, 164, 165, 166, 167,
168, 0, 0, 169, 170, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 72, 73, 74, 0, 0, 0, 0,
@@ -1533,7 +1522,7 @@ static const yytype_int16 yytable[] =
40, 41, 42, 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,
- 0, 340, 14, 15, 16, 17, 168, 0, 0, 0,
+ 0, 337, 14, 15, 16, 17, 168, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 72,
73, 74, 0, 0, 0, 0, 0, 0, 36, 37,
@@ -1560,141 +1549,130 @@ static const yytype_int16 yytable[] =
static const yytype_int16 yycheck[] =
{
- 9, 76, 86, 87, 158, 229, 160, 4, 91, 76,
- 146, 154, 257, 102, 380, 212, 213, 171, 84, 85,
- 9, 109, 377, 9, 0, 391, 115, 141, 71, 191,
- 141, 193, 3, 4, 187, 377, 33, 34, 35, 93,
- 94, 95, 96, 97, 98, 99, 100, 101, 102, 211,
- 196, 4, 95, 408, 193, 3, 4, 78, 169, 170,
- 113, 32, 196, 34, 210, 36, 408, 38, 39, 40,
- 113, 214, 211, 314, 416, 84, 418, 230, 212, 190,
- 33, 34, 35, 328, 32, 76, 34, 96, 36, 313,
- 38, 39, 40, 196, 196, 84, 250, 321, 84, 196,
- 254, 237, 111, 257, 33, 76, 196, 110, 37, 212,
- 212, 265, 112, 210, 123, 229, 269, 113, 229, 262,
- 204, 205, 212, 132, 191, 113, 209, 193, 369, 195,
- 192, 284, 103, 113, 196, 144, 192, 146, 213, 113,
- 196, 365, 191, 384, 192, 154, 387, 192, 196, 120,
- 196, 305, 192, 306, 395, 103, 196, 211, 76, 33,
- 34, 314, 403, 37, 193, 192, 192, 192, 177, 196,
- 196, 196, 120, 76, 328, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 299, 300,
- 301, 302, 303, 304, 213, 192, 104, 105, 106, 313,
- 82, 83, 313, 197, 198, 214, 76, 321, 88, 89,
- 321, 293, 294, 295, 296, 76, 369, 226, 113, 373,
- 33, 34, 35, 201, 202, 203, 289, 290, 237, 382,
- 76, 384, 291, 292, 387, 212, 390, 297, 298, 212,
- 249, 191, 395, 212, 191, 212, 191, 210, 257, 191,
- 403, 365, 192, 262, 365, 191, 410, 206, 90, 92,
- 212, 207, 76, 191, 208, 75, 192, 194, 193, 193,
- 211, 194, 191, 76, 196, 192, 191, 211, 194, 211,
- 194, 194, 212, 192, 194, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, 191, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 213, 34, 211, 36, 328,
- 38, 39, 40, 41, 42, 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, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 211, 12, 84, 85, 377, 212,
- 12, 380, 303, 266, 226, 126, 133, 226, 299, 245,
- 300, 75, 391, 144, 322, 103, 104, 105, 106, 301,
- 108, 302, 249, 378, 86, 177, 391, 304, 249, 408,
- 84, -1, 120, -1, -1, -1, -1, 416, -1, 418,
+ 9, 154, 4, 158, 76, 160, 141, 91, 141, 3,
+ 4, 9, 86, 87, 9, 146, 171, 76, 93, 94,
+ 95, 96, 97, 98, 99, 100, 101, 102, 71, 84,
+ 85, 33, 34, 35, 169, 170, 4, 226, 32, 254,
+ 34, 191, 36, 193, 38, 39, 40, 196, 196, 377,
+ 193, 109, 95, 212, 213, 190, 78, 196, 196, 212,
+ 388, 211, 196, 212, 212, 33, 34, 35, 211, 196,
+ 113, 102, 0, 212, 212, 84, 210, 33, 34, 197,
+ 198, 37, 76, 210, 115, 113, 84, 96, 187, 84,
+ 33, 226, 247, 226, 37, 110, 251, 192, 76, 254,
+ 192, 196, 111, 234, 196, 113, 259, 262, 112, 103,
+ 325, 192, 192, 192, 123, 196, 196, 196, 104, 105,
+ 106, 310, 113, 132, 113, 209, 120, 191, 227, 318,
+ 204, 205, 191, 82, 83, 144, 211, 146, 193, 113,
+ 195, 213, 192, 3, 4, 154, 196, 302, 283, 284,
+ 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 300, 301, 266, 177, 192,
+ 325, 311, 32, 362, 34, 310, 36, 310, 38, 39,
+ 40, 76, 281, 318, 196, 318, 290, 291, 292, 293,
+ 192, 33, 34, 35, 201, 202, 203, 88, 89, 286,
+ 287, 294, 295, 212, 303, 288, 289, 76, 193, 76,
+ 213, 76, 311, 113, 223, 370, 212, 76, 191, 212,
+ 212, 374, 191, 210, 212, 234, 366, 362, 191, 362,
+ 191, 191, 387, 192, 206, 90, 207, 246, 208, 92,
+ 191, 381, 76, 103, 384, 254, 212, 194, 193, 75,
+ 259, 404, 392, 192, 211, 193, 191, 194, 76, 399,
+ 120, 192, 196, 211, 194, 191, 212, 366, 192, 194,
+ 211, 194, 194, 213, 12, 211, 296, 298, 211, 263,
+ 379, 297, 381, 212, 301, 384, 299, 126, 133, 300,
+ 242, 223, 75, 392, 144, 319, 223, 375, 388, 86,
+ 399, 177, 246, 84, 246, -1, 325, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 325, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 328, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 154, -1, 156, -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, 191, -1, -1, -1, -1, -1, 197,
- 198, 199, 200, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 212, 213, 214, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, -1, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, -1, 34, -1,
- 36, -1, 38, 39, 40, 41, 42, 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, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, -1, -1, 84, 85,
+ -1, -1, -1, -1, -1, 374, -1, -1, 377, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 388,
+ -1, -1, -1, -1, -1, -1, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, 404, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, -1, 34, -1, 36,
+ -1, 38, 39, 40, 41, 42, 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, 71, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, -1, -1, 84, 85, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 103, 104, 105,
- 106, -1, 108, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 120, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 103, 104, 105, 106,
+ -1, 108, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 120, -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, 154, -1,
- 156, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 154, -1, 156,
-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, 191, -1, -1, -1, -1,
- -1, 197, 198, 199, 200, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 212, 213, 214, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, -1, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, -1,
- 34, -1, 36, -1, 38, 39, 40, 41, 42, 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, 71, 72, 73,
- 74, 75, 76, 77, 78, 79, 80, 81, -1, -1,
- 84, 85, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 103,
- 104, 105, 106, -1, 108, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 120, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 191, -1, -1, -1, -1, -1,
+ 197, 198, 199, 200, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 212, 213, 214, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, -1, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, -1, 34,
+ -1, 36, -1, 38, 39, 40, 41, 42, 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, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, -1, -1, 84,
+ 85, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 103, 104,
+ 105, 106, -1, 108, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 120, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 154, -1, 156, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 154,
+ -1, 156, -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, 191, -1, -1,
- -1, -1, -1, 197, 198, 199, 200, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 212, 213,
- 214, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- -1, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, -1, 34, -1, 36, -1, 38, 39, 40, 41,
- 42, 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, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- -1, -1, 84, 85, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 191, -1, -1, -1,
+ -1, -1, 197, 198, 199, 200, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 212, 213, 214,
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, -1,
+ 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, -1, 36, -1, 38, 39, 40, 41, 42,
+ 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, 71, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, -1,
+ -1, 84, 85, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 103, 104, 105, 106, -1, 108, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 120, -1,
+ 103, 104, 105, 106, -1, 108, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 120, -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, 154, -1, 156, -1, -1, -1, -1, -1,
+ -1, 154, -1, 156, -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, 191,
- -1, -1, -1, -1, -1, 197, 198, 199, 200, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 191, -1,
+ -1, -1, -1, -1, 197, 198, 199, 200, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 212,
+ 213, 214, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, -1, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, -1, 34, -1, 36, -1, 38, 39, 40,
+ 41, 42, 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,
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, -1, -1, 84, 85, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 212, 213, 214, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, -1, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, -1, 34, -1, 36, -1, 38, 39,
- 40, 41, 42, 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, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, -1, -1, 84, 85, -1, -1, -1, -1,
+ -1, -1, 103, 104, 105, 106, -1, 108, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 120,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 103, 104, 105, 106, -1, 108, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 120, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 154, -1, 156, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 154, -1, 156, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 191, -1, -1, -1, -1, -1, 197, 198, 199, 200,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 191, -1, -1, -1, -1, -1, 197, 198, 199,
- 200, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 212, 213, 3, 4, 5, 6, 7, 8,
+ -1, 212, 213, 214, 3, 4, 5, 6, 7, 8,
9, 10, 11, -1, 13, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
29, 30, 31, 32, -1, 34, -1, 36, -1, 38,
@@ -1988,9 +1966,9 @@ static const yytype_uint16 yystos[] =
76, 103, 104, 105, 106, 108, 116, 117, 118, 119,
120, 154, 156, 219, 222, 252, 253, 254, 255, 256,
261, 262, 263, 264, 265, 268, 270, 271, 272, 273,
- 274, 275, 276, 277, 303, 304, 112, 33, 34, 37,
+ 274, 275, 276, 277, 301, 302, 112, 33, 34, 37,
76, 213, 76, 103, 270, 276, 113, 113, 113, 113,
- 191, 303, 212, 213, 290, 192, 196, 4, 33, 34,
+ 191, 301, 212, 213, 288, 192, 196, 4, 33, 34,
35, 258, 259, 269, 196, 212, 76, 33, 37, 270,
272, 193, 273, 76, 213, 272, 278, 279, 273, 76,
266, 267, 9, 10, 11, 13, 14, 15, 16, 17,
@@ -1999,27 +1977,26 @@ static const yytype_uint16 yystos[] =
224, 225, 227, 228, 229, 230, 231, 232, 233, 234,
235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
245, 246, 247, 248, 250, 252, 253, 272, 283, 284,
- 285, 286, 287, 288, 291, 292, 293, 294, 296, 297,
- 298, 302, 258, 257, 260, 272, 259, 76, 191, 193,
- 211, 194, 234, 247, 251, 272, 113, 278, 76, 280,
- 281, 214, 279, 212, 192, 196, 212, 212, 284, 191,
- 191, 212, 212, 250, 191, 250, 210, 191, 234, 234,
- 250, 214, 291, 84, 85, 193, 195, 192, 192, 196,
- 74, 248, 191, 93, 94, 95, 96, 97, 98, 99,
- 100, 101, 102, 211, 249, 234, 201, 202, 203, 197,
- 198, 82, 83, 86, 87, 204, 205, 88, 89, 206,
- 207, 208, 90, 92, 91, 209, 196, 212, 214, 284,
- 76, 257, 260, 193, 211, 194, 251, 248, 282, 194,
- 214, 193, 196, 212, 267, 75, 283, 292, 299, 250,
- 212, 250, 210, 250, 263, 295, 192, 214, 226, 250,
- 76, 229, 248, 248, 234, 234, 234, 236, 236, 237,
- 237, 238, 238, 238, 238, 239, 239, 240, 241, 242,
- 243, 244, 245, 250, 248, 193, 194, 251, 282, 211,
- 194, 251, 281, 191, 295, 300, 301, 192, 192, 76,
- 192, 194, 210, 251, 211, 194, 282, 211, 194, 250,
- 212, 192, 285, 286, 288, 211, 14, 287, 289, 290,
- 248, 194, 282, 211, 282, 192, 250, 289, 12, 282,
- 191, 282, 212, 285, 286, 250, 192, 285, 12
+ 285, 286, 289, 290, 291, 294, 295, 296, 300, 258,
+ 257, 260, 272, 259, 76, 191, 193, 211, 194, 234,
+ 247, 251, 272, 113, 278, 76, 280, 281, 214, 279,
+ 212, 192, 196, 212, 212, 284, 191, 191, 212, 212,
+ 250, 191, 250, 210, 191, 234, 234, 250, 214, 289,
+ 84, 85, 193, 195, 192, 192, 196, 74, 248, 191,
+ 93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
+ 211, 249, 234, 201, 202, 203, 197, 198, 82, 83,
+ 86, 87, 204, 205, 88, 89, 206, 207, 208, 90,
+ 92, 91, 209, 196, 212, 214, 284, 76, 257, 260,
+ 193, 211, 194, 251, 248, 282, 194, 214, 193, 196,
+ 212, 267, 75, 283, 290, 297, 250, 212, 250, 210,
+ 250, 263, 293, 192, 214, 226, 250, 76, 229, 248,
+ 248, 234, 234, 234, 236, 236, 237, 237, 238, 238,
+ 238, 238, 239, 239, 240, 241, 242, 243, 244, 245,
+ 250, 248, 193, 194, 251, 282, 211, 194, 251, 281,
+ 191, 293, 298, 299, 192, 192, 76, 192, 194, 210,
+ 251, 211, 194, 282, 211, 194, 250, 212, 192, 284,
+ 292, 286, 211, 285, 287, 288, 248, 194, 282, 211,
+ 282, 192, 250, 287, 12, 282, 282, 212, 284
};
#define yyerrok (yyerrstatus = 0)
@@ -2034,9 +2011,18 @@ static const yytype_uint16 yystos[] =
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
+ Once GCC version 2 has supplanted version 1, this can go. However,
+ YYFAIL appears to be in use. Nevertheless, it is formally deprecated
+ in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+ discussed. */
#define YYFAIL goto yyerrlab
+#if defined YYFAIL
+ /* This is here to suppress warnings from the GCC cpp's
+ -Wunused-macros. Normally we don't worry about that warning, but
+ some users do, and we want to make it easy for users to remove
+ YYFAIL uses, which will produce warnings from Bison 2.5. */
+#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -2093,7 +2079,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -2635,7 +2621,7 @@ YYLTYPE yylloc;
YYLTYPE *yylsp;
/* The locations where the error started and ended. */
- YYLTYPE yyerror_range[2];
+ YYLTYPE yyerror_range[3];
YYSIZE_T yystacksize;
@@ -2682,7 +2668,7 @@ YYLTYPE yylloc;
yyvsp = yyvs;
yylsp = yyls;
-#if YYLTYPE_IS_TRIVIAL
+#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
/* Initialize the default location before parsing starts. */
yylloc.first_line = yylloc.last_line = 1;
yylloc.first_column = yylloc.last_column = 1;
@@ -2690,7 +2676,7 @@ YYLTYPE yylloc;
/* User initialization code. */
-/* Line 1242 of yacc.c */
+/* Line 1251 of yacc.c */
#line 41 "glsl_parser.ypp"
{
yylloc.first_line = 1;
@@ -2700,8 +2686,8 @@ YYLTYPE yylloc;
yylloc.source = 0;
}
-/* Line 1242 of yacc.c */
-#line 2705 "glsl_parser.cpp"
+/* Line 1251 of yacc.c */
+#line 2691 "glsl_parser.cpp"
yylsp[0] = yylloc;
goto yysetstate;
@@ -2888,8 +2874,8 @@ yyreduce:
{
case 2:
-/* Line 1455 of yacc.c */
-#line 211 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 214 "glsl_parser.ypp"
{
_mesa_glsl_initialize_types(state);
;}
@@ -2897,8 +2883,8 @@ yyreduce:
case 4:
-/* Line 1455 of yacc.c */
-#line 219 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 222 "glsl_parser.ypp"
{
state->language_version = 110;
state->symbols->language_version = 110;
@@ -2907,8 +2893,8 @@ yyreduce:
case 5:
-/* Line 1455 of yacc.c */
-#line 224 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 227 "glsl_parser.ypp"
{
switch ((yyvsp[(2) - (3)].n)) {
case 110:
@@ -2928,8 +2914,8 @@ yyreduce:
case 12:
-/* Line 1455 of yacc.c */
-#line 255 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 258 "glsl_parser.ypp"
{
if (!_mesa_glsl_process_extension((yyvsp[(2) - (5)].identifier), & (yylsp[(2) - (5)]), (yyvsp[(4) - (5)].identifier), & (yylsp[(4) - (5)]), state)) {
YYERROR;
@@ -2939,8 +2925,8 @@ yyreduce:
case 13:
-/* Line 1455 of yacc.c */
-#line 264 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 267 "glsl_parser.ypp"
{
/* FINISHME: The NULL test is only required because 'precision'
* FINISHME: statements are not yet supported.
@@ -2952,8 +2938,8 @@ yyreduce:
case 14:
-/* Line 1455 of yacc.c */
-#line 272 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 275 "glsl_parser.ypp"
{
/* FINISHME: The NULL test is only required because 'precision'
* FINISHME: statements are not yet supported.
@@ -2965,8 +2951,8 @@ yyreduce:
case 16:
-/* Line 1455 of yacc.c */
-#line 287 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 290 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_identifier, NULL, NULL, NULL);
@@ -2977,8 +2963,8 @@ yyreduce:
case 17:
-/* Line 1455 of yacc.c */
-#line 294 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 297 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_int_constant, NULL, NULL, NULL);
@@ -2989,8 +2975,8 @@ yyreduce:
case 18:
-/* Line 1455 of yacc.c */
-#line 301 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 304 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_uint_constant, NULL, NULL, NULL);
@@ -3001,8 +2987,8 @@ yyreduce:
case 19:
-/* Line 1455 of yacc.c */
-#line 308 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 311 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_float_constant, NULL, NULL, NULL);
@@ -3013,8 +2999,8 @@ yyreduce:
case 20:
-/* Line 1455 of yacc.c */
-#line 315 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 318 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_bool_constant, NULL, NULL, NULL);
@@ -3025,8 +3011,8 @@ yyreduce:
case 21:
-/* Line 1455 of yacc.c */
-#line 322 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 325 "glsl_parser.ypp"
{
(yyval.expression) = (yyvsp[(2) - (3)].expression);
;}
@@ -3034,8 +3020,8 @@ yyreduce:
case 23:
-/* Line 1455 of yacc.c */
-#line 330 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 333 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_array_index, (yyvsp[(1) - (4)].expression), (yyvsp[(3) - (4)].expression), NULL);
@@ -3045,8 +3031,8 @@ yyreduce:
case 24:
-/* Line 1455 of yacc.c */
-#line 336 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 339 "glsl_parser.ypp"
{
(yyval.expression) = (yyvsp[(1) - (1)].expression);
;}
@@ -3054,8 +3040,8 @@ yyreduce:
case 25:
-/* Line 1455 of yacc.c */
-#line 340 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 343 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_field_selection, (yyvsp[(1) - (3)].expression), NULL, NULL);
@@ -3066,8 +3052,8 @@ yyreduce:
case 26:
-/* Line 1455 of yacc.c */
-#line 347 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 350 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_post_inc, (yyvsp[(1) - (2)].expression), NULL, NULL);
@@ -3077,8 +3063,8 @@ yyreduce:
case 27:
-/* Line 1455 of yacc.c */
-#line 353 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 356 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_post_dec, (yyvsp[(1) - (2)].expression), NULL, NULL);
@@ -3088,8 +3074,8 @@ yyreduce:
case 31:
-/* Line 1455 of yacc.c */
-#line 371 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 374 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_field_selection, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression), NULL);
@@ -3099,8 +3085,8 @@ yyreduce:
case 36:
-/* Line 1455 of yacc.c */
-#line 390 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 393 "glsl_parser.ypp"
{
(yyval.expression) = (yyvsp[(1) - (2)].expression);
(yyval.expression)->set_location(yylloc);
@@ -3110,8 +3096,8 @@ yyreduce:
case 37:
-/* Line 1455 of yacc.c */
-#line 396 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 399 "glsl_parser.ypp"
{
(yyval.expression) = (yyvsp[(1) - (3)].expression);
(yyval.expression)->set_location(yylloc);
@@ -3121,8 +3107,8 @@ yyreduce:
case 39:
-/* Line 1455 of yacc.c */
-#line 412 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 415 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_function_expression((yyvsp[(1) - (1)].type_specifier));
@@ -3132,8 +3118,8 @@ yyreduce:
case 40:
-/* Line 1455 of yacc.c */
-#line 418 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 421 "glsl_parser.ypp"
{
void *ctx = state;
ast_expression *callee = new(ctx) ast_expression((yyvsp[(1) - (1)].identifier));
@@ -3144,8 +3130,8 @@ yyreduce:
case 41:
-/* Line 1455 of yacc.c */
-#line 425 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 428 "glsl_parser.ypp"
{
void *ctx = state;
ast_expression *callee = new(ctx) ast_expression((yyvsp[(1) - (1)].identifier));
@@ -3156,8 +3142,8 @@ yyreduce:
case 43:
-/* Line 1455 of yacc.c */
-#line 437 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 440 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_pre_inc, (yyvsp[(2) - (2)].expression), NULL, NULL);
@@ -3167,8 +3153,8 @@ yyreduce:
case 44:
-/* Line 1455 of yacc.c */
-#line 443 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 446 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_pre_dec, (yyvsp[(2) - (2)].expression), NULL, NULL);
@@ -3178,8 +3164,8 @@ yyreduce:
case 45:
-/* Line 1455 of yacc.c */
-#line 449 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 452 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression((yyvsp[(1) - (2)].n), (yyvsp[(2) - (2)].expression), NULL, NULL);
@@ -3189,36 +3175,36 @@ yyreduce:
case 46:
-/* Line 1455 of yacc.c */
-#line 458 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 461 "glsl_parser.ypp"
{ (yyval.n) = ast_plus; ;}
break;
case 47:
-/* Line 1455 of yacc.c */
-#line 459 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 462 "glsl_parser.ypp"
{ (yyval.n) = ast_neg; ;}
break;
case 48:
-/* Line 1455 of yacc.c */
-#line 460 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 463 "glsl_parser.ypp"
{ (yyval.n) = ast_logic_not; ;}
break;
case 49:
-/* Line 1455 of yacc.c */
-#line 461 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 464 "glsl_parser.ypp"
{ (yyval.n) = ast_bit_not; ;}
break;
case 51:
-/* Line 1455 of yacc.c */
-#line 467 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 470 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_mul, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3228,8 +3214,8 @@ yyreduce:
case 52:
-/* Line 1455 of yacc.c */
-#line 473 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 476 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_div, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3239,8 +3225,8 @@ yyreduce:
case 53:
-/* Line 1455 of yacc.c */
-#line 479 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 482 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_mod, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3250,8 +3236,8 @@ yyreduce:
case 55:
-/* Line 1455 of yacc.c */
-#line 489 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 492 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_add, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3261,8 +3247,8 @@ yyreduce:
case 56:
-/* Line 1455 of yacc.c */
-#line 495 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 498 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_sub, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3272,8 +3258,8 @@ yyreduce:
case 58:
-/* Line 1455 of yacc.c */
-#line 505 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 508 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_lshift, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3283,8 +3269,8 @@ yyreduce:
case 59:
-/* Line 1455 of yacc.c */
-#line 511 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 514 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_rshift, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3294,8 +3280,8 @@ yyreduce:
case 61:
-/* Line 1455 of yacc.c */
-#line 521 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 524 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_less, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3305,8 +3291,8 @@ yyreduce:
case 62:
-/* Line 1455 of yacc.c */
-#line 527 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 530 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_greater, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3316,8 +3302,8 @@ yyreduce:
case 63:
-/* Line 1455 of yacc.c */
-#line 533 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 536 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_lequal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3327,8 +3313,8 @@ yyreduce:
case 64:
-/* Line 1455 of yacc.c */
-#line 539 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 542 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_gequal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3338,8 +3324,8 @@ yyreduce:
case 66:
-/* Line 1455 of yacc.c */
-#line 549 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 552 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_equal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3349,8 +3335,8 @@ yyreduce:
case 67:
-/* Line 1455 of yacc.c */
-#line 555 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 558 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_nequal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3360,8 +3346,8 @@ yyreduce:
case 69:
-/* Line 1455 of yacc.c */
-#line 565 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 568 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_bit_or, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3371,8 +3357,8 @@ yyreduce:
case 71:
-/* Line 1455 of yacc.c */
-#line 575 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 578 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_bit_xor, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3382,8 +3368,8 @@ yyreduce:
case 73:
-/* Line 1455 of yacc.c */
-#line 585 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 588 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_bit_or, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3393,8 +3379,8 @@ yyreduce:
case 75:
-/* Line 1455 of yacc.c */
-#line 595 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 598 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_logic_and, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3404,8 +3390,8 @@ yyreduce:
case 77:
-/* Line 1455 of yacc.c */
-#line 605 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 608 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_logic_xor, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3415,8 +3401,8 @@ yyreduce:
case 79:
-/* Line 1455 of yacc.c */
-#line 615 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 618 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_logic_or, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3426,8 +3412,8 @@ yyreduce:
case 81:
-/* Line 1455 of yacc.c */
-#line 625 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 628 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_conditional, (yyvsp[(1) - (5)].expression), (yyvsp[(3) - (5)].expression), (yyvsp[(5) - (5)].expression));
@@ -3437,8 +3423,8 @@ yyreduce:
case 83:
-/* Line 1455 of yacc.c */
-#line 635 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 638 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression((yyvsp[(2) - (3)].n), (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression), NULL);
@@ -3448,85 +3434,85 @@ yyreduce:
case 84:
-/* Line 1455 of yacc.c */
-#line 643 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 646 "glsl_parser.ypp"
{ (yyval.n) = ast_assign; ;}
break;
case 85:
-/* Line 1455 of yacc.c */
-#line 644 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 647 "glsl_parser.ypp"
{ (yyval.n) = ast_mul_assign; ;}
break;
case 86:
-/* Line 1455 of yacc.c */
-#line 645 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 648 "glsl_parser.ypp"
{ (yyval.n) = ast_div_assign; ;}
break;
case 87:
-/* Line 1455 of yacc.c */
-#line 646 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 649 "glsl_parser.ypp"
{ (yyval.n) = ast_mod_assign; ;}
break;
case 88:
-/* Line 1455 of yacc.c */
-#line 647 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 650 "glsl_parser.ypp"
{ (yyval.n) = ast_add_assign; ;}
break;
case 89:
-/* Line 1455 of yacc.c */
-#line 648 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 651 "glsl_parser.ypp"
{ (yyval.n) = ast_sub_assign; ;}
break;
case 90:
-/* Line 1455 of yacc.c */
-#line 649 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 652 "glsl_parser.ypp"
{ (yyval.n) = ast_ls_assign; ;}
break;
case 91:
-/* Line 1455 of yacc.c */
-#line 650 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 653 "glsl_parser.ypp"
{ (yyval.n) = ast_rs_assign; ;}
break;
case 92:
-/* Line 1455 of yacc.c */
-#line 651 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 654 "glsl_parser.ypp"
{ (yyval.n) = ast_and_assign; ;}
break;
case 93:
-/* Line 1455 of yacc.c */
-#line 652 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 655 "glsl_parser.ypp"
{ (yyval.n) = ast_xor_assign; ;}
break;
case 94:
-/* Line 1455 of yacc.c */
-#line 653 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 656 "glsl_parser.ypp"
{ (yyval.n) = ast_or_assign; ;}
break;
case 95:
-/* Line 1455 of yacc.c */
-#line 658 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 661 "glsl_parser.ypp"
{
(yyval.expression) = (yyvsp[(1) - (1)].expression);
;}
@@ -3534,8 +3520,8 @@ yyreduce:
case 96:
-/* Line 1455 of yacc.c */
-#line 662 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 665 "glsl_parser.ypp"
{
void *ctx = state;
if ((yyvsp[(1) - (3)].expression)->oper != ast_sequence) {
@@ -3552,8 +3538,8 @@ yyreduce:
case 98:
-/* Line 1455 of yacc.c */
-#line 682 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 685 "glsl_parser.ypp"
{
(yyval.node) = (yyvsp[(1) - (2)].function);
;}
@@ -3561,8 +3547,8 @@ yyreduce:
case 99:
-/* Line 1455 of yacc.c */
-#line 686 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 689 "glsl_parser.ypp"
{
(yyval.node) = (yyvsp[(1) - (2)].declarator_list);
;}
@@ -3570,8 +3556,8 @@ yyreduce:
case 100:
-/* Line 1455 of yacc.c */
-#line 690 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 693 "glsl_parser.ypp"
{
if (((yyvsp[(3) - (4)].type_specifier)->type_specifier != ast_float)
&& ((yyvsp[(3) - (4)].type_specifier)->type_specifier != ast_int)) {
@@ -3586,8 +3572,8 @@ yyreduce:
case 104:
-/* Line 1455 of yacc.c */
-#line 713 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 716 "glsl_parser.ypp"
{
(yyval.function) = (yyvsp[(1) - (2)].function);
(yyval.function)->parameters.push_tail(& (yyvsp[(2) - (2)].parameter_declarator)->link);
@@ -3596,8 +3582,8 @@ yyreduce:
case 105:
-/* Line 1455 of yacc.c */
-#line 718 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 721 "glsl_parser.ypp"
{
(yyval.function) = (yyvsp[(1) - (3)].function);
(yyval.function)->parameters.push_tail(& (yyvsp[(3) - (3)].parameter_declarator)->link);
@@ -3606,8 +3592,8 @@ yyreduce:
case 106:
-/* Line 1455 of yacc.c */
-#line 726 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 729 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.function) = new(ctx) ast_function();
@@ -3619,8 +3605,8 @@ yyreduce:
case 107:
-/* Line 1455 of yacc.c */
-#line 737 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 740 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();
@@ -3634,8 +3620,8 @@ yyreduce:
case 108:
-/* Line 1455 of yacc.c */
-#line 747 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 750 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();
@@ -3651,8 +3637,8 @@ yyreduce:
case 109:
-/* Line 1455 of yacc.c */
-#line 762 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 765 "glsl_parser.ypp"
{
(yyvsp[(1) - (3)].type_qualifier).i |= (yyvsp[(2) - (3)].type_qualifier).i;
@@ -3663,8 +3649,8 @@ yyreduce:
case 110:
-/* Line 1455 of yacc.c */
-#line 769 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 772 "glsl_parser.ypp"
{
(yyval.parameter_declarator) = (yyvsp[(2) - (2)].parameter_declarator);
(yyval.parameter_declarator)->type->qualifier = (yyvsp[(1) - (2)].type_qualifier).q;
@@ -3673,8 +3659,8 @@ yyreduce:
case 111:
-/* Line 1455 of yacc.c */
-#line 774 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 777 "glsl_parser.ypp"
{
void *ctx = state;
(yyvsp[(1) - (3)].type_qualifier).i |= (yyvsp[(2) - (3)].type_qualifier).i;
@@ -3689,8 +3675,8 @@ yyreduce:
case 112:
-/* Line 1455 of yacc.c */
-#line 785 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 788 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();
@@ -3703,36 +3689,36 @@ yyreduce:
case 113:
-/* Line 1455 of yacc.c */
-#line 796 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 799 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; ;}
break;
case 114:
-/* Line 1455 of yacc.c */
-#line 797 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 800 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.in = 1; ;}
break;
case 115:
-/* Line 1455 of yacc.c */
-#line 798 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 801 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.out = 1; ;}
break;
case 116:
-/* Line 1455 of yacc.c */
-#line 799 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 802 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.in = 1; (yyval.type_qualifier).q.out = 1; ;}
break;
case 119:
-/* Line 1455 of yacc.c */
-#line 809 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 812 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (3)].identifier), false, NULL, NULL);
@@ -3745,8 +3731,8 @@ yyreduce:
case 120:
-/* Line 1455 of yacc.c */
-#line 818 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 821 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (5)].identifier), true, NULL, NULL);
@@ -3759,8 +3745,8 @@ yyreduce:
case 121:
-/* Line 1455 of yacc.c */
-#line 827 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 830 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (6)].identifier), true, (yyvsp[(5) - (6)].expression), NULL);
@@ -3773,8 +3759,8 @@ yyreduce:
case 122:
-/* Line 1455 of yacc.c */
-#line 836 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 839 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (7)].identifier), true, NULL, (yyvsp[(7) - (7)].expression));
@@ -3787,8 +3773,8 @@ yyreduce:
case 123:
-/* Line 1455 of yacc.c */
-#line 845 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 848 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (8)].identifier), true, (yyvsp[(5) - (8)].expression), (yyvsp[(8) - (8)].expression));
@@ -3801,8 +3787,8 @@ yyreduce:
case 124:
-/* Line 1455 of yacc.c */
-#line 854 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 857 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (5)].identifier), false, NULL, (yyvsp[(5) - (5)].expression));
@@ -3815,8 +3801,8 @@ yyreduce:
case 125:
-/* Line 1455 of yacc.c */
-#line 867 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 870 "glsl_parser.ypp"
{
void *ctx = state;
if ((yyvsp[(1) - (1)].fully_specified_type)->specifier->type_specifier != ast_struct) {
@@ -3831,8 +3817,8 @@ yyreduce:
case 126:
-/* Line 1455 of yacc.c */
-#line 878 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 881 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (2)].identifier), false, NULL, NULL);
@@ -3845,8 +3831,8 @@ yyreduce:
case 127:
-/* Line 1455 of yacc.c */
-#line 887 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 890 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (4)].identifier), true, NULL, NULL);
@@ -3859,8 +3845,8 @@ yyreduce:
case 128:
-/* Line 1455 of yacc.c */
-#line 896 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 899 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (5)].identifier), true, (yyvsp[(4) - (5)].expression), NULL);
@@ -3873,8 +3859,8 @@ yyreduce:
case 129:
-/* Line 1455 of yacc.c */
-#line 905 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 908 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (6)].identifier), true, NULL, (yyvsp[(6) - (6)].expression));
@@ -3887,8 +3873,8 @@ yyreduce:
case 130:
-/* Line 1455 of yacc.c */
-#line 914 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 917 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (7)].identifier), true, (yyvsp[(4) - (7)].expression), (yyvsp[(7) - (7)].expression));
@@ -3901,8 +3887,8 @@ yyreduce:
case 131:
-/* Line 1455 of yacc.c */
-#line 923 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 926 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (4)].identifier), false, NULL, (yyvsp[(4) - (4)].expression));
@@ -3915,8 +3901,8 @@ yyreduce:
case 132:
-/* Line 1455 of yacc.c */
-#line 932 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 935 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (2)].identifier), false, NULL, NULL);
@@ -3931,8 +3917,8 @@ yyreduce:
case 133:
-/* Line 1455 of yacc.c */
-#line 946 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 949 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.fully_specified_type) = new(ctx) ast_fully_specified_type();
@@ -3943,8 +3929,8 @@ yyreduce:
case 134:
-/* Line 1455 of yacc.c */
-#line 953 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 956 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.fully_specified_type) = new(ctx) ast_fully_specified_type();
@@ -3956,15 +3942,15 @@ yyreduce:
case 135:
-/* Line 1455 of yacc.c */
-#line 963 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 966 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; ;}
break;
case 137:
-/* Line 1455 of yacc.c */
-#line 969 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 972 "glsl_parser.ypp"
{
(yyval.type_qualifier) = (yyvsp[(3) - (4)].type_qualifier);
;}
@@ -3972,8 +3958,8 @@ yyreduce:
case 139:
-/* Line 1455 of yacc.c */
-#line 977 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 980 "glsl_parser.ypp"
{
(yyval.type_qualifier).i = (yyvsp[(1) - (3)].type_qualifier).i | (yyvsp[(3) - (3)].type_qualifier).i;
;}
@@ -3981,8 +3967,8 @@ yyreduce:
case 140:
-/* Line 1455 of yacc.c */
-#line 984 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 987 "glsl_parser.ypp"
{
(yyval.type_qualifier).i = 0;
@@ -4017,36 +4003,36 @@ yyreduce:
case 141:
-/* Line 1455 of yacc.c */
-#line 1017 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1020 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.smooth = 1; ;}
break;
case 142:
-/* Line 1455 of yacc.c */
-#line 1018 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1021 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.flat = 1; ;}
break;
case 143:
-/* Line 1455 of yacc.c */
-#line 1019 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1022 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.noperspective = 1; ;}
break;
case 144:
-/* Line 1455 of yacc.c */
-#line 1023 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1026 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.constant = 1; ;}
break;
case 146:
-/* Line 1455 of yacc.c */
-#line 1029 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1032 "glsl_parser.ypp"
{
(yyval.type_qualifier).i = (yyvsp[(1) - (2)].type_qualifier).i | (yyvsp[(2) - (2)].type_qualifier).i;
;}
@@ -4054,8 +4040,8 @@ yyreduce:
case 147:
-/* Line 1455 of yacc.c */
-#line 1033 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1036 "glsl_parser.ypp"
{
(yyval.type_qualifier) = (yyvsp[(2) - (2)].type_qualifier);
(yyval.type_qualifier).q.invariant = 1;
@@ -4064,71 +4050,71 @@ yyreduce:
case 148:
-/* Line 1455 of yacc.c */
-#line 1040 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1043 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.constant = 1; ;}
break;
case 149:
-/* Line 1455 of yacc.c */
-#line 1041 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1044 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.attribute = 1; ;}
break;
case 150:
-/* Line 1455 of yacc.c */
-#line 1042 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1045 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = (yyvsp[(1) - (2)].type_qualifier).i; (yyval.type_qualifier).q.varying = 1; ;}
break;
case 151:
-/* Line 1455 of yacc.c */
-#line 1043 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1046 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.centroid = 1; (yyval.type_qualifier).q.varying = 1; ;}
break;
case 152:
-/* Line 1455 of yacc.c */
-#line 1044 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1047 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.in = 1; ;}
break;
case 153:
-/* Line 1455 of yacc.c */
-#line 1045 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1048 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.out = 1; ;}
break;
case 154:
-/* Line 1455 of yacc.c */
-#line 1046 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1049 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.centroid = 1; (yyval.type_qualifier).q.in = 1; ;}
break;
case 155:
-/* Line 1455 of yacc.c */
-#line 1047 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1050 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.centroid = 1; (yyval.type_qualifier).q.out = 1; ;}
break;
case 156:
-/* Line 1455 of yacc.c */
-#line 1048 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1051 "glsl_parser.ypp"
{ (yyval.type_qualifier).i = 0; (yyval.type_qualifier).q.uniform = 1; ;}
break;
case 158:
-/* Line 1455 of yacc.c */
-#line 1054 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1057 "glsl_parser.ypp"
{
(yyval.type_specifier) = (yyvsp[(2) - (2)].type_specifier);
(yyval.type_specifier)->precision = (yyvsp[(1) - (2)].n);
@@ -4137,8 +4123,8 @@ yyreduce:
case 160:
-/* Line 1455 of yacc.c */
-#line 1063 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1066 "glsl_parser.ypp"
{
(yyval.type_specifier) = (yyvsp[(1) - (3)].type_specifier);
(yyval.type_specifier)->is_array = true;
@@ -4148,8 +4134,8 @@ yyreduce:
case 161:
-/* Line 1455 of yacc.c */
-#line 1069 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1072 "glsl_parser.ypp"
{
(yyval.type_specifier) = (yyvsp[(1) - (4)].type_specifier);
(yyval.type_specifier)->is_array = true;
@@ -4159,8 +4145,8 @@ yyreduce:
case 162:
-/* Line 1455 of yacc.c */
-#line 1078 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1081 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.type_specifier) = new(ctx) ast_type_specifier((yyvsp[(1) - (1)].n));
@@ -4170,8 +4156,8 @@ yyreduce:
case 163:
-/* Line 1455 of yacc.c */
-#line 1084 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1087 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.type_specifier) = new(ctx) ast_type_specifier((yyvsp[(1) - (1)].struct_specifier));
@@ -4181,8 +4167,8 @@ yyreduce:
case 164:
-/* Line 1455 of yacc.c */
-#line 1090 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1093 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.type_specifier) = new(ctx) ast_type_specifier((yyvsp[(1) - (1)].identifier));
@@ -4192,365 +4178,365 @@ yyreduce:
case 165:
-/* Line 1455 of yacc.c */
-#line 1098 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1101 "glsl_parser.ypp"
{ (yyval.n) = ast_void; ;}
break;
case 166:
-/* Line 1455 of yacc.c */
-#line 1099 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1102 "glsl_parser.ypp"
{ (yyval.n) = ast_float; ;}
break;
case 167:
-/* Line 1455 of yacc.c */
-#line 1100 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1103 "glsl_parser.ypp"
{ (yyval.n) = ast_int; ;}
break;
case 168:
-/* Line 1455 of yacc.c */
-#line 1101 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1104 "glsl_parser.ypp"
{ (yyval.n) = ast_uint; ;}
break;
case 169:
-/* Line 1455 of yacc.c */
-#line 1102 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1105 "glsl_parser.ypp"
{ (yyval.n) = ast_bool; ;}
break;
case 170:
-/* Line 1455 of yacc.c */
-#line 1103 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1106 "glsl_parser.ypp"
{ (yyval.n) = ast_vec2; ;}
break;
case 171:
-/* Line 1455 of yacc.c */
-#line 1104 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1107 "glsl_parser.ypp"
{ (yyval.n) = ast_vec3; ;}
break;
case 172:
-/* Line 1455 of yacc.c */
-#line 1105 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1108 "glsl_parser.ypp"
{ (yyval.n) = ast_vec4; ;}
break;
case 173:
-/* Line 1455 of yacc.c */
-#line 1106 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1109 "glsl_parser.ypp"
{ (yyval.n) = ast_bvec2; ;}
break;
case 174:
-/* Line 1455 of yacc.c */
-#line 1107 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1110 "glsl_parser.ypp"
{ (yyval.n) = ast_bvec3; ;}
break;
case 175:
-/* Line 1455 of yacc.c */
-#line 1108 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1111 "glsl_parser.ypp"
{ (yyval.n) = ast_bvec4; ;}
break;
case 176:
-/* Line 1455 of yacc.c */
-#line 1109 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1112 "glsl_parser.ypp"
{ (yyval.n) = ast_ivec2; ;}
break;
case 177:
-/* Line 1455 of yacc.c */
-#line 1110 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1113 "glsl_parser.ypp"
{ (yyval.n) = ast_ivec3; ;}
break;
case 178:
-/* Line 1455 of yacc.c */
-#line 1111 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1114 "glsl_parser.ypp"
{ (yyval.n) = ast_ivec4; ;}
break;
case 179:
-/* Line 1455 of yacc.c */
-#line 1112 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1115 "glsl_parser.ypp"
{ (yyval.n) = ast_uvec2; ;}
break;
case 180:
-/* Line 1455 of yacc.c */
-#line 1113 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1116 "glsl_parser.ypp"
{ (yyval.n) = ast_uvec3; ;}
break;
case 181:
-/* Line 1455 of yacc.c */
-#line 1114 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1117 "glsl_parser.ypp"
{ (yyval.n) = ast_uvec4; ;}
break;
case 182:
-/* Line 1455 of yacc.c */
-#line 1115 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1118 "glsl_parser.ypp"
{ (yyval.n) = ast_mat2; ;}
break;
case 183:
-/* Line 1455 of yacc.c */
-#line 1116 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1119 "glsl_parser.ypp"
{ (yyval.n) = ast_mat2x3; ;}
break;
case 184:
-/* Line 1455 of yacc.c */
-#line 1117 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1120 "glsl_parser.ypp"
{ (yyval.n) = ast_mat2x4; ;}
break;
case 185:
-/* Line 1455 of yacc.c */
-#line 1118 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1121 "glsl_parser.ypp"
{ (yyval.n) = ast_mat3x2; ;}
break;
case 186:
-/* Line 1455 of yacc.c */
-#line 1119 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1122 "glsl_parser.ypp"
{ (yyval.n) = ast_mat3; ;}
break;
case 187:
-/* Line 1455 of yacc.c */
-#line 1120 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1123 "glsl_parser.ypp"
{ (yyval.n) = ast_mat3x4; ;}
break;
case 188:
-/* Line 1455 of yacc.c */
-#line 1121 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1124 "glsl_parser.ypp"
{ (yyval.n) = ast_mat4x2; ;}
break;
case 189:
-/* Line 1455 of yacc.c */
-#line 1122 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1125 "glsl_parser.ypp"
{ (yyval.n) = ast_mat4x3; ;}
break;
case 190:
-/* Line 1455 of yacc.c */
-#line 1123 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1126 "glsl_parser.ypp"
{ (yyval.n) = ast_mat4; ;}
break;
case 191:
-/* Line 1455 of yacc.c */
-#line 1124 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1127 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler1d; ;}
break;
case 192:
-/* Line 1455 of yacc.c */
-#line 1125 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1128 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler2d; ;}
break;
case 193:
-/* Line 1455 of yacc.c */
-#line 1126 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1129 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler2drect; ;}
break;
case 194:
-/* Line 1455 of yacc.c */
-#line 1127 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1130 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler3d; ;}
break;
case 195:
-/* Line 1455 of yacc.c */
-#line 1128 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1131 "glsl_parser.ypp"
{ (yyval.n) = ast_samplercube; ;}
break;
case 196:
-/* Line 1455 of yacc.c */
-#line 1129 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1132 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler1dshadow; ;}
break;
case 197:
-/* Line 1455 of yacc.c */
-#line 1130 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1133 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler2dshadow; ;}
break;
case 198:
-/* Line 1455 of yacc.c */
-#line 1131 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1134 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler2drectshadow; ;}
break;
case 199:
-/* Line 1455 of yacc.c */
-#line 1132 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1135 "glsl_parser.ypp"
{ (yyval.n) = ast_samplercubeshadow; ;}
break;
case 200:
-/* Line 1455 of yacc.c */
-#line 1133 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1136 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler1darray; ;}
break;
case 201:
-/* Line 1455 of yacc.c */
-#line 1134 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1137 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler2darray; ;}
break;
case 202:
-/* Line 1455 of yacc.c */
-#line 1135 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1138 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler1darrayshadow; ;}
break;
case 203:
-/* Line 1455 of yacc.c */
-#line 1136 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1139 "glsl_parser.ypp"
{ (yyval.n) = ast_sampler2darrayshadow; ;}
break;
case 204:
-/* Line 1455 of yacc.c */
-#line 1137 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1140 "glsl_parser.ypp"
{ (yyval.n) = ast_isampler1d; ;}
break;
case 205:
-/* Line 1455 of yacc.c */
-#line 1138 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1141 "glsl_parser.ypp"
{ (yyval.n) = ast_isampler2d; ;}
break;
case 206:
-/* Line 1455 of yacc.c */
-#line 1139 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1142 "glsl_parser.ypp"
{ (yyval.n) = ast_isampler3d; ;}
break;
case 207:
-/* Line 1455 of yacc.c */
-#line 1140 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1143 "glsl_parser.ypp"
{ (yyval.n) = ast_isamplercube; ;}
break;
case 208:
-/* Line 1455 of yacc.c */
-#line 1141 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1144 "glsl_parser.ypp"
{ (yyval.n) = ast_isampler1darray; ;}
break;
case 209:
-/* Line 1455 of yacc.c */
-#line 1142 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1145 "glsl_parser.ypp"
{ (yyval.n) = ast_isampler2darray; ;}
break;
case 210:
-/* Line 1455 of yacc.c */
-#line 1143 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1146 "glsl_parser.ypp"
{ (yyval.n) = ast_usampler1d; ;}
break;
case 211:
-/* Line 1455 of yacc.c */
-#line 1144 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1147 "glsl_parser.ypp"
{ (yyval.n) = ast_usampler2d; ;}
break;
case 212:
-/* Line 1455 of yacc.c */
-#line 1145 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1148 "glsl_parser.ypp"
{ (yyval.n) = ast_usampler3d; ;}
break;
case 213:
-/* Line 1455 of yacc.c */
-#line 1146 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1149 "glsl_parser.ypp"
{ (yyval.n) = ast_usamplercube; ;}
break;
case 214:
-/* Line 1455 of yacc.c */
-#line 1147 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1150 "glsl_parser.ypp"
{ (yyval.n) = ast_usampler1darray; ;}
break;
case 215:
-/* Line 1455 of yacc.c */
-#line 1148 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1151 "glsl_parser.ypp"
{ (yyval.n) = ast_usampler2darray; ;}
break;
case 216:
-/* Line 1455 of yacc.c */
-#line 1152 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1155 "glsl_parser.ypp"
{
if (state->language_version < 130)
_mesa_glsl_error(& (yylsp[(1) - (1)]), state,
@@ -4566,8 +4552,8 @@ yyreduce:
case 217:
-/* Line 1455 of yacc.c */
-#line 1163 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1166 "glsl_parser.ypp"
{
if (state->language_version < 130)
_mesa_glsl_error(& (yylsp[(1) - (1)]), state,
@@ -4583,8 +4569,8 @@ yyreduce:
case 218:
-/* Line 1455 of yacc.c */
-#line 1174 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1177 "glsl_parser.ypp"
{
if (state->language_version < 130)
_mesa_glsl_error(& (yylsp[(1) - (1)]), state,
@@ -4600,8 +4586,8 @@ yyreduce:
case 219:
-/* Line 1455 of yacc.c */
-#line 1189 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1192 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.struct_specifier) = new(ctx) ast_struct_specifier((yyvsp[(2) - (5)].identifier), (yyvsp[(4) - (5)].node));
@@ -4611,8 +4597,8 @@ yyreduce:
case 220:
-/* Line 1455 of yacc.c */
-#line 1195 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1198 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.struct_specifier) = new(ctx) ast_struct_specifier(NULL, (yyvsp[(3) - (4)].node));
@@ -4622,8 +4608,8 @@ yyreduce:
case 221:
-/* Line 1455 of yacc.c */
-#line 1204 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1207 "glsl_parser.ypp"
{
(yyval.node) = (ast_node *) (yyvsp[(1) - (1)].declarator_list);
(yyvsp[(1) - (1)].declarator_list)->link.self_link();
@@ -4632,8 +4618,8 @@ yyreduce:
case 222:
-/* Line 1455 of yacc.c */
-#line 1209 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1212 "glsl_parser.ypp"
{
(yyval.node) = (ast_node *) (yyvsp[(1) - (2)].node);
(yyval.node)->link.insert_before(& (yyvsp[(2) - (2)].declarator_list)->link);
@@ -4642,8 +4628,8 @@ yyreduce:
case 223:
-/* Line 1455 of yacc.c */
-#line 1217 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1220 "glsl_parser.ypp"
{
void *ctx = state;
ast_fully_specified_type *type = new(ctx) ast_fully_specified_type();
@@ -4659,8 +4645,8 @@ yyreduce:
case 224:
-/* Line 1455 of yacc.c */
-#line 1232 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1235 "glsl_parser.ypp"
{
(yyval.declaration) = (yyvsp[(1) - (1)].declaration);
(yyvsp[(1) - (1)].declaration)->link.self_link();
@@ -4669,8 +4655,8 @@ yyreduce:
case 225:
-/* Line 1455 of yacc.c */
-#line 1237 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1240 "glsl_parser.ypp"
{
(yyval.declaration) = (yyvsp[(1) - (3)].declaration);
(yyval.declaration)->link.insert_before(& (yyvsp[(3) - (3)].declaration)->link);
@@ -4679,8 +4665,8 @@ yyreduce:
case 226:
-/* Line 1455 of yacc.c */
-#line 1245 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1248 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.declaration) = new(ctx) ast_declaration((yyvsp[(1) - (1)].identifier), false, NULL, NULL);
@@ -4690,8 +4676,8 @@ yyreduce:
case 227:
-/* Line 1455 of yacc.c */
-#line 1251 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1254 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.declaration) = new(ctx) ast_declaration((yyvsp[(1) - (4)].identifier), true, (yyvsp[(3) - (4)].expression), NULL);
@@ -4699,31 +4685,31 @@ yyreduce:
;}
break;
- case 232:
+ case 230:
-/* Line 1455 of yacc.c */
-#line 1274 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1272 "glsl_parser.ypp"
{ (yyval.node) = (ast_node *) (yyvsp[(1) - (1)].compound_statement); ;}
break;
- case 238:
+ case 235:
-/* Line 1455 of yacc.c */
-#line 1286 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1280 "glsl_parser.ypp"
{ (yyval.node) = NULL; ;}
break;
- case 239:
+ case 236:
-/* Line 1455 of yacc.c */
-#line 1287 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1281 "glsl_parser.ypp"
{ (yyval.node) = NULL; ;}
break;
- case 242:
+ case 239:
-/* Line 1455 of yacc.c */
-#line 1294 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1288 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.compound_statement) = new(ctx) ast_compound_statement(true, NULL);
@@ -4731,10 +4717,10 @@ yyreduce:
;}
break;
- case 243:
+ case 240:
-/* Line 1455 of yacc.c */
-#line 1300 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1294 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.compound_statement) = new(ctx) ast_compound_statement(true, (yyvsp[(2) - (3)].node));
@@ -4742,17 +4728,17 @@ yyreduce:
;}
break;
- case 244:
+ case 241:
-/* Line 1455 of yacc.c */
-#line 1308 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1302 "glsl_parser.ypp"
{ (yyval.node) = (ast_node *) (yyvsp[(1) - (1)].compound_statement); ;}
break;
- case 246:
+ case 243:
-/* Line 1455 of yacc.c */
-#line 1314 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1308 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.compound_statement) = new(ctx) ast_compound_statement(false, NULL);
@@ -4760,10 +4746,10 @@ yyreduce:
;}
break;
- case 247:
+ case 244:
-/* Line 1455 of yacc.c */
-#line 1320 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1314 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.compound_statement) = new(ctx) ast_compound_statement(false, (yyvsp[(2) - (3)].node));
@@ -4771,10 +4757,10 @@ yyreduce:
;}
break;
- case 248:
+ case 245:
-/* Line 1455 of yacc.c */
-#line 1329 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1323 "glsl_parser.ypp"
{
if ((yyvsp[(1) - (1)].node) == NULL) {
_mesa_glsl_error(& (yylsp[(1) - (1)]), state, "<nil> statement\n");
@@ -4786,10 +4772,10 @@ yyreduce:
;}
break;
- case 249:
+ case 246:
-/* Line 1455 of yacc.c */
-#line 1339 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1333 "glsl_parser.ypp"
{
if ((yyvsp[(2) - (2)].node) == NULL) {
_mesa_glsl_error(& (yylsp[(2) - (2)]), state, "<nil> statement\n");
@@ -4800,10 +4786,10 @@ yyreduce:
;}
break;
- case 250:
+ case 247:
-/* Line 1455 of yacc.c */
-#line 1351 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1345 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_expression_statement(NULL);
@@ -4811,10 +4797,10 @@ yyreduce:
;}
break;
- case 251:
+ case 248:
-/* Line 1455 of yacc.c */
-#line 1357 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1351 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_expression_statement((yyvsp[(1) - (2)].expression));
@@ -4822,63 +4808,50 @@ yyreduce:
;}
break;
- case 252:
-
-/* Line 1455 of yacc.c */
-#line 1366 "glsl_parser.ypp"
- {
- void *ctx = state;
- (yyval.node) = new(ctx) ast_selection_statement((yyvsp[(3) - (7)].expression), (yyvsp[(5) - (7)].node), (yyvsp[(7) - (7)].node));
- (yyval.node)->set_location(yylloc);
- ;}
- break;
-
- case 253:
+ case 249:
-/* Line 1455 of yacc.c */
-#line 1375 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1360 "glsl_parser.ypp"
{
- void *ctx = state;
- (yyval.node) = new(ctx) ast_selection_statement((yyvsp[(3) - (5)].expression), (yyvsp[(5) - (5)].node), NULL);
+ (yyval.node) = new(state) ast_selection_statement((yyvsp[(3) - (5)].expression), (yyvsp[(5) - (5)].selection_rest_statement).then_statement,
+ (yyvsp[(5) - (5)].selection_rest_statement).else_statement);
(yyval.node)->set_location(yylloc);
;}
break;
- case 254:
+ case 250:
-/* Line 1455 of yacc.c */
-#line 1381 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1369 "glsl_parser.ypp"
{
- void *ctx = state;
- (yyval.node) = new(ctx) ast_selection_statement((yyvsp[(3) - (5)].expression), (yyvsp[(5) - (5)].node), NULL);
- (yyval.node)->set_location(yylloc);
+ (yyval.selection_rest_statement).then_statement = (yyvsp[(1) - (3)].node);
+ (yyval.selection_rest_statement).else_statement = (yyvsp[(3) - (3)].node);
;}
break;
- case 255:
+ case 251:
-/* Line 1455 of yacc.c */
-#line 1387 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1374 "glsl_parser.ypp"
{
- void *ctx = state;
- (yyval.node) = new(ctx) ast_selection_statement((yyvsp[(3) - (7)].expression), (yyvsp[(5) - (7)].node), (yyvsp[(7) - (7)].node));
- (yyval.node)->set_location(yylloc);
+ (yyval.selection_rest_statement).then_statement = (yyvsp[(1) - (1)].node);
+ (yyval.selection_rest_statement).else_statement = NULL;
;}
break;
- case 256:
+ case 252:
-/* Line 1455 of yacc.c */
-#line 1396 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1382 "glsl_parser.ypp"
{
(yyval.node) = (ast_node *) (yyvsp[(1) - (1)].expression);
;}
break;
- case 257:
+ case 253:
-/* Line 1455 of yacc.c */
-#line 1400 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1386 "glsl_parser.ypp"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (4)].identifier), false, NULL, (yyvsp[(4) - (4)].expression));
@@ -4891,10 +4864,10 @@ yyreduce:
;}
break;
- case 261:
+ case 257:
-/* Line 1455 of yacc.c */
-#line 1423 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1409 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_while,
@@ -4903,10 +4876,10 @@ yyreduce:
;}
break;
- case 262:
+ case 258:
-/* Line 1455 of yacc.c */
-#line 1430 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1416 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_do_while,
@@ -4915,10 +4888,10 @@ yyreduce:
;}
break;
- case 263:
+ case 259:
-/* Line 1455 of yacc.c */
-#line 1437 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1423 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_for,
@@ -4927,39 +4900,39 @@ yyreduce:
;}
break;
- case 267:
+ case 263:
-/* Line 1455 of yacc.c */
-#line 1453 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1439 "glsl_parser.ypp"
{
(yyval.node) = NULL;
;}
break;
- case 268:
+ case 264:
-/* Line 1455 of yacc.c */
-#line 1460 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1446 "glsl_parser.ypp"
{
(yyval.for_rest_statement).cond = (yyvsp[(1) - (2)].node);
(yyval.for_rest_statement).rest = NULL;
;}
break;
- case 269:
+ case 265:
-/* Line 1455 of yacc.c */
-#line 1465 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1451 "glsl_parser.ypp"
{
(yyval.for_rest_statement).cond = (yyvsp[(1) - (3)].node);
(yyval.for_rest_statement).rest = (yyvsp[(3) - (3)].expression);
;}
break;
- case 270:
+ case 266:
-/* Line 1455 of yacc.c */
-#line 1474 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1460 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_continue, NULL);
@@ -4967,10 +4940,10 @@ yyreduce:
;}
break;
- case 271:
+ case 267:
-/* Line 1455 of yacc.c */
-#line 1480 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1466 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_break, NULL);
@@ -4978,10 +4951,10 @@ yyreduce:
;}
break;
- case 272:
+ case 268:
-/* Line 1455 of yacc.c */
-#line 1486 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1472 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_return, NULL);
@@ -4989,10 +4962,10 @@ yyreduce:
;}
break;
- case 273:
+ case 269:
-/* Line 1455 of yacc.c */
-#line 1492 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1478 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_return, (yyvsp[(2) - (3)].expression));
@@ -5000,10 +4973,10 @@ yyreduce:
;}
break;
- case 274:
+ case 270:
-/* Line 1455 of yacc.c */
-#line 1498 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1484 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_discard, NULL);
@@ -5011,31 +4984,31 @@ yyreduce:
;}
break;
- case 275:
+ case 271:
-/* Line 1455 of yacc.c */
-#line 1506 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1492 "glsl_parser.ypp"
{ (yyval.node) = (yyvsp[(1) - (1)].function_definition); ;}
break;
- case 276:
+ case 272:
-/* Line 1455 of yacc.c */
-#line 1507 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1493 "glsl_parser.ypp"
{ (yyval.node) = (yyvsp[(1) - (1)].node); ;}
break;
- case 277:
+ case 273:
-/* Line 1455 of yacc.c */
-#line 1508 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1494 "glsl_parser.ypp"
{ (yyval.node) = NULL; ;}
break;
- case 278:
+ case 274:
-/* Line 1455 of yacc.c */
-#line 1513 "glsl_parser.ypp"
+/* Line 1464 of yacc.c */
+#line 1499 "glsl_parser.ypp"
{
void *ctx = state;
(yyval.function_definition) = new(ctx) ast_function_definition();
@@ -5047,8 +5020,8 @@ yyreduce:
-/* Line 1455 of yacc.c */
-#line 5052 "glsl_parser.cpp"
+/* Line 1464 of yacc.c */
+#line 5025 "glsl_parser.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -5120,7 +5093,7 @@ yyerrlab:
#endif
}
- yyerror_range[0] = yylloc;
+ yyerror_range[1] = yylloc;
if (yyerrstatus == 3)
{
@@ -5157,7 +5130,7 @@ yyerrorlab:
if (/*CONSTCOND*/ 0)
goto yyerrorlab;
- yyerror_range[0] = yylsp[1-yylen];
+ yyerror_range[1] = yylsp[1-yylen];
/* Do not reclaim the symbols of the rule which action triggered
this YYERROR. */
YYPOPSTACK (yylen);
@@ -5191,7 +5164,7 @@ yyerrlab1:
if (yyssp == yyss)
YYABORT;
- yyerror_range[0] = *yylsp;
+ yyerror_range[1] = *yylsp;
yydestruct ("Error: popping",
yystos[yystate], yyvsp, yylsp, state);
YYPOPSTACK (1);
@@ -5201,10 +5174,10 @@ yyerrlab1:
*++yyvsp = yylval;
- yyerror_range[1] = yylloc;
+ yyerror_range[2] = yylloc;
/* Using YYLLOC is tempting, but would change the location of
the lookahead. YYLOC is available though. */
- YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
+ YYLLOC_DEFAULT (yyloc, yyerror_range, 2);
*++yylsp = yyloc;
/* Shift the error token. */
diff --git a/src/glsl/glsl_parser.h b/src/glsl/glsl_parser.h
index 3ed90853adf..4a780375bfa 100644
--- a/src/glsl/glsl_parser.h
+++ b/src/glsl/glsl_parser.h
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1. */
+/* A Bison parser, made by GNU Bison 2.4.3. */
/* Skeleton interface for Bison's Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2009, 2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -236,7 +235,7 @@
typedef union YYSTYPE
{
-/* Line 1676 of yacc.c */
+/* Line 1685 of yacc.c */
#line 52 "glsl_parser.ypp"
int n;
@@ -265,10 +264,15 @@ typedef union YYSTYPE
ast_expression *rest;
} for_rest_statement;
+ struct {
+ ast_node *then_statement;
+ ast_node *else_statement;
+ } selection_rest_statement;
+
-/* Line 1676 of yacc.c */
-#line 272 "glsl_parser.h"
+/* Line 1685 of yacc.c */
+#line 276 "glsl_parser.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/src/glsl/glsl_parser.ypp b/src/glsl/glsl_parser.ypp
index 6d99c52503e..b9cc03c1948 100644
--- a/src/glsl/glsl_parser.ypp
+++ b/src/glsl/glsl_parser.ypp
@@ -75,6 +75,11 @@
ast_node *cond;
ast_expression *rest;
} for_rest_statement;
+
+ struct {
+ ast_node *then_statement;
+ ast_node *else_statement;
+ } selection_rest_statement;
}
%token ATTRIBUTE CONST_TOK BOOL_TOK FLOAT_TOK INT_TOK UINT_TOK
@@ -130,8 +135,6 @@
%type <node> statement
%type <node> statement_list
%type <node> simple_statement
-%type <node> statement_matched
-%type <node> statement_unmatched
%type <n> precision_qualifier
%type <type_qualifier> type_qualifier
%type <type_qualifier> storage_qualifier
@@ -197,8 +200,8 @@
%type <declarator_list> struct_declaration
%type <declaration> struct_declarator
%type <declaration> struct_declarator_list
-%type <node> selection_statement_matched
-%type <node> selection_statement_unmatched
+%type <node> selection_statement
+%type <selection_rest_statement> selection_rest_statement
%type <node> iteration_statement
%type <node> condition
%type <node> conditionopt
@@ -1266,23 +1269,14 @@ declaration_statement:
// Grammar Note: labeled statements for SWITCH only; 'goto' is not
// supported.
statement:
- statement_matched
- | statement_unmatched
- ;
-
-statement_matched:
compound_statement { $$ = (ast_node *) $1; }
| simple_statement
;
-statement_unmatched:
- selection_statement_unmatched
- ;
-
simple_statement:
declaration_statement
| expression_statement
- | selection_statement_matched
+ | selection_statement
| switch_statement { $$ = NULL; }
| case_label { $$ = NULL; }
| iteration_statement
@@ -1361,33 +1355,25 @@ expression_statement:
}
;
-selection_statement_matched:
- IF '(' expression ')' statement_matched ELSE statement_matched
+selection_statement:
+ IF '(' expression ')' selection_rest_statement
{
- void *ctx = state;
- $$ = new(ctx) ast_selection_statement($3, $5, $7);
+ $$ = new(state) ast_selection_statement($3, $5.then_statement,
+ $5.else_statement);
$$->set_location(yylloc);
}
;
-selection_statement_unmatched:
- IF '(' expression ')' statement_matched
+selection_rest_statement:
+ statement ELSE statement
{
- void *ctx = state;
- $$ = new(ctx) ast_selection_statement($3, $5, NULL);
- $$->set_location(yylloc);
+ $$.then_statement = $1;
+ $$.else_statement = $3;
}
- | IF '(' expression ')' statement_unmatched
+ | statement
{
- void *ctx = state;
- $$ = new(ctx) ast_selection_statement($3, $5, NULL);
- $$->set_location(yylloc);
- }
- | IF '(' expression ')' statement_matched ELSE statement_unmatched
- {
- void *ctx = state;
- $$ = new(ctx) ast_selection_statement($3, $5, $7);
- $$->set_location(yylloc);
+ $$.then_statement = $1;
+ $$.else_statement = NULL;
}
;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 23:28:26 +0000