Skip to content

A
angle
Commit 3f83e29c by shannonwoods@chromium.org
Options

Added preprocessor support for parsing the unsigned integer suffix.

TRAC #23185 Signed-off-by: Geoff Lang Signed-off-by: Shannon Woods Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2412 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent b0757168
Showing with 72 additions and 70 deletions
src/compiler/preprocessor/Tokenizer.cpp
......@@ -368,7 +368,7 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
static yyconst flex_int16_t yy_accept[90] =
static yyconst flex_int16_t yy_accept[93] =
{ 0,
0, 0, 0, 0, 39, 37, 34, 35, 35, 33,
7, 33, 33, 33, 33, 33, 33, 33, 33, 9,
......@@ -378,7 +378,9 @@ static yyconst flex_int16_t yy_accept[90] =
11, 11, 9, 11, 9, 9, 14, 16, 18, 17,
15, 8, 36, 36, 31, 21, 32, 22, 3, 5,
6, 11, 10, 11, 1, 10, 11, 0, 10, 9,
28, 29, 0, 10, 10, 10, 9, 10, 0
9, 9, 28, 29, 0, 10, 10, 10, 9, 10,
9, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
......@@ -420,88 +422,88 @@ static yyconst flex_int32_t yy_meta[29] =
4, 4, 4, 4, 4, 1, 1, 1
} ;
static yyconst flex_int16_t yy_base[94] =
static yyconst flex_int16_t yy_base[97] =
{ 0,
0, 0, 26, 28, 167, 173, 164, 173, 129, 107,
173, 102, 25, 173, 97, 23, 27, 32, 31, 38,
51, 38, 88, 50, 0, 74, 16, 52, 0, 173,
98, 81, 80, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 68, 173, 0, 173, 81, 54, 84,
95, 107, 0, 112, 0, 0, 46, 173, 173, 173,
39, 0, 173, 49, 173, 173, 173, 173, 0, 173,
173, 98, 0, 127, 0, 0, 134, 71, 119, 16,
173, 173, 137, 129, 136, 140, 0, 143, 173, 160,
33, 164, 168
0, 0, 26, 28, 174, 175, 171, 175, 167, 148,
175, 147, 25, 175, 113, 23, 27, 32, 31, 38,
51, 38, 107, 50, 0, 74, 16, 52, 0, 175,
118, 102, 105, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 68, 175, 0, 175, 81, 76, 84,
95, 107, 71, 112, 0, 58, 60, 175, 175, 175,
46, 0, 175, 55, 175, 175, 175, 175, 0, 175,
175, 98, 0, 127, 0, 0, 134, 71, 119, 0,
28, 0, 175, 175, 137, 129, 136, 140, 16, 143,
0, 175, 160, 33, 164, 168
} ;
static yyconst flex_int16_t yy_def[94] =
static yyconst flex_int16_t yy_def[97] =
{ 0,
89, 1, 90, 90, 89, 89, 89, 89, 89, 89,
89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
89, 89, 89, 89, 91, 89, 89, 89, 92, 89,
89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
89, 89, 89, 89, 89, 93, 89, 89, 20, 20,
48, 51, 51, 89, 21, 51, 89, 89, 89, 89,
89, 91, 89, 89, 89, 89, 89, 89, 92, 89,
89, 44, 44, 72, 93, 48, 51, 89, 52, 54,
89, 89, 89, 74, 77, 89, 51, 89, 0, 89,
89, 89, 89
92, 1, 93, 93, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 94, 92, 92, 92, 95, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 96, 92, 92, 20, 20,
48, 51, 51, 92, 21, 51, 92, 92, 92, 92,
92, 94, 92, 92, 92, 92, 92, 92, 95, 92,
92, 44, 44, 72, 96, 48, 51, 92, 52, 51,
54, 51, 92, 92, 92, 74, 77, 92, 51, 92,
51, 0, 92, 92, 92, 92
} ;
static yyconst flex_int16_t yy_nxt[202] =
static yyconst flex_int16_t yy_nxt[204] =
{ 0,
6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 21, 22, 23, 24,
25, 25, 25, 25, 25, 26, 27, 28, 30, 31,
30, 31, 37, 40, 65, 32, 62, 32, 42, 87,
30, 31, 37, 40, 65, 32, 62, 32, 42, 91,
45, 41, 66, 38, 46, 43, 44, 44, 44, 47,
48, 63, 49, 49, 50, 57, 58, 82, 51, 52,
51, 53, 54, 48, 81, 55, 55, 55, 60, 61,
67, 51, 52, 51, 56, 51, 63, 64, 51, 68,
72, 33, 73, 73, 73, 86, 86, 86, 72, 74,
72, 72, 72, 51, 71, 76, 76, 76, 50, 50,
70, 51, 77, 51, 51, 51, 59, 51, 51, 51,
51, 51, 72, 72, 72, 39, 51, 78, 78, 72,
36, 79, 79, 79, 51, 35, 80, 80, 80, 89,
89, 34, 80, 80, 51, 51, 51, 83, 83, 89,
89, 84, 84, 84, 83, 83, 89, 89, 85, 85,
85, 88, 88, 88, 86, 86, 86, 88, 88, 88,
29, 29, 29, 29, 69, 33, 89, 69, 75, 89,
75, 75, 5, 89, 89, 89, 89, 89, 89, 89,
89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
89
48, 89, 49, 49, 50, 57, 58, 63, 51, 52,
51, 53, 54, 48, 84, 55, 55, 55, 60, 61,
67, 51, 52, 51, 56, 51, 63, 64, 83, 68,
72, 82, 73, 73, 73, 88, 88, 88, 72, 74,
72, 72, 72, 51, 80, 76, 76, 76, 50, 50,
51, 51, 77, 51, 51, 51, 33, 51, 51, 51,
51, 51, 72, 72, 72, 71, 51, 78, 78, 72,
70, 79, 79, 79, 51, 59, 81, 81, 81, 92,
92, 39, 81, 81, 51, 51, 51, 85, 85, 92,
92, 86, 86, 86, 85, 85, 92, 92, 87, 87,
87, 90, 90, 90, 88, 88, 88, 90, 90, 90,
29, 29, 29, 29, 69, 36, 35, 69, 75, 34,
75, 75, 33, 92, 5, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92
} ;
static yyconst flex_int16_t yy_chk[202] =
static yyconst flex_int16_t yy_chk[204] =
{ 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, 3, 3,
4, 4, 13, 16, 27, 3, 91, 4, 17, 80,
4, 4, 13, 16, 27, 3, 94, 4, 17, 89,
19, 16, 27, 13, 19, 17, 18, 18, 18, 19,
20, 64, 20, 20, 20, 22, 22, 61, 20, 20,
20, 20, 20, 21, 57, 21, 21, 21, 24, 24,
28, 21, 21, 21, 21, 21, 26, 26, 49, 28,
44, 33, 44, 44, 44, 78, 78, 78, 44, 44,
44, 44, 44, 48, 32, 48, 48, 48, 50, 50,
31, 48, 48, 48, 48, 48, 23, 50, 50, 51,
51, 51, 72, 72, 72, 15, 51, 52, 52, 72,
12, 52, 52, 52, 54, 10, 54, 54, 54, 79,
79, 9, 54, 54, 54, 54, 54, 74, 74, 84,
84, 74, 74, 74, 77, 77, 85, 85, 77, 77,
77, 83, 83, 83, 86, 86, 86, 88, 88, 88,
90, 90, 90, 90, 92, 7, 5, 92, 93, 0,
93, 93, 89, 89, 89, 89, 89, 89, 89, 89,
89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
89
20, 81, 20, 20, 20, 22, 22, 64, 20, 20,
20, 20, 20, 21, 61, 21, 21, 21, 24, 24,
28, 21, 21, 21, 21, 21, 26, 26, 57, 28,
44, 56, 44, 44, 44, 78, 78, 78, 44, 44,
44, 44, 44, 48, 53, 48, 48, 48, 50, 50,
49, 48, 48, 48, 48, 48, 33, 50, 50, 51,
51, 51, 72, 72, 72, 32, 51, 52, 52, 72,
31, 52, 52, 52, 54, 23, 54, 54, 54, 79,
79, 15, 54, 54, 54, 54, 54, 74, 74, 86,
86, 74, 74, 74, 77, 77, 87, 87, 77, 77,
77, 85, 85, 85, 88, 88, 88, 90, 90, 90,
93, 93, 93, 93, 95, 12, 10, 95, 96, 9,
96, 96, 7, 5, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92
} ;
/* The intent behind this definition is that it'll catch
......@@ -854,13 +856,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 90 )
if ( yy_current_state >= 93 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
while ( yy_current_state != 89 );
while ( yy_current_state != 92 );
yy_cp = yyg->yy_last_accepting_cpos;
yy_current_state = yyg->yy_last_accepting_state;
......@@ -1453,7 +1455,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 90 )
if ( yy_current_state >= 93 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
......@@ -1482,11 +1484,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 90 )
if ( yy_current_state >= 93 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 89);
yy_is_jam = (yy_current_state == 92);
return yy_is_jam ? 0 : yy_current_state;
}
......
src/compiler/preprocessor/Tokenizer.l
......@@ -115,7 +115,7 @@ FRACTIONAL_CONSTANT ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
return pp::Token::IDENTIFIER;
}
{DECIMAL_CONSTANT}|{OCTAL_CONSTANT}|{HEXADECIMAL_CONSTANT} {
({DECIMAL_CONSTANT}[uU]?)|({OCTAL_CONSTANT}[uU]?)|({HEXADECIMAL_CONSTANT}[uU]?) {
yylval->assign(yytext, yyleng);
return pp::Token::CONST_INT;
}
......
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