diff options
| author | Carl Worth <[email protected]> | 2014-07-01 15:02:14 -0700 |
|---|---|---|
| committer | Carl Worth <[email protected]> | 2014-07-29 15:11:51 -0700 |
| commit | 4ebff9bca638d96b562640c093b2dcc5d02fb443 (patch) | |
| tree | 8b39ee34c4b20897f89b247e703a1ab5606eba8e /src/glsl | |
| parent | 80e9301d9be3f1fd85803a1fe5d9c6ac899e4e19 (diff) | |
glsl/glcpp: Combine the two rules matching any character
Using a single rule here means that we can use the <*> syntax to match
all start conditions. This makes the catch-all rule more robust against
the addition of future start conditions, (no need to maintain an ever-
growing list of start conditions for this rul).
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Kristian Høgsberg <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/glcpp/glcpp-lex.l | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index f95e6a3919d..79a7ad7b09a 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/glsl/glcpp/glcpp-lex.l @@ -543,17 +543,17 @@ 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,COMMENT,DEFINE,DONE,HASH,NEWLINE_CATCHUP>. { +<*>. { glcpp_error(yylloc, yyextra, "Internal compiler error: Unexpected character: %s", yytext); -} /* We don't actually use the UNREACHABLE start condition. We - only have this action here so that we can pretend to call some + only have this block here so that we can pretend to call some generated functions, (to avoid "defined but not used" warnings. */ -<UNREACHABLE>. { - unput('.'); - yy_top_state(yyextra); + if (YY_START == UNREACHABLE) { + unput('.'); + yy_top_state(yyextra); + } } %% |