diff options
| -rw-r--r-- | src/glsl/glcpp/glcpp-lex.l | 11 | ||||
| -rw-r--r-- | src/glsl/glcpp/tests/.gitignore | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index aeaf8abdf8a..48cc62c1109 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/glsl/glcpp/glcpp-lex.l @@ -172,6 +172,7 @@ SPACE [[:space:]] NONSPACE [^[:space:]] HSPACE [ \t] HASH # +NEWLINE (\r\n|\n\r|\r|\n) IDENTIFIER [_a-zA-Z][_a-zA-Z0-9]* PP_NUMBER [.]?[0-9]([._a-zA-Z0-9]|[eEpP][-+])* PUNCTUATION [][(){}.&*~!/%<>^|;,=+-] @@ -256,9 +257,9 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]? /* Multi-line comments */ <INITIAL,DEFINE,HASH>"/*" { yy_push_state(COMMENT, yyscanner); } <COMMENT>[^*\r\n]* -<COMMENT>[^*\r\n]*[\r\n] { yylineno++; yycolumn = 0; parser->commented_newlines++; } +<COMMENT>[^*\r\n]*{NEWLINE} { yylineno++; yycolumn = 0; parser->commented_newlines++; } <COMMENT>"*"+[^*/\r\n]* -<COMMENT>"*"+[^*/\r\n]*[\r\n] { yylineno++; yycolumn = 0; parser->commented_newlines++; } +<COMMENT>"*"+[^*/\r\n]*{NEWLINE} { yylineno++; yycolumn = 0; parser->commented_newlines++; } <COMMENT>"*"+"/" { yy_pop_state(yyscanner); /* In the <HASH> start condition, we don't want any SPACE token. */ @@ -289,7 +290,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]? /* Swallow empty #pragma directives, (to avoid confusing the * downstream compiler). */ -<HASH>pragma{HSPACE}*/[\r\n] { +<HASH>pragma{HSPACE}*/{NEWLINE} { BEGIN INITIAL; } @@ -305,7 +306,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]? RETURN_TOKEN (LINE); } -<HASH>\n { +<HASH>{NEWLINE} { BEGIN INITIAL; RETURN_TOKEN_NEVER_SKIP (NEWLINE); } @@ -521,7 +522,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]? /* We preserve all newlines, even between #if 0..#endif, so no skipping.. */ -<*>[\r\n] { +<*>{NEWLINE} { if (parser->commented_newlines) { BEGIN NEWLINE_CATCHUP; } else { diff --git a/src/glsl/glcpp/tests/.gitignore b/src/glsl/glcpp/tests/.gitignore new file mode 100644 index 00000000000..f18a9bb4b3a --- /dev/null +++ b/src/glsl/glcpp/tests/.gitignore @@ -0,0 +1,3 @@ +subtest-cr/ +subtest-cr-lf/ +subtest-lf-cr/ |