Module: Mesa Branch: glsl2 Commit: 2233d10442f1e19d18693fc030aefe292b14cf29 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2233d10442f1e19d18693fc030aefe292b14cf29
Author: Carl Worth <[email protected]> Date: Wed Jul 28 11:07:46 2010 -0700 glcpp: Remove 2 shift/reduce conflicts from the grammar. Since we have productions to turn "defined FOO" and "defined ( FOO )" into a conditional_token we don't need to list DEFINED as an operator as well. Doing so just introduces the shift/reduce ambiguity with no benefit. --- src/glsl/glcpp/glcpp-parse.y | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y index 5b74678..3322db0 100644 --- a/src/glsl/glcpp/glcpp-parse.y +++ b/src/glsl/glcpp/glcpp-parse.y @@ -478,7 +478,6 @@ operator: | ',' { $$ = ','; } | '=' { $$ = '='; } | PASTE { $$ = PASTE; } -| DEFINED { $$ = DEFINED; } ; %% _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
