diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2010-10-20 21:51:03 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2010-10-21 00:13:33 -0700 |
| commit | bd55ba568b301d0f764cd1ca015e84e1ae932c8b (patch) | |
| tree | 84e12eb5113e40d0817a16adf2f63748973b9f5b /src/glsl | |
| parent | 089aa0ba247cee908ae689f8e4f3ffc457ce7627 (diff) | |
glcpp: Return NEWLINE token for newlines inside multi-line comments.
This is necessary for the main compiler to get correct line numbers.
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/glcpp/glcpp-lex.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index 8eb84ed138..e936854cf2 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/glsl/glcpp/glcpp-lex.l @@ -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) |