diff options
| author | Chad Versace <[email protected]> | 2010-10-08 12:05:02 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2010-10-11 14:25:53 -0700 |
| commit | 41c2079855cde03470d811a637e9abf1b5a3763f (patch) | |
| tree | 108bb2c58dbd90adf5dc90aa182ebb620184498c /src | |
| parent | 0c9fef6111162498035e05241e492fe1bb0df6a4 (diff) | |
glsl: Changes in generated file glsl_lexer.cpp
Signed-off-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/glsl_lexer.cpp | 1407 |
1 files changed, 716 insertions, 691 deletions
diff --git a/src/glsl/glsl_lexer.cpp b/src/glsl/glsl_lexer.cpp index 9db1652ed2f..c93cc3a9790 100644 --- a/src/glsl/glsl_lexer.cpp +++ b/src/glsl/glsl_lexer.cpp @@ -358,8 +358,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 183 -#define YY_END_OF_BUFFER 184 +#define YY_NUM_RULES 187 +#define YY_END_OF_BUFFER 188 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -367,86 +367,87 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[708] = +static yyconst flex_int16_t yy_accept[716] = { 0, - 0, 0, 15, 15, 0, 0, 184, 182, 1, 20, - 182, 182, 182, 182, 182, 182, 182, 182, 96, 94, - 182, 182, 182, 181, 182, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 182, 1, 182, 91, 183, - 15, 19, 183, 18, 16, 17, 13, 12, 1, 80, - 87, 81, 90, 84, 75, 86, 76, 93, 98, 85, - 99, 96, 0, 0, 101, 0, 94, 0, 77, 79, - 78, 0, 181, 83, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 181, 28, 181, 181, 181, - - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 32, 181, 181, 56, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 92, 82, 1, 0, 0, - 2, 0, 0, 0, 0, 15, 14, 18, 17, 0, - 98, 97, 0, 99, 0, 100, 95, 88, 89, 181, - 104, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 31, 181, 181, 181, 181, 181, 181, 181, - - 181, 181, 181, 25, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 57, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 0, 0, 0, 0, 14, 0, 98, 0, - 97, 0, 99, 100, 181, 181, 23, 181, 181, 144, - 181, 181, 181, 181, 181, 181, 181, 181, 181, 30, - 107, 181, 181, 181, 181, 63, 181, 181, 112, 126, - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 123, 147, 44, 45, 46, 181, 181, 181, 181, - - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 181, 110, 102, 181, 181, - 181, 181, 181, 181, 181, 41, 42, 43, 73, 181, - 181, 0, 0, 0, 0, 0, 97, 181, 181, 26, - 35, 36, 37, 181, 105, 181, 22, 181, 181, 181, - 181, 134, 135, 136, 181, 103, 181, 127, 24, 137, - 138, 139, 149, 131, 132, 133, 181, 181, 181, 58, - 129, 181, 181, 38, 39, 40, 181, 181, 181, 181, - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 181, 124, 181, 181, 181, 181, 181, 181, 181, - - 181, 181, 181, 106, 181, 146, 181, 181, 29, 0, - 0, 0, 0, 153, 181, 181, 151, 181, 181, 181, - 125, 120, 156, 181, 181, 181, 181, 181, 181, 115, - 181, 181, 74, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 181, 181, 181, 181, 130, 111, 181, 181, - 118, 34, 181, 181, 143, 64, 119, 72, 154, 113, - 181, 181, 181, 181, 181, 181, 181, 0, 0, 0, - 0, 181, 181, 181, 114, 33, 181, 181, 181, 181, - 181, 181, 157, 158, 159, 181, 181, 181, 181, 148, - 181, 181, 181, 181, 181, 181, 181, 181, 108, 181, - - 181, 181, 181, 181, 59, 181, 60, 181, 0, 0, - 0, 0, 0, 181, 61, 27, 121, 161, 162, 163, - 181, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 116, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 109, 165, 166, 167, 181, 181, 128, 117, 0, - 0, 6, 0, 0, 0, 11, 3, 21, 181, 181, - 181, 181, 181, 181, 181, 181, 181, 160, 122, 62, - 145, 181, 152, 150, 180, 66, 67, 68, 181, 181, - 181, 181, 181, 181, 0, 0, 0, 0, 0, 0, - 181, 181, 181, 164, 181, 181, 181, 181, 181, 181, - - 181, 181, 181, 181, 181, 181, 181, 181, 181, 168, - 4, 0, 5, 0, 0, 0, 0, 0, 181, 181, - 181, 181, 181, 181, 181, 177, 181, 181, 181, 181, - 181, 181, 69, 181, 181, 181, 0, 0, 0, 181, - 181, 178, 169, 181, 170, 181, 181, 181, 181, 181, - 181, 181, 181, 181, 179, 0, 0, 171, 172, 175, - 176, 65, 181, 140, 181, 141, 155, 173, 174, 0, - 0, 181, 181, 181, 0, 0, 0, 70, 181, 71, - 0, 0, 0, 181, 0, 0, 0, 181, 0, 0, - 7, 0, 0, 181, 0, 8, 0, 0, 142, 0, - - 0, 0, 0, 9, 0, 10, 0 + 0, 0, 15, 15, 0, 0, 188, 186, 1, 20, + 186, 186, 186, 186, 186, 186, 186, 186, 100, 98, + 186, 186, 186, 185, 186, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 186, 1, 186, 95, 187, + 15, 19, 187, 18, 16, 17, 13, 12, 1, 84, + 91, 85, 94, 88, 79, 90, 80, 97, 102, 89, + 103, 100, 0, 0, 105, 0, 98, 0, 81, 83, + 82, 0, 185, 87, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 29, 185, 185, 185, + + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 33, 185, 185, 60, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 96, 86, 1, 0, + 0, 2, 0, 0, 0, 0, 15, 14, 18, 17, + 0, 102, 101, 0, 103, 0, 104, 99, 92, 93, + 185, 108, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 32, 185, 185, 185, 185, 185, 185, + + 185, 185, 185, 185, 25, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 61, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 0, 0, 0, 0, 14, + 0, 102, 0, 101, 0, 103, 104, 185, 185, 23, + 185, 185, 148, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 31, 111, 185, 185, 185, 185, 67, 185, + 185, 116, 130, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 127, 151, 48, 49, 50, 185, + + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 114, + 106, 185, 185, 26, 185, 185, 185, 185, 185, 185, + 45, 46, 47, 77, 185, 185, 0, 0, 0, 0, + 0, 101, 185, 185, 27, 36, 37, 38, 185, 109, + 185, 22, 185, 185, 185, 185, 138, 139, 140, 185, + 107, 185, 131, 24, 141, 142, 143, 153, 135, 136, + 137, 185, 185, 185, 62, 133, 185, 185, 39, 40, + 41, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 128, 185, 185, + + 185, 185, 185, 185, 185, 185, 185, 185, 110, 185, + 150, 42, 43, 44, 185, 185, 30, 0, 0, 0, + 0, 157, 185, 185, 155, 185, 185, 185, 129, 124, + 160, 185, 185, 185, 185, 185, 185, 119, 185, 185, + 78, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 185, 185, 185, 185, 134, 115, 185, 185, 122, 35, + 185, 185, 147, 68, 123, 76, 158, 117, 185, 185, + 185, 185, 185, 185, 185, 0, 0, 0, 0, 185, + 185, 185, 118, 34, 185, 185, 185, 185, 185, 185, + 161, 162, 163, 185, 185, 185, 185, 152, 185, 185, + + 185, 185, 185, 185, 185, 185, 112, 185, 185, 185, + 185, 185, 63, 185, 64, 185, 0, 0, 0, 0, + 0, 185, 65, 28, 125, 165, 166, 167, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 120, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 113, + 169, 170, 171, 185, 185, 132, 121, 0, 0, 6, + 0, 0, 0, 11, 3, 21, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 164, 126, 66, 149, 185, + 156, 154, 184, 70, 71, 72, 185, 185, 185, 185, + 185, 185, 0, 0, 0, 0, 0, 0, 185, 185, + + 185, 168, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 172, 4, 0, + 5, 0, 0, 0, 0, 0, 185, 185, 185, 185, + 185, 185, 185, 181, 185, 185, 185, 185, 185, 185, + 73, 185, 185, 185, 0, 0, 0, 185, 185, 182, + 173, 185, 174, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 183, 0, 0, 175, 176, 179, 180, 69, + 185, 144, 185, 145, 159, 177, 178, 0, 0, 185, + 185, 185, 0, 0, 0, 74, 185, 75, 0, 0, + 0, 185, 0, 0, 0, 185, 0, 0, 7, 0, + + 0, 185, 0, 8, 0, 0, 146, 0, 0, 0, + 0, 9, 0, 10, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -492,173 +493,175 @@ static yyconst flex_int32_t yy_meta[65] = 8, 7, 7, 1 } ; -static yyconst flex_int16_t yy_base[719] = +static yyconst flex_int16_t yy_base[727] = { 0, - 0, 63, 88, 0, 1076, 1075, 1077, 1080, 64, 1080, - 1051, 1050, 59, 1049, 58, 60, 58, 1048, 139, 187, - 47, 1047, 56, 0, 1034, 121, 110, 137, 138, 134, - 163, 1017, 173, 177, 115, 149, 140, 1011, 159, 121, - 187, 194, 194, 172, 1022, 171, 249, 240, 1042, 1080, - 250, 1080, 1051, 241, 1080, 0, 1080, 1080, 262, 1080, - 1080, 1080, 1080, 1080, 1080, 1080, 1080, 1080, 236, 1080, - 238, 187, 286, 303, 1080, 0, 0, 1040, 1080, 1080, - 1080, 1039, 0, 1080, 1006, 1011, 1004, 1007, 1016, 1015, - 1001, 1004, 1016, 35, 1010, 997, 994, 1008, 994, 991, - - 991, 997, 215, 232, 991, 1002, 987, 993, 997, 998, - 0, 989, 1000, 234, 995, 975, 226, 979, 993, 983, - 119, 976, 234, 989, 991, 973, 969, 977, 974, 963, - 972, 256, 970, 976, 971, 974, 962, 965, 967, 245, - 970, 961, 974, 227, 967, 1080, 1080, 308, 294, 324, - 1080, 952, 965, 956, 967, 329, 0, 338, 0, 368, - 1080, 303, 379, 1080, 386, 393, 0, 1080, 1080, 962, - 0, 953, 957, 967, 964, 947, 946, 946, 950, 216, - 961, 958, 958, 956, 953, 944, 951, 937, 935, 948, - 933, 950, 0, 947, 934, 942, 939, 943, 944, 937, - - 934, 922, 921, 935, 938, 935, 922, 929, 919, 320, - 925, 928, 918, 926, 914, 918, 909, 924, 914, 905, - 924, 907, 905, 916, 905, 900, 898, 912, 897, 899, - 896, 908, 907, 910, 288, 901, 895, 884, 331, 903, - 905, 893, 885, 889, 901, 884, 0, 400, 410, 427, - 1080, 439, 446, 1080, 879, 890, 0, 887, 343, 0, - 880, 878, 880, 875, 884, 872, 890, 878, 346, 0, - 0, 872, 883, 882, 882, 0, 866, 350, 0, 0, - 868, 353, 876, 877, 867, 861, 860, 861, 860, 357, - 856, 0, 0, 852, 851, 850, 852, 853, 858, 852, - - 848, 862, 857, 856, 855, 846, 849, 849, 841, 844, - 839, 848, 853, 838, 851, 841, 0, 0, 848, 844, - 835, 835, 841, 840, 837, 0, 0, 0, 0, 826, - 839, 838, 837, 834, 822, 453, 463, 834, 836, 0, - 0, 0, 0, 822, 0, 822, 0, 821, 822, 816, - 827, 0, 0, 0, 817, 0, 813, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 824, 469, 823, 0, - 0, 821, 817, 0, 0, 0, 806, 415, 432, 473, - 811, 807, 813, 803, 801, 815, 799, 799, 813, 801, - 813, 808, 0, 806, 803, 807, 790, 792, 799, 805, - - 800, 799, 786, 0, 788, 0, 787, 791, 0, 785, - 834, 784, 787, 0, 775, 785, 0, 773, 773, 787, - 0, 789, 0, 482, 797, 796, 795, 766, 765, 0, - 783, 782, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 766, 780, 766, 763, 0, 0, 769, 768, - 0, 0, 766, 758, 0, 0, 0, 0, 0, 0, - 755, 767, 485, 759, 766, 763, 757, 750, 503, 766, - 751, 746, 760, 758, 0, 0, 750, 769, 768, 767, - 738, 737, 301, 481, 0, 750, 753, 751, 739, 0, - 749, 746, 745, 734, 733, 732, 509, 741, 0, 753, - - 752, 751, 722, 721, 0, 736, 0, 734, 729, 515, - 527, 773, 722, 730, 0, 0, 0, 745, 744, 0, - 726, 729, 713, 721, 711, 719, 720, 720, 719, 704, - 717, 0, 718, 706, 705, 701, 725, 724, 723, 694, - 693, 0, 723, 722, 0, 704, 707, 0, 0, 693, - 537, 1080, 561, 0, 567, 340, 1080, 0, 690, 689, - 699, 699, 686, 701, 684, 699, 694, 0, 0, 0, - 0, 679, 0, 0, 0, 700, 389, 700, 689, 692, - 676, 675, 685, 685, 675, 529, 589, 474, 683, 671, - 669, 668, 679, 0, 682, 678, 680, 676, 662, 669, - - 669, 671, 667, 669, 667, 667, 654, 653, 664, 0, - 1080, 531, 1080, 596, 0, 616, 666, 648, 665, 664, - 647, 635, 643, 633, 634, 0, 627, 646, 635, 607, - 604, 601, 0, 604, 603, 586, 533, 572, 580, 564, - 563, 0, 0, 564, 0, 540, 554, 552, 516, 530, - 505, 486, 453, 450, 0, 461, 443, 0, 0, 0, - 0, 0, 400, 406, 385, 0, 0, 0, 0, 343, - 389, 319, 267, 249, 487, 341, 235, 0, 200, 0, - 507, 498, 184, 157, 150, 564, 559, 136, 565, 591, - 1080, 593, 550, 112, 594, 1080, 569, 576, 0, 123, - - 619, 621, 637, 1080, 638, 1080, 1080, 648, 653, 658, - 663, 665, 667, 673, 680, 685, 690, 695 + 0, 63, 88, 0, 1084, 1083, 1085, 1088, 64, 1088, + 1059, 1058, 59, 1057, 58, 60, 58, 1056, 139, 187, + 47, 1055, 56, 0, 1042, 121, 110, 137, 138, 134, + 163, 1025, 173, 177, 115, 149, 140, 1019, 159, 121, + 187, 194, 194, 172, 1030, 171, 253, 240, 1050, 1088, + 250, 1088, 1059, 244, 1088, 0, 1088, 1088, 265, 1088, + 1088, 1088, 1088, 1088, 1088, 1088, 1088, 1088, 241, 1088, + 243, 187, 286, 303, 1088, 0, 0, 1048, 1088, 1088, + 1088, 1047, 0, 1088, 1014, 1019, 1012, 1015, 1024, 1023, + 1009, 1012, 1024, 35, 1018, 1005, 1002, 1016, 1002, 999, + + 999, 1005, 218, 238, 999, 1010, 995, 1001, 1005, 1006, + 0, 997, 1008, 239, 1003, 983, 218, 987, 1001, 991, + 119, 984, 240, 997, 999, 981, 977, 985, 982, 971, + 980, 258, 978, 984, 979, 982, 970, 973, 258, 224, + 979, 982, 969, 982, 264, 975, 1088, 1088, 329, 324, + 334, 1088, 960, 973, 964, 975, 330, 0, 322, 0, + 333, 1088, 316, 378, 1088, 385, 392, 0, 1088, 1088, + 970, 0, 961, 965, 975, 972, 955, 954, 954, 958, + 300, 969, 966, 966, 964, 961, 952, 959, 945, 943, + 956, 941, 958, 0, 955, 942, 950, 947, 951, 952, + + 945, 942, 930, 929, 943, 946, 943, 930, 937, 927, + 343, 933, 936, 926, 934, 922, 926, 917, 932, 922, + 913, 932, 915, 913, 924, 913, 908, 906, 920, 905, + 907, 904, 916, 915, 918, 899, 320, 908, 902, 912, + 890, 350, 909, 911, 899, 891, 895, 907, 890, 0, + 399, 409, 426, 1088, 438, 445, 1088, 885, 896, 0, + 893, 361, 0, 886, 884, 886, 881, 890, 878, 896, + 884, 367, 0, 0, 878, 889, 888, 888, 0, 872, + 414, 0, 0, 874, 431, 882, 883, 873, 867, 866, + 867, 866, 450, 862, 0, 0, 858, 857, 856, 858, + + 859, 864, 858, 854, 868, 863, 862, 861, 852, 855, + 855, 847, 850, 845, 854, 859, 844, 857, 847, 0, + 0, 854, 850, 0, 841, 841, 847, 846, 453, 843, + 0, 0, 0, 0, 832, 845, 844, 843, 840, 828, + 462, 474, 840, 842, 0, 0, 0, 0, 828, 0, + 828, 0, 827, 828, 822, 833, 0, 0, 0, 823, + 0, 819, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 830, 457, 829, 0, 0, 827, 823, 0, 0, + 0, 812, 479, 482, 485, 817, 813, 819, 809, 807, + 821, 805, 805, 819, 807, 819, 814, 0, 812, 809, + + 813, 796, 798, 805, 811, 806, 805, 792, 0, 794, + 0, 0, 0, 0, 793, 797, 0, 791, 840, 790, + 793, 0, 781, 791, 0, 779, 779, 793, 0, 795, + 0, 491, 803, 802, 801, 772, 771, 0, 789, 788, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 772, 786, 772, 769, 0, 0, 775, 774, 0, 0, + 772, 764, 0, 0, 0, 0, 0, 0, 761, 773, + 494, 765, 772, 769, 763, 756, 512, 772, 757, 752, + 766, 764, 0, 0, 756, 775, 774, 773, 744, 743, + 331, 480, 0, 756, 759, 757, 745, 0, 755, 752, + + 751, 740, 739, 738, 507, 747, 0, 759, 758, 757, + 728, 727, 0, 742, 0, 740, 735, 485, 535, 779, + 728, 736, 0, 0, 0, 751, 750, 0, 732, 735, + 719, 727, 717, 725, 726, 726, 725, 710, 723, 0, + 724, 712, 711, 707, 731, 730, 729, 700, 699, 0, + 729, 728, 0, 710, 713, 0, 0, 699, 542, 1088, + 563, 0, 569, 525, 1088, 0, 696, 695, 705, 705, + 692, 707, 690, 705, 700, 0, 0, 0, 0, 685, + 0, 0, 0, 706, 337, 706, 695, 698, 682, 681, + 691, 691, 681, 514, 590, 373, 689, 677, 675, 674, + + 685, 0, 688, 684, 686, 682, 668, 675, 675, 677, + 673, 675, 673, 673, 660, 659, 670, 0, 1088, 420, + 1088, 597, 0, 617, 672, 654, 671, 670, 653, 645, + 653, 643, 651, 0, 640, 659, 656, 650, 647, 644, + 0, 639, 609, 592, 537, 588, 598, 582, 581, 0, + 0, 569, 0, 567, 583, 560, 544, 527, 491, 487, + 390, 378, 0, 392, 384, 0, 0, 0, 0, 0, + 339, 330, 275, 0, 0, 0, 0, 249, 265, 241, + 242, 222, 380, 541, 213, 0, 200, 0, 545, 497, + 184, 157, 150, 566, 568, 136, 593, 594, 1088, 619, + + 571, 112, 595, 1088, 572, 578, 0, 123, 621, 630, + 639, 1088, 640, 1088, 1088, 650, 655, 660, 665, 667, + 669, 675, 682, 687, 692, 697 } ; -static yyconst flex_int16_t yy_def[719] = +static yyconst flex_int16_t yy_def[727] = { 0, - 707, 1, 707, 3, 708, 708, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 709, 707, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 710, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 711, 707, - 712, 19, 707, 707, 707, 713, 20, 707, 707, 707, - 707, 707, 709, 707, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 714, 707, 710, 707, - 707, 712, 707, 707, 707, 707, 713, 707, 707, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 707, 707, 707, 707, 714, 707, 707, 707, - 707, 707, 707, 707, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 707, 707, 707, 707, 707, 707, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - - 709, 709, 709, 709, 709, 709, 709, 709, 709, 707, - 707, 707, 707, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 707, 707, 707, - 707, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - - 709, 709, 709, 709, 709, 709, 709, 709, 707, 715, - 707, 707, 707, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 707, - 707, 707, 707, 716, 707, 707, 707, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 707, 717, 707, 716, 707, 707, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 707, 707, 707, 707, 718, 707, 707, 707, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 718, 707, 707, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 707, 707, 709, 709, 709, - 709, 709, 709, 709, 709, 709, 709, 709, 709, 707, - 707, 709, 709, 709, 707, 707, 707, 709, 709, 709, - 707, 707, 707, 709, 707, 707, 707, 709, 707, 707, - 707, 707, 707, 709, 707, 707, 707, 707, 709, 707, - - 707, 707, 707, 707, 707, 707, 0, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707 + 715, 1, 715, 3, 716, 716, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + 715, 715, 715, 717, 715, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 715, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 718, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 715, 719, 715, + 720, 19, 715, 715, 715, 721, 20, 715, 715, 715, + 715, 715, 717, 715, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 722, 715, 718, + 715, 715, 720, 715, 715, 715, 715, 721, 715, 715, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 715, 715, 715, 715, 722, + 715, 715, 715, 715, 715, 715, 715, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 715, 715, 715, 715, + 715, 715, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 715, 715, 715, + 715, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 715, 715, 715, 715, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 715, 723, 715, 715, + 715, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 715, 715, 715, + 715, 724, 715, 715, 715, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 715, 725, 715, 724, 715, 715, 717, 717, + + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 715, 715, + 715, 715, 726, 715, 715, 715, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 726, 715, 715, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, + 717, 717, 717, 715, 715, 717, 717, 717, 717, 717, + 717, 717, 717, 717, 717, 717, 717, 715, 715, 717, + 717, 717, 715, 715, 715, 717, 717, 717, 715, 715, + 715, 717, 715, 715, 715, 717, 715, 715, 715, 715, + + 715, 717, 715, 715, 715, 715, 717, 715, 715, 715, + 715, 715, 715, 715, 0, 715, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 715 } ; -static yyconst flex_int16_t yy_nxt[1145] = +static yyconst flex_int16_t yy_nxt[1153] = { 0, 8, 9, 10, 9, 11, 8, 12, 13, 8, 8, 14, 15, 16, 17, 18, 19, 20, 20, 20, 20, @@ -668,7 +671,7 @@ static yyconst flex_int16_t yy_nxt[1145] = 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 24, 24, 24, 46, 47, 59, 62, 59, 48, 65, 78, 79, 67, 69, 69, 69, 69, 69, 69, 69, - 81, 82, 66, 63, 68, 179, 180, 49, 50, 51, + 81, 82, 66, 63, 68, 180, 181, 49, 50, 51, 52, 51, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 53, 50, 54, 54, 54, 54, 54, 54, @@ -677,118 +680,119 @@ static yyconst flex_int16_t yy_nxt[1145] = 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 50, 71, 116, 72, 72, 72, 72, 72, 72, - 73, 85, 88, 126, 89, 213, 702, 117, 90, 74, - 75, 699, 214, 127, 76, 91, 86, 87, 120, 92, - 95, 74, 75, 99, 96, 100, 93, 118, 694, 94, - 97, 119, 121, 689, 101, 146, 98, 123, 688, 76, + 73, 85, 88, 126, 89, 214, 710, 117, 90, 74, + 75, 707, 215, 127, 76, 91, 86, 87, 120, 92, + 95, 74, 75, 99, 96, 100, 93, 118, 702, 94, + 97, 119, 121, 697, 101, 147, 98, 123, 696, 76, 71, 102, 77, 77, 77, 77, 77, 77, 77, 103, - 142, 108, 104, 124, 143, 105, 125, 74, 75, 109, - 111, 106, 707, 112, 144, 128, 687, 113, 114, 74, - 75, 110, 129, 130, 147, 115, 135, 131, 684, 136, - 139, 150, 151, 132, 133, 140, 134, 707, 137, 141, - 148, 156, 59, 156, 149, 138, 158, 158, 158, 158, - 158, 158, 158, 59, 189, 59, 160, 161, 163, 164, - 191, 264, 265, 240, 216, 190, 241, 208, 160, 161, - 163, 164, 152, 201, 192, 209, 202, 203, 217, 153, - 204, 235, 205, 154, 226, 150, 151, 683, 155, 71, - - 236, 73, 73, 73, 73, 73, 73, 73, 680, 148, - 227, 59, 679, 149, 165, 165, 74, 75, 166, 166, - 166, 166, 166, 166, 166, 150, 151, 523, 74, 75, - 156, 321, 156, 250, 251, 524, 152, 294, 295, 296, - 322, 556, 681, 153, 675, 250, 251, 154, 326, 327, - 328, 676, 155, 158, 158, 158, 158, 158, 158, 158, - 341, 342, 343, 352, 353, 354, 152, 360, 361, 362, - 364, 365, 366, 153, 374, 375, 376, 154, 678, 248, - 248, 589, 155, 249, 249, 249, 249, 249, 249, 249, - 252, 252, 590, 682, 253, 253, 253, 253, 253, 253, - - 253, 166, 166, 166, 166, 166, 166, 166, 166, 166, - 166, 166, 166, 166, 166, 249, 249, 249, 249, 249, - 249, 249, 602, 603, 254, 249, 249, 249, 249, 249, - 249, 249, 434, 435, 436, 677, 254, 674, 336, 336, - 673, 161, 337, 337, 337, 337, 337, 337, 337, 437, - 438, 439, 672, 161, 253, 253, 253, 253, 253, 253, - 253, 253, 253, 253, 253, 253, 253, 253, 337, 337, - 337, 337, 337, 337, 337, 551, 552, 164, 337, 337, - 337, 337, 337, 337, 337, 425, 426, 427, 675, 164, - 440, 441, 442, 671, 251, 676, 428, 429, 478, 479, - - 480, 500, 501, 502, 469, 670, 251, 525, 681, 481, - 482, 669, 503, 504, 668, 526, 551, 552, 510, 511, - 511, 511, 511, 511, 511, 537, 538, 539, 551, 552, - 612, 613, 612, 613, 612, 613, 540, 541, 551, 552, - 667, 685, 555, 555, 555, 555, 555, 555, 555, 686, - 554, 697, 586, 587, 587, 587, 587, 587, 587, 682, - 692, 666, 551, 552, 615, 690, 695, 693, 551, 552, - 697, 665, 664, 691, 696, 554, 553, 553, 553, 553, - 553, 553, 555, 555, 555, 555, 555, 555, 555, 615, - 612, 613, 690, 663, 692, 695, 662, 612, 613, 661, - - 691, 693, 698, 696, 616, 616, 616, 616, 616, 616, - 616, 614, 614, 614, 614, 614, 614, 612, 613, 700, - 703, 698, 705, 660, 659, 658, 657, 701, 704, 656, - 706, 616, 616, 616, 616, 616, 616, 616, 703, 705, - 655, 654, 653, 652, 651, 650, 704, 706, 57, 57, - 57, 57, 57, 57, 57, 57, 83, 83, 83, 83, - 83, 159, 159, 159, 159, 159, 69, 69, 162, 162, - 167, 167, 167, 247, 247, 649, 247, 247, 247, 247, - 247, 553, 553, 553, 648, 647, 646, 553, 588, 588, - 588, 614, 614, 614, 645, 644, 643, 614, 637, 637, - - 637, 642, 641, 640, 639, 638, 636, 635, 634, 633, - 632, 631, 630, 629, 628, 627, 626, 625, 624, 623, - 622, 621, 620, 619, 618, 617, 611, 610, 609, 608, - 607, 606, 605, 604, 601, 600, 599, 598, 597, 596, - 595, 594, 593, 592, 591, 585, 584, 583, 582, 581, - 580, 579, 578, 577, 576, 575, 574, 573, 572, 571, - 570, 569, 568, 567, 566, 565, 564, 563, 562, 561, - 560, 559, 558, 557, 556, 550, 549, 548, 547, 546, - 545, 544, 543, 542, 536, 535, 534, 533, 532, 531, - 530, 529, 528, 527, 522, 521, 520, 519, 518, 517, - - 516, 515, 514, 513, 512, 509, 508, 507, 506, 505, - 499, 498, 497, 496, 495, 494, 493, 492, 491, 490, - 489, 488, 487, 486, 485, 484, 483, 477, 476, 475, - 474, 473, 472, 471, 470, 469, 468, 467, 466, 465, - 464, 463, 462, 461, 460, 459, 458, 457, 456, 455, - 454, 453, 452, 451, 450, 449, 448, 447, 446, 445, - 444, 443, 433, 432, 431, 430, 424, 423, 422, 421, - 420, 419, 418, 417, 416, 415, 414, 413, 412, 411, - 410, 409, 408, 407, 406, 405, 404, 403, 402, 401, - 400, 399, 398, 397, 396, 395, 394, 393, 392, 391, - - 390, 389, 388, 387, 386, 385, 384, 383, 382, 381, - 380, 379, 378, 377, 373, 372, 371, 370, 369, 368, - 367, 363, 359, 358, 357, 356, 355, 351, 350, 349, - 348, 347, 346, 345, 344, 340, 339, 338, 335, 334, - 333, 332, 331, 330, 329, 325, 324, 323, 320, 319, - 318, 317, 316, 315, 314, 313, 312, 311, 310, 309, - 308, 307, 306, 305, 304, 303, 302, 301, 300, 299, - 298, 297, 293, 292, 291, 290, 289, 288, 287, 286, - 285, 284, 283, 282, 281, 280, 279, 278, 277, 276, - 275, 274, 273, 272, 271, 270, 269, 268, 267, 266, - - 263, 262, 261, 260, 259, 258, 257, 256, 255, 246, - 245, 244, 243, 242, 239, 238, 237, 234, 233, 232, - 231, 230, 229, 228, 225, 224, 223, 222, 221, 220, - 219, 218, 215, 212, 211, 210, 207, 206, 200, 199, - 198, 197, 196, 195, 194, 193, 188, 187, 186, 185, - 184, 183, 182, 181, 178, 177, 176, 175, 174, 173, - 172, 171, 170, 169, 168, 157, 80, 145, 122, 107, - 84, 80, 70, 64, 61, 60, 707, 58, 58, 7, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707 + 143, 108, 104, 124, 144, 105, 125, 74, 75, 109, + 111, 106, 715, 112, 145, 128, 695, 113, 114, 74, + 75, 110, 129, 130, 148, 115, 135, 131, 692, 136, + 139, 151, 152, 132, 133, 140, 134, 715, 137, 141, + 683, 157, 142, 157, 149, 138, 59, 684, 150, 159, + 159, 159, 159, 159, 159, 159, 59, 190, 59, 209, + 237, 161, 162, 164, 165, 691, 192, 210, 191, 238, + 217, 688, 153, 161, 162, 164, 165, 687, 202, 154, + 193, 203, 204, 155, 218, 205, 227, 206, 156, 71, + + 686, 73, 73, 73, 73, 73, 73, 73, 235, 236, + 243, 685, 228, 244, 166, 166, 74, 75, 167, 167, + 167, 167, 167, 167, 167, 151, 152, 682, 74, 75, + 149, 157, 59, 157, 150, 151, 152, 159, 159, 159, + 159, 159, 159, 159, 251, 251, 253, 254, 252, 252, + 252, 252, 252, 252, 252, 267, 268, 531, 253, 254, + 297, 298, 299, 325, 681, 532, 153, 331, 332, 333, + 610, 611, 326, 154, 559, 560, 153, 155, 346, 347, + 348, 683, 156, 154, 357, 358, 359, 155, 684, 255, + 255, 680, 156, 256, 256, 256, 256, 256, 256, 256, + + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 252, 252, 252, 252, 252, 252, + 252, 620, 621, 257, 252, 252, 252, 252, 252, 252, + 252, 365, 366, 367, 679, 257, 678, 341, 341, 677, + 162, 342, 342, 342, 342, 342, 342, 342, 369, 370, + 371, 676, 162, 256, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 256, 256, 256, 379, 380, 381, + 412, 413, 414, 433, 434, 435, 165, 342, 342, 342, + 342, 342, 342, 342, 436, 437, 559, 560, 165, 342, + 342, 342, 342, 342, 342, 342, 442, 443, 444, 445, + + 446, 447, 448, 449, 450, 254, 533, 486, 487, 488, + 508, 509, 510, 477, 534, 620, 621, 254, 489, 490, + 562, 511, 512, 545, 546, 547, 564, 518, 519, 519, + 519, 519, 519, 519, 548, 549, 559, 560, 620, 621, + 693, 675, 689, 559, 560, 562, 689, 674, 694, 623, + 563, 563, 563, 563, 563, 563, 563, 594, 595, 595, + 595, 595, 595, 595, 559, 560, 597, 698, 673, 700, + 559, 560, 705, 705, 623, 699, 701, 598, 561, 561, + 561, 561, 561, 561, 563, 563, 563, 563, 563, 563, + 563, 620, 621, 690, 703, 698, 703, 690, 620, 621, + + 672, 671, 704, 699, 704, 624, 624, 624, 624, 624, + 624, 624, 622, 622, 622, 622, 622, 622, 620, 621, + 700, 708, 711, 706, 706, 670, 669, 701, 668, 709, + 712, 713, 624, 624, 624, 624, 624, 624, 624, 714, + 711, 713, 667, 666, 665, 664, 663, 662, 712, 714, + 57, 57, 57, 57, 57, 57, 57, 57, 83, 83, + 83, 83, 83, 160, 160, 160, 160, 160, 69, 69, + 163, 163, 168, 168, 168, 250, 250, 661, 250, 250, + 250, 250, 250, 561, 561, 561, 660, 659, 658, 561, + 596, 596, 596, 622, 622, 622, 657, 656, 655, 622, + + 645, 645, 645, 654, 653, 652, 651, 650, 649, 648, + 647, 646, 644, 643, 642, 641, 640, 639, 638, 637, + 636, 635, 634, 633, 632, 631, 630, 629, 628, 627, + 626, 625, 619, 618, 617, 616, 615, 614, 613, 612, + 609, 608, 607, 606, 605, 604, 603, 602, 601, 600, + 599, 593, 592, 591, 590, 589, 588, 587, 586, 585, + 584, 583, 582, 581, 580, 579, 578, 577, 576, 575, + 574, 573, 572, 571, 570, 569, 568, 567, 566, 565, + 564, 558, 557, 556, 555, 554, 553, 552, 551, 550, + 544, 543, 542, 541, 540, 539, 538, 537, 536, 535, + + 530, 529, 528, 527, 526, 525, 524, 523, 522, 521, + 520, 517, 516, 515, 514, 513, 507, 506, 505, 504, + 503, 502, 501, 500, 499, 498, 497, 496, 495, 494, + 493, 492, 491, 485, 484, 483, 482, 481, 480, 479, + 478, 477, 476, 475, 474, 473, 472, 471, 470, 469, + 468, 467, 466, 465, 464, 463, 462, 461, 460, 459, + 458, 457, 456, 455, 454, 453, 452, 451, 441, 440, + 439, 438, 432, 431, 430, 429, 428, 427, 426, 425, + 424, 423, 422, 421, 420, 419, 418, 417, 416, 415, + 411, 410, 409, 408, 407, 406, 405, 404, 403, 402, + + 401, 400, 399, 398, 397, 396, 395, 394, 393, 392, + 391, 390, 389, 388, 387, 386, 385, 384, 383, 382, + 378, 377, 376, 375, 374, 373, 372, 368, 364, 363, + 362, 361, 360, 356, 355, 354, 353, 352, 351, 350, + 349, 345, 344, 343, 340, 339, 338, 337, 336, 335, + 334, 330, 329, 328, 327, 324, 323, 322, 321, 320, + 319, 318, 317, 316, 315, 314, 313, 312, 311, 310, + 309, 308, 307, 306, 305, 304, 303, 302, 301, 300, + 296, 295, 294, 293, 292, 291, 290, 289, 288, 287, + 286, 285, 284, 283, 282, 281, 280, 279, 278, 277, + + 276, 275, 274, 273, 272, 271, 270, 269, 266, 265, + 264, 263, 262, 261, 260, 259, 258, 249, 248, 247, + 246, 245, 242, 241, 240, 239, 234, 233, 232, 231, + 230, 229, 226, 225, 224, 223, 222, 221, 220, 219, + 216, 213, 212, 211, 208, 207, 201, 200, 199, 198, + 197, 196, 195, 194, 189, 188, 187, 186, 185, 184, + 183, 182, 179, 178, 177, 176, 175, 174, 173, 172, + 171, 170, 169, 158, 80, 146, 122, 107, 84, 80, + 70, 64, 61, 60, 715, 58, 58, 7, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + 715, 715 } ; -static yyconst flex_int16_t yy_chk[1145] = +static yyconst flex_int16_t yy_chk[1153] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -807,115 +811,116 @@ static yyconst flex_int16_t yy_chk[1145] = 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 19, 35, 19, 19, 19, 19, 19, 19, - 19, 26, 27, 40, 27, 121, 700, 35, 27, 19, - 19, 694, 121, 40, 19, 28, 26, 26, 37, 28, - 29, 19, 19, 30, 29, 30, 28, 36, 688, 28, - 29, 36, 37, 685, 30, 46, 29, 39, 684, 19, + 19, 26, 27, 40, 27, 121, 708, 35, 27, 19, + 19, 702, 121, 40, 19, 28, 26, 26, 37, 28, + 29, 19, 19, 30, 29, 30, 28, 36, 696, 28, + 29, 36, 37, 693, 30, 46, 29, 39, 692, 19, 20, 31, 20, 20, 20, 20, 20, 20, 20, 31, 44, 33, 31, 39, 44, 31, 39, 20, 20, 33, - 34, 31, 72, 34, 44, 41, 683, 34, 34, 20, - 20, 33, 41, 41, 46, 34, 42, 41, 679, 42, + 34, 31, 72, 34, 44, 41, 691, 34, 34, 20, + 20, 33, 41, 41, 46, 34, 42, 41, 687, 42, 43, 48, 48, 41, 41, 43, 41, 72, 42, 43, - 47, 51, 47, 51, 47, 42, 54, 54, 54, 54, - 54, 54, 54, 59, 103, 59, 69, 69, 71, 71, - 104, 180, 180, 144, 123, 103, 144, 117, 69, 69, - 71, 71, 48, 114, 104, 117, 114, 114, 123, 48, - 114, 140, 114, 48, 132, 149, 149, 677, 48, 73, - - 140, 73, 73, 73, 73, 73, 73, 73, 674, 148, - 132, 148, 673, 148, 74, 74, 73, 73, 74, 74, - 74, 74, 74, 74, 74, 150, 150, 483, 73, 73, - 156, 235, 156, 162, 162, 483, 149, 210, 210, 210, - 235, 556, 676, 149, 670, 162, 162, 149, 239, 239, - 239, 670, 149, 158, 158, 158, 158, 158, 158, 158, - 259, 259, 259, 269, 269, 269, 150, 278, 278, 278, - 282, 282, 282, 150, 290, 290, 290, 150, 672, 160, - 160, 556, 150, 160, 160, 160, 160, 160, 160, 160, - 163, 163, 556, 676, 163, 163, 163, 163, 163, 163, - - 163, 165, 165, 165, 165, 165, 165, 165, 166, 166, - 166, 166, 166, 166, 166, 248, 248, 248, 248, 248, - 248, 248, 577, 577, 166, 249, 249, 249, 249, 249, - 249, 249, 378, 378, 378, 671, 166, 665, 250, 250, - 664, 249, 250, 250, 250, 250, 250, 250, 250, 379, - 379, 379, 663, 249, 252, 252, 252, 252, 252, 252, - 252, 253, 253, 253, 253, 253, 253, 253, 336, 336, - 336, 336, 336, 336, 336, 588, 588, 253, 337, 337, - 337, 337, 337, 337, 337, 368, 368, 368, 675, 253, - 380, 380, 380, 657, 337, 675, 368, 368, 424, 424, - - 424, 463, 463, 463, 469, 656, 337, 484, 681, 424, - 424, 654, 463, 463, 653, 484, 510, 510, 469, 469, - 469, 469, 469, 469, 469, 497, 497, 497, 511, 511, - 586, 586, 612, 612, 637, 637, 497, 497, 551, 551, - 652, 682, 511, 511, 511, 511, 511, 511, 511, 682, - 510, 693, 551, 551, 551, 551, 551, 551, 551, 681, - 687, 651, 553, 553, 586, 686, 689, 687, 555, 555, - 697, 650, 649, 686, 689, 510, 553, 553, 553, 553, - 553, 553, 555, 555, 555, 555, 555, 555, 555, 586, - 587, 587, 690, 648, 692, 695, 647, 614, 614, 646, - - 690, 692, 693, 695, 587, 587, 587, 587, 587, 587, - 587, 614, 614, 614, 614, 614, 614, 616, 616, 698, - 701, 697, 702, 644, 641, 640, 639, 698, 701, 638, - 702, 616, 616, 616, 616, 616, 616, 616, 703, 705, - 636, 635, 634, 632, 631, 630, 703, 705, 708, 708, - 708, 708, 708, 708, 708, 708, 709, 709, 709, 709, - 709, 710, 710, 710, 710, 710, 711, 711, 712, 712, - 713, 713, 713, 714, 714, 629, 714, 714, 714, 714, - 714, 715, 715, 715, 628, 627, 625, 715, 716, 716, - 716, 717, 717, 717, 624, 623, 622, 717, 718, 718, - - 718, 621, 620, 619, 618, 617, 609, 608, 607, 606, - 605, 604, 603, 602, 601, 600, 599, 598, 597, 596, - 595, 593, 592, 591, 590, 589, 585, 584, 583, 582, - 581, 580, 579, 578, 576, 572, 567, 566, 565, 564, - 563, 562, 561, 560, 559, 550, 547, 546, 544, 543, - 541, 540, 539, 538, 537, 536, 535, 534, 533, 531, - 530, 529, 528, 527, 526, 525, 524, 523, 522, 521, - 519, 518, 514, 513, 512, 509, 508, 506, 504, 503, - 502, 501, 500, 498, 496, 495, 494, 493, 492, 491, - 489, 488, 487, 486, 482, 481, 480, 479, 478, 477, - - 474, 473, 472, 471, 470, 468, 467, 466, 465, 464, - 462, 461, 454, 453, 450, 449, 446, 445, 444, 443, - 432, 431, 429, 428, 427, 426, 425, 422, 420, 419, - 418, 416, 415, 413, 412, 411, 410, 408, 407, 405, - 403, 402, 401, 400, 399, 398, 397, 396, 395, 394, - 392, 391, 390, 389, 388, 387, 386, 385, 384, 383, - 382, 381, 377, 373, 372, 369, 367, 357, 355, 351, - 350, 349, 348, 346, 344, 339, 338, 335, 334, 333, - 332, 331, 330, 325, 324, 323, 322, 321, 320, 319, - 316, 315, 314, 313, 312, 311, 310, 309, 308, 307, - - 306, 305, 304, 303, 302, 301, 300, 299, 298, 297, - 296, 295, 294, 291, 289, 288, 287, 286, 285, 284, - 283, 281, 277, 275, 274, 273, 272, 268, 267, 266, - 265, 264, 263, 262, 261, 258, 256, 255, 246, 245, - 244, 243, 242, 241, 240, 238, 237, 236, 234, 233, - 232, 231, 230, 229, 228, 227, 226, 225, 224, 223, - 222, 221, 220, 219, 218, 217, 216, 215, 214, 213, - 212, 211, 209, 208, 207, 206, 205, 204, 203, 202, - 201, 200, 199, 198, 197, 196, 195, 194, 192, 191, - 190, 189, 188, 187, 186, 185, 184, 183, 182, 181, - - 179, 178, 177, 176, 175, 174, 173, 172, 170, 155, - 154, 153, 152, 145, 143, 142, 141, 139, 138, 137, - 136, 135, 134, 133, 131, 130, 129, 128, 127, 126, - 125, 124, 122, 120, 119, 118, 116, 115, 113, 112, - 110, 109, 108, 107, 106, 105, 102, 101, 100, 99, - 98, 97, 96, 95, 93, 92, 91, 90, 89, 88, - 87, 86, 85, 82, 78, 53, 49, 45, 38, 32, - 25, 22, 18, 14, 12, 11, 7, 6, 5, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707 + 678, 51, 43, 51, 47, 42, 47, 678, 47, 54, + 54, 54, 54, 54, 54, 54, 59, 103, 59, 117, + 140, 69, 69, 71, 71, 685, 104, 117, 103, 140, + 123, 682, 48, 69, 69, 71, 71, 681, 114, 48, + 104, 114, 114, 48, 123, 114, 132, 114, 48, 73, + + 680, 73, 73, 73, 73, 73, 73, 73, 139, 139, + 145, 679, 132, 145, 74, 74, 73, 73, 74, 74, + 74, 74, 74, 74, 74, 150, 150, 673, 73, 73, + 149, 157, 149, 157, 149, 151, 151, 159, 159, 159, + 159, 159, 159, 159, 161, 161, 163, 163, 161, 161, + 161, 161, 161, 161, 161, 181, 181, 491, 163, 163, + 211, 211, 211, 237, 672, 491, 150, 242, 242, 242, + 585, 585, 237, 150, 596, 596, 151, 150, 262, 262, + 262, 683, 150, 151, 272, 272, 272, 151, 683, 164, + 164, 671, 151, 164, 164, 164, 164, 164, 164, 164, + + 166, 166, 166, 166, 166, 166, 166, 167, 167, 167, + 167, 167, 167, 167, 251, 251, 251, 251, 251, 251, + 251, 620, 620, 167, 252, 252, 252, 252, 252, 252, + 252, 281, 281, 281, 665, 167, 664, 253, 253, 662, + 252, 253, 253, 253, 253, 253, 253, 253, 285, 285, + 285, 661, 252, 255, 255, 255, 255, 255, 255, 255, + 256, 256, 256, 256, 256, 256, 256, 293, 293, 293, + 329, 329, 329, 373, 373, 373, 256, 341, 341, 341, + 341, 341, 341, 341, 373, 373, 518, 518, 256, 342, + 342, 342, 342, 342, 342, 342, 383, 383, 383, 384, + + 384, 384, 385, 385, 385, 342, 492, 432, 432, 432, + 471, 471, 471, 477, 492, 594, 594, 342, 432, 432, + 518, 471, 471, 505, 505, 505, 564, 477, 477, 477, + 477, 477, 477, 477, 505, 505, 519, 519, 645, 645, + 690, 660, 684, 559, 559, 518, 689, 659, 690, 594, + 519, 519, 519, 519, 519, 519, 519, 559, 559, 559, + 559, 559, 559, 559, 561, 561, 564, 694, 658, 695, + 563, 563, 701, 705, 594, 694, 695, 564, 561, 561, + 561, 561, 561, 561, 563, 563, 563, 563, 563, 563, + 563, 595, 595, 684, 697, 698, 703, 689, 622, 622, + + 657, 656, 697, 698, 703, 595, 595, 595, 595, 595, + 595, 595, 622, 622, 622, 622, 622, 622, 624, 624, + 700, 706, 709, 701, 705, 655, 654, 700, 652, 706, + 709, 710, 624, 624, 624, 624, 624, 624, 624, 710, + 711, 713, 649, 648, 647, 646, 644, 643, 711, 713, + 716, 716, 716, 716, 716, 716, 716, 716, 717, 717, + 717, 717, 717, 718, 718, 718, 718, 718, 719, 719, + 720, 720, 721, 721, 721, 722, 722, 642, 722, 722, + 722, 722, 722, 723, 723, 723, 640, 639, 638, 723, + 724, 724, 724, 725, 725, 725, 637, 636, 635, 725, + + 726, 726, 726, 633, 632, 631, 630, 629, 628, 627, + 626, 625, 617, 616, 615, 614, 613, 612, 611, 610, + 609, 608, 607, 606, 605, 604, 603, 601, 600, 599, + 598, 597, 593, 592, 591, 590, 589, 588, 587, 586, + 584, 580, 575, 574, 573, 572, 571, 570, 569, 568, + 567, 558, 555, 554, 552, 551, 549, 548, 547, 546, + 545, 544, 543, 542, 541, 539, 538, 537, 536, 535, + 534, 533, 532, 531, 530, 529, 527, 526, 522, 521, + 520, 517, 516, 514, 512, 511, 510, 509, 508, 506, + 504, 503, 502, 501, 500, 499, 497, 496, 495, 494, + + 490, 489, 488, 487, 486, 485, 482, 481, 480, 479, + 478, 476, 475, 474, 473, 472, 470, 469, 462, 461, + 458, 457, 454, 453, 452, 451, 440, 439, 437, 436, + 435, 434, 433, 430, 428, 427, 426, 424, 423, 421, + 420, 419, 418, 416, 415, 410, 408, 407, 406, 405, + 404, 403, 402, 401, 400, 399, 397, 396, 395, 394, + 393, 392, 391, 390, 389, 388, 387, 386, 382, 378, + 377, 374, 372, 362, 360, 356, 355, 354, 353, 351, + 349, 344, 343, 340, 339, 338, 337, 336, 335, 330, + 328, 327, 326, 325, 323, 322, 319, 318, 317, 316, + + 315, 314, 313, 312, 311, 310, 309, 308, 307, 306, + 305, 304, 303, 302, 301, 300, 299, 298, 297, 294, + 292, 291, 290, 289, 288, 287, 286, 284, 280, 278, + 277, 276, 275, 271, 270, 269, 268, 267, 266, 265, + 264, 261, 259, 258, 249, 248, 247, 246, 245, 244, + 243, 241, 240, 239, 238, 236, 235, 234, 233, 232, + 231, 230, 229, 228, 227, 226, 225, 224, 223, 222, + 221, 220, 219, 218, 217, 216, 215, 214, 213, 212, + 210, 209, 208, 207, 206, 205, 204, 203, 202, 201, + 200, 199, 198, 197, 196, 195, 193, 192, 191, 190, + + 189, 188, 187, 186, 185, 184, 183, 182, 180, 179, + 178, 177, 176, 175, 174, 173, 171, 156, 155, 154, + 153, 146, 144, 143, 142, 141, 138, 137, 136, 135, + 134, 133, 131, 130, 129, 128, 127, 126, 125, 124, + 122, 120, 119, 118, 116, 115, 113, 112, 110, 109, + 108, 107, 106, 105, 102, 101, 100, 99, 98, 97, + 96, 95, 93, 92, 91, 90, 89, 88, 87, 86, + 85, 82, 78, 53, 49, 45, 38, 32, 25, 22, + 18, 14, 12, 11, 7, 6, 5, 715, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + 715, 715, 715, 715, 715, 715, 715, 715, 715, 715, + 715, 715 } ; /* The intent behind this definition is that it'll catch @@ -995,7 +1000,7 @@ static yyconst flex_int16_t yy_chk[1145] = } \ } while (0) -#line 999 "glsl_lexer.cpp" +#line 1004 "glsl_lexer.cpp" #define INITIAL 0 #define PP 1 @@ -1237,7 +1242,7 @@ YY_DECL #line 86 "glsl_lexer.lpp" -#line 1241 "glsl_lexer.cpp" +#line 1246 "glsl_lexer.cpp" yylval = yylval_param; @@ -1295,13 +1300,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 708 ) + if ( yy_current_state >= 716 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 707 ); + while ( yy_current_state != 715 ); yy_cp = yyg->yy_last_accepting_cpos; yy_current_state = yyg->yy_last_accepting_state; @@ -1506,824 +1511,844 @@ return INT_TOK; YY_BREAK case 26: YY_RULE_SETUP -#line 165 "glsl_lexer.lpp" -return BREAK; +#line 164 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER(130, UINT_TOK); YY_BREAK case 27: YY_RULE_SETUP #line 166 "glsl_lexer.lpp" -return CONTINUE; +return BREAK; YY_BREAK case 28: YY_RULE_SETUP #line 167 "glsl_lexer.lpp" -return DO; +return CONTINUE; YY_BREAK case 29: YY_RULE_SETUP #line 168 "glsl_lexer.lpp" -return WHILE; +return DO; YY_BREAK case 30: YY_RULE_SETUP #line 169 "glsl_lexer.lpp" -return ELSE; +return WHILE; YY_BREAK case 31: YY_RULE_SETUP #line 170 "glsl_lexer.lpp" -return FOR; +return ELSE; YY_BREAK case 32: YY_RULE_SETUP #line 171 "glsl_lexer.lpp" -return IF; +return FOR; YY_BREAK case 33: YY_RULE_SETUP #line 172 "glsl_lexer.lpp" -return DISCARD; +return IF; YY_BREAK case 34: YY_RULE_SETUP #line 173 "glsl_lexer.lpp" -return RETURN; +return DISCARD; YY_BREAK case 35: YY_RULE_SETUP -#line 175 "glsl_lexer.lpp" -return BVEC2; +#line 174 "glsl_lexer.lpp" +return RETURN; YY_BREAK case 36: YY_RULE_SETUP #line 176 "glsl_lexer.lpp" -return BVEC3; +return BVEC2; YY_BREAK case 37: YY_RULE_SETUP #line 177 "glsl_lexer.lpp" -return BVEC4; +return BVEC3; YY_BREAK case 38: YY_RULE_SETUP #line 178 "glsl_lexer.lpp" -return IVEC2; +return BVEC4; YY_BREAK case 39: YY_RULE_SETUP #line 179 "glsl_lexer.lpp" -return IVEC3; +return IVEC2; YY_BREAK case 40: YY_RULE_SETUP #line 180 "glsl_lexer.lpp" -return IVEC4; +return IVEC3; YY_BREAK case 41: YY_RULE_SETUP #line 181 "glsl_lexer.lpp" -return VEC2; +return IVEC4; YY_BREAK case 42: YY_RULE_SETUP #line 182 "glsl_lexer.lpp" -return VEC3; +TOKEN_OR_IDENTIFIER(130, UVEC2); YY_BREAK case 43: YY_RULE_SETUP #line 183 "glsl_lexer.lpp" -return VEC4; +TOKEN_OR_IDENTIFIER(130, UVEC3); YY_BREAK case 44: YY_RULE_SETUP #line 184 "glsl_lexer.lpp" -return MAT2X2; +TOKEN_OR_IDENTIFIER(130, UVEC4); YY_BREAK case 45: YY_RULE_SETUP #line 185 "glsl_lexer.lpp" -return MAT3X3; +return VEC2; YY_BREAK case 46: YY_RULE_SETUP #line 186 "glsl_lexer.lpp" -return MAT4X4; +return VEC3; YY_BREAK case 47: YY_RULE_SETUP #line 187 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(120, MAT2X2); +return VEC4; YY_BREAK case 48: YY_RULE_SETUP #line 188 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(120, MAT2X3); +return MAT2X2; YY_BREAK case 49: YY_RULE_SETUP #line 189 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(120, MAT2X4); +return MAT3X3; YY_BREAK case 50: YY_RULE_SETUP #line 190 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(120, MAT3X2); +return MAT4X4; YY_BREAK case 51: YY_RULE_SETUP #line 191 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(120, MAT3X3); +TOKEN_OR_IDENTIFIER(120, MAT2X2); YY_BREAK case 52: YY_RULE_SETUP #line 192 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(120, MAT3X4); +TOKEN_OR_IDENTIFIER(120, MAT2X3); YY_BREAK case 53: YY_RULE_SETUP #line 193 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(120, MAT4X2); +TOKEN_OR_IDENTIFIER(120, MAT2X4); YY_BREAK case 54: YY_RULE_SETUP #line 194 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(120, MAT4X3); +TOKEN_OR_IDENTIFIER(120, MAT3X2); YY_BREAK case 55: YY_RULE_SETUP #line 195 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(120, MAT4X4); +TOKEN_OR_IDENTIFIER(120, MAT3X3); YY_BREAK case 56: YY_RULE_SETUP -#line 197 "glsl_lexer.lpp" -return IN_TOK; +#line 196 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER(120, MAT3X4); YY_BREAK case 57: YY_RULE_SETUP -#line 198 "glsl_lexer.lpp" -return OUT_TOK; +#line 197 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER(120, MAT4X2); YY_BREAK case 58: YY_RULE_SETUP -#line 199 "glsl_lexer.lpp" -return INOUT_TOK; +#line 198 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER(120, MAT4X3); YY_BREAK case 59: YY_RULE_SETUP -#line 200 "glsl_lexer.lpp" -return UNIFORM; +#line 199 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER(120, MAT4X4); YY_BREAK case 60: YY_RULE_SETUP #line 201 "glsl_lexer.lpp" -return VARYING; +return IN_TOK; YY_BREAK case 61: YY_RULE_SETUP #line 202 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(120, CENTROID); +return OUT_TOK; YY_BREAK case 62: YY_RULE_SETUP #line 203 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER_ES(120, INVARIANT); +return INOUT_TOK; YY_BREAK case 63: YY_RULE_SETUP -#line 205 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER_ES(130, FLAT); +#line 204 "glsl_lexer.lpp" +return UNIFORM; YY_BREAK case 64: YY_RULE_SETUP -#line 206 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, SMOOTH); +#line 205 "glsl_lexer.lpp" +return VARYING; YY_BREAK case 65: YY_RULE_SETUP -#line 207 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, NOPERSPECTIVE); +#line 206 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER(120, CENTROID); YY_BREAK case 66: YY_RULE_SETUP -#line 209 "glsl_lexer.lpp" -return SAMPLER1D; +#line 207 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER_ES(120, INVARIANT); YY_BREAK case 67: YY_RULE_SETUP -#line 210 "glsl_lexer.lpp" -return SAMPLER2D; +#line 209 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER_ES(130, FLAT); YY_BREAK case 68: YY_RULE_SETUP -#line 211 "glsl_lexer.lpp" -return SAMPLER3D; +#line 210 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER(130, SMOOTH); YY_BREAK case 69: YY_RULE_SETUP -#line 212 "glsl_lexer.lpp" -return SAMPLERCUBE; +#line 211 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER(130, NOPERSPECTIVE); YY_BREAK case 70: YY_RULE_SETUP #line 213 "glsl_lexer.lpp" -return SAMPLER1DSHADOW; +return SAMPLER1D; YY_BREAK case 71: YY_RULE_SETUP #line 214 "glsl_lexer.lpp" -return SAMPLER2DSHADOW; +return SAMPLER2D; YY_BREAK case 72: YY_RULE_SETUP -#line 216 "glsl_lexer.lpp" -return STRUCT; +#line 215 "glsl_lexer.lpp" +return SAMPLER3D; YY_BREAK case 73: YY_RULE_SETUP -#line 217 "glsl_lexer.lpp" -return VOID_TOK; +#line 216 "glsl_lexer.lpp" +return SAMPLERCUBE; YY_BREAK case 74: YY_RULE_SETUP -#line 219 "glsl_lexer.lpp" -{ - if ((yyextra->language_version >= 140) - || yyextra->ARB_explicit_attrib_location_enable - || (yyextra->ARB_fragment_coord_conventions_enable)){ - return LAYOUT_TOK; - } else { - yylval->identifier = strdup(yytext); - return IDENTIFIER; - } - } +#line 217 "glsl_lexer.lpp" +return SAMPLER1DSHADOW; YY_BREAK case 75: YY_RULE_SETUP -#line 230 "glsl_lexer.lpp" -return INC_OP; +#line 218 "glsl_lexer.lpp" +return SAMPLER2DSHADOW; YY_BREAK case 76: YY_RULE_SETUP -#line 231 "glsl_lexer.lpp" -return DEC_OP; +#line 220 "glsl_lexer.lpp" +return STRUCT; YY_BREAK case 77: YY_RULE_SETUP -#line 232 "glsl_lexer.lpp" -return LE_OP; +#line 221 "glsl_lexer.lpp" +return VOID_TOK; YY_BREAK case 78: YY_RULE_SETUP -#line 233 "glsl_lexer.lpp" -return GE_OP; +#line 223 "glsl_lexer.lpp" +{ + if ((yyextra->language_version >= 140) + || yyextra->ARB_explicit_attrib_location_enable + || (yyextra->ARB_fragment_coord_conventions_enable)){ + return LAYOUT_TOK; + } else { + yylval->identifier = strdup(yytext); + return IDENTIFIER; + } + } YY_BREAK case 79: YY_RULE_SETUP #line 234 "glsl_lexer.lpp" -return EQ_OP; +return INC_OP; YY_BREAK case 80: YY_RULE_SETUP #line 235 "glsl_lexer.lpp" -return NE_OP; +return DEC_OP; YY_BREAK case 81: YY_RULE_SETUP #line 236 "glsl_lexer.lpp" -return AND_OP; +return LE_OP; YY_BREAK case 82: YY_RULE_SETUP #line 237 "glsl_lexer.lpp" -return OR_OP; +return GE_OP; YY_BREAK case 83: YY_RULE_SETUP #line 238 "glsl_lexer.lpp" -return XOR_OP; +return EQ_OP; YY_BREAK case 84: YY_RULE_SETUP -#line 240 "glsl_lexer.lpp" -return MUL_ASSIGN; +#line 239 "glsl_lexer.lpp" +return NE_OP; YY_BREAK case 85: YY_RULE_SETUP -#line 241 "glsl_lexer.lpp" -return DIV_ASSIGN; +#line 240 "glsl_lexer.lpp" +return AND_OP; YY_BREAK case 86: YY_RULE_SETUP -#line 242 "glsl_lexer.lpp" -return ADD_ASSIGN; +#line 241 "glsl_lexer.lpp" +return OR_OP; YY_BREAK case 87: YY_RULE_SETUP -#line 243 "glsl_lexer.lpp" -return MOD_ASSIGN; +#line 242 "glsl_lexer.lpp" +return XOR_OP; YY_BREAK case 88: YY_RULE_SETUP #line 244 "glsl_lexer.lpp" -return LEFT_ASSIGN; +return MUL_ASSIGN; YY_BREAK case 89: YY_RULE_SETUP #line 245 "glsl_lexer.lpp" -return RIGHT_ASSIGN; +return DIV_ASSIGN; YY_BREAK case 90: YY_RULE_SETUP #line 246 "glsl_lexer.lpp" -return AND_ASSIGN; +return ADD_ASSIGN; YY_BREAK case 91: YY_RULE_SETUP #line 247 "glsl_lexer.lpp" -return XOR_ASSIGN; +return MOD_ASSIGN; YY_BREAK case 92: YY_RULE_SETUP #line 248 "glsl_lexer.lpp" -return OR_ASSIGN; +return LEFT_ASSIGN; YY_BREAK case 93: YY_RULE_SETUP #line 249 "glsl_lexer.lpp" -return SUB_ASSIGN; +return RIGHT_ASSIGN; YY_BREAK case 94: YY_RULE_SETUP +#line 250 "glsl_lexer.lpp" +return AND_ASSIGN; + YY_BREAK +case 95: +YY_RULE_SETUP #line 251 "glsl_lexer.lpp" +return XOR_ASSIGN; + YY_BREAK +case 96: +YY_RULE_SETUP +#line 252 "glsl_lexer.lpp" +return OR_ASSIGN; + YY_BREAK +case 97: +YY_RULE_SETUP +#line 253 "glsl_lexer.lpp" +return SUB_ASSIGN; + YY_BREAK +case 98: +YY_RULE_SETUP +#line 255 "glsl_lexer.lpp" { yylval->n = strtol(yytext, NULL, 10); return INTCONSTANT; } YY_BREAK -case 95: +case 99: YY_RULE_SETUP -#line 255 "glsl_lexer.lpp" +#line 259 "glsl_lexer.lpp" { yylval->n = strtol(yytext + 2, NULL, 16); return INTCONSTANT; } YY_BREAK -case 96: +case 100: YY_RULE_SETUP -#line 259 "glsl_lexer.lpp" +#line 263 "glsl_lexer.lpp" { yylval->n = strtol(yytext, NULL, 8); return INTCONSTANT; } YY_BREAK -case 97: +case 101: YY_RULE_SETUP -#line 264 "glsl_lexer.lpp" +#line 268 "glsl_lexer.lpp" { yylval->real = strtod(yytext, NULL); return FLOATCONSTANT; } YY_BREAK -case 98: +case 102: YY_RULE_SETUP -#line 268 "glsl_lexer.lpp" +#line 272 "glsl_lexer.lpp" { yylval->real = strtod(yytext, NULL); return FLOATCONSTANT; } YY_BREAK -case 99: +case 103: YY_RULE_SETUP -#line 272 "glsl_lexer.lpp" +#line 276 "glsl_lexer.lpp" { yylval->real = strtod(yytext, NULL); return FLOATCONSTANT; } YY_BREAK -case 100: +case 104: YY_RULE_SETUP -#line 276 "glsl_lexer.lpp" +#line 280 "glsl_lexer.lpp" { yylval->real = strtod(yytext, NULL); return FLOATCONSTANT; } YY_BREAK -case 101: +case 105: YY_RULE_SETUP -#line 280 "glsl_lexer.lpp" +#line 284 "glsl_lexer.lpp" { yylval->real = strtod(yytext, NULL); return FLOATCONSTANT; } YY_BREAK -case 102: +case 106: YY_RULE_SETUP -#line 285 "glsl_lexer.lpp" +#line 289 "glsl_lexer.lpp" { yylval->n = 1; return BOOLCONSTANT; } YY_BREAK -case 103: +case 107: YY_RULE_SETUP -#line 289 "glsl_lexer.lpp" +#line 293 "glsl_lexer.lpp" { yylval->n = 0; return BOOLCONSTANT; } YY_BREAK /* Reserved words in GLSL 1.10. */ -case 104: -YY_RULE_SETUP -#line 296 "glsl_lexer.lpp" -RESERVED_WORD(999, ASM); - YY_BREAK -case 105: -YY_RULE_SETUP -#line 297 "glsl_lexer.lpp" -RESERVED_WORD(999, CLASS); - YY_BREAK -case 106: -YY_RULE_SETUP -#line 298 "glsl_lexer.lpp" -RESERVED_WORD(999, UNION); - YY_BREAK -case 107: -YY_RULE_SETUP -#line 299 "glsl_lexer.lpp" -RESERVED_WORD(999, ENUM); - YY_BREAK case 108: YY_RULE_SETUP #line 300 "glsl_lexer.lpp" -RESERVED_WORD(999, TYPEDEF); +RESERVED_WORD(999, ASM); YY_BREAK case 109: YY_RULE_SETUP #line 301 "glsl_lexer.lpp" -RESERVED_WORD(999, TEMPLATE); +RESERVED_WORD(999, CLASS); YY_BREAK case 110: YY_RULE_SETUP #line 302 "glsl_lexer.lpp" -RESERVED_WORD(999, THIS); +RESERVED_WORD(999, UNION); YY_BREAK case 111: YY_RULE_SETUP #line 303 "glsl_lexer.lpp" -RESERVED_WORD(999, PACKED_TOK); +RESERVED_WORD(999, ENUM); YY_BREAK case 112: YY_RULE_SETUP #line 304 "glsl_lexer.lpp" -RESERVED_WORD(999, GOTO); +RESERVED_WORD(999, TYPEDEF); YY_BREAK case 113: YY_RULE_SETUP #line 305 "glsl_lexer.lpp" -RESERVED_WORD(130, SWITCH); +RESERVED_WORD(999, TEMPLATE); YY_BREAK case 114: YY_RULE_SETUP #line 306 "glsl_lexer.lpp" -RESERVED_WORD(130, DEFAULT); +RESERVED_WORD(999, THIS); YY_BREAK case 115: YY_RULE_SETUP #line 307 "glsl_lexer.lpp" -RESERVED_WORD(999, INLINE_TOK); +RESERVED_WORD(999, PACKED_TOK); YY_BREAK case 116: YY_RULE_SETUP #line 308 "glsl_lexer.lpp" -RESERVED_WORD(999, NOINLINE); +RESERVED_WORD(999, GOTO); YY_BREAK case 117: YY_RULE_SETUP #line 309 "glsl_lexer.lpp" -RESERVED_WORD(999, VOLATILE); +RESERVED_WORD(130, SWITCH); YY_BREAK case 118: YY_RULE_SETUP #line 310 "glsl_lexer.lpp" -RESERVED_WORD(999, PUBLIC_TOK); +RESERVED_WORD(130, DEFAULT); YY_BREAK case 119: YY_RULE_SETUP #line 311 "glsl_lexer.lpp" -RESERVED_WORD(999, STATIC); +RESERVED_WORD(999, INLINE_TOK); YY_BREAK case 120: YY_RULE_SETUP #line 312 "glsl_lexer.lpp" -RESERVED_WORD(999, EXTERN); +RESERVED_WORD(999, NOINLINE); YY_BREAK case 121: YY_RULE_SETUP #line 313 "glsl_lexer.lpp" -RESERVED_WORD(999, EXTERNAL); +RESERVED_WORD(999, VOLATILE); YY_BREAK case 122: YY_RULE_SETUP #line 314 "glsl_lexer.lpp" -RESERVED_WORD(999, INTERFACE); +RESERVED_WORD(999, PUBLIC_TOK); YY_BREAK case 123: YY_RULE_SETUP #line 315 "glsl_lexer.lpp" -RESERVED_WORD(999, LONG_TOK); +RESERVED_WORD(999, STATIC); YY_BREAK case 124: YY_RULE_SETUP #line 316 "glsl_lexer.lpp" -RESERVED_WORD(999, SHORT_TOK); +RESERVED_WORD(999, EXTERN); YY_BREAK case 125: YY_RULE_SETUP #line 317 "glsl_lexer.lpp" -RESERVED_WORD(999, DOUBLE_TOK); +RESERVED_WORD(999, EXTERNAL); YY_BREAK case 126: YY_RULE_SETUP #line 318 "glsl_lexer.lpp" -RESERVED_WORD(999, HALF); +RESERVED_WORD(999, INTERFACE); YY_BREAK case 127: YY_RULE_SETUP #line 319 "glsl_lexer.lpp" -RESERVED_WORD(999, FIXED_TOK); +RESERVED_WORD(999, LONG_TOK); YY_BREAK case 128: YY_RULE_SETUP #line 320 "glsl_lexer.lpp" -RESERVED_WORD(999, UNSIGNED); +RESERVED_WORD(999, SHORT_TOK); YY_BREAK case 129: YY_RULE_SETUP #line 321 "glsl_lexer.lpp" -RESERVED_WORD(999, INPUT_TOK); +RESERVED_WORD(999, DOUBLE_TOK); YY_BREAK case 130: YY_RULE_SETUP #line 322 "glsl_lexer.lpp" -RESERVED_WORD(999, OUTPUT); +RESERVED_WORD(999, HALF); YY_BREAK case 131: YY_RULE_SETUP #line 323 "glsl_lexer.lpp" -RESERVED_WORD(999, HVEC2); +RESERVED_WORD(999, FIXED_TOK); YY_BREAK case 132: YY_RULE_SETUP #line 324 "glsl_lexer.lpp" -RESERVED_WORD(999, HVEC3); +RESERVED_WORD(999, UNSIGNED); YY_BREAK case 133: YY_RULE_SETUP #line 325 "glsl_lexer.lpp" -RESERVED_WORD(999, HVEC4); +RESERVED_WORD(999, INPUT_TOK); YY_BREAK case 134: YY_RULE_SETUP #line 326 "glsl_lexer.lpp" -RESERVED_WORD(999, DVEC2); +RESERVED_WORD(999, OUTPUT); YY_BREAK case 135: YY_RULE_SETUP #line 327 "glsl_lexer.lpp" -RESERVED_WORD(999, DVEC3); +RESERVED_WORD(999, HVEC2); YY_BREAK case 136: YY_RULE_SETUP #line 328 "glsl_lexer.lpp" -RESERVED_WORD(999, DVEC4); +RESERVED_WORD(999, HVEC3); YY_BREAK case 137: YY_RULE_SETUP #line 329 "glsl_lexer.lpp" -RESERVED_WORD(999, FVEC2); +RESERVED_WORD(999, HVEC4); YY_BREAK case 138: YY_RULE_SETUP #line 330 "glsl_lexer.lpp" -RESERVED_WORD(999, FVEC3); +RESERVED_WORD(999, DVEC2); YY_BREAK case 139: YY_RULE_SETUP #line 331 "glsl_lexer.lpp" -RESERVED_WORD(999, FVEC4); +RESERVED_WORD(999, DVEC3); YY_BREAK case 140: YY_RULE_SETUP #line 332 "glsl_lexer.lpp" -return SAMPLER2DRECT; +RESERVED_WORD(999, DVEC4); YY_BREAK case 141: YY_RULE_SETUP #line 333 "glsl_lexer.lpp" -RESERVED_WORD(999, SAMPLER3DRECT); +RESERVED_WORD(999, FVEC2); YY_BREAK case 142: YY_RULE_SETUP #line 334 "glsl_lexer.lpp" -return SAMPLER2DRECTSHADOW; +RESERVED_WORD(999, FVEC3); YY_BREAK case 143: YY_RULE_SETUP #line 335 "glsl_lexer.lpp" -RESERVED_WORD(999, SIZEOF); +RESERVED_WORD(999, FVEC4); YY_BREAK case 144: YY_RULE_SETUP #line 336 "glsl_lexer.lpp" -RESERVED_WORD(999, CAST); +return SAMPLER2DRECT; YY_BREAK case 145: YY_RULE_SETUP #line 337 "glsl_lexer.lpp" -RESERVED_WORD(999, NAMESPACE); +RESERVED_WORD(999, SAMPLER3DRECT); YY_BREAK case 146: YY_RULE_SETUP #line 338 "glsl_lexer.lpp" -RESERVED_WORD(999, USING); +return SAMPLER2DRECTSHADOW; YY_BREAK -/* Additional reserved words in GLSL 1.20. */ case 147: YY_RULE_SETUP -#line 341 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER_ES(120, LOWP); +#line 339 "glsl_lexer.lpp" +RESERVED_WORD(999, SIZEOF); YY_BREAK case 148: YY_RULE_SETUP -#line 342 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER_ES(120, MEDIUMP); +#line 340 "glsl_lexer.lpp" +RESERVED_WORD(999, CAST); YY_BREAK case 149: YY_RULE_SETUP -#line 343 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER_ES(120, HIGHP); +#line 341 "glsl_lexer.lpp" +RESERVED_WORD(999, NAMESPACE); YY_BREAK case 150: YY_RULE_SETUP -#line 344 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER_ES(120, PRECISION); +#line 342 "glsl_lexer.lpp" +RESERVED_WORD(999, USING); YY_BREAK -/* Additional reserved words in GLSL 1.30. */ +/* Additional reserved words in GLSL 1.20. */ case 151: YY_RULE_SETUP -#line 347 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, COMMON); +#line 345 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER_ES(120, LOWP); YY_BREAK case 152: YY_RULE_SETUP -#line 348 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, PARTITION); +#line 346 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER_ES(120, MEDIUMP); YY_BREAK case 153: YY_RULE_SETUP -#line 349 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, ACTIVE); +#line 347 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER_ES(120, HIGHP); YY_BREAK case 154: YY_RULE_SETUP -#line 350 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER_ES(130, SUPERP); +#line 348 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER_ES(120, PRECISION); YY_BREAK +/* Additional reserved words in GLSL 1.30. */ case 155: YY_RULE_SETUP #line 351 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, SAMPLERBUFFER); +TOKEN_OR_IDENTIFIER(130, COMMON); YY_BREAK case 156: YY_RULE_SETUP #line 352 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, FILTER); +TOKEN_OR_IDENTIFIER(130, PARTITION); YY_BREAK case 157: YY_RULE_SETUP #line 353 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IMAGE1D); +TOKEN_OR_IDENTIFIER(130, ACTIVE); YY_BREAK case 158: YY_RULE_SETUP #line 354 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IMAGE2D); +TOKEN_OR_IDENTIFIER_ES(130, SUPERP); YY_BREAK case 159: YY_RULE_SETUP #line 355 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IMAGE3D); +TOKEN_OR_IDENTIFIER(130, SAMPLERBUFFER); YY_BREAK case 160: YY_RULE_SETUP #line 356 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IMAGECUBE); +TOKEN_OR_IDENTIFIER(130, FILTER); YY_BREAK case 161: YY_RULE_SETUP #line 357 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IIMAGE1D); +TOKEN_OR_IDENTIFIER(130, IMAGE1D); YY_BREAK case 162: YY_RULE_SETUP #line 358 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IIMAGE2D); +TOKEN_OR_IDENTIFIER(130, IMAGE2D); YY_BREAK case 163: YY_RULE_SETUP #line 359 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IIMAGE3D); +TOKEN_OR_IDENTIFIER(130, IMAGE3D); YY_BREAK case 164: YY_RULE_SETUP #line 360 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IIMAGECUBE); +TOKEN_OR_IDENTIFIER(130, IMAGECUBE); YY_BREAK case 165: YY_RULE_SETUP #line 361 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, UIMAGE1D); +TOKEN_OR_IDENTIFIER(130, IIMAGE1D); YY_BREAK case 166: YY_RULE_SETUP #line 362 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, UIMAGE2D); +TOKEN_OR_IDENTIFIER(130, IIMAGE2D); YY_BREAK case 167: YY_RULE_SETUP #line 363 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, UIMAGE3D); +TOKEN_OR_IDENTIFIER(130, IIMAGE3D); YY_BREAK case 168: YY_RULE_SETUP #line 364 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, UIMAGECUBE); +TOKEN_OR_IDENTIFIER(130, IIMAGECUBE); YY_BREAK case 169: YY_RULE_SETUP #line 365 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IMAGE1DARRAY); +TOKEN_OR_IDENTIFIER(130, UIMAGE1D); YY_BREAK case 170: YY_RULE_SETUP #line 366 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IMAGE2DARRAY); +TOKEN_OR_IDENTIFIER(130, UIMAGE2D); YY_BREAK case 171: YY_RULE_SETUP #line 367 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IIMAGE1DARRAY); +TOKEN_OR_IDENTIFIER(130, UIMAGE3D); YY_BREAK case 172: YY_RULE_SETUP #line 368 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IIMAGE2DARRAY); +TOKEN_OR_IDENTIFIER(130, UIMAGECUBE); YY_BREAK case 173: YY_RULE_SETUP #line 369 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, UIMAGE1DARRAY); +TOKEN_OR_IDENTIFIER(130, IMAGE1DARRAY); YY_BREAK case 174: YY_RULE_SETUP #line 370 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, UIMAGE2DARRAY); +TOKEN_OR_IDENTIFIER(130, IMAGE2DARRAY); YY_BREAK case 175: YY_RULE_SETUP #line 371 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IMAGE1DSHADOW); +TOKEN_OR_IDENTIFIER(130, IIMAGE1DARRAY); YY_BREAK case 176: YY_RULE_SETUP #line 372 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IMAGE2DSHADOW); +TOKEN_OR_IDENTIFIER(130, IIMAGE2DARRAY); YY_BREAK case 177: YY_RULE_SETUP #line 373 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IMAGEBUFFER); +TOKEN_OR_IDENTIFIER(130, UIMAGE1DARRAY); YY_BREAK case 178: YY_RULE_SETUP #line 374 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, IIMAGEBUFFER); +TOKEN_OR_IDENTIFIER(130, UIMAGE2DARRAY); YY_BREAK case 179: YY_RULE_SETUP #line 375 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, UIMAGEBUFFER); +TOKEN_OR_IDENTIFIER(130, IMAGE1DSHADOW); YY_BREAK case 180: YY_RULE_SETUP #line 376 "glsl_lexer.lpp" -TOKEN_OR_IDENTIFIER(130, ROW_MAJOR); +TOKEN_OR_IDENTIFIER(130, IMAGE2DSHADOW); YY_BREAK case 181: YY_RULE_SETUP +#line 377 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER(130, IMAGEBUFFER); + YY_BREAK +case 182: +YY_RULE_SETUP #line 378 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER(130, IIMAGEBUFFER); + YY_BREAK +case 183: +YY_RULE_SETUP +#line 379 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER(130, UIMAGEBUFFER); + YY_BREAK +case 184: +YY_RULE_SETUP +#line 380 "glsl_lexer.lpp" +TOKEN_OR_IDENTIFIER(130, ROW_MAJOR); + YY_BREAK +case 185: +YY_RULE_SETUP +#line 382 "glsl_lexer.lpp" { struct _mesa_glsl_parse_state *state = yyextra; void *ctx = state; @@ -2331,17 +2356,17 @@ YY_RULE_SETUP return IDENTIFIER; } YY_BREAK -case 182: +case 186: YY_RULE_SETUP -#line 385 "glsl_lexer.lpp" +#line 389 "glsl_lexer.lpp" { return yytext[0]; } YY_BREAK -case 183: +case 187: YY_RULE_SETUP -#line 387 "glsl_lexer.lpp" +#line 391 "glsl_lexer.lpp" ECHO; YY_BREAK -#line 2345 "glsl_lexer.cpp" +#line 2370 "glsl_lexer.cpp" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(PP): case YY_STATE_EOF(PRAGMA): @@ -2639,7 +2664,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 708 ) + if ( yy_current_state >= 716 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2668,11 +2693,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 708 ) + if ( yy_current_state >= 716 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 707); + yy_is_jam = (yy_current_state == 715); return yy_is_jam ? 0 : yy_current_state; } @@ -3484,7 +3509,7 @@ void _mesa_glsl_free (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 387 "glsl_lexer.lpp" +#line 391 "glsl_lexer.lpp" |