Skip to content

A
angle
Commit 47fcd1de by shannonwoods@chromium.org
Options

A special state to track field selection is not necessary.

Identifier is sufficient to parse struct fieldname. TEST=WebGL conformance tests. Review URL: https://codereview.appspot.com/8709048 git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@2232 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent e37bfa0f
Showing with 346 additions and 395 deletions
src/compiler/glslang.l
...@@ -59,7 +59,6 @@ static int reserved_word(yyscan_t yyscanner); ...@@ -59,7 +59,6 @@ static int reserved_word(yyscan_t yyscanner);
%option noyywrap nounput never-interactive %option noyywrap nounput never-interactive
%option yylineno reentrant bison-bridge %option yylineno reentrant bison-bridge
%option extra-type="TParseContext*" %option extra-type="TParseContext*"
%x FIELDS
D [0-9] D [0-9]
L [a-zA-Z_] L [a-zA-Z_]
...@@ -227,7 +226,7 @@ O [0-7] ...@@ -227,7 +226,7 @@ O [0-7]
")" { return RIGHT_PAREN; } ")" { return RIGHT_PAREN; }
("["|"<:") { return LEFT_BRACKET; } ("["|"<:") { return LEFT_BRACKET; }
("]"|":>") { return RIGHT_BRACKET; } ("]"|":>") { return RIGHT_BRACKET; }
"." { BEGIN(FIELDS); return DOT; } "." { return DOT; }
"!" { return BANG; } "!" { return BANG; }
"-" { return DASH; } "-" { return DASH; }
"~" { return TILDE; } "~" { return TILDE; }
...@@ -242,16 +241,9 @@ O [0-7] ...@@ -242,16 +241,9 @@ O [0-7]
"&" { return AMPERSAND; } "&" { return AMPERSAND; }
"?" { return QUESTION; } "?" { return QUESTION; }
<FIELDS>{L}({L}|{D})* {
BEGIN(INITIAL);
yylval->lex.string = NewPoolTString(yytext);
return FIELD_SELECTION;
}
<FIELDS>[ \t\v\f\r] {}
[ \t\v\n\f\r] { } [ \t\v\n\f\r] { }
<*><<EOF>> { yyterminate(); } <<EOF>> { yyterminate(); }
<*>. { assert(false); return 0; } . { assert(false); return 0; }
%% %%
......
src/compiler/glslang.y
...@@ -116,7 +116,6 @@ extern void yyerror(TParseContext* context, const char* reason); ...@@ -116,7 +116,6 @@ extern void yyerror(TParseContext* context, const char* reason);
%token <lex> SAMPLER2D SAMPLERCUBE SAMPLER_EXTERNAL_OES SAMPLER2DRECT %token <lex> SAMPLER2D SAMPLERCUBE SAMPLER_EXTERNAL_OES SAMPLER2DRECT
%token <lex> IDENTIFIER TYPE_NAME FLOATCONSTANT INTCONSTANT BOOLCONSTANT %token <lex> IDENTIFIER TYPE_NAME FLOATCONSTANT INTCONSTANT BOOLCONSTANT
%token <lex> FIELD_SELECTION
%token <lex> LEFT_OP RIGHT_OP %token <lex> LEFT_OP RIGHT_OP
%token <lex> INC_OP DEC_OP LE_OP GE_OP EQ_OP NE_OP %token <lex> INC_OP DEC_OP LE_OP GE_OP EQ_OP NE_OP
%token <lex> AND_OP OR_OP XOR_OP MUL_ASSIGN DIV_ASSIGN ADD_ASSIGN %token <lex> AND_OP OR_OP XOR_OP MUL_ASSIGN DIV_ASSIGN ADD_ASSIGN
...@@ -322,7 +321,7 @@ postfix_expression ...@@ -322,7 +321,7 @@ postfix_expression
| function_call { | function_call {
$$ = $1; $$ = $1;
} }
| postfix_expression DOT FIELD_SELECTION { | postfix_expression DOT identifier {
if ($1->isArray()) { if ($1->isArray()) {
context->error($3.line, "cannot apply dot operator to an array", "."); context->error($3.line, "cannot apply dot operator to an array", ".");
context->recover(); context->recover();
...@@ -672,13 +671,6 @@ function_identifier ...@@ -672,13 +671,6 @@ function_identifier
TFunction *function = new TFunction($1.string, type); TFunction *function = new TFunction($1.string, type);
$$ = function; $$ = function;
} }
| FIELD_SELECTION {
if (context->reservedErrorCheck($1.line, *$1.string))
context->recover();
TType type(EbtVoid, EbpUndefined);
TFunction *function = new TFunction($1.string, type);
$$ = function;
}
; ;
unary_expression unary_expression
......
src/compiler/glslang_lex.cpp
...@@ -383,8 +383,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); ...@@ -383,8 +383,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
*yy_cp = '\0'; \ *yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp; yyg->yy_c_buf_p = yy_cp;
#define YY_NUM_RULES 149 #define YY_NUM_RULES 147
#define YY_END_OF_BUFFER 150 #define YY_END_OF_BUFFER 148
/* This struct is not used in this scanner, /* This struct is not used in this scanner,
but its presence is necessary. */ but its presence is necessary. */
struct yy_trans_info struct yy_trans_info
...@@ -392,57 +392,57 @@ struct yy_trans_info ...@@ -392,57 +392,57 @@ struct yy_trans_info
flex_int32_t yy_verify; flex_int32_t yy_verify;
flex_int32_t yy_nxt; flex_int32_t yy_nxt;
}; };
static yyconst flex_int16_t yy_accept[449] = static yyconst flex_int16_t yy_accept[443] =
{ 0, { 0,
0, 0, 0, 0, 150, 148, 147, 147, 132, 138, 0, 0, 148, 146, 145, 145, 132, 138, 143, 127,
143, 127, 128, 136, 135, 124, 133, 131, 137, 96, 128, 136, 135, 124, 133, 131, 137, 96, 96, 125,
96, 125, 121, 139, 126, 140, 144, 93, 129, 130, 121, 139, 126, 140, 144, 93, 129, 130, 142, 93,
142, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 122, 141, 123, 134, 146, 149, 145, 118, 104, 93, 93, 93, 93, 93, 93, 93, 93, 93, 122,
123, 112, 107, 102, 110, 100, 111, 101, 99, 103, 141, 123, 134, 118, 104, 123, 112, 107, 102, 110,
98, 95, 96, 0, 0, 130, 122, 129, 119, 115, 100, 111, 101, 99, 103, 98, 95, 96, 0, 0,
117, 116, 120, 93, 108, 114, 93, 93, 93, 93, 130, 122, 129, 119, 115, 117, 116, 120, 93, 108,
93, 93, 93, 93, 93, 93, 12, 93, 93, 93, 114, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 12, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
15, 17, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 15, 17, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 109,
113, 145, 0, 98, 0, 0, 97, 94, 105, 106,
45, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 13,
93, 93, 93, 93, 93, 93, 93, 93, 21, 93,
93, 93, 93, 93, 93, 93, 93, 18, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 109, 113, 0, 98, 0, 0,
97, 94, 105, 106, 45, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 0, 99, 0, 98, 93, 23, 93, 93, 90, 93, 93, 93, 13, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 16, 48, 93, 93, 93, 21, 93, 93, 93, 93, 93, 93, 93,
93, 93, 64, 93, 93, 53, 68, 93, 93, 93, 93, 18, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 65, 4, 28, 29, 30,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 51, 24, 93, 93,
93, 93, 93, 93, 31, 32, 33, 22, 93, 93, 93, 93, 93, 93, 93, 0, 99, 0, 98, 93,
93, 10, 37, 38, 39, 46, 7, 93, 93, 93, 23, 93, 93, 90, 93, 93, 93, 93, 93, 93,
93, 77, 78, 79, 93, 25, 69, 20, 80, 81, 93, 16, 48, 93, 93, 93, 64, 93, 93, 53,
68, 93, 93, 93, 93, 93, 93, 93, 93, 65,
82, 2, 74, 75, 76, 93, 19, 72, 93, 93, 4, 28, 29, 30, 93, 93, 93, 93, 93, 93,
34, 35, 36, 93, 93, 93, 93, 93, 93, 93,
93, 93, 66, 93, 93, 93, 93, 93, 93, 93,
93, 47, 93, 92, 93, 93, 14, 93, 93, 93,
93, 67, 61, 56, 93, 93, 93, 93, 93, 73,
52, 93, 59, 27, 93, 89, 60, 44, 71, 54,
93, 93, 93, 93, 93, 93, 93, 93, 55, 26,
93, 93, 93, 3, 93, 93, 93, 93, 93, 49,
8, 93, 9, 93, 93, 11, 62, 93, 93, 93,
57, 93, 93, 93, 93, 93, 93, 50, 70, 58,
6, 63, 1, 91, 5, 83, 40, 84, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
41, 93, 93, 93, 93, 93, 93, 93, 43, 93, 51, 24, 93, 93, 93, 93, 93, 93, 31, 32,
87, 93, 93, 93, 93, 93, 85, 93, 86, 93, 33, 22, 93, 93, 93, 10, 37, 38, 39, 46,
93, 93, 93, 93, 93, 42, 88, 0 7, 93, 93, 93, 93, 77, 78, 79, 93, 25,
69, 20, 80, 81, 82, 2, 74, 75, 76, 93,
19, 72, 93, 93, 34, 35, 36, 93, 93, 93,
93, 93, 93, 93, 93, 93, 66, 93, 93, 93,
93, 93, 93, 93, 93, 47, 93, 92, 93, 93,
14, 93, 93, 93, 93, 67, 61, 56, 93, 93,
93, 93, 93, 73, 52, 93, 59, 27, 93, 89,
60, 44, 71, 54, 93, 93, 93, 93, 93, 93,
93, 93, 55, 26, 93, 93, 93, 3, 93, 93,
93, 93, 93, 49, 8, 93, 9, 93, 93, 11,
62, 93, 93, 93, 57, 93, 93, 93, 93, 93,
93, 50, 70, 58, 6, 63, 1, 91, 5, 83,
40, 84, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 41, 93, 93, 93, 93, 93,
93, 93, 43, 93, 87, 93, 93, 93, 93, 93,
85, 93, 86, 93, 93, 93, 93, 93, 93, 42,
88, 0
} ; } ;
static yyconst flex_int32_t yy_ec[256] = static yyconst flex_int32_t yy_ec[256] =
...@@ -488,199 +488,189 @@ static yyconst flex_int32_t yy_meta[68] = ...@@ -488,199 +488,189 @@ static yyconst flex_int32_t yy_meta[68] =
3, 3, 3, 1, 1, 1, 1 3, 3, 3, 1, 1, 1, 1
} ; } ;
static yyconst flex_int16_t yy_base[452] = static yyconst flex_int16_t yy_base[445] =
{ 0, { 0,
0, 0, 67, 0, 656, 657, 657, 657, 630, 110, 0, 0, 587, 588, 588, 588, 561, 43, 64, 588,
131, 657, 657, 629, 128, 657, 127, 125, 628, 144, 588, 560, 61, 588, 60, 58, 559, 77, 86, 557,
153, 626, 657, 171, 626, 122, 657, 0, 657, 657, 588, 104, 557, 55, 588, 0, 588, 588, 75, 26,
142, 93, 124, 149, 150, 140, 160, 597, 164, 162, 57, 82, 83, 73, 93, 528, 97, 95, 527, 44,
596, 111, 138, 590, 171, 603, 177, 183, 102, 178, 71, 521, 104, 534, 110, 116, 35, 111, 530, 588,
599, 657, 181, 657, 657, 657, 657, 0, 657, 657, 114, 588, 588, 588, 588, 588, 588, 588, 588, 588,
657, 657, 657, 657, 657, 657, 657, 657, 232, 657, 588, 588, 588, 165, 588, 172, 202, 211, 233, 0,
239, 269, 278, 300, 0, 657, 657, 657, 620, 657, 588, 588, 588, 551, 588, 588, 588, 550, 0, 588,
657, 657, 619, 0, 657, 657, 592, 585, 588, 596, 588, 523, 516, 519, 527, 526, 513, 528, 515, 521,
595, 582, 597, 584, 590, 578, 575, 588, 575, 572, 509, 506, 519, 506, 503, 503, 509, 497, 108, 502,
572, 578, 566, 175, 571, 581, 567, 573, 576, 577, 512, 498, 504, 507, 508, 0, 145, 507, 113, 493,
0, 212, 576, 180, 562, 575, 566, 568, 558, 572, 506, 497, 499, 489, 503, 500, 502, 485, 490, 487,
569, 571, 554, 559, 556, 545, 224, 553, 558, 554, 476, 157, 484, 489, 485, 487, 476, 479, 118, 484,
556, 545, 548, 185, 553, 545, 557, 137, 550, 657, 476, 488, 70, 481, 588, 588, 246, 253, 270, 219,
657, 0, 313, 320, 337, 286, 350, 0, 657, 657, 283, 0, 588, 588, 0, 473, 477, 486, 483, 467,
0, 542, 546, 555, 552, 536, 536, 186, 551, 548, 467, 119, 482, 479, 479, 477, 474, 466, 472, 459,
548, 546, 543, 535, 541, 528, 539, 525, 541, 0, 470, 456, 472, 0, 469, 457, 464, 461, 465, 458,
538, 526, 533, 530, 534, 527, 516, 515, 528, 531, 447, 446, 459, 462, 459, 454, 445, 188, 450, 453,
528, 523, 514, 255, 519, 522, 513, 510, 514, 520, 444, 441, 445, 451, 442, 433, 436, 434, 444, 430,
511, 502, 505, 503, 513, 499, 497, 510, 496, 498, 428, 441, 427, 429, 426, 437, 436, 124, 431, 426,
495, 506, 505, 191, 500, 495, 484, 325, 502, 504, 415, 258, 433, 435, 424, 290, 297, 304, 311, 425,
493, 357, 364, 371, 378, 494, 0, 492, 342, 0, 0, 423, 275, 0, 415, 413, 421, 410, 427, 416,
484, 482, 490, 479, 496, 485, 383, 0, 0, 479, 316, 0, 0, 410, 420, 420, 0, 405, 319, 0,
489, 489, 0, 474, 386, 0, 0, 476, 389, 477, 0, 407, 322, 408, 402, 401, 402, 401, 325, 0,
471, 470, 471, 470, 392, 0, 0, 0, 0, 0, 0, 0, 0, 0, 397, 398, 403, 394, 407, 402,
466, 467, 472, 463, 476, 471, 470, 462, 466, 458, 401, 393, 397, 389, 392, 396, 401, 387, 399, 390,
461, 465, 470, 456, 468, 459, 0, 0, 465, 454, 0, 0, 396, 385, 385, 390, 389, 386, 0, 0,
454, 459, 458, 455, 0, 0, 0, 0, 445, 457, 0, 0, 376, 388, 390, 0, 0, 0, 0, 0,
459, 0, 0, 0, 0, 0, 0, 447, 448, 442, 0, 378, 379, 373, 383, 0, 0, 0, 374, 0,
452, 0, 0, 0, 443, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 381,
0, 0, 0, 0, 0, 450, 0, 0, 448, 444, 0, 0, 379, 375, 0, 0, 0, 371, 367, 372,
0, 0, 0, 440, 436, 441, 431, 444, 430, 443, 362, 375, 361, 374, 363, 370, 0, 368, 370, 354,
432, 439, 0, 437, 439, 423, 425, 431, 437, 432, 356, 362, 368, 363, 351, 0, 353, 0, 352, 355,
420, 0, 422, 0, 421, 424, 0, 413, 412, 412, 0, 344, 343, 343, 356, 0, 358, 0, 357, 356,
425, 0, 427, 0, 426, 425, 410, 423, 410, 0, 341, 354, 341, 0, 0, 344, 0, 0, 336, 0,
0, 413, 0, 0, 405, 0, 0, 0, 0, 0, 0, 0, 0, 0, 333, 344, 337, 343, 340, 335,
402, 413, 406, 412, 409, 404, 396, 408, 0, 0, 327, 339, 0, 0, 332, 339, 328, 0, 337, 334,
401, 408, 397, 0, 406, 403, 393, 396, 401, 0, 324, 329, 332, 0, 0, 332, 0, 330, 329, 0,
0, 401, 0, 399, 398, 0, 0, 397, 383, 395, 0, 328, 314, 326, 0, 317, 338, 337, 336, 307,
0, 386, 407, 406, 405, 376, 372, 0, 0, 0, 303, 0, 0, 0, 0, 0, 0, 0, 0, 328,
0, 0, 0, 0, 0, 397, 233, 392, 383, 366, 166, 325, 316, 299, 308, 310, 306, 308, 307, 306,
375, 377, 373, 375, 374, 373, 376, 373, 323, 320, 309, 306, 256, 253, 0, 228, 238, 222, 235, 203,
0, 295, 305, 289, 302, 270, 274, 271, 279, 258, 207, 204, 212, 191, 0, 201, 165, 167, 153, 161,
0, 268, 232, 234, 220, 228, 0, 237, 0, 242, 0, 170, 0, 175, 151, 141, 100, 114, 59, 0,
218, 208, 167, 181, 126, 0, 0, 657, 426, 428, 0, 588, 359, 113
180
} ; } ;
static yyconst flex_int16_t yy_def[452] = static yyconst flex_int16_t yy_def[445] =
{ 0, { 0,
448, 1, 448, 3, 448, 448, 448, 448, 448, 448, 442, 1, 442, 442, 442, 442, 442, 442, 442, 442,
448, 448, 448, 448, 448, 448, 448, 448, 448, 448, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
448, 448, 448, 448, 448, 448, 448, 449, 448, 448, 442, 442, 442, 442, 442, 443, 442, 442, 442, 443,
448, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 442,
449, 448, 448, 448, 448, 448, 448, 450, 448, 448, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
448, 448, 448, 448, 448, 448, 448, 448, 448, 448, 442, 442, 442, 442, 442, 442, 442, 442, 442, 444,
448, 448, 448, 448, 451, 448, 448, 448, 448, 448, 442, 442, 442, 442, 442, 442, 442, 442, 443, 442,
448, 448, 448, 449, 448, 448, 449, 449, 449, 449, 442, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 448, 443, 443, 443, 443, 442, 442, 442, 442, 442, 442,
448, 450, 448, 448, 448, 448, 448, 451, 448, 448, 442, 444, 442, 442, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 442, 442, 442, 442, 443,
449, 448, 448, 448, 448, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 449, 449, 449, 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
449, 449, 449, 449, 449, 449, 449, 0, 448, 448, 443, 0, 442, 442
448
} ; } ;
static yyconst flex_int16_t yy_nxt[725] = static yyconst flex_int16_t yy_nxt[656] =
{ 0, { 0,
6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
16, 17, 18, 19, 20, 21, 21, 21, 21, 21, 14, 15, 16, 17, 18, 19, 19, 19, 19, 19,
21, 22, 23, 24, 25, 26, 27, 28, 28, 28, 19, 20, 21, 22, 23, 24, 25, 26, 26, 26,
28, 28, 28, 28, 28, 28, 29, 30, 31, 32, 26, 26, 26, 26, 26, 26, 27, 28, 29, 30,
33, 34, 35, 36, 37, 38, 39, 40, 28, 41, 31, 32, 33, 34, 35, 36, 37, 38, 26, 39,
42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
28, 28, 28, 52, 53, 54, 55, 6, 56, 57, 26, 26, 26, 50, 51, 52, 53, 55, 56, 57,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 60, 62, 64, 64, 64, 64, 64, 64, 64, 77,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 78, 82, 83, 110, 63, 61, 129, 111, 58, 66,
6, 6, 6, 6, 58, 58, 58, 58, 58, 58, 130, 67, 67, 67, 67, 67, 67, 68, 66, 80,
58, 58, 58, 6, 6, 6, 58, 58, 58, 58, 68, 68, 68, 68, 68, 68, 68, 69, 72, 84,
58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 112, 85, 70, 81, 142, 86, 69, 203, 441, 204,
58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 69, 87, 94, 113, 95, 73, 90, 74, 75, 69,
6, 6, 6, 6, 60, 61, 62, 65, 67, 69, 91, 88, 97, 96, 89, 92, 103, 70, 135, 106,
69, 69, 69, 69, 69, 69, 82, 83, 87, 88, 98, 93, 99, 115, 104, 100, 107, 162, 440, 119,
115, 68, 66, 134, 116, 63, 71, 135, 72, 72, 131, 101, 439, 108, 132, 105, 120, 121, 116, 125,
72, 72, 72, 72, 73, 71, 85, 73, 73, 73, 163, 117, 126, 133, 176, 198, 122, 123, 264, 124,
73, 73, 73, 73, 74, 77, 89, 117, 90, 75, 127, 438, 177, 199, 216, 217, 265, 128, 136, 64,
86, 148, 91, 74, 209, 447, 210, 74, 92, 99, 64, 64, 64, 64, 64, 64, 138, 138, 138, 138,
118, 100, 78, 95, 79, 80, 74, 96, 93, 102, 138, 138, 138, 437, 170, 137, 190, 171, 172, 406,
101, 94, 97, 108, 75, 140, 111, 103, 98, 104, 407, 173, 139, 174, 242, 243, 244, 436, 137, 435,
120, 109, 105, 112, 168, 446, 124, 136, 106, 445, 434, 191, 433, 432, 66, 139, 67, 67, 67, 67,
113, 137, 110, 125, 126, 121, 130, 169, 122, 131, 67, 67, 68, 66, 431, 68, 68, 68, 68, 68,
138, 182, 204, 127, 128, 270, 129, 132, 444, 183, 68, 68, 69, 141, 141, 141, 141, 141, 141, 141,
205, 222, 223, 271, 133, 141, 69, 69, 69, 69, 430, 69, 140, 429, 140, 69, 428, 141, 141, 141,
69, 69, 69, 144, 144, 144, 144, 144, 144, 144, 141, 141, 141, 141, 69, 206, 427, 206, 426, 425,
443, 176, 143, 196, 177, 178, 412, 413, 179, 145, 207, 207, 207, 207, 207, 207, 207, 138, 138, 138,
180, 248, 249, 250, 442, 143, 441, 440, 197, 439, 138, 138, 138, 138, 269, 270, 271, 424, 423, 208,
438, 71, 145, 72, 72, 72, 72, 72, 72, 73, 422, 208, 421, 139, 209, 209, 209, 209, 209, 209,
71, 437, 73, 73, 73, 73, 73, 73, 73, 74, 209, 277, 278, 279, 420, 419, 139, 141, 141, 141,
147, 147, 147, 147, 147, 147, 147, 436, 74, 146, 141, 141, 141, 141, 207, 207, 207, 207, 207, 207,
435, 146, 74, 434, 147, 147, 147, 147, 147, 147, 207, 207, 207, 207, 207, 207, 207, 207, 209, 209,
147, 74, 212, 433, 212, 432, 431, 213, 213, 213, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
213, 213, 213, 213, 144, 144, 144, 144, 144, 144, 209, 209, 286, 287, 288, 293, 294, 295, 297, 298,
144, 275, 276, 277, 430, 429, 214, 428, 214, 427, 299, 305, 306, 307, 387, 388, 389, 418, 417, 416,
145, 215, 215, 215, 215, 215, 215, 215, 283, 284, 415, 414, 413, 412, 411, 410, 409, 390, 408, 391,
285, 426, 425, 145, 147, 147, 147, 147, 147, 147, 79, 79, 405, 404, 403, 402, 401, 400, 399, 398,
147, 213, 213, 213, 213, 213, 213, 213, 213, 213, 397, 396, 395, 394, 393, 392, 386, 385, 384, 383,
213, 213, 213, 213, 213, 215, 215, 215, 215, 215, 382, 381, 380, 379, 378, 377, 376, 375, 374, 373,
215, 215, 215, 215, 215, 215, 215, 215, 215, 292, 372, 371, 370, 369, 368, 367, 366, 365, 364, 363,
293, 294, 299, 300, 301, 303, 304, 305, 311, 312, 362, 361, 360, 359, 358, 357, 356, 355, 354, 353,
313, 393, 394, 395, 424, 423, 422, 421, 420, 419, 352, 351, 350, 349, 348, 347, 346, 345, 344, 343,
418, 417, 416, 415, 396, 414, 397, 84, 84, 142, 342, 341, 340, 339, 338, 337, 336, 335, 334, 333,
142, 411, 410, 409, 408, 407, 406, 405, 404, 403, 332, 331, 330, 329, 328, 327, 326, 325, 324, 323,
402, 401, 400, 399, 398, 392, 391, 390, 389, 388, 322, 321, 320, 319, 318, 317, 316, 315, 314, 313,
387, 386, 385, 384, 383, 382, 381, 380, 379, 378, 312, 311, 310, 309, 308, 304, 303, 302, 301, 300,
377, 376, 375, 374, 373, 372, 371, 370, 369, 368, 296, 292, 291, 290, 289, 285, 284, 283, 282, 281,
367, 366, 365, 364, 363, 362, 361, 360, 359, 358, 280, 276, 275, 274, 273, 272, 268, 267, 266, 263,
357, 356, 355, 354, 353, 352, 351, 350, 349, 348, 262, 261, 260, 259, 258, 257, 256, 255, 254, 253,
347, 346, 345, 344, 343, 342, 341, 340, 339, 338, 252, 251, 250, 249, 248, 247, 246, 245, 241, 240,
337, 336, 335, 334, 333, 332, 331, 330, 329, 328, 239, 238, 237, 236, 235, 234, 233, 232, 231, 230,
327, 326, 325, 324, 323, 322, 321, 320, 319, 318, 229, 228, 227, 226, 225, 224, 223, 222, 221, 220,
317, 316, 315, 314, 310, 309, 308, 307, 306, 302, 219, 218, 215, 214, 213, 212, 211, 210, 205, 202,
298, 297, 296, 295, 291, 290, 289, 288, 287, 286, 201, 200, 197, 196, 195, 194, 193, 192, 189, 188,
282, 281, 280, 279, 278, 274, 273, 272, 269, 268, 187, 186, 185, 184, 183, 182, 181, 180, 179, 178,
267, 266, 265, 264, 263, 262, 261, 260, 259, 258, 175, 169, 168, 167, 166, 165, 164, 161, 160, 159,
257, 256, 255, 254, 253, 252, 251, 247, 246, 245, 158, 157, 156, 155, 154, 153, 152, 151, 150, 149,
244, 243, 242, 241, 240, 239, 238, 237, 236, 235, 148, 147, 146, 145, 144, 143, 134, 118, 114, 109,
234, 233, 232, 231, 230, 229, 228, 227, 226, 225, 102, 76, 71, 65, 59, 54, 442, 3, 442, 442,
224, 221, 220, 219, 218, 217, 216, 211, 208, 207, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
206, 203, 202, 201, 200, 199, 198, 195, 194, 193, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
192, 191, 190, 189, 188, 187, 186, 185, 184, 181, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
175, 174, 173, 172, 171, 170, 167, 166, 165, 164, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
163, 162, 161, 160, 159, 158, 157, 156, 155, 154, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
153, 152, 151, 150, 149, 139, 123, 119, 114, 107, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
81, 76, 70, 64, 59, 448, 5, 448, 448, 448, 442, 442, 442, 442, 442
448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448
} ; } ;
static yyconst flex_int16_t yy_chk[725] = static yyconst flex_int16_t yy_chk[656] =
{ 0, { 0,
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, 1, 1,
...@@ -688,84 +678,76 @@ static yyconst flex_int16_t yy_chk[725] = ...@@ -688,84 +678,76 @@ static yyconst flex_int16_t yy_chk[725] =
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, 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, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 8, 8, 9,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 13, 15, 16, 16, 16, 16, 16, 16, 16, 24,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 24, 30, 30, 40, 15, 13, 47, 40, 9, 18,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 47, 18, 18, 18, 18, 18, 18, 18, 19, 29,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 19, 19, 19, 19, 19, 19, 19, 18, 22, 31,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 41, 31, 18, 29, 444, 31, 19, 133, 439, 133,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 18, 32, 34, 41, 34, 22, 33, 22, 22, 19,
3, 3, 3, 3, 10, 10, 11, 15, 17, 18, 33, 32, 35, 34, 32, 33, 37, 18, 51, 38,
18, 18, 18, 18, 18, 18, 26, 26, 32, 32, 35, 33, 35, 43, 37, 35, 38, 99, 438, 45,
42, 17, 15, 49, 42, 11, 20, 49, 20, 20, 48, 35, 437, 38, 48, 37, 45, 45, 43, 46,
20, 20, 20, 20, 20, 21, 31, 21, 21, 21, 99, 43, 46, 48, 109, 129, 45, 45, 198, 45,
21, 21, 21, 21, 20, 24, 33, 43, 33, 20, 46, 436, 109, 129, 152, 152, 198, 46, 51, 64,
31, 451, 33, 21, 138, 445, 138, 20, 34, 36, 64, 64, 64, 64, 64, 64, 66, 66, 66, 66,
43, 36, 24, 35, 24, 24, 21, 35, 34, 37, 66, 66, 66, 435, 107, 64, 122, 107, 107, 401,
36, 34, 35, 39, 20, 53, 40, 37, 35, 37, 401, 107, 66, 107, 178, 178, 178, 434, 64, 432,
45, 39, 37, 40, 104, 444, 47, 50, 37, 443, 430, 122, 429, 428, 67, 66, 67, 67, 67, 67,
40, 50, 39, 47, 47, 45, 48, 104, 45, 48, 67, 67, 67, 68, 427, 68, 68, 68, 68, 68,
50, 114, 134, 47, 47, 204, 47, 48, 442, 114, 68, 68, 67, 140, 140, 140, 140, 140, 140, 140,
134, 158, 158, 204, 48, 53, 69, 69, 69, 69, 426, 68, 69, 424, 69, 67, 423, 69, 69, 69,
69, 69, 69, 71, 71, 71, 71, 71, 71, 71, 69, 69, 69, 69, 68, 137, 422, 137, 421, 420,
441, 112, 69, 127, 112, 112, 407, 407, 112, 71, 137, 137, 137, 137, 137, 137, 137, 138, 138, 138,
112, 184, 184, 184, 440, 69, 438, 436, 127, 435, 138, 138, 138, 138, 202, 202, 202, 419, 418, 139,
434, 72, 71, 72, 72, 72, 72, 72, 72, 72, 417, 139, 416, 138, 139, 139, 139, 139, 139, 139,
73, 433, 73, 73, 73, 73, 73, 73, 73, 72, 139, 213, 213, 213, 414, 413, 138, 141, 141, 141,
146, 146, 146, 146, 146, 146, 146, 432, 73, 74, 141, 141, 141, 141, 206, 206, 206, 206, 206, 206,
430, 74, 72, 429, 74, 74, 74, 74, 74, 74, 206, 207, 207, 207, 207, 207, 207, 207, 208, 208,
74, 73, 143, 428, 143, 427, 426, 143, 143, 143, 208, 208, 208, 208, 208, 209, 209, 209, 209, 209,
143, 143, 143, 143, 144, 144, 144, 144, 144, 144, 209, 209, 221, 221, 221, 229, 229, 229, 233, 233,
144, 208, 208, 208, 425, 424, 145, 423, 145, 422, 233, 239, 239, 239, 372, 372, 372, 412, 411, 410,
144, 145, 145, 145, 145, 145, 145, 145, 219, 219, 409, 408, 407, 406, 405, 404, 403, 372, 402, 372,
219, 420, 419, 144, 147, 147, 147, 147, 147, 147, 443, 443, 400, 391, 390, 389, 388, 387, 386, 384,
147, 212, 212, 212, 212, 212, 212, 212, 213, 213, 383, 382, 379, 378, 376, 373, 371, 370, 369, 367,
213, 213, 213, 213, 213, 214, 214, 214, 214, 214, 366, 365, 362, 361, 360, 359, 358, 357, 356, 355,
214, 214, 215, 215, 215, 215, 215, 215, 215, 227, 349, 346, 343, 342, 341, 340, 339, 337, 335, 334,
227, 227, 235, 235, 235, 239, 239, 239, 245, 245, 333, 332, 330, 329, 327, 325, 324, 323, 322, 321,
245, 378, 378, 378, 418, 417, 416, 415, 414, 413, 320, 319, 318, 316, 315, 314, 313, 312, 311, 310,
412, 411, 410, 409, 378, 408, 378, 449, 449, 450, 309, 308, 304, 303, 300, 289, 285, 284, 283, 282,
450, 406, 397, 396, 395, 394, 393, 392, 390, 389, 275, 274, 273, 268, 267, 266, 265, 264, 263, 260,
388, 385, 384, 382, 379, 377, 376, 375, 373, 372, 259, 258, 257, 256, 255, 254, 253, 252, 251, 250,
371, 368, 367, 366, 365, 364, 363, 362, 361, 355, 249, 248, 247, 246, 245, 238, 237, 236, 235, 234,
352, 349, 348, 347, 346, 345, 343, 341, 340, 339, 232, 228, 226, 225, 224, 220, 219, 218, 217, 216,
338, 336, 335, 333, 331, 330, 329, 328, 327, 326, 215, 212, 210, 205, 204, 203, 201, 200, 199, 197,
325, 324, 322, 321, 320, 319, 318, 317, 316, 315, 196, 195, 194, 193, 192, 191, 190, 189, 188, 187,
314, 310, 309, 306, 295, 291, 290, 289, 288, 281, 186, 185, 184, 183, 182, 181, 180, 179, 177, 176,
280, 279, 274, 273, 272, 271, 270, 269, 266, 265, 175, 174, 173, 172, 171, 170, 169, 168, 167, 166,
264, 263, 262, 261, 260, 259, 258, 257, 256, 255, 165, 163, 162, 161, 160, 159, 158, 157, 156, 155,
254, 253, 252, 251, 244, 243, 242, 241, 240, 238, 154, 153, 151, 150, 149, 148, 147, 146, 134, 132,
234, 232, 231, 230, 226, 225, 224, 223, 222, 221, 131, 130, 128, 127, 126, 125, 124, 123, 121, 120,
218, 216, 211, 210, 209, 207, 206, 205, 203, 202, 119, 118, 117, 116, 115, 114, 113, 112, 111, 110,
201, 200, 199, 198, 197, 196, 195, 194, 193, 192, 108, 105, 104, 103, 102, 101, 100, 98, 97, 96,
191, 190, 189, 188, 187, 186, 185, 183, 182, 181, 95, 94, 93, 92, 91, 90, 89, 88, 87, 86,
180, 179, 178, 177, 176, 175, 174, 173, 172, 171, 85, 84, 83, 82, 78, 74, 49, 44, 42, 39,
169, 168, 167, 166, 165, 164, 163, 162, 161, 160, 36, 23, 20, 17, 12, 7, 3, 442, 442, 442,
159, 157, 156, 155, 154, 153, 152, 139, 137, 136, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
135, 133, 132, 131, 130, 129, 128, 126, 125, 124, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
123, 122, 121, 120, 119, 118, 117, 116, 115, 113, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
110, 109, 108, 107, 106, 105, 103, 102, 101, 100, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
99, 98, 97, 96, 95, 94, 93, 92, 91, 90, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
89, 88, 87, 83, 79, 51, 46, 44, 41, 38, 442, 442, 442, 442, 442, 442, 442, 442, 442, 442,
25, 22, 19, 14, 9, 5, 448, 448, 448, 448, 442, 442, 442, 442, 442
448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448
} ; } ;
/* Table of booleans, true if rule could match eol. */ /* Table of booleans, true if rule could match eol. */
static yyconst flex_int32_t yy_rule_can_match_eol[150] = static yyconst flex_int32_t yy_rule_can_match_eol[148] =
{ 0, { 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
...@@ -774,7 +756,7 @@ static yyconst flex_int32_t yy_rule_can_match_eol[150] = ...@@ -774,7 +756,7 @@ static yyconst flex_int32_t yy_rule_can_match_eol[150] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 1, 0, 0, }; 0, 0, 0, 0, 0, 1, 0, 0, };
/* The intent behind this definition is that it'll catch /* The intent behind this definition is that it'll catch
* any uses of REJECT which flex missed. * any uses of REJECT which flex missed.
...@@ -818,7 +800,6 @@ static int check_type(yyscan_t yyscanner); ...@@ -818,7 +800,6 @@ static int check_type(yyscan_t yyscanner);
static int reserved_word(yyscan_t yyscanner); static int reserved_word(yyscan_t yyscanner);
#define INITIAL 0 #define INITIAL 0
#define FIELDS 1
#define YY_EXTRA_TYPE TParseContext* #define YY_EXTRA_TYPE TParseContext*
...@@ -1090,13 +1071,13 @@ yy_match: ...@@ -1090,13 +1071,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 449 ) if ( yy_current_state >= 443 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp; ++yy_cp;
} }
while ( yy_current_state != 448 ); while ( yy_current_state != 442 );
yy_cp = yyg->yy_last_accepting_cpos; yy_cp = yyg->yy_last_accepting_cpos;
yy_current_state = yyg->yy_last_accepting_state; yy_current_state = yyg->yy_last_accepting_state;
...@@ -1653,7 +1634,7 @@ YY_RULE_SETUP ...@@ -1653,7 +1634,7 @@ YY_RULE_SETUP
YY_BREAK YY_BREAK
case 131: case 131:
YY_RULE_SETUP YY_RULE_SETUP
{ BEGIN(FIELDS); return DOT; } { return DOT; }
YY_BREAK YY_BREAK
case 132: case 132:
YY_RULE_SETUP YY_RULE_SETUP
...@@ -1708,31 +1689,18 @@ YY_RULE_SETUP ...@@ -1708,31 +1689,18 @@ YY_RULE_SETUP
{ return QUESTION; } { return QUESTION; }
YY_BREAK YY_BREAK
case 145: case 145:
YY_RULE_SETUP /* rule 145 can match eol */
{
BEGIN(INITIAL);
yylval->lex.string = NewPoolTString(yytext);
return FIELD_SELECTION;
}
YY_BREAK
case 146:
YY_RULE_SETUP
{}
YY_BREAK
case 147:
/* rule 147 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
{ } { }
YY_BREAK YY_BREAK
case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(FIELDS):
{ yyterminate(); } { yyterminate(); }
YY_BREAK YY_BREAK
case 148: case 146:
YY_RULE_SETUP YY_RULE_SETUP
{ assert(false); return 0; } { assert(false); return 0; }
YY_BREAK YY_BREAK
case 149: case 147:
YY_RULE_SETUP YY_RULE_SETUP
ECHO; ECHO;
YY_BREAK YY_BREAK
...@@ -2028,7 +1996,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -2028,7 +1996,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 449 ) if ( yy_current_state >= 443 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
...@@ -2057,11 +2025,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) ...@@ -2057,11 +2025,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 449 ) if ( yy_current_state >= 443 )
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 448); yy_is_jam = (yy_current_state == 442);
return yy_is_jam ? 0 : yy_current_state; return yy_is_jam ? 0 : yy_current_state;
} }
......
src/compiler/glslang_tab.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/compiler/glslang_tab.h
...@@ -93,52 +93,51 @@ extern int yydebug; ...@@ -93,52 +93,51 @@ extern int yydebug;
FLOATCONSTANT = 302, FLOATCONSTANT = 302,
INTCONSTANT = 303, INTCONSTANT = 303,
BOOLCONSTANT = 304, BOOLCONSTANT = 304,
FIELD_SELECTION = 305, LEFT_OP = 305,
LEFT_OP = 306, RIGHT_OP = 306,
RIGHT_OP = 307, INC_OP = 307,
INC_OP = 308, DEC_OP = 308,
DEC_OP = 309, LE_OP = 309,
LE_OP = 310, GE_OP = 310,
GE_OP = 311, EQ_OP = 311,
EQ_OP = 312, NE_OP = 312,
NE_OP = 313, AND_OP = 313,
AND_OP = 314, OR_OP = 314,
OR_OP = 315, XOR_OP = 315,
XOR_OP = 316, MUL_ASSIGN = 316,
MUL_ASSIGN = 317, DIV_ASSIGN = 317,
DIV_ASSIGN = 318, ADD_ASSIGN = 318,
ADD_ASSIGN = 319, MOD_ASSIGN = 319,
MOD_ASSIGN = 320, LEFT_ASSIGN = 320,
LEFT_ASSIGN = 321, RIGHT_ASSIGN = 321,
RIGHT_ASSIGN = 322, AND_ASSIGN = 322,
AND_ASSIGN = 323, XOR_ASSIGN = 323,
XOR_ASSIGN = 324, OR_ASSIGN = 324,
OR_ASSIGN = 325, SUB_ASSIGN = 325,
SUB_ASSIGN = 326, LEFT_PAREN = 326,
LEFT_PAREN = 327, RIGHT_PAREN = 327,
RIGHT_PAREN = 328, LEFT_BRACKET = 328,
LEFT_BRACKET = 329, RIGHT_BRACKET = 329,
RIGHT_BRACKET = 330, LEFT_BRACE = 330,
LEFT_BRACE = 331, RIGHT_BRACE = 331,
RIGHT_BRACE = 332, DOT = 332,
DOT = 333, COMMA = 333,
COMMA = 334, COLON = 334,
COLON = 335, EQUAL = 335,
EQUAL = 336, SEMICOLON = 336,
SEMICOLON = 337, BANG = 337,
BANG = 338, DASH = 338,
DASH = 339, TILDE = 339,
TILDE = 340, PLUS = 340,
PLUS = 341, STAR = 341,
STAR = 342, SLASH = 342,
SLASH = 343, PERCENT = 343,
PERCENT = 344, LEFT_ANGLE = 344,
LEFT_ANGLE = 345, RIGHT_ANGLE = 345,
RIGHT_ANGLE = 346, VERTICAL_BAR = 346,
VERTICAL_BAR = 347, CARET = 347,
CARET = 348, AMPERSAND = 348,
AMPERSAND = 349, QUESTION = 349
QUESTION = 350
}; };
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment