summaryrefslogtreecommitdiff
path: root/src/glsl/glcpp
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-08-16 13:42:04 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-08-16 13:43:35 -0700
commit6be3a8b70af4ba4fa4d037d54ecf6d5f055edbc9 (patch)
treeac754fd7a351f91e741a95ddb887d8f580810488 /src/glsl/glcpp
parentfc63e37b971b641dfdff000ba353c4810414c20e (diff)
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.
Diffstat (limited to 'src/glsl/glcpp')
-rw-r--r--src/glsl/glcpp/glcpp-lex.l4
-rw-r--r--src/glsl/glcpp/glcpp-parse.y2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index 1cd95b238d..9187926146 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 3d08ce6c75..c91da15519 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
;