glcpp: Remove 2 shift/reduce conflicts from the grammar.
authorCarl Worth <cworth@cworth.org>
Wed, 28 Jul 2010 18:07:46 +0000 (11:07 -0700)
committerCarl Worth <cworth@cworth.org>
Wed, 28 Jul 2010 18:07:46 +0000 (11:07 -0700)
commit2233d10442f1e19d18693fc030aefe292b14cf29
treea0dd7e42aa73b437902dab69549bd4b58d30e805
parentf9b0e5e322a676cf778dc3785281040fcc0bd248
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