The glcpp parser is line-based, so it needs to see a NEWLINE token at the end
of each line. This causes a trick for files that end without a final newline.
Previously, the lexer for glcpp punted in this case by unconditionally
returning a NEWLINE token at end-of-file, (causing most files to have an extra
blank line at the end). Here, we refine this by lexing end-of-file as a
NEWLINE token only if the immediately preceding token was not a NEWLINE token.
The patch is a minor change that only looks huge for two reasons:
1. Almost all glcpp test result ".expected" files are updated to drop
the extra newline.
2. All return statements from the lexer are adjusted to use a new
RETURN_TOKEN macro that tracks the last-token-was-a-newline state.
---
src/glsl/glcpp/glcpp-lex.l | 88 ++++++++++++----------
src/glsl/glcpp/glcpp-parse.y | 1 +
src/glsl/glcpp/glcpp.h | 1 +
.../glcpp/tests/000-content-with-spaces.c.expected | 1 -
src/glsl/glcpp/tests/001-define.c.expected | 1 -
src/glsl/glcpp/tests/002-define-chain.c.expected | 1 -
.../tests/003-define-chain-reverse.c.expected | 1 -
.../glcpp/tests/004-define-recursive.c.expected | 1 -
.../tests/005-define-composite-chain.c.expected | 1 -
.../006-define-composite-chain-reverse.c.expected | 1 -
.../007-define-composite-recursive.c.expected | 1 -
src/glsl/glcpp/tests/008-define-empty.c.expected | 1 -
src/glsl/glcpp/tests/009-undef.c.expected | 1 -
.../glcpp/tests/010-undef-re-define.c.expected | 1 -
.../glcpp/tests/011-define-func-empty.c.expected | 1 -
.../glcpp/tests/012-define-func-no-args.c.expected | 1 -
.../tests/013-define-func-1-arg-unused.c.expected | 1 -
.../tests/014-define-func-2-arg-unused.c.expected | 1 -
.../tests/015-define-object-with-parens.c.expected | 1 -
.../glcpp/tests/016-define-func-1-arg.c.expected | 1 -
.../glcpp/tests/017-define-func-2-args.c.expected | 1 -
.../018-define-func-macro-as-parameter.c.expected | 1 -
.../tests/019-define-func-1-arg-multi.c.expected | 1 -
.../tests/020-define-func-2-arg-multi.c.expected | 1 -
.../glcpp/tests/021-define-func-compose.c.expected | 1 -
.../022-define-func-arg-with-parens.c.expected | 1 -
.../tests/023-define-extra-whitespace.c.expected | 1 -
.../024-define-chain-to-self-recursion.c.expected | 1 -
.../tests/025-func-macro-as-non-macro.c.expected | 1 -
.../026-define-func-extra-newlines.c.expected | 1 -
.../tests/027-define-chain-obj-to-func.c.expected | 1 -
.../028-define-chain-obj-to-non-func.c.expected | 1 -
...9-define-chain-obj-to-func-with-args.c.expected | 1 -
...030-define-chain-obj-to-func-compose.c.expected | 1 -
...31-define-chain-func-to-func-compose.c.expected | 1 -
.../tests/032-define-func-self-recurse.c.expected | 1 -
.../tests/033-define-func-self-compose.c.expected | 1 -
...34-define-func-self-compose-non-func.c.expected | 1 -
...ompose-non-func-multi-token-argument.c.expected | 1 -
...-func-non-macro-multi-token-argument.c.expected | 1 -
.../tests/037-finalize-unexpanded-macro.c.expected | 1 -
.../tests/038-func-arg-with-commas.c.expected | 1 -
.../039-func-arg-obj-macro-with-comma.c.expected | 1 -
src/glsl/glcpp/tests/040-token-pasting.c.expected | 1 -
src/glsl/glcpp/tests/041-if-0.c.expected | 1 -
src/glsl/glcpp/tests/042-if-1.c.expected | 1 -
src/glsl/glcpp/tests/043-if-0-else.c.expected | 1 -
src/glsl/glcpp/tests/044-if-1-else.c.expected | 1 -
src/glsl/glcpp/tests/045-if-0-elif.c.expected | 1 -
src/glsl/glcpp/tests/046-if-1-elsif.c.expected | 1 -
src/glsl/glcpp/tests/047-if-elif-else.c.expected | 1 -
src/glsl/glcpp/tests/048-if-nested.c.expected | 1 -
.../tests/049-if-expression-precedence.c.expected | 1 -
src/glsl/glcpp/tests/050-if-defined.c.expected | 1 -
src/glsl/glcpp/tests/051-if-relational.c.expected | 1 -
src/glsl/glcpp/tests/052-if-bitwise.c.expected | 1 -
.../glcpp/tests/053-if-divide-and-shift.c.expected | 1 -
src/glsl/glcpp/tests/054-if-with-macros.c.expected | 1 -
...ine-chain-obj-to-func-parens-in-text.c.expected | 1 -
.../tests/056-macro-argument-with-comma.c.expected | 1 -
.../glcpp/tests/057-empty-arguments.c.expected | 1 -
.../058-token-pasting-empty-arguments.c.expected | 1 -
.../tests/059-token-pasting-integer.c.expected | 1 -
...t-paren-in-macro-right-paren-in-text.c.expected | 1 -
.../061-define-chain-obj-to-func-multi.c.expected | 1 -
.../glcpp/tests/062-if-0-skips-garbage.c.expected | 1 -
src/glsl/glcpp/tests/063-comments.c.expected | 1 -
src/glsl/glcpp/tests/064-version.c.expected | 1 -
.../glcpp/tests/065-if-defined-parens.c.expected | 1 -
.../tests/066-if-nospace-expression.c.expected | 1 -
.../glcpp/tests/067-nested-ifdef-ifndef.c.expected | 1 -
.../glcpp/tests/068-accidental-pasting.c.expected | 1 -
.../glcpp/tests/069-repeated-argument.c.expected | 1 -
.../070-undefined-macro-in-expression.c.expected | 1 -
src/glsl/glcpp/tests/071-punctuator.c.expected | 1 -
.../tests/072-token-pasting-same-line.c.expected | 1 -
src/glsl/glcpp/tests/073-if-in-ifdef.c.expected | 1 -
src/glsl/glcpp/tests/074-elif-undef.c.expected | 1 -
.../glcpp/tests/075-elif-elif-undef.c.expected | 1 -
.../glcpp/tests/076-elif-undef-nested.c.expected | 1 -
.../glcpp/tests/077-else-without-if.c.expected | 1 -
.../glcpp/tests/078-elif-without-if.c.expected | 1 -
.../glcpp/tests/079-endif-without-if.c.expected | 1 -
.../tests/080-if-without-expression.c.expected | 1 -
.../tests/081-elif-without-expression.c.expected | 1 -
src/glsl/glcpp/tests/082-invalid-paste.c.expected | 1 -
.../glcpp/tests/083-unterminated-if.c.expected | 1 -
.../tests/085-incorrect-argument-count.c.expected | 1 -
.../tests/086-reserved-macro-names.c.expected | 1 -
src/glsl/glcpp/tests/087-if-comments.c.expected | 1 -
.../tests/088-redefine-macro-legitimate.c.expected | 1 -
.../tests/089-redefine-macro-error.c.expected | 1 -
src/glsl/glcpp/tests/090-hash-error.c.expected | 1 -
src/glsl/glcpp/tests/091-hash-line.c.expected | 1 -
.../tests/092-redefine-macro-error-2.c.expected | 1 -
src/glsl/glcpp/tests/093-divide-by-zero.c.expected | 1 -
.../094-divide-by-zero-short-circuit.c.expected | 1 -
.../glcpp/tests/095-recursive-define.c.expected | 1 -
src/glsl/glcpp/tests/096-paste-twice.c.expected | 1 -
.../097-paste-with-non-function-macro.c.expected | 1 -
src/glsl/glcpp/tests/098-elif-undefined.c.expected | 1 -
src/glsl/glcpp/tests/099-c99-example.c.expected | 1 -
.../glcpp/tests/100-macro-with-colon.c.expected | 1 -
.../glcpp/tests/101-macros-used-twice.c.expected | 1 -
.../104-hash-line-followed-by-code.c.expected | 1 -
.../glcpp/tests/105-multiline-hash-line.c.expected | 1 -
.../glcpp/tests/106-multiline-hash-if.c.expected | 1 -
.../glcpp/tests/107-multiline-hash-elif.c.expected | 1 -
.../108-no-space-after-hash-version.c.expected | 1 -
.../tests/109-no-space-after-hash-line.c.expected | 1 -
.../110-no-space-digits-after-hash-elif.c.expected | 1 -
.../111-no-space-operator-after-hash-if.c.expected | 1 -
...12-no-space-operator-after-hash-elif.c.expected | 1 -
.../tests/113-line-and-file-macros.c.expected | 1 -
.../tests/114-paste-integer-tokens.c.expected | 1 -
.../glcpp/tests/115-line-continuations.c.expected | 1 -
.../116-disable-line-continuations.c.expected | 1 -
...ation-and-non-continuation-backslash.c.expected | 1 -
.../tests/118-comment-becomes-space.c.expected | 1 -
src/glsl/glcpp/tests/118-multiple-else.c.expected | 1 -
.../glcpp/tests/119-elif-after-else.c.expected | 1 -
src/glsl/glcpp/tests/120-undef-builtin.c.expected | 1 -
.../glcpp/tests/121-comment-bug-72686.c.expected | 1 -
.../glcpp/tests/122-redefine-whitespace.c.expected | 1 -
.../tests/124-preprocessing-numbers.c.expected | 1 -
.../125-es-short-circuit-undefined.c.expected | 1 -
.../tests/126-garbage-after-directive.c.expected | 1 -
src/glsl/glcpp/tests/127-pragma-empty.c.expected | 1 -
src/glsl/glcpp/tests/129-define-comment.c.expected | 1 -
129 files changed, 52 insertions(+), 164 deletions(-)
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index 134e71d..2ae2095 100644
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/src/glsl/glcpp/glcpp-lex.l
@@ -60,6 +60,16 @@ void glcpp_set_column (int column_no , yyscan_t yyscanner);
yycolumn = 1; \
yylloc->source = 0; \
} while(0)
+
+#define RETURN_TOKEN(token) \
+ do { \
+ if (token == NEWLINE) \
+ parser->last_token_was_newline = 1; \
+ else \
+ parser->last_token_was_newline = 0; \
+ return (token); \
+ } while(0)
+
%}
%option bison-bridge bison-locations reentrant noyywrap
@@ -111,7 +121,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
parser->commented_newlines--;
if (parser->commented_newlines == 0)
BEGIN INITIAL;
- return NEWLINE;
+ RETURN_TOKEN (NEWLINE);
}
/* The handling of the SKIP vs INITIAL start states requires
@@ -169,13 +179,13 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
<COMMENT>"*"+"/" {
yy_pop_state(yyscanner);
if (yyextra->space_tokens)
- return SPACE;
+ RETURN_TOKEN (SPACE);
}
{HASH}version{HSPACE}+ {
yylval->str = ralloc_strdup (yyextra, yytext);
yyextra->space_tokens = 0;
- return HASH_VERSION;
+ RETURN_TOKEN (HASH_VERSION);
}
/* glcpp doesn't handle #extension, #version, or #pragma directives.
@@ -184,46 +194,46 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
yylval->str = ralloc_strdup (yyextra, yytext);
yylineno++;
yycolumn = 0;
- return OTHER;
+ RETURN_TOKEN (OTHER);
}
{HASH}line{HSPACE}+ {
- return HASH_LINE;
+ RETURN_TOKEN (HASH_LINE);
}
<SKIP,INITIAL>{
{HASH}ifdef {
yyextra->lexing_directive = 1;
yyextra->space_tokens = 0;
- return HASH_IFDEF;
+ RETURN_TOKEN (HASH_IFDEF);
}
{HASH}ifndef {
yyextra->lexing_directive = 1;
yyextra->space_tokens = 0;
- return HASH_IFNDEF;
+ RETURN_TOKEN (HASH_IFNDEF);
}
{HASH}if/[^_a-zA-Z0-9] {
yyextra->lexing_directive = 1;
yyextra->space_tokens = 0;
- return HASH_IF;
+ RETURN_TOKEN (HASH_IF);
}
{HASH}elif/[^_a-zA-Z0-9] {
yyextra->lexing_directive = 1;
yyextra->space_tokens = 0;
- return HASH_ELIF;
+ RETURN_TOKEN (HASH_ELIF);
}
{HASH}else {
yyextra->space_tokens = 0;
- return HASH_ELSE;
+ RETURN_TOKEN (HASH_ELSE);
}
{HASH}endif {
yyextra->space_tokens = 0;
- return HASH_ENDIF;
+ RETURN_TOKEN (HASH_ENDIF);
}
}
@@ -258,21 +268,21 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
{HASH}define{HSPACE}+ {
yyextra->space_tokens = 0;
yy_push_state(DEFINE, yyscanner);
- return HASH_DEFINE;
+ RETURN_TOKEN (HASH_DEFINE);
}
/* An identifier immediately followed by '(' */
<DEFINE>{IDENTIFIER}/"(" {
yy_pop_state(yyscanner);
yylval->str = ralloc_strdup (yyextra, yytext);
- return FUNC_IDENTIFIER;
+ RETURN_TOKEN (FUNC_IDENTIFIER);
}
/* An identifier not immediately followed by '(' */
<DEFINE>{IDENTIFIER} {
yy_pop_state(yyscanner);
yylval->str = ralloc_strdup (yyextra, yytext);
- return OBJ_IDENTIFIER;
+ RETURN_TOKEN (OBJ_IDENTIFIER);
}
/* Whitespace */
@@ -284,7 +294,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
<DEFINE>[/][^*]{NONSPACE}* {
BEGIN INITIAL;
glcpp_error(yylloc, yyextra, "#define followed by a non-identifier:
%s", yytext);
- return INTEGER_STRING;
+ RETURN_TOKEN (INTEGER_STRING);
}
/* A character that can't start an identifier, comment, or
@@ -292,98 +302,98 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
<DEFINE>[^_a-zA-Z/[:space:]]{NONSPACE}* {
BEGIN INITIAL;
glcpp_error(yylloc, yyextra, "#define followed by a non-identifier:
%s", yytext);
- return INTEGER_STRING;
+ RETURN_TOKEN (INTEGER_STRING);
}
{HASH}undef {
yyextra->space_tokens = 0;
- return HASH_UNDEF;
+ RETURN_TOKEN (HASH_UNDEF);
}
{HASH} {
yyextra->space_tokens = 0;
- return HASH;
+ RETURN_TOKEN (HASH);
}
{DECIMAL_INTEGER} {
yylval->str = ralloc_strdup (yyextra, yytext);
- return INTEGER_STRING;
+ RETURN_TOKEN (INTEGER_STRING);
}
{OCTAL_INTEGER} {
yylval->str = ralloc_strdup (yyextra, yytext);
- return INTEGER_STRING;
+ RETURN_TOKEN (INTEGER_STRING);
}
{HEXADECIMAL_INTEGER} {
yylval->str = ralloc_strdup (yyextra, yytext);
- return INTEGER_STRING;
+ RETURN_TOKEN (INTEGER_STRING);
}
"<<" {
- return LEFT_SHIFT;
+ RETURN_TOKEN (LEFT_SHIFT);
}
">>" {
- return RIGHT_SHIFT;
+ RETURN_TOKEN (RIGHT_SHIFT);
}
"<=" {
- return LESS_OR_EQUAL;
+ RETURN_TOKEN (LESS_OR_EQUAL);
}
">=" {
- return GREATER_OR_EQUAL;
+ RETURN_TOKEN (GREATER_OR_EQUAL);
}
"==" {
- return EQUAL;
+ RETURN_TOKEN (EQUAL);
}
"!=" {
- return NOT_EQUAL;
+ RETURN_TOKEN (NOT_EQUAL);
}
"&&" {
- return AND;
+ RETURN_TOKEN (AND);
}
"||" {
- return OR;
+ RETURN_TOKEN (OR);
}
"##" {
if (parser->is_gles)
glcpp_error(yylloc, yyextra, "Token pasting (##) is illegal in
GLES");
- return PASTE;
+ RETURN_TOKEN (PASTE);
}
"defined" {
- return DEFINED;
+ RETURN_TOKEN (DEFINED);
}
{IDENTIFIER} {
yylval->str = ralloc_strdup (yyextra, yytext);
- return IDENTIFIER;
+ RETURN_TOKEN (IDENTIFIER);
}
{PP_NUMBER} {
yylval->str = ralloc_strdup (yyextra, yytext);
- return OTHER;
+ RETURN_TOKEN (OTHER);
}
{PUNCTUATION} {
- return yytext[0];
+ RETURN_TOKEN (yytext[0]);
}
{OTHER}+ {
yylval->str = ralloc_strdup (yyextra, yytext);
- return OTHER;
+ RETURN_TOKEN (OTHER);
}
{HSPACE} {
if (yyextra->space_tokens) {
- return SPACE;
+ RETURN_TOKEN (SPACE);
}
}
@@ -394,7 +404,8 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
yyextra->lexing_directive = 0;
yylineno++;
yycolumn = 0;
- return NEWLINE;
+ parser->last_token_was_newline = 1;
+ RETURN_TOKEN (NEWLINE);
}
<INITIAL,COMMENT,DEFINE><<EOF>> {
@@ -404,7 +415,8 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
glcpp_error(yylloc, yyextra, "#define without macro name");
BEGIN DONE; /* Don't keep matching this rule forever. */
yyextra->lexing_directive = 0;
- return NEWLINE;
+ if (! parser->last_token_was_newline)
+ RETURN_TOKEN (NEWLINE);
}
/* We don't actually use the UNREACHABLE start condition. We
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index c5e364e..92a34d0 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -1307,6 +1307,7 @@ glcpp_parser_create (const struct gl_extensions
*extensions, gl_api api)
parser->active = NULL;
parser->lexing_directive = 0;
parser->space_tokens = 1;
+ parser->last_token_was_newline = 0;
parser->newline_as_space = 0;
parser->in_control_line = 0;
parser->paren_count = 0;
diff --git a/src/glsl/glcpp/glcpp.h b/src/glsl/glcpp/glcpp.h
index 64b4872..6316c9f 100644
--- a/src/glsl/glcpp/glcpp.h
+++ b/src/glsl/glcpp/glcpp.h
@@ -177,6 +177,7 @@ struct glcpp_parser {
active_list_t *active;
int lexing_directive;
int space_tokens;
+ int last_token_was_newline;
int newline_as_space;
int in_control_line;
int paren_count;
diff --git a/src/glsl/glcpp/tests/000-content-with-spaces.c.expected
b/src/glsl/glcpp/tests/000-content-with-spaces.c.expected
index 5e17ec9..f49870f 100644
--- a/src/glsl/glcpp/tests/000-content-with-spaces.c.expected
+++ b/src/glsl/glcpp/tests/000-content-with-spaces.c.expected
@@ -1,2 +1 @@
this is four tokens with spaces
-
diff --git a/src/glsl/glcpp/tests/001-define.c.expected
b/src/glsl/glcpp/tests/001-define.c.expected
index 878fd15..a464d9d 100644
--- a/src/glsl/glcpp/tests/001-define.c.expected
+++ b/src/glsl/glcpp/tests/001-define.c.expected
@@ -1,3 +1,2 @@
1
-
diff --git a/src/glsl/glcpp/tests/002-define-chain.c.expected
b/src/glsl/glcpp/tests/002-define-chain.c.expected
index 43d484d..c6c9ee3 100644
--- a/src/glsl/glcpp/tests/002-define-chain.c.expected
+++ b/src/glsl/glcpp/tests/002-define-chain.c.expected
@@ -1,4 +1,3 @@
1
-
diff --git a/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected
b/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected
index 43d484d..c6c9ee3 100644
--- a/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected
+++ b/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected
@@ -1,4 +1,3 @@
1
-
diff --git a/src/glsl/glcpp/tests/004-define-recursive.c.expected
b/src/glsl/glcpp/tests/004-define-recursive.c.expected
index 4d2698b..2d07687 100644
--- a/src/glsl/glcpp/tests/004-define-recursive.c.expected
+++ b/src/glsl/glcpp/tests/004-define-recursive.c.expected
@@ -4,4 +4,3 @@
foo
bar
baz
-
diff --git a/src/glsl/glcpp/tests/005-define-composite-chain.c.expected
b/src/glsl/glcpp/tests/005-define-composite-chain.c.expected
index c67358f..892975c 100644
--- a/src/glsl/glcpp/tests/005-define-composite-chain.c.expected
+++ b/src/glsl/glcpp/tests/005-define-composite-chain.c.expected
@@ -1,4 +1,3 @@
a 1
-
diff --git a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected
b/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected
index c67358f..892975c 100644
--- a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected
+++ b/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected
@@ -1,4 +1,3 @@
a 1
-
diff --git a/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected
b/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected
index 30fe4dc..0b0b477 100644
--- a/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected
+++ b/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected
@@ -4,4 +4,3 @@
a b c foo
b c a bar
c a b baz
-
diff --git a/src/glsl/glcpp/tests/008-define-empty.c.expected
b/src/glsl/glcpp/tests/008-define-empty.c.expected
index c0f53d7..d148bc8 100644
--- a/src/glsl/glcpp/tests/008-define-empty.c.expected
+++ b/src/glsl/glcpp/tests/008-define-empty.c.expected
@@ -1,3 +1,2 @@
-
diff --git a/src/glsl/glcpp/tests/009-undef.c.expected
b/src/glsl/glcpp/tests/009-undef.c.expected
index 03a7061..9c0b35a 100644
--- a/src/glsl/glcpp/tests/009-undef.c.expected
+++ b/src/glsl/glcpp/tests/009-undef.c.expected
@@ -2,4 +2,3 @@
1
foo
-
diff --git a/src/glsl/glcpp/tests/010-undef-re-define.c.expected
b/src/glsl/glcpp/tests/010-undef-re-define.c.expected
index f4f7efd..5970f49 100644
--- a/src/glsl/glcpp/tests/010-undef-re-define.c.expected
+++ b/src/glsl/glcpp/tests/010-undef-re-define.c.expected
@@ -4,4 +4,3 @@
foo
2
-
diff --git a/src/glsl/glcpp/tests/011-define-func-empty.c.expected
b/src/glsl/glcpp/tests/011-define-func-empty.c.expected
index c0f53d7..d148bc8 100644
--- a/src/glsl/glcpp/tests/011-define-func-empty.c.expected
+++ b/src/glsl/glcpp/tests/011-define-func-empty.c.expected
@@ -1,3 +1,2 @@
-
diff --git a/src/glsl/glcpp/tests/012-define-func-no-args.c.expected
b/src/glsl/glcpp/tests/012-define-func-no-args.c.expected
index 0353767..9f075f2 100644
--- a/src/glsl/glcpp/tests/012-define-func-no-args.c.expected
+++ b/src/glsl/glcpp/tests/012-define-func-no-args.c.expected
@@ -1,3 +1,2 @@
bar
-
diff --git a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected
b/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected
index 878fd15..a464d9d 100644
--- a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected
+++ b/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected
@@ -1,3 +1,2 @@
1
-
diff --git a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected
b/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected
index 878fd15..a464d9d 100644
--- a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected
+++ b/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected
@@ -1,3 +1,2 @@
1
-
diff --git a/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected
b/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected
index d6f8cb9..a70321a 100644
--- a/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected
+++ b/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected
@@ -2,4 +2,3 @@
()1()
()2()
-
diff --git a/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected
b/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected
index 7f1828a..6bfe04f 100644
--- a/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected
+++ b/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected
@@ -1,3 +1,2 @@
((bar)+1)
-
diff --git a/src/glsl/glcpp/tests/017-define-func-2-args.c.expected
b/src/glsl/glcpp/tests/017-define-func-2-args.c.expected
index 9f341da..f7a2b8c 100644
--- a/src/glsl/glcpp/tests/017-define-func-2-args.c.expected
+++ b/src/glsl/glcpp/tests/017-define-func-2-args.c.expected
@@ -1,3 +1,2 @@
((bar)*(baz))
-
diff --git a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected
b/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected
index 43d484d..c6c9ee3 100644
--- a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected
+++ b/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected
@@ -1,4 +1,3 @@
1
-
diff --git a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected
b/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected
index 4314fc8..1e89b8c 100644
--- a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected
+++ b/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected
@@ -1,3 +1,2 @@
(this is more than one word)
-
diff --git a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected
b/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected
index 5648e4f..19f59f5 100644
--- a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected
+++ b/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected
@@ -1,3 +1,2 @@
one fish,two fish,red fish,blue fish
-
diff --git a/src/glsl/glcpp/tests/021-define-func-compose.c.expected
b/src/glsl/glcpp/tests/021-define-func-compose.c.expected
index 1d62105..87f51f0 100644
--- a/src/glsl/glcpp/tests/021-define-func-compose.c.expected
+++ b/src/glsl/glcpp/tests/021-define-func-compose.c.expected
@@ -1,4 +1,3 @@
(2*((1+(3))))
-
diff --git a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected
b/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected
index 66c1658..1dfc669 100644
--- a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected
+++ b/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected
@@ -1,3 +1,2 @@
(argument(including parens)for the win)
-
diff --git a/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected
b/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected
index 573829c..9c58275 100644
--- a/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected
+++ b/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected
@@ -6,4 +6,3 @@
2
3 4
5 6 7
-
diff --git a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected
b/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected
index ad955fc..15600af 100644
--- a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected
+++ b/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected
@@ -1,4 +1,3 @@
foo
-
diff --git a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected
b/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected
index 960f445..4a59f05 100644
--- a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected
+++ b/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected
@@ -1,3 +1,2 @@
foo bar
-
diff --git a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected
b/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected
index f0888f2..5e3c70f 100644
--- a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected
+++ b/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected
@@ -1,4 +1,3 @@
bar
-
diff --git a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected
b/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected
index aef762e..94c15f9 100644
--- a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected
+++ b/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected
@@ -1,4 +1,3 @@
success
-
diff --git a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected
b/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected
index aef762e..94c15f9 100644
--- a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected
+++ b/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected
@@ -1,4 +1,3 @@
success
-
diff --git
a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
b/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
index aef762e..94c15f9 100644
--- a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
+++ b/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
@@ -1,4 +1,3 @@
success
-
diff --git
a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
b/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
index 729bdd1..bed826e 100644
--- a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
+++ b/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
@@ -2,4 +2,3 @@
success
-
diff --git
a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected
b/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected
index 729bdd1..bed826e 100644
--- a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected
+++ b/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected
@@ -2,4 +2,3 @@
success
-
diff --git a/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected
b/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected
index 541d44d..983f941 100644
--- a/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected
+++ b/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected
@@ -1,3 +1,2 @@
foo(2*(3))
-
diff --git a/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected
b/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected
index 6ea6905..0818362 100644
--- a/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected
+++ b/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected
@@ -1,3 +1,2 @@
foo(2*(foo(2*(3))))
-
diff --git
a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected
b/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected
index 24823b1..3f808fe 100644
--- a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected
+++ b/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected
@@ -1,3 +1,2 @@
foo
-
diff --git
a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
b/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
index 137a9ea..09dfdd6 100644
---
a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
+++
b/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
@@ -1,3 +1,2 @@
1+foo
-
diff --git
a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
b/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
index ff6360b..580ed95 100644
---
a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
+++
b/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
@@ -1,4 +1,3 @@
more success
-
diff --git a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected
b/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected
index cbadee8..e804d7e 100644
--- a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected
+++ b/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected
@@ -1,4 +1,3 @@
expand(just once)
-
diff --git a/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected
b/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected
index 5a28fb3..6544adb 100644
--- a/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected
+++ b/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected
@@ -1,3 +1,2 @@
success
-
diff --git a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
b/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
index b73869d..8a15397 100644
--- a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
+++ b/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
@@ -1,4 +1,3 @@
(two,words)
-
diff --git a/src/glsl/glcpp/tests/040-token-pasting.c.expected
b/src/glsl/glcpp/tests/040-token-pasting.c.expected
index 36f6699..48e836e 100644
--- a/src/glsl/glcpp/tests/040-token-pasting.c.expected
+++ b/src/glsl/glcpp/tests/040-token-pasting.c.expected
@@ -1,3 +1,2 @@
onetoken
-
diff --git a/src/glsl/glcpp/tests/041-if-0.c.expected
b/src/glsl/glcpp/tests/041-if-0.c.expected
index 3800024..8b506b3 100644
--- a/src/glsl/glcpp/tests/041-if-0.c.expected
+++ b/src/glsl/glcpp/tests/041-if-0.c.expected
@@ -3,4 +3,3 @@ success_1
success_2
-
diff --git a/src/glsl/glcpp/tests/042-if-1.c.expected
b/src/glsl/glcpp/tests/042-if-1.c.expected
index e591044..a6ae946 100644
--- a/src/glsl/glcpp/tests/042-if-1.c.expected
+++ b/src/glsl/glcpp/tests/042-if-1.c.expected
@@ -3,4 +3,3 @@ success_1
success_2
success_3
-
diff --git a/src/glsl/glcpp/tests/043-if-0-else.c.expected
b/src/glsl/glcpp/tests/043-if-0-else.c.expected
index ee9e677..3d7e6be 100644
--- a/src/glsl/glcpp/tests/043-if-0-else.c.expected
+++ b/src/glsl/glcpp/tests/043-if-0-else.c.expected
@@ -5,4 +5,3 @@ success_1
success_2
success_3
-
diff --git a/src/glsl/glcpp/tests/044-if-1-else.c.expected
b/src/glsl/glcpp/tests/044-if-1-else.c.expected
index 129f5c8..4a31e1c 100644
--- a/src/glsl/glcpp/tests/044-if-1-else.c.expected
+++ b/src/glsl/glcpp/tests/044-if-1-else.c.expected
@@ -5,4 +5,3 @@ success_2
success_3
-
diff --git a/src/glsl/glcpp/tests/045-if-0-elif.c.expected
b/src/glsl/glcpp/tests/045-if-0-elif.c.expected
index 97a11b4..a9bb158 100644
--- a/src/glsl/glcpp/tests/045-if-0-elif.c.expected
+++ b/src/glsl/glcpp/tests/045-if-0-elif.c.expected
@@ -9,4 +9,3 @@ success_3
success_4
-
diff --git a/src/glsl/glcpp/tests/046-if-1-elsif.c.expected
b/src/glsl/glcpp/tests/046-if-1-elsif.c.expected
index b928b91..a499571 100644
--- a/src/glsl/glcpp/tests/046-if-1-elsif.c.expected
+++ b/src/glsl/glcpp/tests/046-if-1-elsif.c.expected
@@ -9,4 +9,3 @@ success_2
success_3
-
diff --git a/src/glsl/glcpp/tests/047-if-elif-else.c.expected
b/src/glsl/glcpp/tests/047-if-elif-else.c.expected
index e5b53a3..54d3086 100644
--- a/src/glsl/glcpp/tests/047-if-elif-else.c.expected
+++ b/src/glsl/glcpp/tests/047-if-elif-else.c.expected
@@ -9,4 +9,3 @@ success_1
success_2
success_3
-
diff --git a/src/glsl/glcpp/tests/048-if-nested.c.expected
b/src/glsl/glcpp/tests/048-if-nested.c.expected
index c61fd0b..8beb9c3 100644
--- a/src/glsl/glcpp/tests/048-if-nested.c.expected
+++ b/src/glsl/glcpp/tests/048-if-nested.c.expected
@@ -9,4 +9,3 @@ success_1
success_2
-
diff --git a/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected
b/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected
index 569debb..729bdd1 100644
--- a/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected
+++ b/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected
@@ -3,4 +3,3 @@
success
-
diff --git a/src/glsl/glcpp/tests/050-if-defined.c.expected
b/src/glsl/glcpp/tests/050-if-defined.c.expected
index 3f01955..737eb8d 100644
--- a/src/glsl/glcpp/tests/050-if-defined.c.expected
+++ b/src/glsl/glcpp/tests/050-if-defined.c.expected
@@ -15,4 +15,3 @@ success_2
success_3
-
diff --git a/src/glsl/glcpp/tests/051-if-relational.c.expected
b/src/glsl/glcpp/tests/051-if-relational.c.expected
index d2b76f1..652fefd 100644
--- a/src/glsl/glcpp/tests/051-if-relational.c.expected
+++ b/src/glsl/glcpp/tests/051-if-relational.c.expected
@@ -33,4 +33,3 @@ success_5
-
diff --git a/src/glsl/glcpp/tests/052-if-bitwise.c.expected
b/src/glsl/glcpp/tests/052-if-bitwise.c.expected
index bb5d92e..44e52b2 100644
--- a/src/glsl/glcpp/tests/052-if-bitwise.c.expected
+++ b/src/glsl/glcpp/tests/052-if-bitwise.c.expected
@@ -18,4 +18,3 @@ success_4
-
diff --git a/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected
b/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected
index f97e936..7e78e04 100644
--- a/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected
+++ b/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected
@@ -13,4 +13,3 @@ success_2
success_3
-
diff --git a/src/glsl/glcpp/tests/054-if-with-macros.c.expected
b/src/glsl/glcpp/tests/054-if-with-macros.c.expected
index 27ea496..70f737c 100644
--- a/src/glsl/glcpp/tests/054-if-with-macros.c.expected
+++ b/src/glsl/glcpp/tests/054-if-with-macros.c.expected
@@ -32,4 +32,3 @@ success_6
-
diff --git
a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
b/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
index aef762e..94c15f9 100644
---
a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
+++
b/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
@@ -1,4 +1,3 @@
success
-
diff --git a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected
b/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected
index 729bdd1..bed826e 100644
--- a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected
+++ b/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected
@@ -2,4 +2,3 @@
success
-
diff --git a/src/glsl/glcpp/tests/057-empty-arguments.c.expected
b/src/glsl/glcpp/tests/057-empty-arguments.c.expected
index 4e3aad5..7d97e15 100644
--- a/src/glsl/glcpp/tests/057-empty-arguments.c.expected
+++ b/src/glsl/glcpp/tests/057-empty-arguments.c.expected
@@ -4,4 +4,3 @@ success
success
success
-
diff --git a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected
b/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected
index a1c34e5..e0967a1 100644
--- a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected
+++ b/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected
@@ -3,4 +3,3 @@ ab
a
b
-
diff --git a/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected
b/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected
index f1a2cd2..f1288aa 100644
--- a/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected
+++ b/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected
@@ -2,4 +2,3 @@
12
1000
identifier2
-
diff --git
a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
b/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
index c1f0d24..3e5501a 100644
---
a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
+++
b/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
@@ -1,4 +1,3 @@
5*2
-
diff --git a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
b/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
index 111f7d1..15eb64b 100644
--- a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
+++ b/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
@@ -3,4 +3,3 @@
success
-
diff --git a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected
b/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected
index 6fb66a5..3f2ff2d 100644
--- a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected
+++ b/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected
@@ -3,4 +3,3 @@
-
diff --git a/src/glsl/glcpp/tests/063-comments.c.expected
b/src/glsl/glcpp/tests/063-comments.c.expected
index 1965c9b..f6e10ce 100644
--- a/src/glsl/glcpp/tests/063-comments.c.expected
+++ b/src/glsl/glcpp/tests/063-comments.c.expected
@@ -18,4 +18,3 @@ more code here
are not treated like comments.
-
diff --git a/src/glsl/glcpp/tests/064-version.c.expected
b/src/glsl/glcpp/tests/064-version.c.expected
index 3af7111..4036b1e 100644
--- a/src/glsl/glcpp/tests/064-version.c.expected
+++ b/src/glsl/glcpp/tests/064-version.c.expected
@@ -1,3 +1,2 @@
#version 130
-
diff --git a/src/glsl/glcpp/tests/065-if-defined-parens.c.expected
b/src/glsl/glcpp/tests/065-if-defined-parens.c.expected
index 3f01955..737eb8d 100644
--- a/src/glsl/glcpp/tests/065-if-defined-parens.c.expected
+++ b/src/glsl/glcpp/tests/065-if-defined-parens.c.expected
@@ -15,4 +15,3 @@ success_2
success_3
-
diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected
b/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected
index 0e84a7c..5a28fb3 100644
--- a/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected
+++ b/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected
@@ -1,4 +1,3 @@
success
-
diff --git a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected
b/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected
index 3340daa..9a5ed2e 100644
--- a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected
+++ b/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected
@@ -38,4 +38,3 @@ success
success
-
diff --git a/src/glsl/glcpp/tests/068-accidental-pasting.c.expected
b/src/glsl/glcpp/tests/068-accidental-pasting.c.expected
index ce41cd6..27582cd 100644
--- a/src/glsl/glcpp/tests/068-accidental-pasting.c.expected
+++ b/src/glsl/glcpp/tests/068-accidental-pasting.c.expected
@@ -9,4 +9,3 @@
| |
+ +
- -
-
diff --git a/src/glsl/glcpp/tests/069-repeated-argument.c.expected
b/src/glsl/glcpp/tests/069-repeated-argument.c.expected
index 755c4d4..8b4b095 100644
--- a/src/glsl/glcpp/tests/069-repeated-argument.c.expected
+++ b/src/glsl/glcpp/tests/069-repeated-argument.c.expected
@@ -1,3 +1,2 @@
1 1
-
diff --git a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected
b/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected
index d5a8452..44b93a4 100644
--- a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected
+++ b/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected
@@ -3,4 +3,3 @@
Success
-
diff --git a/src/glsl/glcpp/tests/071-punctuator.c.expected
b/src/glsl/glcpp/tests/071-punctuator.c.expected
index fee253b..959d682 100644
--- a/src/glsl/glcpp/tests/071-punctuator.c.expected
+++ b/src/glsl/glcpp/tests/071-punctuator.c.expected
@@ -1,2 +1 @@
a = b
-
diff --git a/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected
b/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected
index c780b43..7b80af7 100644
--- a/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected
+++ b/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected
@@ -1,3 +1,2 @@
success_1 success_2 success_3
-
diff --git a/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected
b/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected
index 3f2ff2d..fd40910 100644
--- a/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected
+++ b/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected
@@ -2,4 +2,3 @@
-
diff --git a/src/glsl/glcpp/tests/074-elif-undef.c.expected
b/src/glsl/glcpp/tests/074-elif-undef.c.expected
index fd40910..b28b04f 100644
--- a/src/glsl/glcpp/tests/074-elif-undef.c.expected
+++ b/src/glsl/glcpp/tests/074-elif-undef.c.expected
@@ -1,4 +1,3 @@
-
diff --git a/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected
b/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected
index 3f2ff2d..fd40910 100644
--- a/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected
+++ b/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected
@@ -2,4 +2,3 @@
-
diff --git a/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected
b/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected
index 6fb66a5..3f2ff2d 100644
--- a/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected
+++ b/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected
@@ -3,4 +3,3 @@
-
diff --git a/src/glsl/glcpp/tests/077-else-without-if.c.expected
b/src/glsl/glcpp/tests/077-else-without-if.c.expected
index d289b36..cc1c379 100644
--- a/src/glsl/glcpp/tests/077-else-without-if.c.expected
+++ b/src/glsl/glcpp/tests/077-else-without-if.c.expected
@@ -1,4 +1,3 @@
0:1(2): preprocessor error: else without #if
-
diff --git a/src/glsl/glcpp/tests/078-elif-without-if.c.expected
b/src/glsl/glcpp/tests/078-elif-without-if.c.expected
index 7d41f0a..ee34501 100644
--- a/src/glsl/glcpp/tests/078-elif-without-if.c.expected
+++ b/src/glsl/glcpp/tests/078-elif-without-if.c.expected
@@ -1,4 +1,3 @@
0:1(2): preprocessor error: elif without #if
-
diff --git a/src/glsl/glcpp/tests/079-endif-without-if.c.expected
b/src/glsl/glcpp/tests/079-endif-without-if.c.expected
index 08dd335..ad21d4c 100644
--- a/src/glsl/glcpp/tests/079-endif-without-if.c.expected
+++ b/src/glsl/glcpp/tests/079-endif-without-if.c.expected
@@ -1,4 +1,3 @@
0:1(2): preprocessor error: #endif without #if
-
diff --git a/src/glsl/glcpp/tests/080-if-without-expression.c.expected
b/src/glsl/glcpp/tests/080-if-without-expression.c.expected
index 768ba0f..2e4cd73 100644
--- a/src/glsl/glcpp/tests/080-if-without-expression.c.expected
+++ b/src/glsl/glcpp/tests/080-if-without-expression.c.expected
@@ -3,4 +3,3 @@
-
diff --git a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected
b/src/glsl/glcpp/tests/081-elif-without-expression.c.expected
index 974f0f5..b607b84 100644
--- a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected
+++ b/src/glsl/glcpp/tests/081-elif-without-expression.c.expected
@@ -2,4 +2,3 @@
-
diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c.expected
b/src/glsl/glcpp/tests/082-invalid-paste.c.expected
index 2dd21c0..b48a2d6 100644
--- a/src/glsl/glcpp/tests/082-invalid-paste.c.expected
+++ b/src/glsl/glcpp/tests/082-invalid-paste.c.expected
@@ -17,4 +17,3 @@ Pasting "4" and "+" does not give a valid preprocessing token.
2
34
45.2
-
diff --git a/src/glsl/glcpp/tests/083-unterminated-if.c.expected
b/src/glsl/glcpp/tests/083-unterminated-if.c.expected
index a69f8ba..b03f9cc 100644
--- a/src/glsl/glcpp/tests/083-unterminated-if.c.expected
+++ b/src/glsl/glcpp/tests/083-unterminated-if.c.expected
@@ -2,4 +2,3 @@
-
diff --git a/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected
b/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected
index 1df30cb..d23845b 100644
--- a/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected
+++ b/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected
@@ -9,4 +9,3 @@ MULT()
MULT(1)
MULT(1,2,3)
-
diff --git a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected
b/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected
index 5ca42a9..f0b1373 100644
--- a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected
+++ b/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected
@@ -7,4 +7,3 @@
-
diff --git a/src/glsl/glcpp/tests/087-if-comments.c.expected
b/src/glsl/glcpp/tests/087-if-comments.c.expected
index 827e548..2783a9c 100644
--- a/src/glsl/glcpp/tests/087-if-comments.c.expected
+++ b/src/glsl/glcpp/tests/087-if-comments.c.expected
@@ -3,4 +3,3 @@
win
-
diff --git a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected
b/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected
index 6fb66a5..3f2ff2d 100644
--- a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected
+++ b/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected
@@ -3,4 +3,3 @@
-
diff --git a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected
b/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected
index 6209ead..a945161 100644
--- a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected
+++ b/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected
@@ -27,4 +27,3 @@
-
diff --git a/src/glsl/glcpp/tests/090-hash-error.c.expected
b/src/glsl/glcpp/tests/090-hash-error.c.expected
index f2f1fbe..b9b226b 100644
--- a/src/glsl/glcpp/tests/090-hash-error.c.expected
+++ b/src/glsl/glcpp/tests/090-hash-error.c.expected
@@ -1,3 +1,2 @@
0:1(2): preprocessor error: #error human error
-
diff --git a/src/glsl/glcpp/tests/091-hash-line.c.expected
b/src/glsl/glcpp/tests/091-hash-line.c.expected
index 48af0b2..d6831da 100644
--- a/src/glsl/glcpp/tests/091-hash-line.c.expected
+++ b/src/glsl/glcpp/tests/091-hash-line.c.expected
@@ -16,4 +16,3 @@
#line 90 2
#line 180 2
-
diff --git a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected
b/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected
index 0026f91..698294d 100644
--- a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected
+++ b/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected
@@ -7,4 +7,3 @@
-
diff --git a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected
b/src/glsl/glcpp/tests/093-divide-by-zero.c.expected
index 08f183f..9adae3f 100644
--- a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected
+++ b/src/glsl/glcpp/tests/093-divide-by-zero.c.expected
@@ -1,4 +1,3 @@
0:1(13): preprocessor error: division by 0 in preprocessor directive
-
diff --git a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
b/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
index be20b7c..570952b 100644
--- a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
+++ b/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
@@ -12,4 +12,3 @@
-
diff --git a/src/glsl/glcpp/tests/095-recursive-define.c.expected
b/src/glsl/glcpp/tests/095-recursive-define.c.expected
index c7aa18f..493ab09 100644
--- a/src/glsl/glcpp/tests/095-recursive-define.c.expected
+++ b/src/glsl/glcpp/tests/095-recursive-define.c.expected
@@ -1,4 +1,3 @@
B(0, C)
-
diff --git a/src/glsl/glcpp/tests/096-paste-twice.c.expected
b/src/glsl/glcpp/tests/096-paste-twice.c.expected
index e401941..96c57d2 100644
--- a/src/glsl/glcpp/tests/096-paste-twice.c.expected
+++ b/src/glsl/glcpp/tests/096-paste-twice.c.expected
@@ -1,4 +1,3 @@
justonetoken
-
diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
index af92187..36f6699 100644
--- a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
+++ b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
@@ -1,4 +1,3 @@
onetoken
-
diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c.expected
b/src/glsl/glcpp/tests/098-elif-undefined.c.expected
index 2af0a12..c6ef689 100644
--- a/src/glsl/glcpp/tests/098-elif-undefined.c.expected
+++ b/src/glsl/glcpp/tests/098-elif-undefined.c.expected
@@ -5,4 +5,3 @@
Yes, this.
-
diff --git a/src/glsl/glcpp/tests/099-c99-example.c.expected
b/src/glsl/glcpp/tests/099-c99-example.c.expected
index 19be750..352bbff 100644
--- a/src/glsl/glcpp/tests/099-c99-example.c.expected
+++ b/src/glsl/glcpp/tests/099-c99-example.c.expected
@@ -14,4 +14,3 @@
f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1);
f(2 * (2 +(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1);
int i[] = { 1, 23, 4, 5, };
-
diff --git a/src/glsl/glcpp/tests/100-macro-with-colon.c.expected
b/src/glsl/glcpp/tests/100-macro-with-colon.c.expected
index 36f98aa..b436078 100644
--- a/src/glsl/glcpp/tests/100-macro-with-colon.c.expected
+++ b/src/glsl/glcpp/tests/100-macro-with-colon.c.expected
@@ -5,4 +5,3 @@ switch (1) {
case 1 + 2:
break;
}
-
diff --git a/src/glsl/glcpp/tests/101-macros-used-twice.c.expected
b/src/glsl/glcpp/tests/101-macros-used-twice.c.expected
index 1a4bf15..1e0b306 100644
--- a/src/glsl/glcpp/tests/101-macros-used-twice.c.expected
+++ b/src/glsl/glcpp/tests/101-macros-used-twice.c.expected
@@ -14,4 +14,3 @@ once
once again
-
diff --git a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected
b/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected
index e89a292..3fbeec4 100644
--- a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected
+++ b/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected
@@ -1,3 +1,2 @@
#line 2
int foo();
-
diff --git a/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected
b/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected
index fb8e150..814cef1 100644
--- a/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected
+++ b/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected
@@ -3,4 +3,3 @@
#line 2
-
diff --git a/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected
b/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected
index 6f5ff2e..1c0cbc9 100644
--- a/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected
+++ b/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected
@@ -4,4 +4,3 @@
int foo();
-
diff --git a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected
b/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected
index 68d489b..b0601d7 100644
--- a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected
+++ b/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected
@@ -5,4 +5,3 @@
int foo();
-
diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected
b/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected
index da4544a..748bfe1 100644
--- a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected
+++ b/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected
@@ -1,2 +1 @@
0:1(3): preprocessor error: Invalid tokens after #
-
diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected
b/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected
index da4544a..748bfe1 100644
--- a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected
+++ b/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected
@@ -1,2 +1 @@
0:1(3): preprocessor error: Invalid tokens after #
-
diff --git
a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected
b/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected
index 6d5e9d1..847437c 100644
--- a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected
+++ b/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected
@@ -1,4 +1,3 @@
0:2(2): preprocessor error: Invalid tokens after #
-
diff --git
a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected
b/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected
index e083008..5c005c3 100644
--- a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected
+++ b/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected
@@ -17,4 +17,3 @@ success
success
-
diff --git
a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected
b/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected
index 3b5479a..86b3703 100644
--- a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected
+++ b/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected
@@ -22,4 +22,3 @@ success
success
-
diff --git a/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected
b/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected
index 3562fb9..55bc788 100644
--- a/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected
+++ b/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected
@@ -5,4 +5,3 @@
5. Hexadecimal for 20560: 5 0 5 0
6: Zip code for Nortonville, KS: 6 6 0 6 0
7. James Bond, as a number: 0 0 7
-
diff --git a/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected
b/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected
index a3ad7da..aa97110 100644
--- a/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected
+++ b/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected
@@ -5,4 +5,3 @@
5. Hexadecimal for 20560: 5050
6: Zip code for Nortonville, KS: 66060
7. James Bond, as a number: 007
-
diff --git a/src/glsl/glcpp/tests/115-line-continuations.c.expected
b/src/glsl/glcpp/tests/115-line-continuations.c.expected
index f67ba1c..428b5e8 100644
--- a/src/glsl/glcpp/tests/115-line-continuations.c.expected
+++ b/src/glsl/glcpp/tests/115-line-continuations.c.expected
@@ -7,4 +7,3 @@
success
-
diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected
b/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected
index 9b9a8c5..5ca7892 100644
--- a/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected
+++ b/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected
@@ -11,4 +11,3 @@ success
-
diff --git
a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected
b/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected
index 292d651..8aaa04d 100644
---
a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected
+++
b/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected
@@ -10,4 +10,3 @@
-
diff --git a/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected
b/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected
index 2adf5d1..1fa8135 100644
--- a/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected
+++ b/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected
@@ -2,4 +2,3 @@
first second
-
diff --git a/src/glsl/glcpp/tests/118-multiple-else.c.expected
b/src/glsl/glcpp/tests/118-multiple-else.c.expected
index eaec481..00b3328 100644
--- a/src/glsl/glcpp/tests/118-multiple-else.c.expected
+++ b/src/glsl/glcpp/tests/118-multiple-else.c.expected
@@ -5,4 +5,3 @@ int foo;
int bar;
-
diff --git a/src/glsl/glcpp/tests/119-elif-after-else.c.expected
b/src/glsl/glcpp/tests/119-elif-after-else.c.expected
index 33f0513..6369567 100644
--- a/src/glsl/glcpp/tests/119-elif-after-else.c.expected
+++ b/src/glsl/glcpp/tests/119-elif-after-else.c.expected
@@ -5,4 +5,3 @@ int foo;
int bar;
-
diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c.expected
b/src/glsl/glcpp/tests/120-undef-builtin.c.expected
index d6981dc..339ea4f 100644
--- a/src/glsl/glcpp/tests/120-undef-builtin.c.expected
+++ b/src/glsl/glcpp/tests/120-undef-builtin.c.expected
@@ -4,4 +4,3 @@
-
diff --git a/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected
b/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected
index 402a763..5c484c2 100644
--- a/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected
+++ b/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected
@@ -1,3 +1,2 @@
-
diff --git a/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected
b/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected
index 193ebc4..602bdef 100644
--- a/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected
+++ b/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected
@@ -20,4 +20,3 @@
-
diff --git a/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected
b/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected
index 6f5254c..6ec5888 100644
--- a/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected
+++ b/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected
@@ -35,4 +35,3 @@
.23P+OK;GO
1.3p-OK-GO
12.P-OK&GO
-
diff --git a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected
b/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected
index 93bcffb..89d0b73 100644
--- a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected
+++ b/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected
@@ -27,4 +27,3 @@ Success
More success
-
diff --git a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected
b/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected
index 95a9e61..283963d 100644
--- a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected
+++ b/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected
@@ -5,4 +5,3 @@
-
diff --git a/src/glsl/glcpp/tests/127-pragma-empty.c.expected
b/src/glsl/glcpp/tests/127-pragma-empty.c.expected
index 957daff..89fe08e 100644
--- a/src/glsl/glcpp/tests/127-pragma-empty.c.expected
+++ b/src/glsl/glcpp/tests/127-pragma-empty.c.expected
@@ -1,4 +1,3 @@
#pragma
-
diff --git a/src/glsl/glcpp/tests/129-define-comment.c.expected
b/src/glsl/glcpp/tests/129-define-comment.c.expected
index ed59055..43d399c 100644
--- a/src/glsl/glcpp/tests/129-define-comment.c.expected
+++ b/src/glsl/glcpp/tests/129-define-comment.c.expected
@@ -1,3 +1,2 @@
FOO( bar )
-
--
2.0.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
