Mesa (master): ARB prog lexer: Fix lexer to eat both DOS and Unix line endings
Ian Romanick
idr at kemper.freedesktop.org
Sun Aug 23 18:17:41 UTC 2009
Module: Mesa
Branch: master
Commit: 9b70c33e735ff060ddad7d0b501d19c670f41618
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b70c33e735ff060ddad7d0b501d19c670f41618
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Sat Aug 22 19:19:40 2009 -0700
ARB prog lexer: Fix lexer to eat both DOS and Unix line endings
---
src/mesa/shader/lex.yy.c | 610 ++++++++++++++++++++-------------------
src/mesa/shader/program_lexer.l | 2 +-
2 files changed, 308 insertions(+), 304 deletions(-)
diff --git a/src/mesa/shader/lex.yy.c b/src/mesa/shader/lex.yy.c
index 0ff4bac..6d661bd 100644
--- a/src/mesa/shader/lex.yy.c
+++ b/src/mesa/shader/lex.yy.c
@@ -447,19 +447,19 @@ static yyconst flex_int16_t yy_accept[675] =
static yyconst flex_int32_t yy_ec[256] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
+ 1, 1, 4, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 4, 1, 5, 6, 1, 1, 1, 1,
- 1, 1, 7, 1, 7, 8, 1, 9, 10, 11,
- 12, 13, 14, 14, 14, 14, 14, 1, 1, 1,
- 1, 1, 1, 1, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 6, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 1, 1, 1, 1, 40, 1, 41, 42, 43, 44,
-
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 2, 5, 1, 6, 7, 1, 1, 1, 1,
+ 1, 1, 8, 1, 8, 9, 1, 10, 11, 12,
+ 13, 14, 15, 15, 15, 15, 15, 1, 1, 1,
+ 1, 1, 1, 1, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 7, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 1, 1, 1, 1, 41, 1, 42, 43, 44, 45,
+
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -476,104 +476,104 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[67] =
+static yyconst flex_int32_t yy_meta[68] =
{ 0,
- 1, 1, 1, 1, 1, 2, 1, 3, 4, 4,
- 4, 4, 4, 4, 2, 2, 2, 4, 4, 2,
+ 1, 1, 1, 1, 1, 1, 2, 1, 3, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 4, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2
+ 2, 2, 2, 2, 2, 2, 2
} ;
-static yyconst flex_int16_t yy_base[679] =
+static yyconst flex_int16_t yy_base[678] =
{ 0,
- 0, 0, 935, 936, 932, 936, 929, 929, 0, 65,
- 81, 97, 119, 913, 116, 54, 39, 59, 56, 907,
- 112, 129, 68, 55, 129, 133, 66, 900, 870, 869,
- 881, 865, 879, 878, 920, 906, 917, 936, 0, 168,
- 936, 162, 136, 143, 17, 117, 126, 43, 145, 878,
- 864, 90, 174, 862, 874, 147, 936, 191, 192, 137,
- 189, 179, 193, 197, 255, 267, 278, 936, 936, 936,
- 883, 896, 890, 128, 879, 882, 878, 893, 260, 875,
- 889, 189, 875, 888, 879, 892, 869, 880, 871, 233,
- 872, 863, 872, 863, 862, 863, 857, 863, 874, 860,
-
- 857, 869, 872, 859, 852, 868, 844, 167, 190, 864,
- 840, 825, 820, 837, 813, 818, 844, 241, 833, 110,
- 828, 295, 256, 830, 811, 274, 821, 817, 812, 225,
- 818, 804, 820, 817, 808, 277, 281, 810, 799, 813,
- 816, 798, 813, 800, 797, 804, 241, 812, 149, 271,
- 289, 299, 303, 789, 806, 807, 800, 782, 282, 783,
- 805, 796, 288, 299, 303, 307, 311, 315, 319, 936,
- 377, 388, 394, 400, 804, 199, 828, 0, 827, 810,
- 800, 799, 819, 797, 796, 795, 794, 0, 793, 0,
- 792, 791, 0, 790, 789, 0, 788, 787, 786, 785,
-
- 784, 783, 799, 792, 805, 779, 778, 784, 776, 775,
- 774, 795, 772, 771, 770, 769, 779, 767, 766, 765,
- 764, 756, 755, 740, 740, 739, 738, 781, 753, 741,
- 406, 414, 388, 745, 280, 742, 736, 736, 730, 743,
- 743, 728, 936, 936, 743, 731, 390, 738, 39, 735,
- 741, 284, 736, 936, 727, 734, 733, 736, 722, 721,
- 725, 720, 200, 725, 392, 400, 402, 936, 717, 715,
- 715, 723, 724, 706, 393, 711, 717, 391, 398, 402,
- 406, 410, 468, 474, 731, 743, 729, 728, 721, 735,
- 725, 724, 0, 723, 722, 721, 720, 719, 718, 717,
-
- 716, 715, 714, 713, 712, 711, 710, 709, 712, 705,
- 712, 705, 704, 0, 703, 702, 701, 704, 699, 698,
- 697, 696, 0, 695, 694, 693, 692, 670, 664, 669,
- 675, 658, 673, 249, 936, 672, 662, 666, 936, 936,
- 656, 665, 651, 668, 651, 654, 648, 936, 649, 648,
- 645, 652, 645, 653, 649, 659, 656, 638, 644, 651,
- 635, 634, 652, 634, 646, 645, 936, 644, 634, 638,
- 936, 625, 936, 630, 630, 638, 621, 622, 632, 936,
- 936, 664, 646, 662, 0, 323, 660, 660, 659, 658,
- 657, 656, 655, 654, 653, 652, 651, 650, 649, 648,
-
- 647, 646, 645, 644, 631, 624, 0, 641, 640, 639,
- 638, 637, 615, 635, 634, 633, 632, 631, 630, 629,
- 628, 597, 600, 580, 0, 581, 574, 581, 580, 581,
- 573, 591, 936, 936, 573, 571, 581, 574, 936, 569,
- 586, 257, 936, 577, 561, 562, 571, 562, 561, 561,
- 936, 560, 569, 559, 575, 572, 936, 571, 569, 558,
- 559, 555, 547, 554, 549, 550, 545, 571, 571, 569,
- 583, 582, 577, 0, 565, 564, 563, 562, 561, 560,
- 559, 558, 557, 556, 555, 554, 553, 552, 551, 550,
- 549, 0, 0, 548, 547, 546, 545, 544, 479, 543,
-
- 542, 541, 540, 539, 538, 537, 536, 514, 514, 0,
- 521, 0, 555, 554, 503, 521, 936, 516, 511, 504,
- 500, 512, 502, 500, 496, 512, 503, 502, 936, 936,
- 505, 936, 500, 493, 482, 493, 485, 489, 502, 497,
- 500, 482, 936, 936, 494, 483, 936, 0, 0, 0,
- 0, 0, 522, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 954, 955, 66, 955, 948, 949, 0, 69,
+ 85, 128, 140, 152, 151, 58, 39, 48, 75, 927,
+ 158, 160, 73, 59, 71, 170, 54, 920, 890, 889,
+ 901, 885, 899, 898, 142, 927, 939, 955, 0, 206,
+ 955, 189, 168, 171, 53, 27, 66, 119, 175, 899,
+ 885, 123, 170, 883, 895, 183, 955, 198, 225, 99,
+ 212, 219, 223, 227, 285, 297, 308, 955, 955, 955,
+ 904, 917, 911, 165, 900, 903, 899, 914, 224, 896,
+ 910, 194, 896, 909, 900, 913, 890, 901, 892, 294,
+ 893, 884, 893, 884, 883, 884, 878, 884, 895, 881,
+
+ 878, 890, 893, 880, 873, 889, 865, 193, 139, 885,
+ 861, 846, 841, 858, 834, 839, 865, 167, 854, 259,
+ 849, 325, 282, 851, 832, 302, 842, 838, 833, 43,
+ 839, 825, 841, 838, 829, 305, 309, 831, 820, 834,
+ 837, 819, 834, 821, 818, 825, 275, 833, 254, 299,
+ 317, 327, 331, 810, 827, 828, 821, 803, 310, 804,
+ 826, 817, 316, 327, 331, 335, 339, 343, 347, 955,
+ 405, 416, 422, 428, 825, 240, 849, 0, 848, 831,
+ 821, 820, 840, 818, 817, 816, 815, 0, 814, 0,
+ 813, 812, 0, 811, 810, 0, 809, 808, 807, 806,
+
+ 805, 804, 820, 813, 826, 800, 799, 805, 797, 796,
+ 795, 816, 793, 792, 791, 790, 800, 788, 787, 786,
+ 785, 777, 776, 761, 761, 760, 759, 802, 774, 762,
+ 434, 442, 416, 766, 186, 763, 757, 757, 751, 764,
+ 764, 749, 955, 955, 764, 752, 418, 759, 281, 756,
+ 762, 308, 757, 955, 748, 755, 754, 757, 743, 742,
+ 746, 741, 278, 746, 420, 428, 430, 955, 738, 736,
+ 736, 744, 745, 727, 421, 732, 738, 419, 426, 430,
+ 434, 438, 496, 502, 752, 764, 750, 749, 742, 756,
+ 746, 745, 0, 744, 743, 742, 741, 740, 739, 738,
+
+ 737, 736, 735, 734, 733, 732, 731, 730, 733, 726,
+ 733, 726, 725, 0, 724, 723, 722, 725, 720, 719,
+ 718, 717, 0, 716, 715, 714, 713, 691, 685, 690,
+ 696, 679, 694, 315, 955, 693, 683, 687, 955, 955,
+ 677, 686, 672, 689, 672, 675, 669, 955, 670, 669,
+ 666, 673, 666, 674, 670, 680, 677, 659, 665, 672,
+ 656, 655, 673, 655, 667, 666, 955, 665, 655, 659,
+ 955, 646, 955, 651, 651, 659, 642, 643, 653, 955,
+ 955, 685, 667, 683, 0, 507, 681, 681, 680, 679,
+ 678, 677, 676, 675, 674, 673, 672, 671, 670, 669,
+
+ 668, 667, 666, 665, 652, 645, 0, 662, 661, 660,
+ 659, 658, 636, 656, 655, 654, 653, 652, 651, 650,
+ 649, 618, 621, 601, 0, 602, 595, 602, 601, 602,
+ 594, 612, 955, 955, 594, 592, 602, 595, 955, 590,
+ 607, 330, 955, 598, 582, 583, 592, 583, 582, 582,
+ 955, 581, 590, 580, 596, 593, 955, 592, 590, 579,
+ 580, 576, 568, 575, 570, 571, 566, 592, 592, 590,
+ 604, 603, 598, 0, 586, 585, 584, 583, 582, 581,
+ 580, 579, 578, 577, 576, 575, 574, 573, 572, 571,
+ 570, 0, 0, 569, 568, 567, 566, 565, 509, 564,
+
+ 563, 562, 561, 560, 559, 558, 557, 535, 535, 0,
+ 542, 0, 576, 575, 524, 542, 955, 537, 532, 525,
+ 521, 533, 523, 521, 517, 533, 524, 523, 955, 955,
+ 526, 955, 521, 514, 503, 514, 506, 510, 523, 518,
+ 521, 503, 955, 955, 515, 504, 955, 0, 0, 0,
+ 0, 0, 543, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 518, 517, 515, 0, 0,
- 0, 0, 0, 0, 0, 0, 473, 0, 0, 524,
- 523, 936, 470, 936, 474, 474, 483, 936, 467, 481,
-
- 469, 470, 462, 464, 936, 442, 453, 936, 936, 457,
- 453, 446, 444, 444, 457, 936, 441, 481, 0, 0,
- 481, 0, 488, 487, 446, 440, 936, 936, 936, 448,
- 448, 936, 447, 396, 407, 936, 396, 390, 356, 335,
- 936, 936, 348, 364, 327, 936, 936, 304, 936, 306,
- 936, 311, 936, 936, 242, 226, 936, 936, 936, 161,
- 0, 114, 936, 96, 936, 936, 338, 936, 936, 118,
- 86, 0, 0, 936, 510, 513, 515, 519
+ 0, 0, 0, 0, 0, 539, 538, 536, 0, 0,
+ 0, 0, 0, 0, 0, 0, 494, 0, 0, 545,
+ 544, 955, 491, 955, 495, 495, 504, 955, 488, 502,
+
+ 483, 485, 482, 490, 955, 468, 479, 955, 955, 483,
+ 479, 472, 470, 470, 483, 955, 467, 507, 0, 0,
+ 507, 0, 514, 513, 472, 433, 955, 955, 955, 435,
+ 435, 955, 429, 386, 377, 955, 366, 365, 323, 328,
+ 955, 955, 339, 348, 337, 955, 955, 307, 955, 305,
+ 955, 257, 955, 955, 247, 221, 955, 955, 955, 236,
+ 0, 213, 955, 150, 955, 955, 232, 955, 955, 162,
+ 138, 0, 0, 955, 541, 108, 544
} ;
-static yyconst flex_int16_t yy_def[679] =
+static yyconst flex_int16_t yy_def[678] =
{ 0,
674, 1, 674, 674, 674, 674, 674, 675, 676, 674,
- 674, 677, 677, 13, 676, 676, 676, 676, 676, 676,
+ 674, 674, 674, 674, 676, 676, 676, 676, 676, 676,
676, 676, 676, 676, 676, 676, 676, 676, 676, 676,
676, 676, 676, 676, 674, 674, 675, 674, 676, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
- 674, 674, 674, 674, 678, 674, 674, 674, 674, 674,
+ 674, 674, 674, 674, 677, 674, 674, 674, 674, 674,
676, 676, 676, 676, 676, 676, 676, 676, 676, 676,
676, 676, 676, 676, 676, 676, 676, 676, 676, 676,
676, 676, 676, 676, 676, 676, 676, 676, 676, 676,
@@ -640,125 +640,127 @@ static yyconst flex_int16_t yy_def[679] =
674, 674, 674, 676, 676, 674, 674, 674, 674, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 676,
676, 674, 674, 674, 674, 674, 676, 674, 674, 676,
- 676, 676, 676, 0, 674, 674, 674, 674
+ 676, 676, 676, 0, 674, 674, 674
} ;
-static yyconst flex_int16_t yy_nxt[1003] =
+static yyconst flex_int16_t yy_nxt[1023] =
{ 0,
- 4, 5, 6, 7, 8, 9, 4, 10, 11, 12,
- 13, 14, 11, 11, 15, 9, 16, 17, 18, 19,
- 9, 9, 9, 20, 21, 22, 9, 23, 24, 9,
- 25, 26, 27, 9, 9, 9, 28, 9, 9, 9,
- 9, 9, 9, 9, 9, 29, 9, 9, 9, 9,
- 9, 9, 9, 9, 9, 30, 9, 31, 32, 33,
- 9, 34, 9, 9, 9, 9, 40, 79, 127, 96,
- 80, 128, 41, 42, 42, 42, 42, 42, 42, 76,
- 83, 77, 97, 349, 108, 81, 84, 78, 65, 66,
- 66, 66, 66, 66, 66, 82, 94, 134, 350, 67,
-
- 135, 95, 109, 673, 65, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 68, 67, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 67, 65, 61, 62, 63,
- 64, 71, 86, 72, 87, 672, 69, 67, 140, 88,
- 73, 67, 89, 90, 141, 98, 74, 99, 75, 101,
- 230, 91, 178, 102, 103, 104, 92, 105, 179, 669,
- 100, 129, 93, 67, 154, 130, 106, 668, 107, 40,
- 42, 42, 42, 42, 42, 42, 123, 123, 131, 132,
- 122, 160, 123, 126, 123, 136, 137, 147, 124, 123,
- 133, 123, 217, 123, 161, 125, 667, 260, 148, 189,
-
- 123, 149, 123, 218, 150, 219, 122, 261, 118, 119,
- 45, 46, 47, 48, 142, 50, 51, 190, 220, 52,
- 53, 54, 55, 56, 57, 120, 59, 60, 143, 286,
- 121, 151, 152, 162, 155, 144, 156, 153, 287, 157,
- 158, 164, 163, 165, 166, 154, 364, 159, 123, 365,
- 198, 163, 163, 163, 163, 167, 163, 163, 168, 169,
- 163, 163, 163, 171, 171, 171, 171, 171, 171, 199,
- 240, 184, 185, 172, 65, 66, 66, 66, 66, 66,
- 66, 186, 241, 666, 173, 67, 174, 174, 174, 174,
- 174, 174, 257, 124, 428, 665, 233, 233, 258, 172,
-
- 125, 231, 233, 232, 232, 232, 232, 232, 232, 524,
- 429, 67, 525, 233, 233, 233, 236, 233, 233, 262,
- 233, 247, 233, 233, 337, 263, 273, 233, 353, 233,
- 233, 233, 471, 472, 233, 233, 274, 338, 233, 265,
- 233, 354, 264, 266, 267, 233, 233, 670, 671, 233,
- 278, 278, 278, 278, 473, 664, 233, 663, 662, 661,
- 233, 278, 278, 278, 278, 279, 278, 278, 280, 281,
- 278, 278, 278, 278, 278, 278, 278, 282, 278, 278,
- 278, 278, 278, 278, 278, 42, 42, 42, 42, 42,
- 42, 660, 659, 658, 283, 122, 284, 284, 284, 284,
-
- 284, 284, 174, 174, 174, 174, 174, 174, 174, 174,
- 174, 174, 174, 174, 232, 232, 232, 232, 232, 232,
- 657, 122, 232, 232, 232, 232, 232, 232, 335, 335,
- 335, 335, 335, 335, 335, 374, 335, 375, 335, 376,
- 335, 335, 367, 335, 656, 335, 335, 335, 335, 335,
- 655, 654, 377, 380, 380, 380, 380, 335, 653, 335,
- 380, 380, 380, 380, 381, 380, 380, 380, 380, 380,
- 380, 380, 380, 380, 380, 380, 284, 284, 284, 284,
- 284, 284, 284, 284, 284, 284, 284, 284, 576, 577,
- 652, 651, 650, 649, 648, 647, 646, 645, 644, 643,
-
- 642, 641, 640, 639, 638, 637, 636, 635, 634, 578,
- 37, 37, 37, 37, 39, 633, 39, 66, 66, 170,
- 170, 632, 170, 631, 630, 629, 628, 627, 626, 625,
- 624, 623, 622, 621, 620, 619, 618, 617, 616, 615,
- 614, 613, 612, 611, 610, 609, 608, 607, 606, 605,
- 604, 603, 602, 601, 600, 599, 598, 597, 596, 595,
- 594, 593, 592, 591, 590, 589, 588, 587, 586, 585,
- 584, 583, 582, 581, 580, 579, 575, 574, 573, 572,
- 571, 570, 569, 568, 567, 566, 565, 564, 563, 562,
- 561, 560, 559, 558, 557, 556, 555, 554, 553, 552,
-
- 551, 550, 549, 548, 547, 546, 545, 544, 543, 542,
- 541, 540, 539, 538, 537, 536, 535, 534, 533, 532,
- 531, 530, 529, 528, 527, 526, 523, 522, 521, 520,
- 519, 518, 517, 516, 515, 514, 513, 512, 511, 510,
- 509, 508, 507, 506, 505, 504, 503, 502, 501, 500,
- 499, 498, 497, 496, 495, 494, 493, 492, 491, 490,
- 489, 488, 487, 486, 485, 484, 483, 482, 481, 480,
- 479, 478, 477, 476, 475, 474, 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, 442, 441, 440, 439, 438, 437,
- 436, 435, 434, 433, 432, 431, 430, 427, 426, 425,
- 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, 379, 378, 373, 372, 371, 370, 369,
- 368, 366, 363, 362, 361, 360, 359, 358, 357, 356,
- 355, 352, 351, 348, 347, 346, 345, 344, 343, 342,
- 341, 340, 339, 336, 264, 236, 334, 333, 332, 331,
-
- 330, 329, 328, 327, 326, 325, 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, 299, 298, 297, 296, 295, 294, 293, 292, 291,
- 290, 289, 288, 285, 277, 276, 275, 272, 271, 270,
- 269, 268, 259, 256, 255, 254, 253, 252, 251, 250,
- 249, 248, 246, 245, 244, 243, 242, 239, 238, 237,
- 235, 234, 162, 229, 228, 227, 226, 225, 224, 223,
- 222, 221, 216, 215, 214, 213, 212, 211, 210, 209,
- 208, 207, 206, 205, 204, 203, 202, 201, 200, 197,
-
- 196, 195, 194, 193, 192, 191, 188, 187, 183, 182,
- 181, 180, 177, 176, 175, 146, 145, 139, 138, 38,
- 117, 35, 116, 115, 114, 113, 112, 111, 110, 85,
- 70, 38, 36, 35, 674, 3, 674, 674, 674, 674,
+ 4, 5, 6, 5, 7, 8, 9, 4, 10, 11,
+ 12, 13, 14, 11, 11, 15, 9, 16, 17, 18,
+ 19, 9, 9, 9, 20, 21, 22, 9, 23, 24,
+ 9, 25, 26, 27, 9, 9, 9, 28, 9, 9,
+ 9, 9, 9, 9, 9, 9, 29, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 30, 9, 31, 32,
+ 33, 9, 34, 9, 9, 9, 9, 35, 79, 35,
+ 40, 80, 129, 108, 96, 81, 130, 41, 42, 42,
+ 42, 42, 42, 42, 76, 82, 77, 97, 98, 240,
+ 99, 109, 78, 65, 66, 66, 66, 66, 66, 66,
+
+ 83, 241, 94, 100, 67, 127, 84, 95, 128, 39,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 131,
+ 132, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 67, 133, 61, 62, 63, 64, 65, 66, 66, 66,
+ 66, 66, 66, 35, 160, 35, 68, 67, 65, 66,
+ 66, 66, 66, 66, 66, 219, 673, 161, 69, 67,
+ 65, 66, 66, 66, 66, 66, 66, 71, 220, 72,
+ 70, 67, 140, 67, 134, 90, 73, 135, 141, 86,
+ 672, 87, 74, 91, 75, 67, 88, 101, 92, 89,
+ 178, 102, 103, 104, 93, 105, 179, 67, 42, 42,
+
+ 42, 42, 42, 42, 106, 189, 107, 40, 122, 123,
+ 123, 142, 126, 123, 669, 123, 136, 137, 123, 217,
+ 124, 124, 123, 190, 147, 143, 123, 125, 125, 123,
+ 218, 337, 144, 123, 122, 148, 184, 185, 149, 151,
+ 152, 150, 670, 671, 338, 153, 186, 118, 119, 45,
+ 46, 47, 48, 154, 50, 51, 123, 162, 52, 53,
+ 54, 55, 56, 57, 120, 59, 60, 668, 155, 121,
+ 156, 286, 667, 157, 158, 163, 163, 163, 163, 666,
+ 287, 159, 164, 163, 165, 166, 167, 163, 163, 168,
+ 169, 163, 163, 163, 171, 171, 171, 171, 171, 171,
+
+ 230, 665, 664, 260, 172, 65, 66, 66, 66, 66,
+ 66, 66, 198, 261, 154, 173, 67, 174, 174, 174,
+ 174, 174, 174, 233, 233, 364, 349, 257, 365, 233,
+ 172, 199, 231, 258, 232, 232, 232, 232, 232, 232,
+ 233, 350, 67, 233, 233, 236, 233, 233, 262, 233,
+ 247, 233, 233, 353, 263, 273, 233, 663, 233, 233,
+ 233, 428, 662, 233, 233, 274, 354, 233, 265, 233,
+ 661, 264, 266, 267, 233, 233, 660, 429, 233, 278,
+ 278, 278, 278, 524, 659, 233, 525, 658, 657, 233,
+ 278, 278, 278, 278, 279, 278, 278, 280, 281, 278,
+
+ 278, 278, 278, 278, 278, 278, 282, 278, 278, 278,
+ 278, 278, 278, 278, 42, 42, 42, 42, 42, 42,
+ 656, 655, 654, 283, 122, 284, 284, 284, 284, 284,
+ 284, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 232, 232, 232, 232, 232, 232, 653,
+ 122, 232, 232, 232, 232, 232, 232, 335, 335, 335,
+ 335, 335, 335, 335, 374, 335, 375, 335, 376, 335,
+ 335, 367, 335, 652, 335, 335, 335, 335, 335, 651,
+ 650, 377, 380, 380, 380, 380, 335, 649, 335, 380,
+ 380, 380, 380, 381, 380, 380, 380, 380, 380, 380,
+
+ 380, 380, 380, 380, 380, 284, 284, 284, 284, 284,
+ 284, 284, 284, 284, 284, 284, 284, 471, 472, 576,
+ 577, 648, 647, 646, 645, 644, 643, 642, 641, 640,
+ 639, 638, 637, 636, 635, 634, 633, 632, 631, 473,
+ 578, 37, 37, 37, 170, 170, 630, 629, 628, 627,
+ 626, 625, 624, 623, 622, 621, 620, 619, 618, 617,
+ 616, 615, 614, 613, 612, 611, 610, 609, 608, 607,
+ 606, 605, 604, 603, 602, 601, 600, 599, 598, 597,
+ 596, 595, 594, 593, 592, 591, 590, 589, 588, 587,
+ 586, 585, 584, 583, 582, 581, 580, 579, 575, 574,
+
+ 573, 572, 571, 570, 569, 568, 567, 566, 565, 564,
+ 563, 562, 561, 560, 559, 558, 557, 556, 555, 554,
+ 553, 552, 551, 550, 549, 548, 547, 546, 545, 544,
+ 543, 542, 541, 540, 539, 538, 537, 536, 535, 534,
+ 533, 532, 531, 530, 529, 528, 527, 526, 523, 522,
+ 521, 520, 519, 518, 517, 516, 515, 514, 513, 512,
+ 511, 510, 509, 508, 507, 506, 505, 504, 503, 502,
+ 501, 500, 499, 498, 497, 496, 495, 494, 493, 492,
+ 491, 490, 489, 488, 487, 486, 485, 484, 483, 482,
+ 481, 480, 479, 478, 477, 476, 475, 474, 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, 442, 441, 440, 439,
+ 438, 437, 436, 435, 434, 433, 432, 431, 430, 427,
+ 426, 425, 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, 379, 378, 373, 372, 371,
+ 370, 369, 368, 366, 363, 362, 361, 360, 359, 358,
+
+ 357, 356, 355, 352, 351, 348, 347, 346, 345, 344,
+ 343, 342, 341, 340, 339, 336, 264, 236, 334, 333,
+ 332, 331, 330, 329, 328, 327, 326, 325, 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, 299, 298, 297, 296, 295, 294, 293,
+ 292, 291, 290, 289, 288, 285, 277, 276, 275, 272,
+ 271, 270, 269, 268, 259, 256, 255, 254, 253, 252,
+ 251, 250, 249, 248, 246, 245, 244, 243, 242, 239,
+ 238, 237, 235, 234, 162, 229, 228, 227, 226, 225,
+
+ 224, 223, 222, 221, 216, 215, 214, 213, 212, 211,
+ 210, 209, 208, 207, 206, 205, 204, 203, 202, 201,
+ 200, 197, 196, 195, 194, 193, 192, 191, 188, 187,
+ 183, 182, 181, 180, 177, 176, 175, 146, 145, 139,
+ 138, 38, 117, 116, 115, 114, 113, 112, 111, 110,
+ 85, 38, 36, 674, 3, 674, 674, 674, 674, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
+
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
-
674, 674
} ;
-static yyconst flex_int16_t yy_chk[1003] =
+static yyconst flex_int16_t yy_chk[1023] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -766,110 +768,112 @@ static yyconst flex_int16_t yy_chk[1003] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 10, 17, 45, 24,
- 17, 45, 10, 10, 10, 10, 10, 10, 10, 16,
- 19, 16, 24, 249, 27, 18, 19, 16, 11, 11,
- 11, 11, 11, 11, 11, 18, 23, 48, 249, 11,
-
- 48, 23, 27, 671, 12, 10, 10, 10, 10, 10,
- 10, 10, 10, 10, 12, 12, 10, 10, 10, 10,
- 10, 10, 10, 10, 10, 11, 13, 10, 10, 10,
- 10, 15, 21, 15, 21, 670, 13, 13, 52, 21,
- 15, 12, 21, 22, 52, 25, 15, 25, 15, 26,
- 120, 22, 74, 26, 26, 26, 22, 26, 74, 664,
- 25, 46, 22, 13, 120, 46, 26, 662, 26, 40,
- 42, 42, 42, 42, 42, 42, 43, 43, 47, 47,
- 42, 60, 43, 44, 44, 49, 49, 56, 43, 44,
- 47, 49, 108, 43, 60, 43, 660, 149, 56, 82,
-
- 44, 56, 49, 108, 56, 109, 42, 149, 40, 40,
- 40, 40, 40, 40, 53, 40, 40, 82, 109, 40,
- 40, 40, 40, 40, 40, 40, 40, 40, 53, 176,
- 40, 58, 58, 61, 59, 53, 59, 58, 176, 59,
- 59, 62, 62, 62, 62, 58, 263, 59, 58, 263,
- 90, 61, 61, 61, 61, 63, 63, 63, 63, 64,
- 64, 64, 64, 65, 65, 65, 65, 65, 65, 90,
- 130, 79, 79, 65, 66, 66, 66, 66, 66, 66,
- 66, 79, 130, 656, 67, 66, 67, 67, 67, 67,
- 67, 67, 147, 118, 334, 655, 123, 123, 147, 65,
-
- 118, 122, 123, 122, 122, 122, 122, 122, 122, 442,
- 334, 66, 442, 123, 126, 126, 126, 136, 136, 150,
- 126, 137, 137, 136, 235, 150, 159, 137, 252, 151,
- 151, 126, 386, 386, 136, 151, 159, 235, 137, 152,
- 152, 252, 151, 153, 153, 152, 151, 667, 667, 153,
- 163, 163, 163, 163, 386, 652, 152, 650, 648, 645,
- 153, 164, 164, 164, 164, 165, 165, 165, 165, 166,
- 166, 166, 166, 167, 167, 167, 167, 168, 168, 168,
- 168, 169, 169, 169, 169, 171, 171, 171, 171, 171,
- 171, 644, 643, 640, 172, 171, 172, 172, 172, 172,
-
- 172, 172, 173, 173, 173, 173, 173, 173, 174, 174,
- 174, 174, 174, 174, 231, 231, 231, 231, 231, 231,
- 639, 171, 232, 232, 232, 232, 232, 232, 233, 233,
- 247, 247, 265, 265, 233, 275, 247, 275, 265, 275,
- 266, 266, 267, 267, 638, 233, 266, 247, 267, 265,
- 637, 635, 275, 278, 278, 278, 278, 266, 634, 267,
- 279, 279, 279, 279, 280, 280, 280, 280, 281, 281,
- 281, 281, 282, 282, 282, 282, 283, 283, 283, 283,
- 283, 283, 284, 284, 284, 284, 284, 284, 499, 499,
- 633, 631, 630, 626, 625, 624, 623, 621, 618, 617,
-
- 615, 614, 613, 612, 611, 610, 607, 606, 604, 499,
- 675, 675, 675, 675, 676, 603, 676, 677, 677, 678,
- 678, 602, 678, 601, 600, 599, 597, 596, 595, 593,
- 591, 590, 587, 578, 577, 576, 553, 546, 545, 542,
- 541, 540, 539, 538, 537, 536, 535, 534, 533, 531,
- 528, 527, 526, 525, 524, 523, 522, 521, 520, 519,
- 518, 516, 515, 514, 513, 511, 509, 508, 507, 506,
- 505, 504, 503, 502, 501, 500, 498, 497, 496, 495,
- 494, 491, 490, 489, 488, 487, 486, 485, 484, 483,
- 482, 481, 480, 479, 478, 477, 476, 475, 473, 472,
-
- 471, 470, 469, 468, 467, 466, 465, 464, 463, 462,
- 461, 460, 459, 458, 456, 455, 454, 453, 452, 450,
- 449, 448, 447, 446, 445, 444, 441, 440, 438, 437,
- 436, 435, 432, 431, 430, 429, 428, 427, 426, 424,
- 423, 422, 421, 420, 419, 418, 417, 416, 415, 414,
- 413, 412, 411, 410, 409, 408, 406, 405, 404, 403,
- 402, 401, 400, 399, 398, 397, 396, 395, 394, 393,
- 392, 391, 390, 389, 388, 387, 384, 383, 382, 379,
- 378, 377, 376, 375, 374, 372, 370, 369, 368, 366,
- 365, 364, 363, 362, 361, 360, 359, 358, 357, 356,
-
- 355, 354, 353, 352, 351, 350, 349, 347, 346, 345,
- 344, 343, 342, 341, 338, 337, 336, 333, 332, 331,
- 330, 329, 328, 327, 326, 325, 324, 322, 321, 320,
- 319, 318, 317, 316, 315, 313, 312, 311, 310, 309,
- 308, 307, 306, 305, 304, 303, 302, 301, 300, 299,
- 298, 297, 296, 295, 294, 292, 291, 290, 289, 288,
- 287, 286, 285, 277, 276, 274, 273, 272, 271, 270,
- 269, 264, 262, 261, 260, 259, 258, 257, 256, 255,
- 253, 251, 250, 248, 246, 245, 242, 241, 240, 239,
- 238, 237, 236, 234, 230, 229, 228, 227, 226, 225,
-
- 224, 223, 222, 221, 220, 219, 218, 217, 216, 215,
- 214, 213, 212, 211, 210, 209, 208, 207, 206, 205,
- 204, 203, 202, 201, 200, 199, 198, 197, 195, 194,
- 192, 191, 189, 187, 186, 185, 184, 183, 182, 181,
- 180, 179, 177, 175, 162, 161, 160, 158, 157, 156,
- 155, 154, 148, 146, 145, 144, 143, 142, 141, 140,
- 139, 138, 135, 134, 133, 132, 131, 129, 128, 127,
- 125, 124, 121, 119, 117, 116, 115, 114, 113, 112,
- 111, 110, 107, 106, 105, 104, 103, 102, 101, 100,
- 99, 98, 97, 96, 95, 94, 93, 92, 91, 89,
-
- 88, 87, 86, 85, 84, 83, 81, 80, 78, 77,
- 76, 75, 73, 72, 71, 55, 54, 51, 50, 37,
- 36, 35, 34, 33, 32, 31, 30, 29, 28, 20,
- 14, 8, 7, 5, 3, 674, 674, 674, 674, 674,
+ 1, 1, 1, 1, 1, 1, 1, 5, 17, 5,
+ 10, 17, 46, 27, 24, 18, 46, 10, 10, 10,
+ 10, 10, 10, 10, 16, 18, 16, 24, 25, 130,
+ 25, 27, 16, 11, 11, 11, 11, 11, 11, 11,
+
+ 19, 130, 23, 25, 11, 45, 19, 23, 45, 676,
+ 10, 10, 10, 10, 10, 10, 10, 10, 10, 47,
+ 47, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+ 11, 47, 10, 10, 10, 10, 12, 12, 12, 12,
+ 12, 12, 12, 35, 60, 35, 12, 12, 13, 13,
+ 13, 13, 13, 13, 13, 109, 671, 60, 13, 13,
+ 14, 14, 14, 14, 14, 14, 14, 15, 109, 15,
+ 14, 14, 52, 12, 48, 22, 15, 48, 52, 21,
+ 670, 21, 15, 22, 15, 13, 21, 26, 22, 21,
+ 74, 26, 26, 26, 22, 26, 74, 14, 42, 42,
+
+ 42, 42, 42, 42, 26, 82, 26, 40, 42, 43,
+ 43, 53, 44, 44, 664, 43, 49, 49, 44, 108,
+ 118, 43, 49, 82, 56, 53, 43, 118, 43, 44,
+ 108, 235, 53, 49, 42, 56, 79, 79, 56, 58,
+ 58, 56, 667, 667, 235, 58, 79, 40, 40, 40,
+ 40, 40, 40, 58, 40, 40, 58, 61, 40, 40,
+ 40, 40, 40, 40, 40, 40, 40, 662, 59, 40,
+ 59, 176, 660, 59, 59, 61, 61, 61, 61, 656,
+ 176, 59, 62, 62, 62, 62, 63, 63, 63, 63,
+ 64, 64, 64, 64, 65, 65, 65, 65, 65, 65,
+
+ 120, 655, 652, 149, 65, 66, 66, 66, 66, 66,
+ 66, 66, 90, 149, 120, 67, 66, 67, 67, 67,
+ 67, 67, 67, 123, 123, 263, 249, 147, 263, 123,
+ 65, 90, 122, 147, 122, 122, 122, 122, 122, 122,
+ 123, 249, 66, 126, 126, 126, 136, 136, 150, 126,
+ 137, 137, 136, 252, 150, 159, 137, 650, 151, 151,
+ 126, 334, 648, 136, 151, 159, 252, 137, 152, 152,
+ 645, 151, 153, 153, 152, 151, 644, 334, 153, 163,
+ 163, 163, 163, 442, 643, 152, 442, 640, 639, 153,
+ 164, 164, 164, 164, 165, 165, 165, 165, 166, 166,
+
+ 166, 166, 167, 167, 167, 167, 168, 168, 168, 168,
+ 169, 169, 169, 169, 171, 171, 171, 171, 171, 171,
+ 638, 637, 635, 172, 171, 172, 172, 172, 172, 172,
+ 172, 173, 173, 173, 173, 173, 173, 174, 174, 174,
+ 174, 174, 174, 231, 231, 231, 231, 231, 231, 634,
+ 171, 232, 232, 232, 232, 232, 232, 233, 233, 247,
+ 247, 265, 265, 233, 275, 247, 275, 265, 275, 266,
+ 266, 267, 267, 633, 233, 266, 247, 267, 265, 631,
+ 630, 275, 278, 278, 278, 278, 266, 626, 267, 279,
+ 279, 279, 279, 280, 280, 280, 280, 281, 281, 281,
+
+ 281, 282, 282, 282, 282, 283, 283, 283, 283, 283,
+ 283, 284, 284, 284, 284, 284, 284, 386, 386, 499,
+ 499, 625, 624, 623, 621, 618, 617, 615, 614, 613,
+ 612, 611, 610, 607, 606, 604, 603, 602, 601, 386,
+ 499, 675, 675, 675, 677, 677, 600, 599, 597, 596,
+ 595, 593, 591, 590, 587, 578, 577, 576, 553, 546,
+ 545, 542, 541, 540, 539, 538, 537, 536, 535, 534,
+ 533, 531, 528, 527, 526, 525, 524, 523, 522, 521,
+ 520, 519, 518, 516, 515, 514, 513, 511, 509, 508,
+ 507, 506, 505, 504, 503, 502, 501, 500, 498, 497,
+
+ 496, 495, 494, 491, 490, 489, 488, 487, 486, 485,
+ 484, 483, 482, 481, 480, 479, 478, 477, 476, 475,
+ 473, 472, 471, 470, 469, 468, 467, 466, 465, 464,
+ 463, 462, 461, 460, 459, 458, 456, 455, 454, 453,
+ 452, 450, 449, 448, 447, 446, 445, 444, 441, 440,
+ 438, 437, 436, 435, 432, 431, 430, 429, 428, 427,
+ 426, 424, 423, 422, 421, 420, 419, 418, 417, 416,
+ 415, 414, 413, 412, 411, 410, 409, 408, 406, 405,
+ 404, 403, 402, 401, 400, 399, 398, 397, 396, 395,
+ 394, 393, 392, 391, 390, 389, 388, 387, 384, 383,
+
+ 382, 379, 378, 377, 376, 375, 374, 372, 370, 369,
+ 368, 366, 365, 364, 363, 362, 361, 360, 359, 358,
+ 357, 356, 355, 354, 353, 352, 351, 350, 349, 347,
+ 346, 345, 344, 343, 342, 341, 338, 337, 336, 333,
+ 332, 331, 330, 329, 328, 327, 326, 325, 324, 322,
+ 321, 320, 319, 318, 317, 316, 315, 313, 312, 311,
+ 310, 309, 308, 307, 306, 305, 304, 303, 302, 301,
+ 300, 299, 298, 297, 296, 295, 294, 292, 291, 290,
+ 289, 288, 287, 286, 285, 277, 276, 274, 273, 272,
+ 271, 270, 269, 264, 262, 261, 260, 259, 258, 257,
+
+ 256, 255, 253, 251, 250, 248, 246, 245, 242, 241,
+ 240, 239, 238, 237, 236, 234, 230, 229, 228, 227,
+ 226, 225, 224, 223, 222, 221, 220, 219, 218, 217,
+ 216, 215, 214, 213, 212, 211, 210, 209, 208, 207,
+ 206, 205, 204, 203, 202, 201, 200, 199, 198, 197,
+ 195, 194, 192, 191, 189, 187, 186, 185, 184, 183,
+ 182, 181, 180, 179, 177, 175, 162, 161, 160, 158,
+ 157, 156, 155, 154, 148, 146, 145, 144, 143, 142,
+ 141, 140, 139, 138, 135, 134, 133, 132, 131, 129,
+ 128, 127, 125, 124, 121, 119, 117, 116, 115, 114,
+
+ 113, 112, 111, 110, 107, 106, 105, 104, 103, 102,
+ 101, 100, 99, 98, 97, 96, 95, 94, 93, 92,
+ 91, 89, 88, 87, 86, 85, 84, 83, 81, 80,
+ 78, 77, 76, 75, 73, 72, 71, 55, 54, 51,
+ 50, 37, 36, 34, 33, 32, 31, 30, 29, 28,
+ 20, 8, 7, 3, 674, 674, 674, 674, 674, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
+
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
674, 674, 674, 674, 674, 674, 674, 674, 674, 674,
-
674, 674
} ;
@@ -1007,7 +1011,7 @@ swiz_from_char(char c)
} while(0);
#define YY_EXTRA_TYPE struct asm_parser_state *
-#line 1011 "lex.yy.c"
+#line 1015 "lex.yy.c"
#define INITIAL 0
@@ -1256,7 +1260,7 @@ YY_DECL
#line 135 "program_lexer.l"
-#line 1260 "lex.yy.c"
+#line 1264 "lex.yy.c"
yylval = yylval_param;
@@ -1319,7 +1323,7 @@ yy_match:
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 936 );
+ while ( yy_base[yy_current_state] != 955 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -2388,7 +2392,7 @@ YY_RULE_SETUP
#line 474 "program_lexer.l"
ECHO;
YY_BREAK
-#line 2392 "lex.yy.c"
+#line 2396 "lex.yy.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
diff --git a/src/mesa/shader/program_lexer.l b/src/mesa/shader/program_lexer.l
index 0597831..c50c7c5 100644
--- a/src/mesa/shader/program_lexer.l
+++ b/src/mesa/shader/program_lexer.l
@@ -468,7 +468,7 @@ ARRAYSHADOW2D { return_token_or_IDENTIFIER(require_ARB_fp && require
yylloc->last_column = 1;
yylloc->position++;
}
-[ \t]+ /* eat whitespace */ ;
+[ \t\r]+ /* eat whitespace */ ;
#.*$ /* eat comments */ ;
. { return yytext[0]; }
%%
More information about the mesa-commit
mailing list