projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 81affb8) | patch
glsl: Eliminate reduce/reduce conflicts in glsl grammar
authorKeith Packard <keithp@keithp.com>
Fri, 8 Oct 2010 00:25:34 +0000 (17:25 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Fri, 11 Feb 2011 22:12:43 +0000 (14:12 -0800)
commitf4b812e1a661448cf4b624f283c949a54b52e9d5
tree76f59f0df126970028d101c518baa288b32fdebbtree
parent81affb8f4cb1a8e0304002d9cb3630ad42710b4ccommit | diff
glsl: Eliminate reduce/reduce conflicts in glsl grammar

This requires lexical disambiguation between variable and type
identifiers (as most C compilers do).

Signed-off-by: Keith Packard <keithp@keithp.com>
NOTE: This is a candidate for the 7.9 and 7.10 branches.
src/glsl/glsl_parser.ypp diff | blob | history