fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-31 04:50:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

glcpp: Return NEWLINE token for newlines inside multi-line comments.

Browse source 
This is necessary for the main compiler to get correct line numbers.
(cherry picked from commit bd55ba568b)
This commit is contained in:
Kenneth Graunke 2010-10-20 21:51:03 -07:00 • committed by Ian Romanick
parent 2f398485f2
commit 2c57c020a3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/glsl/glcpp/glcpp-lex.l
View file

@ -82,9 +82,9 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
/* Multi-line comments */
"/*" { yy_push_state(COMMENT, yyscanner); }
<COMMENT>[^*\n]*
<COMMENT>[^*\n]*\n { yylineno++; yycolumn = 0; }
<COMMENT>[^*\n]*\n { yylineno++; yycolumn = 0; return NEWLINE; }
<COMMENT>"*"+[^*/\n]*
<COMMENT>"*"+[^*/\n]*\n { yylineno++; yycolumn = 0; }
<COMMENT>"*"+[^*/\n]*\n { yylineno++; yycolumn = 0; return NEWLINE; }
<COMMENT>"*"+"/" {
yy_pop_state(yyscanner);
if (yyextra->space_tokens)