From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 16 Aug 2010 20:42:04 +0000 (-0700)
Subject: glcpp: Remove spurious newline generated by #version handling.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6be3a8b70af4ba4fa4d037d54ecf6d5f055edbc9;p=mesa.git

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 1cd95b238d2..9187926146a 100644
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/src/glsl/glcpp/glcpp-lex.l
@@ -88,10 +88,8 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 		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 3d08ce6c75f..c91da15519e 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -309,7 +309,7 @@ control_line:
 			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
 ;