glcpp: Fix locations when encounting "#<NEWLINE>".
authorKenneth Graunke <kenneth@whitecape.org>
Wed, 9 Mar 2016 03:03:11 +0000 (19:03 -0800)
committerKenneth Graunke <kenneth@whitecape.org>
Thu, 10 Mar 2016 19:23:26 +0000 (11:23 -0800)
commite032e4ad5a3f73dffb1a8babcfd333954a574ffa
treee8bfcb081c2857e59826cf9206248129741a1971
parent84f857bef79d66d229a001554719e9299ebe0881
glcpp: Fix locations when encounting "#<NEWLINE>".

We were failing to reset our location tracking when encountering a
NEWLINE in the <HASH> state.  Rip the code from the <*>{NEWLINE} rule,
which handles this properly.

Also, update 146-version-first-hash.c to have proper expectations.
When I introduced the test, I didn't verify that the line/column
numbers were correct, and it turns out they varied based on the type
of newline ending.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94447
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
src/compiler/glsl/glcpp/glcpp-lex.l
src/compiler/glsl/glcpp/tests/146-version-first-hash.c.expected