Mesa (7.9): glsl: Commit lexer files changed by previous cherry picking
Ian Romanick
idr at kemper.freedesktop.org
Tue Dec 14 21:13:05 UTC 2010
Module: Mesa
Branch: 7.9
Commit: 9ef05d27a63e5f028ed9422851328117e7099450
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ef05d27a63e5f028ed9422851328117e7099450
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue Dec 14 13:10:14 2010 -0800
glsl: Commit lexer files changed by previous cherry picking
---
src/glsl/glcpp/glcpp-lex.c | 4 +-
src/glsl/glsl_lexer.cpp | 640 ++++++++++++++++++++++---------------------
2 files changed, 329 insertions(+), 315 deletions(-)
diff --git a/src/glsl/glcpp/glcpp-lex.c b/src/glsl/glcpp/glcpp-lex.c
index 0f99ea1..e5b201b 100644
--- a/src/glsl/glcpp/glcpp-lex.c
+++ b/src/glsl/glcpp/glcpp-lex.c
@@ -1109,7 +1109,7 @@ case 4:
/* rule 4 can match eol */
YY_RULE_SETUP
#line 85 "glcpp/glcpp-lex.l"
-{ yylineno++; yycolumn = 0; }
+{ yylineno++; yycolumn = 0; return NEWLINE; }
YY_BREAK
case 5:
YY_RULE_SETUP
@@ -1120,7 +1120,7 @@ case 6:
/* rule 6 can match eol */
YY_RULE_SETUP
#line 87 "glcpp/glcpp-lex.l"
-{ yylineno++; yycolumn = 0; }
+{ yylineno++; yycolumn = 0; return NEWLINE; }
YY_BREAK
case 7:
YY_RULE_SETUP
diff --git a/src/glsl/glsl_lexer.cpp b/src/glsl/glsl_lexer.cpp
index 7661bbe..f3434f1 100644
--- a/src/glsl/glsl_lexer.cpp
+++ b/src/glsl/glsl_lexer.cpp
@@ -54,7 +54,6 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@@ -85,6 +84,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
+#endif /* ! C99 */
+
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@@ -158,7 +159,15 @@ typedef void* yyscan_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -364,11 +373,11 @@ static yyconst flex_int16_t yy_accept[708] =
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, 182, 1, 182, 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, 91, 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,
@@ -485,85 +494,85 @@ static yyconst flex_int32_t yy_meta[65] =
static yyconst flex_int16_t yy_base[719] =
{ 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, 69, 0, 1075, 1074, 1076, 1079, 64, 1079,
+ 1050, 1049, 126, 1048, 123, 124, 122, 1047, 138, 186,
+ 121, 1046, 136, 0, 128, 122, 113, 134, 133, 133,
+ 162, 1017, 151, 172, 97, 128, 136, 1011, 156, 179,
+ 187, 193, 141, 198, 1022, 171, 248, 225, 1079, 238,
+ 1079, 1052, 240, 1079, 0, 1079, 1079, 261, 1079, 1079,
+ 1079, 1079, 1079, 1079, 1079, 1079, 1079, 238, 1079, 242,
+ 210, 273, 290, 1079, 0, 0, 1041, 1079, 1079, 1079,
+ 1040, 0, 1079, 1079, 1007, 1012, 1005, 1008, 1017, 1016,
+ 1002, 1005, 1017, 215, 1011, 998, 995, 1009, 995, 992,
+
+ 992, 998, 203, 244, 992, 1003, 988, 994, 998, 999,
+ 0, 990, 1001, 265, 996, 976, 220, 980, 994, 984,
+ 166, 977, 258, 990, 992, 974, 970, 978, 975, 964,
+ 973, 259, 971, 977, 972, 975, 963, 966, 968, 273,
+ 971, 962, 975, 276, 968, 1079, 1079, 326, 298, 331,
+ 1079, 953, 966, 957, 968, 274, 0, 342, 0, 375,
+ 1079, 306, 386, 1079, 349, 393, 0, 1079, 1079, 963,
+ 0, 954, 958, 968, 965, 948, 947, 947, 951, 279,
+ 962, 959, 959, 957, 954, 945, 952, 938, 936, 949,
+ 934, 951, 0, 948, 935, 943, 940, 944, 945, 938,
+
+ 935, 923, 922, 936, 939, 936, 923, 930, 920, 324,
+ 926, 929, 919, 927, 915, 919, 910, 925, 915, 906,
+ 925, 908, 906, 917, 906, 901, 899, 913, 898, 900,
+ 897, 909, 908, 911, 287, 902, 896, 885, 327, 904,
+ 906, 894, 886, 890, 902, 885, 0, 400, 410, 427,
+ 1079, 439, 446, 1079, 880, 891, 0, 888, 335, 0,
+ 881, 879, 881, 876, 885, 873, 891, 879, 357, 0,
+ 0, 873, 884, 883, 883, 0, 867, 360, 0, 0,
+ 869, 364, 877, 878, 868, 862, 861, 862, 861, 415,
+ 857, 0, 0, 853, 852, 851, 853, 854, 859, 853,
+
+ 849, 863, 858, 857, 856, 847, 850, 850, 842, 845,
+ 840, 849, 854, 839, 852, 842, 0, 0, 849, 845,
+ 836, 836, 842, 841, 838, 0, 0, 0, 0, 827,
+ 840, 839, 838, 835, 823, 453, 463, 835, 837, 0,
+ 0, 0, 0, 823, 0, 823, 0, 822, 823, 817,
+ 828, 0, 0, 0, 818, 0, 814, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 825, 469, 824, 0,
+ 0, 822, 818, 0, 0, 0, 807, 432, 473, 481,
+ 812, 808, 814, 804, 802, 816, 800, 800, 814, 802,
+ 814, 809, 0, 807, 804, 808, 791, 793, 800, 806,
+
+ 801, 800, 787, 0, 789, 0, 788, 792, 0, 786,
+ 835, 785, 788, 0, 776, 786, 0, 774, 774, 788,
+ 0, 790, 0, 485, 798, 797, 796, 767, 766, 0,
+ 784, 783, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 767, 781, 767, 764, 0, 0, 770, 769,
+ 0, 0, 767, 759, 0, 0, 0, 0, 0, 0,
+ 756, 768, 491, 760, 767, 764, 758, 751, 509, 767,
+ 752, 747, 761, 759, 0, 0, 751, 770, 769, 768,
+ 739, 738, 261, 488, 0, 751, 754, 752, 740, 0,
+ 750, 747, 746, 735, 734, 733, 515, 742, 0, 754,
+
+ 753, 752, 723, 722, 0, 737, 0, 735, 730, 503,
+ 533, 774, 723, 731, 0, 0, 0, 746, 745, 0,
+ 727, 730, 714, 722, 712, 720, 721, 721, 720, 705,
+ 718, 0, 719, 707, 706, 702, 726, 725, 724, 695,
+ 694, 0, 724, 723, 0, 705, 708, 0, 0, 694,
+ 554, 1079, 563, 0, 575, 516, 1079, 0, 691, 690,
+ 700, 700, 687, 702, 685, 700, 695, 0, 0, 0,
+ 0, 680, 0, 0, 0, 701, 338, 701, 690, 693,
+ 677, 676, 686, 686, 676, 565, 586, 398, 684, 672,
+ 670, 669, 680, 0, 683, 679, 681, 677, 663, 670,
+
+ 670, 672, 668, 670, 668, 668, 655, 654, 665, 0,
+ 1079, 421, 1079, 596, 0, 616, 667, 649, 662, 661,
+ 644, 629, 637, 627, 627, 0, 587, 606, 587, 586,
+ 582, 566, 0, 561, 551, 532, 474, 528, 538, 500,
+ 499, 0, 0, 487, 0, 482, 498, 495, 465, 479,
+ 459, 398, 379, 376, 0, 391, 338, 0, 0, 0,
+ 0, 0, 333, 321, 298, 0, 0, 0, 0, 487,
+ 292, 267, 279, 261, 515, 492, 214, 0, 210, 0,
+ 510, 494, 200, 183, 147, 538, 618, 111, 619, 620,
+ 1079, 622, 557, 87, 637, 1079, 558, 596, 0, 23,
+
+ 639, 640, 641, 1079, 642, 1079, 1079, 652, 657, 662,
+ 667, 669, 671, 677, 684, 689, 694, 699
} ;
static yyconst flex_int16_t yy_def[719] =
@@ -573,10 +582,10 @@ static yyconst flex_int16_t yy_def[719] =
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,
+ 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, 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,
@@ -649,7 +658,7 @@ static yyconst flex_int16_t yy_def[719] =
707, 707, 707, 707, 707, 707, 707, 707
} ;
-static yyconst flex_int16_t yy_nxt[1145] =
+static yyconst flex_int16_t yy_nxt[1144] =
{ 0,
8, 9, 10, 9, 11, 8, 12, 13, 8, 8,
14, 15, 16, 17, 18, 19, 20, 20, 20, 20,
@@ -657,118 +666,118 @@ static yyconst flex_int16_t yy_nxt[1145] =
24, 24, 24, 24, 24, 24, 25, 24, 26, 27,
28, 29, 30, 31, 32, 33, 34, 24, 24, 35,
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,
- 52, 51, 50, 50, 50, 50, 50, 50, 50, 50,
-
- 50, 50, 53, 50, 54, 54, 54, 54, 54, 54,
- 55, 50, 50, 50, 56, 56, 56, 56, 56, 56,
- 56, 56, 56, 56, 50, 56, 56, 56, 56, 56,
- 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,
-
- 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,
+ 24, 24, 24, 46, 47, 58, 702, 58, 48, 49,
+ 50, 51, 50, 49, 49, 49, 49, 49, 49, 49,
+ 49, 49, 49, 52, 49, 53, 53, 53, 53, 53,
+ 53, 54, 49, 49, 49, 55, 55, 55, 55, 55,
+
+ 55, 55, 55, 55, 55, 49, 55, 55, 55, 55,
+ 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+ 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+ 55, 55, 49, 61, 64, 116, 66, 68, 68, 68,
+ 68, 68, 68, 68, 77, 78, 699, 65, 67, 117,
+ 62, 70, 83, 71, 71, 71, 71, 71, 71, 72,
+ 80, 81, 85, 694, 84, 88, 118, 89, 73, 74,
+ 119, 90, 91, 75, 120, 95, 92, 86, 87, 96,
+ 73, 74, 99, 93, 100, 97, 94, 139, 121, 108,
+ 689, 98, 140, 101, 123, 146, 141, 109, 75, 70,
+
+ 102, 76, 76, 76, 76, 76, 76, 76, 103, 110,
+ 124, 104, 213, 125, 105, 111, 73, 74, 112, 214,
+ 106, 126, 113, 114, 688, 128, 150, 151, 73, 74,
+ 115, 127, 129, 130, 147, 135, 142, 131, 136, 156,
+ 143, 156, 687, 132, 133, 707, 134, 137, 684, 148,
+ 144, 58, 189, 149, 138, 158, 158, 158, 158, 158,
+ 158, 158, 58, 190, 58, 179, 180, 152, 160, 161,
+ 707, 208, 163, 164, 153, 156, 683, 156, 154, 209,
+ 160, 161, 191, 155, 163, 164, 70, 523, 72, 72,
+ 72, 72, 72, 72, 72, 524, 192, 226, 216, 150,
+
+ 151, 165, 165, 73, 74, 166, 166, 166, 166, 166,
+ 166, 166, 217, 227, 201, 73, 74, 202, 203, 235,
+ 680, 204, 240, 205, 679, 241, 678, 148, 236, 58,
+ 321, 149, 150, 151, 264, 265, 250, 251, 677, 322,
+ 152, 294, 295, 296, 326, 327, 328, 153, 250, 251,
+ 674, 154, 341, 342, 343, 673, 155, 158, 158, 158,
+ 158, 158, 158, 158, 166, 166, 166, 166, 166, 166,
+ 166, 602, 603, 152, 352, 353, 354, 360, 361, 362,
+ 153, 364, 365, 366, 154, 672, 248, 248, 671, 155,
+ 249, 249, 249, 249, 249, 249, 249, 252, 252, 551,
+
+ 552, 253, 253, 253, 253, 253, 253, 253, 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,
+ 249, 249, 612, 613, 254, 249, 249, 249, 249, 249,
+ 249, 249, 374, 375, 376, 670, 254, 669, 336, 336,
+ 668, 161, 337, 337, 337, 337, 337, 337, 337, 434,
+ 435, 436, 667, 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, 612, 613, 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,
+ 437, 438, 439, 681, 251, 676, 428, 429, 440, 441,
+
+ 442, 478, 479, 480, 551, 552, 251, 500, 501, 502,
+ 469, 681, 481, 482, 525, 666, 675, 556, 503, 504,
+ 665, 664, 526, 676, 510, 511, 511, 511, 511, 511,
+ 511, 537, 538, 539, 551, 552, 663, 685, 554, 690,
+ 662, 661, 540, 541, 682, 686, 660, 691, 555, 555,
+ 555, 555, 555, 555, 555, 551, 552, 589, 697, 697,
+ 659, 658, 682, 554, 551, 552, 612, 613, 590, 586,
+ 587, 587, 587, 587, 587, 587, 551, 552, 553, 553,
+ 553, 553, 553, 553, 657, 656, 655, 612, 613, 654,
+ 555, 555, 555, 555, 555, 555, 555, 612, 613, 653,
+
+ 615, 616, 616, 616, 616, 616, 616, 616, 652, 698,
+ 698, 614, 614, 614, 614, 614, 614, 612, 613, 692,
+ 695, 690, 651, 692, 650, 615, 693, 649, 696, 691,
+ 693, 616, 616, 616, 616, 616, 616, 616, 695, 700,
+ 703, 705, 703, 705, 648, 647, 696, 701, 704, 706,
+ 704, 706, 56, 56, 56, 56, 56, 56, 56, 56,
+ 82, 82, 82, 82, 82, 159, 159, 159, 159, 159,
+ 68, 68, 162, 162, 167, 167, 167, 247, 247, 646,
+ 247, 247, 247, 247, 247, 553, 553, 553, 645, 644,
+ 643, 553, 588, 588, 588, 614, 614, 614, 642, 641,
+
+ 640, 614, 637, 637, 637, 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, 145, 122, 107,
+ 79, 69, 63, 60, 59, 707, 57, 57, 7, 707,
707, 707, 707, 707, 707, 707, 707, 707, 707, 707,
707, 707, 707, 707, 707, 707, 707, 707, 707, 707,
@@ -776,10 +785,10 @@ static yyconst flex_int16_t yy_nxt[1145] =
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
} ;
-static yyconst flex_int16_t yy_chk[1145] =
+static yyconst flex_int16_t yy_chk[1144] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -787,118 +796,118 @@ static yyconst flex_int16_t yy_chk[1145] =
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, 2, 9, 13, 9, 2, 15,
- 21, 21, 16, 17, 17, 17, 17, 17, 17, 17,
- 23, 23, 15, 13, 16, 94, 94, 2, 3, 3,
+ 1, 1, 1, 1, 2, 9, 700, 9, 2, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
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,
-
- 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,
- 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,
+ 3, 3, 3, 13, 15, 35, 16, 17, 17, 17,
+ 17, 17, 17, 17, 21, 21, 694, 15, 16, 35,
+ 13, 19, 25, 19, 19, 19, 19, 19, 19, 19,
+ 23, 23, 26, 688, 25, 27, 36, 27, 19, 19,
+ 36, 27, 28, 19, 37, 29, 28, 26, 26, 29,
+ 19, 19, 30, 28, 30, 29, 28, 43, 37, 33,
+ 685, 29, 43, 30, 39, 46, 43, 33, 19, 20,
+
+ 31, 20, 20, 20, 20, 20, 20, 20, 31, 33,
+ 39, 31, 121, 39, 31, 34, 20, 20, 34, 121,
+ 31, 40, 34, 34, 684, 41, 48, 48, 20, 20,
+ 34, 40, 41, 41, 46, 42, 44, 41, 42, 50,
+ 44, 50, 683, 41, 41, 71, 41, 42, 679, 47,
+ 44, 47, 103, 47, 42, 53, 53, 53, 53, 53,
+ 53, 53, 58, 103, 58, 94, 94, 48, 68, 68,
+ 71, 117, 70, 70, 48, 156, 677, 156, 48, 117,
+ 68, 68, 104, 48, 70, 70, 72, 483, 72, 72,
+ 72, 72, 72, 72, 72, 483, 104, 132, 123, 149,
+
+ 149, 73, 73, 72, 72, 73, 73, 73, 73, 73,
+ 73, 73, 123, 132, 114, 72, 72, 114, 114, 140,
+ 674, 114, 144, 114, 673, 144, 672, 148, 140, 148,
+ 235, 148, 150, 150, 180, 180, 162, 162, 671, 235,
+ 149, 210, 210, 210, 239, 239, 239, 149, 162, 162,
+ 665, 149, 259, 259, 259, 664, 149, 158, 158, 158,
+ 158, 158, 158, 158, 165, 165, 165, 165, 165, 165,
+ 165, 577, 577, 150, 269, 269, 269, 278, 278, 278,
+ 150, 282, 282, 282, 150, 663, 160, 160, 657, 150,
+ 160, 160, 160, 160, 160, 160, 160, 163, 163, 588,
+
+ 588, 163, 163, 163, 163, 163, 163, 163, 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,
+ 248, 248, 612, 612, 166, 249, 249, 249, 249, 249,
+ 249, 249, 290, 290, 290, 656, 166, 654, 250, 250,
+ 653, 249, 250, 250, 250, 250, 250, 250, 250, 378,
+ 378, 378, 652, 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,
+ 336, 336, 336, 336, 336, 637, 637, 253, 337, 337,
+ 337, 337, 337, 337, 337, 368, 368, 368, 670, 253,
+ 379, 379, 379, 676, 337, 670, 368, 368, 380, 380,
+
+ 380, 424, 424, 424, 510, 510, 337, 463, 463, 463,
+ 469, 681, 424, 424, 484, 651, 675, 556, 463, 463,
+ 650, 649, 484, 675, 469, 469, 469, 469, 469, 469,
+ 469, 497, 497, 497, 511, 511, 648, 682, 510, 686,
+ 647, 646, 497, 497, 676, 682, 644, 686, 511, 511,
+ 511, 511, 511, 511, 511, 551, 551, 556, 693, 697,
+ 641, 640, 681, 510, 553, 553, 586, 586, 556, 551,
+ 551, 551, 551, 551, 551, 551, 555, 555, 553, 553,
+ 553, 553, 553, 553, 639, 638, 636, 587, 587, 635,
+ 555, 555, 555, 555, 555, 555, 555, 614, 614, 634,
+
+ 586, 587, 587, 587, 587, 587, 587, 587, 632, 693,
+ 697, 614, 614, 614, 614, 614, 614, 616, 616, 687,
+ 689, 690, 631, 692, 630, 586, 687, 629, 689, 690,
+ 692, 616, 616, 616, 616, 616, 616, 616, 695, 698,
+ 701, 702, 703, 705, 628, 627, 695, 698, 701, 702,
+ 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, 625,
+ 714, 714, 714, 714, 714, 715, 715, 715, 624, 623,
+ 622, 715, 716, 716, 716, 717, 717, 717, 621, 620,
+
+ 619, 717, 718, 718, 718, 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, 81, 77, 52, 45, 38, 32,
+ 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,
@@ -906,7 +915,7 @@ static yyconst flex_int16_t yy_chk[1145] =
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
} ;
/* The intent behind this definition is that it'll catch
@@ -986,7 +995,7 @@ static yyconst flex_int16_t yy_chk[1145] =
} \
} while (0)
-#line 990 "glsl_lexer.cpp"
+#line 999 "glsl_lexer.cpp"
#define INITIAL 0
#define PP 1
@@ -1113,7 +1122,12 @@ static int input (yyscan_t yyscanner );
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -1121,7 +1135,7 @@ static int input (yyscan_t yyscanner );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -1132,7 +1146,7 @@ static int input (yyscan_t yyscanner );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ size_t n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -1223,7 +1237,7 @@ YY_DECL
#line 86 "glsl_lexer.lpp"
-#line 1227 "glsl_lexer.cpp"
+#line 1241 "glsl_lexer.cpp"
yylval = yylval_param;
@@ -2326,7 +2340,7 @@ YY_RULE_SETUP
#line 386 "glsl_lexer.lpp"
ECHO;
YY_BREAK
-#line 2330 "glsl_lexer.cpp"
+#line 2344 "glsl_lexer.cpp"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(PP):
case YY_STATE_EOF(PRAGMA):
@@ -3062,8 +3076,8 @@ YY_BUFFER_STATE _mesa_glsl__scan_string (yyconst char * yystr , yyscan_t yyscann
/** Setup the input buffer state to scan the given bytes. The next call to _mesa_glsl_lex() will
* scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
* @param yyscanner The scanner object.
* @return the newly allocated buffer state object.
*/
More information about the mesa-commit
mailing list