diff options
| author | Carl Worth <[email protected]> | 2010-07-28 11:07:46 -0700 |
|---|---|---|
| committer | Carl Worth <[email protected]> | 2010-07-28 11:07:46 -0700 |
| commit | 2233d10442f1e19d18693fc030aefe292b14cf29 (patch) | |
| tree | a0dd7e42aa73b437902dab69549bd4b58d30e805 /src/glsl/glcpp | |
| parent | f9b0e5e322a676cf778dc3785281040fcc0bd248 (diff) | |
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.
Diffstat (limited to 'src/glsl/glcpp')
| -rw-r--r-- | 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 5b7467836d7..3322db06ed3 100644 --- a/src/glsl/glcpp/glcpp-parse.y +++ b/src/glsl/glcpp/glcpp-parse.y @@ -478,7 +478,6 @@ operator: | ',' { $$ = ','; } | '=' { $$ = '='; } | PASTE { $$ = PASTE; } -| DEFINED { $$ = DEFINED; } ; %% |