glcpp: Remove spurious newline generated by #version handling.
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.
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index 1cd95b2..9187926 100644
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/src/glsl/glcpp/glcpp-lex.l
@@ -88,10 +88,8 @@
return SPACE;
}
-{HASH}(version) {
+{HASH}version {
yylval->str = talloc_strdup (yyextra, yytext);
- yylineno++;
- yycolumn = 0;
yyextra->space_tokens = 0;
return HASH_VERSION;
}
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 3d08ce6..c91da15 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -309,7 +309,7 @@
talloc_free (macro);
}
add_builtin_define (parser, "__VERSION__", $2);
- glcpp_printf(parser->output, "#version %" PRIiMAX "\n", $2);
+ glcpp_printf(parser->output, "#version %" PRIiMAX, $2);
}
| HASH NEWLINE
;