diff options
| author | Carl Worth <[email protected]> | 2014-07-01 14:55:56 -0700 |
|---|---|---|
| committer | Carl Worth <[email protected]> | 2014-07-29 15:11:51 -0700 |
| commit | 80e9301d9be3f1fd85803a1fe5d9c6ac899e4e19 (patch) | |
| tree | 28c2da660752f87181d28e69417ddb4728cbd4f4 /src | |
| parent | f9c99aefea85fe23bbe4b7802542eaf8f70d6798 (diff) | |
glsl/glcpp: Alphabetize lists of start conditions
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 <[email protected]>
Reviewed-by: Kristian Høgsberg <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/glcpp/glcpp-lex.l | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index 1c3e0ab252d..f95e6a3919d 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/glsl/glcpp/glcpp-lex.l @@ -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 * this file. */ -%x DONE COMMENT HASH UNREACHABLE DEFINE NEWLINE_CATCHUP +%x COMMENT DEFINE DONE HASH NEWLINE_CATCHUP UNREACHABLE SPACE [[:space:]] NONSPACE [^[:space:]] @@ -253,7 +253,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]? } /* 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]*[\r\n] { yylineno++; yycolumn = 0; parser->commented_newlines++; } <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 * 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); } |