OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl/glcpp: Alphabetize lists of start conditions

Browse Source 
There is no behavioral change here. It's just easier to verify that lists
of start conditions include all expected conditions when they appear in a
consistent order.

The <INITIAL> state is special, so it appears first in all lists. All others
appear in alphabetical order.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
This commit is contained in:
Carl Worth
2014-07-01 14:55:56 -07:00
parent f9c99aefea
commit 80e9301d9b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/glsl/glcpp/glcpp-lex.l
View File

@@ -165,7 +165,7 @@ glcpp_lex_update_state_per_token (glcpp_parser_t *parser, int token)
* update the "Internal compiler error" catch-all rule near the end of * update the "Internal compiler error" catch-all rule near the end of
* this file. */ * this file. */
%x DONE COMMENT HASH UNREACHABLE DEFINE NEWLINE_CATCHUP %x COMMENT DEFINE DONE HASH NEWLINE_CATCHUP UNREACHABLE
SPACE [[:space:]] SPACE [[:space:]]
NONSPACE [^[:space:]] NONSPACE [^[:space:]]
@@ -253,7 +253,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
} }
/* Multi-line comments */ /* Multi-line comments */
<DEFINE,HASH,INITIAL>"/*" { yy_push_state(COMMENT, yyscanner); } <INITIAL,DEFINE,HASH>"/*" { yy_push_state(COMMENT, yyscanner); }
<COMMENT>[^*\r\n]* <COMMENT>[^*\r\n]*
<COMMENT>[^*\r\n]*[\r\n] { yylineno++; yycolumn = 0; parser->commented_newlines++; } <COMMENT>[^*\r\n]*[\r\n] { yylineno++; yycolumn = 0; parser->commented_newlines++; }
<COMMENT>"*"+[^*/\r\n]* <COMMENT>"*"+[^*/\r\n]*
@@ -543,7 +543,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
* rule, then we have made a mistake above and need to fix one or more * rule, then we have made a mistake above and need to fix one or more
* of the preceding patterns to match that input. */ * of the preceding patterns to match that input. */
<INITIAL,DONE,COMMENT,DEFINE,HASH,NEWLINE_CATCHUP>. { <INITIAL,COMMENT,DEFINE,DONE,HASH,NEWLINE_CATCHUP>. {
glcpp_error(yylloc, yyextra, "Internal compiler error: Unexpected character: %s", yytext); glcpp_error(yylloc, yyextra, "Internal compiler error: Unexpected character: %s", yytext);
} }