diff options
| author | Carl Worth <cworth@cworth.org> | 2014-07-02 10:27:50 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-08-07 16:08:29 -0700 |
| commit | bf9bce5bea17e8034927e34bcafa4c694790d9b9 (patch) | |
| tree | 2f2b37999307d1d91eb49ec1e0480af16f9ea279 | |
| parent | 9a54b07651f80c394fb5386855b6611aa722a34b (diff) | |
glsl/glcpp: Fix #pragma to not over-increment the line-number count
Previously, the #pragma directive was swallowing an entire line, (including
the final newline). At that time it was appropriate for it to increment the
line count.
More recently, our handling of #pragma changed to not include the newline. But
the code to increment yylineno stuck around. This was causing __LINE__ to be
increased by one more than desired for every #pragma.
Remove the bogus, extra increment, and add a test for this case.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
| -rw-r--r-- | src/glsl/glcpp/glcpp-lex.l | 2 | ||||
| -rw-r--r-- | src/glsl/glcpp/tests/141-pragma-and-__LINE__.c | 6 | ||||
| -rw-r--r-- | src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index 2b92fd37e2..430abd4bfa 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/glsl/glcpp/glcpp-lex.l @@ -291,8 +291,6 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]? * Simply pass them through to the main compiler's lexer/parser. */ <HASH>(extension|pragma)[^\r\n]* { BEGIN INITIAL; - yylineno++; - yycolumn = 0; RETURN_STRING_TOKEN (PRAGMA); } diff --git a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c b/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c new file mode 100644 index 0000000000..a93f3ce35f --- /dev/null +++ b/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c @@ -0,0 +1,6 @@ +Line 1 /* Test for a bug where #pragma was throwing off the __LINE__ count. */ +Line __LINE__ /* Line 2 */ +#pragma Line 3 +Line __LINE__ /* Line 4 */ +#pragma Line 5 +Line __LINE__ /* Line 6 */ diff --git a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected b/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected new file mode 100644 index 0000000000..330731dc80 --- /dev/null +++ b/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected @@ -0,0 +1,6 @@ +Line 1 +Line 2 +#pragma Line 3 +Line 4 +#pragma Line 5 +Line 6 |