OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glcpp: Remove spurious newline generated by #version handling.

Browse Source 
This was causing line numbering to be off by one.  The newline comes
from the NEWLINE token at the end of the line; there's no need to
insert one.
This commit is contained in:
Kenneth Graunke
2010-08-16 13:42:04 -07:00
parent fc63e37b97
commit 6be3a8b70a
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,10 +88,8 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
return SPACE; return SPACE;
} }
{HASH}(version) { {HASH}version {
yylval->str = talloc_strdup (yyextra, yytext); yylval->str = talloc_strdup (yyextra, yytext);
yylineno++;
yycolumn = 0;
yyextra->space_tokens = 0; yyextra->space_tokens = 0;
return HASH_VERSION; return HASH_VERSION;
} }

2
src/glsl/glcpp/glcpp-parse.y
View File

@@ -309,7 +309,7 @@ control_line:
talloc_free (macro); talloc_free (macro);
} }
add_builtin_define (parser, "__VERSION__", $2); add_builtin_define (parser, "__VERSION__", $2);
glcpp_printf(parser->output, "#version %" PRIiMAX "\n", $2); glcpp_printf(parser->output, "#version %" PRIiMAX, $2);
} }
| HASH NEWLINE | HASH NEWLINE
; ;