glcpp: don't push #line directives into next line
authorFabian Bieler <fabianbieler@fastmail.fm>
Tue, 24 Jul 2012 13:36:46 +0000 (15:36 +0200)
committerMatt Turner <mattst88@gmail.com>
Fri, 9 Nov 2012 22:33:08 +0000 (14:33 -0800)
commit9ad71c44fa316314551b8540241e81b296d35f44
tree89df6f71951d05c7e79b560de851d81644406e13
parent060e69679925f171cfcc2a5f84fab1d833a7e804
glcpp: don't push #line directives into next line

By moving the HASH_LINE rule out of control_line: and into line:, we avoid
adding control_line's additional \n (as seen in the first hunk).

mattst88: Carl and I determined independently of Fabian that the 091
test needed to be modified identically to this, and our patch to fix the
test was more complicated.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=51506
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Carl Worth <cworth@cworth.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/glsl/glcpp/glcpp-parse.y
src/glsl/glcpp/tests/091-hash-line.c.expected