diff options
Diffstat (limited to 'dist/Mesa/src/glsl/glcpp')
114 files changed, 138 insertions, 156 deletions
diff --git a/dist/Mesa/src/glsl/glcpp/glcpp.h b/dist/Mesa/src/glsl/glcpp/glcpp.h index 70aa14b6e..79ccb234f 100644 --- a/dist/Mesa/src/glsl/glcpp/glcpp.h +++ b/dist/Mesa/src/glsl/glcpp/glcpp.h @@ -29,7 +29,7 @@ #include "main/mtypes.h" -#include "util/ralloc.h" +#include "../ralloc.h" #include "program/hash_table.h" @@ -37,12 +37,6 @@ /* Some data types used for parser values. */ -typedef struct expression_value { - intmax_t value; - char *undefined_macro; -} expression_value_t; - - typedef struct string_node { const char *str; struct string_node *next; @@ -59,7 +53,6 @@ typedef struct token_list token_list_t; typedef union YYSTYPE { intmax_t ival; - expression_value_t expression_value; char *str; string_list_t *string_list; token_t *token; @@ -175,17 +168,13 @@ struct glcpp_parser { yyscan_t scanner; struct hash_table *defines; active_list_t *active; - int lexing_directive; + int lexing_if; int space_tokens; - int last_token_was_newline; - int last_token_was_space; - int first_non_space_token_this_line; int newline_as_space; int in_control_line; int paren_count; int commented_newlines; skip_node_t *skip_stack; - int skipping; token_list_t *lex_from_list; token_node_t *lex_from_node; char *output; diff --git a/dist/Mesa/src/glsl/glcpp/pp.c b/dist/Mesa/src/glsl/glcpp/pp.c index a54bcbe16..4a623f81e 100644 --- a/dist/Mesa/src/glsl/glcpp/pp.c +++ b/dist/Mesa/src/glsl/glcpp/pp.c @@ -70,42 +70,6 @@ glcpp_warning (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...) &parser->info_log_length, "\n"); } -/* Given str, (that's expected to start with a newline terminator of some - * sort), return a pointer to the first character in str after the newline. - * - * A newline terminator can be any of the following sequences: - * - * "\r\n" - * "\n\r" - * "\n" - * "\r" - * - * And the longest such sequence will be skipped. - */ -static const char * -skip_newline (const char *str) -{ - const char *ret = str; - - if (ret == NULL) - return ret; - - if (*ret == '\0') - return ret; - - if (*ret == '\r') { - ret++; - if (*ret && *ret == '\n') - ret++; - } else if (*ret == '\n') { - ret++; - if (*ret && *ret == '\r') - ret++; - } - - return ret; -} - /* Remove any line continuation characters in the shader, (whether in * preprocessing directives or in GLSL code). */ @@ -114,49 +78,10 @@ remove_line_continuations(glcpp_parser_t *ctx, const char *shader) { char *clean = ralloc_strdup(ctx, ""); const char *backslash, *newline, *search_start; - const char *cr, *lf; - char newline_separator[3]; int collapsed_newlines = 0; search_start = shader; - /* Determine what flavor of newlines this shader is using. GLSL - * provides for 4 different possible ways to separate lines, (using - * one or two characters): - * - * "\n" (line-feed, like Linux, Unix, and new Mac OS) - * "\r" (carriage-return, like old Mac files) - * "\r\n" (carriage-return + line-feed, like DOS files) - * "\n\r" (line-feed + carriage-return, like nothing, really) - * - * This code explicitly supports a shader that uses a mixture of - * newline terminators and will properly handle line continuation - * backslashes followed by any of the above. - * - * But, since we must also insert additional newlines in the output - * (for any collapsed lines) we attempt to maintain consistency by - * examining the first encountered newline terminator, and using the - * same terminator for any newlines we insert. - */ - cr = strchr(search_start, '\r'); - lf = strchr(search_start, '\n'); - - newline_separator[0] = '\n'; - newline_separator[1] = '\0'; - newline_separator[2] = '\0'; - - if (cr == NULL) { - /* Nothing to do. */ - } else if (lf == NULL) { - newline_separator[0] = '\r'; - } else if (lf == cr + 1) { - newline_separator[0] = '\r'; - newline_separator[1] = '\n'; - } else if (cr == lf + 1) { - newline_separator[0] = '\n'; - newline_separator[1] = '\r'; - } - while (true) { backslash = strchr(search_start, '\\'); @@ -166,24 +91,17 @@ remove_line_continuations(glcpp_parser_t *ctx, const char *shader) * line numbers. */ if (collapsed_newlines) { - cr = strchr (search_start, '\r'); - lf = strchr (search_start, '\n'); - if (cr && lf) - newline = cr < lf ? cr : lf; - else if (cr) - newline = cr; - else - newline = lf; + newline = strchr(search_start, '\n'); if (newline && (backslash == NULL || newline < backslash)) { ralloc_strncat(&clean, shader, newline - shader + 1); while (collapsed_newlines) { - ralloc_strcat(&clean, newline_separator); + ralloc_strcat(&clean, "\n"); collapsed_newlines--; } - shader = skip_newline (newline); + shader = newline + 1; search_start = shader; } } @@ -198,11 +116,15 @@ remove_line_continuations(glcpp_parser_t *ctx, const char *shader) * advance the shader pointer to the character after the * newline. */ - if (backslash[1] == '\r' || backslash[1] == '\n') + if (backslash[1] == '\n' || + (backslash[1] == '\r' && backslash[2] == '\n')) { collapsed_newlines++; ralloc_strncat(&clean, shader, backslash - shader); - shader = skip_newline (backslash + 1); + if (backslash[1] == '\n') + shader = backslash + 2; + else + shader = backslash + 3; search_start = shader; } } diff --git a/dist/Mesa/src/glsl/glcpp/tests/000-content-with-spaces.c.expected b/dist/Mesa/src/glsl/glcpp/tests/000-content-with-spaces.c.expected index 00791910e..5e17ec910 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/000-content-with-spaces.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/000-content-with-spaces.c.expected @@ -1 +1,2 @@ - this is four tokens with spaces + this is four tokens with spaces + diff --git a/dist/Mesa/src/glsl/glcpp/tests/001-define.c.expected b/dist/Mesa/src/glsl/glcpp/tests/001-define.c.expected index a464d9da7..878fd15d6 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/001-define.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/001-define.c.expected @@ -1,2 +1,3 @@ 1 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/002-define-chain.c.expected b/dist/Mesa/src/glsl/glcpp/tests/002-define-chain.c.expected index c6c9ee38a..43d484d71 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/002-define-chain.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/002-define-chain.c.expected @@ -1,3 +1,4 @@ 1 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected b/dist/Mesa/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected index c6c9ee38a..43d484d71 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected @@ -1,3 +1,4 @@ 1 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/004-define-recursive.c.expected b/dist/Mesa/src/glsl/glcpp/tests/004-define-recursive.c.expected index 2d07687f8..4d2698b7a 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/004-define-recursive.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/004-define-recursive.c.expected @@ -4,3 +4,4 @@ foo bar baz + diff --git a/dist/Mesa/src/glsl/glcpp/tests/005-define-composite-chain.c.expected b/dist/Mesa/src/glsl/glcpp/tests/005-define-composite-chain.c.expected index 892975c26..c67358f4f 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/005-define-composite-chain.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/005-define-composite-chain.c.expected @@ -1,3 +1,4 @@ a 1 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected b/dist/Mesa/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected index 892975c26..c67358f4f 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected @@ -1,3 +1,4 @@ a 1 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected b/dist/Mesa/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected index 0b0b477d9..30fe4dc1f 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected @@ -4,3 +4,4 @@ a b c foo b c a bar c a b baz + diff --git a/dist/Mesa/src/glsl/glcpp/tests/008-define-empty.c.expected b/dist/Mesa/src/glsl/glcpp/tests/008-define-empty.c.expected index d148bc8e8..c0f53d75c 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/008-define-empty.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/008-define-empty.c.expected @@ -1,2 +1,3 @@ + diff --git a/dist/Mesa/src/glsl/glcpp/tests/009-undef.c.expected b/dist/Mesa/src/glsl/glcpp/tests/009-undef.c.expected index 9c0b35a45..03a7061af 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/009-undef.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/009-undef.c.expected @@ -2,3 +2,4 @@ 1 foo + diff --git a/dist/Mesa/src/glsl/glcpp/tests/010-undef-re-define.c.expected b/dist/Mesa/src/glsl/glcpp/tests/010-undef-re-define.c.expected index 5970f4902..f4f7efdc2 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/010-undef-re-define.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/010-undef-re-define.c.expected @@ -4,3 +4,4 @@ foo 2 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/011-define-func-empty.c.expected b/dist/Mesa/src/glsl/glcpp/tests/011-define-func-empty.c.expected index d148bc8e8..c0f53d75c 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/011-define-func-empty.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/011-define-func-empty.c.expected @@ -1,2 +1,3 @@ + diff --git a/dist/Mesa/src/glsl/glcpp/tests/012-define-func-no-args.c.expected b/dist/Mesa/src/glsl/glcpp/tests/012-define-func-no-args.c.expected index 9f075f260..035376729 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/012-define-func-no-args.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/012-define-func-no-args.c.expected @@ -1,2 +1,3 @@ bar + diff --git a/dist/Mesa/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected b/dist/Mesa/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected index a464d9da7..878fd15d6 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected @@ -1,2 +1,3 @@ 1 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected b/dist/Mesa/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected index a464d9da7..878fd15d6 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected @@ -1,2 +1,3 @@ 1 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected b/dist/Mesa/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected index a70321a4c..d6f8cb9dc 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected @@ -2,3 +2,4 @@ ()1() ()2() + diff --git a/dist/Mesa/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected b/dist/Mesa/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected index 6bfe04f73..7f1828a3c 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected @@ -1,2 +1,3 @@ ((bar)+1) + diff --git a/dist/Mesa/src/glsl/glcpp/tests/017-define-func-2-args.c.expected b/dist/Mesa/src/glsl/glcpp/tests/017-define-func-2-args.c.expected index f7a2b8c26..9f341dac0 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/017-define-func-2-args.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/017-define-func-2-args.c.expected @@ -1,2 +1,3 @@ ((bar)*(baz)) + diff --git a/dist/Mesa/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected b/dist/Mesa/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected index c6c9ee38a..43d484d71 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected @@ -1,3 +1,4 @@ 1 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected b/dist/Mesa/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected index 1e89b8cfd..4314fc88d 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected @@ -1,2 +1,3 @@ (this is more than one word) + diff --git a/dist/Mesa/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected b/dist/Mesa/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected index 19f59f5ec..5648e4fb9 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected @@ -1,2 +1,3 @@ one fish,two fish,red fish,blue fish + diff --git a/dist/Mesa/src/glsl/glcpp/tests/021-define-func-compose.c.expected b/dist/Mesa/src/glsl/glcpp/tests/021-define-func-compose.c.expected index 87f51f0ba..1d62105de 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/021-define-func-compose.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/021-define-func-compose.c.expected @@ -1,3 +1,4 @@ (2*((1+(3)))) + diff --git a/dist/Mesa/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected b/dist/Mesa/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected index 1dfc6698b..66c165817 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected @@ -1,2 +1,3 @@ (argument(including parens)for the win) + diff --git a/dist/Mesa/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected b/dist/Mesa/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected index 9c58275d0..573829c2d 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected @@ -6,3 +6,4 @@ 2 3 4 5 6 7 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected b/dist/Mesa/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected index 15600af54..ad955fce6 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected @@ -1,3 +1,4 @@ foo + diff --git a/dist/Mesa/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected b/dist/Mesa/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected index 4a59f0520..960f44511 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected @@ -1,2 +1,3 @@ foo bar + diff --git a/dist/Mesa/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected b/dist/Mesa/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected index 5e3c70f2c..f0888f21b 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected @@ -1,3 +1,4 @@ bar + diff --git a/dist/Mesa/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected b/dist/Mesa/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected index 94c15f950..aef762e1e 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected @@ -1,3 +1,4 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected b/dist/Mesa/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected index 94c15f950..aef762e1e 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected @@ -1,3 +1,4 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected b/dist/Mesa/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected index 94c15f950..aef762e1e 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected @@ -1,3 +1,4 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected b/dist/Mesa/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected index bed826e78..729bdd15f 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected @@ -2,3 +2,4 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected b/dist/Mesa/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected index bed826e78..729bdd15f 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected @@ -2,3 +2,4 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected b/dist/Mesa/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected index 983f94174..541d44db7 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected @@ -1,2 +1,3 @@ foo(2*(3)) + diff --git a/dist/Mesa/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected b/dist/Mesa/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected index 081836236..6ea6905d8 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected @@ -1,2 +1,3 @@ foo(2*(foo(2*(3)))) + diff --git a/dist/Mesa/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected b/dist/Mesa/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected index 3f808fe66..24823b1b6 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected @@ -1,2 +1,3 @@ foo + diff --git a/dist/Mesa/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected b/dist/Mesa/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected index 09dfdd64e..137a9ea2d 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected @@ -1,2 +1,3 @@ 1+foo + diff --git a/dist/Mesa/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected b/dist/Mesa/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected index 580ed9599..ff6360bfe 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected @@ -1,3 +1,4 @@ more success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected b/dist/Mesa/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected index e804d7e4f..cbadee848 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected @@ -1,3 +1,4 @@ expand(just once) + diff --git a/dist/Mesa/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected b/dist/Mesa/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected index 6544adb3a..5a28fb3b6 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected @@ -1,2 +1,3 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c b/dist/Mesa/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c index a7c053bb4..0f7fe632b 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c +++ b/dist/Mesa/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c @@ -1,24 +1,3 @@ -/* This works. */ #define foo(a) (a) #define bar two,words foo(bar) - -/* So does this. */ -#define foo2(a,b) (a separate b) -#define foo2_wrap(a) foo2(a) -foo2_wrap(bar) - -/* But this generates an error. */ -#define foo_wrap(a) foo(a) -foo_wrap(bar) - -/* Adding parentheses to foo_wrap fixes it. */ -#define foo_wrap_parens(a) foo((a)) -foo_wrap_parens(bar) - -/* As does adding parentheses to bar */ -#define bar_parens (two,words) -foo_wrap(bar_parens) -foo_wrap_parens(bar_parens) - - diff --git a/dist/Mesa/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected b/dist/Mesa/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected index 4cc795338..b73869d02 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected @@ -1,26 +1,4 @@ -0:12(21): preprocessor error: Error: macro foo invoked with 2 arguments (expected 1) - - (two,words) - - - -(two separate words) - - - -foo(two,words) - - - -((two,words)) - - - -((two,words)) -(((two,words))) - - diff --git a/dist/Mesa/src/glsl/glcpp/tests/040-token-pasting.c.expected b/dist/Mesa/src/glsl/glcpp/tests/040-token-pasting.c.expected index 48e836ec3..36f669925 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/040-token-pasting.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/040-token-pasting.c.expected @@ -1,2 +1,3 @@ onetoken + diff --git a/dist/Mesa/src/glsl/glcpp/tests/041-if-0.c.expected b/dist/Mesa/src/glsl/glcpp/tests/041-if-0.c.expected index 8b506b32d..3800024c6 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/041-if-0.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/041-if-0.c.expected @@ -3,3 +3,4 @@ success_1 success_2 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/042-if-1.c.expected b/dist/Mesa/src/glsl/glcpp/tests/042-if-1.c.expected index a6ae9465a..e591044ad 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/042-if-1.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/042-if-1.c.expected @@ -3,3 +3,4 @@ success_1 success_2 success_3 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/043-if-0-else.c.expected b/dist/Mesa/src/glsl/glcpp/tests/043-if-0-else.c.expected index 3d7e6be96..ee9e67709 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/043-if-0-else.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/043-if-0-else.c.expected @@ -5,3 +5,4 @@ success_1 success_2 success_3 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/044-if-1-else.c.expected b/dist/Mesa/src/glsl/glcpp/tests/044-if-1-else.c.expected index 4a31e1cfa..129f5c854 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/044-if-1-else.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/044-if-1-else.c.expected @@ -5,3 +5,4 @@ success_2 success_3 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/045-if-0-elif.c.expected b/dist/Mesa/src/glsl/glcpp/tests/045-if-0-elif.c.expected index a9bb1588e..97a11b447 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/045-if-0-elif.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/045-if-0-elif.c.expected @@ -9,3 +9,4 @@ success_3 success_4 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/046-if-1-elsif.c.expected b/dist/Mesa/src/glsl/glcpp/tests/046-if-1-elsif.c.expected index a4995713c..b928b917e 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/046-if-1-elsif.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/046-if-1-elsif.c.expected @@ -9,3 +9,4 @@ success_2 success_3 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/047-if-elif-else.c.expected b/dist/Mesa/src/glsl/glcpp/tests/047-if-elif-else.c.expected index 54d308611..e5b53a3fa 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/047-if-elif-else.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/047-if-elif-else.c.expected @@ -9,3 +9,4 @@ success_1 success_2 success_3 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/048-if-nested.c.expected b/dist/Mesa/src/glsl/glcpp/tests/048-if-nested.c.expected index 8beb9c32c..c61fd0b31 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/048-if-nested.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/048-if-nested.c.expected @@ -9,3 +9,4 @@ success_1 success_2 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected b/dist/Mesa/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected index 729bdd15f..569debb0b 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected @@ -3,3 +3,4 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/050-if-defined.c.expected b/dist/Mesa/src/glsl/glcpp/tests/050-if-defined.c.expected index 737eb8d94..3f01955ee 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/050-if-defined.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/050-if-defined.c.expected @@ -15,3 +15,4 @@ success_2 success_3 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/051-if-relational.c.expected b/dist/Mesa/src/glsl/glcpp/tests/051-if-relational.c.expected index 652fefdd4..d2b76f145 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/051-if-relational.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/051-if-relational.c.expected @@ -33,3 +33,4 @@ success_5 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/052-if-bitwise.c.expected b/dist/Mesa/src/glsl/glcpp/tests/052-if-bitwise.c.expected index 44e52b206..bb5d92e8d 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/052-if-bitwise.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/052-if-bitwise.c.expected @@ -18,3 +18,4 @@ success_4 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected b/dist/Mesa/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected index 7e78e0454..f97e93673 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected @@ -13,3 +13,4 @@ success_2 success_3 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/054-if-with-macros.c.expected b/dist/Mesa/src/glsl/glcpp/tests/054-if-with-macros.c.expected index 70f737c90..27ea49696 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/054-if-with-macros.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/054-if-with-macros.c.expected @@ -32,3 +32,4 @@ success_6 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected b/dist/Mesa/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected index 94c15f950..aef762e1e 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected @@ -1,3 +1,4 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected b/dist/Mesa/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected index bed826e78..729bdd15f 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected @@ -2,3 +2,4 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/057-empty-arguments.c.expected b/dist/Mesa/src/glsl/glcpp/tests/057-empty-arguments.c.expected index 7d97e15e2..4e3aad521 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/057-empty-arguments.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/057-empty-arguments.c.expected @@ -4,3 +4,4 @@ success success success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected b/dist/Mesa/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected index e0967a1b9..a1c34e5c1 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected @@ -3,3 +3,4 @@ ab a b + diff --git a/dist/Mesa/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected b/dist/Mesa/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected index f1288aa7c..f1a2cd21c 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected @@ -2,3 +2,4 @@ 12 1000 identifier2 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected b/dist/Mesa/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected index 3e5501aa6..c1f0d24a1 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected @@ -1,3 +1,4 @@ 5*2 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected b/dist/Mesa/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected index 15eb64b97..111f7d106 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected @@ -3,3 +3,4 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected b/dist/Mesa/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected index 3f2ff2d6c..6fb66a5e2 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected @@ -3,3 +3,4 @@ + diff --git a/dist/Mesa/src/glsl/glcpp/tests/064-version.c.expected b/dist/Mesa/src/glsl/glcpp/tests/064-version.c.expected index 4036b1ee3..3af71113c 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/064-version.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/064-version.c.expected @@ -1,2 +1,3 @@ #version 130 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/065-if-defined-parens.c.expected b/dist/Mesa/src/glsl/glcpp/tests/065-if-defined-parens.c.expected index 737eb8d94..3f01955ee 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/065-if-defined-parens.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/065-if-defined-parens.c.expected @@ -15,3 +15,4 @@ success_2 success_3 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected b/dist/Mesa/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected index 5a28fb3b6..0e84a7cda 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected @@ -1,3 +1,4 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected b/dist/Mesa/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected index 9a5ed2eb2..3340daaa1 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected @@ -38,3 +38,4 @@ success success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/068-accidental-pasting.c.expected b/dist/Mesa/src/glsl/glcpp/tests/068-accidental-pasting.c.expected index 27582cda5..ce41cd6e5 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/068-accidental-pasting.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/068-accidental-pasting.c.expected @@ -9,3 +9,4 @@ | | + + - - + diff --git a/dist/Mesa/src/glsl/glcpp/tests/069-repeated-argument.c.expected b/dist/Mesa/src/glsl/glcpp/tests/069-repeated-argument.c.expected index 8b4b095e4..755c4d4b5 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/069-repeated-argument.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/069-repeated-argument.c.expected @@ -1,2 +1,3 @@ 1 1 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected b/dist/Mesa/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected index 44b93a434..d5a845255 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected @@ -3,3 +3,4 @@ Success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/071-punctuator.c.expected b/dist/Mesa/src/glsl/glcpp/tests/071-punctuator.c.expected index 959d68259..fee253b74 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/071-punctuator.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/071-punctuator.c.expected @@ -1 +1,2 @@ a = b + diff --git a/dist/Mesa/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected b/dist/Mesa/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected index 7b80af7e4..c780b43d7 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected @@ -1,2 +1,3 @@ success_1 success_2 success_3 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected b/dist/Mesa/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected index fd40910d9..3f2ff2d6c 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected @@ -2,3 +2,4 @@ + diff --git a/dist/Mesa/src/glsl/glcpp/tests/074-elif-undef.c.expected b/dist/Mesa/src/glsl/glcpp/tests/074-elif-undef.c.expected index b28b04f64..fd40910d9 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/074-elif-undef.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/074-elif-undef.c.expected @@ -1,3 +1,4 @@ + diff --git a/dist/Mesa/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected b/dist/Mesa/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected index fd40910d9..3f2ff2d6c 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected @@ -2,3 +2,4 @@ + diff --git a/dist/Mesa/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected b/dist/Mesa/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected index 3f2ff2d6c..6fb66a5e2 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected @@ -3,3 +3,4 @@ + diff --git a/dist/Mesa/src/glsl/glcpp/tests/077-else-without-if.c.expected b/dist/Mesa/src/glsl/glcpp/tests/077-else-without-if.c.expected index 69f340470..d289b3635 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/077-else-without-if.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/077-else-without-if.c.expected @@ -1,3 +1,4 @@ -0:1(1): preprocessor error: #else without #if +0:1(2): preprocessor error: else without #if + diff --git a/dist/Mesa/src/glsl/glcpp/tests/078-elif-without-if.c.expected b/dist/Mesa/src/glsl/glcpp/tests/078-elif-without-if.c.expected index b8e40ecc0..7d41f0ac7 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/078-elif-without-if.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/078-elif-without-if.c.expected @@ -1,3 +1,4 @@ -0:1(1): preprocessor error: #elif without #if +0:1(2): preprocessor error: elif without #if + diff --git a/dist/Mesa/src/glsl/glcpp/tests/079-endif-without-if.c.expected b/dist/Mesa/src/glsl/glcpp/tests/079-endif-without-if.c.expected index 7ae579dd2..08dd33546 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/079-endif-without-if.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/079-endif-without-if.c.expected @@ -1,3 +1,4 @@ -0:1(1): preprocessor error: #endif without #if +0:1(2): preprocessor error: #endif without #if + diff --git a/dist/Mesa/src/glsl/glcpp/tests/080-if-without-expression.c.expected b/dist/Mesa/src/glsl/glcpp/tests/080-if-without-expression.c.expected index 2e4cd7323..768ba0f47 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/080-if-without-expression.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/080-if-without-expression.c.expected @@ -3,3 +3,4 @@ + diff --git a/dist/Mesa/src/glsl/glcpp/tests/081-elif-without-expression.c.expected b/dist/Mesa/src/glsl/glcpp/tests/081-elif-without-expression.c.expected index b607b8490..974f0f550 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/081-elif-without-expression.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/081-elif-without-expression.c.expected @@ -2,3 +2,4 @@ + diff --git a/dist/Mesa/src/glsl/glcpp/tests/082-invalid-paste.c.expected b/dist/Mesa/src/glsl/glcpp/tests/082-invalid-paste.c.expected index b48a2d6d2..2dd21c063 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/082-invalid-paste.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/082-invalid-paste.c.expected @@ -17,3 +17,4 @@ Pasting "4" and "+" does not give a valid preprocessing token. 2 34 45.2 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/083-unterminated-if.c.expected b/dist/Mesa/src/glsl/glcpp/tests/083-unterminated-if.c.expected index 4659ab6fe..a69f8bab5 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/083-unterminated-if.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/083-unterminated-if.c.expected @@ -1,4 +1,5 @@ -0:1(6): preprocessor error: Unterminated #if +0:1(7): preprocessor error: Unterminated #if + diff --git a/dist/Mesa/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected b/dist/Mesa/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected index d23845bfd..1df30cbb5 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected @@ -9,3 +9,4 @@ MULT() MULT(1) MULT(1,2,3) + diff --git a/dist/Mesa/src/glsl/glcpp/tests/087-if-comments.c.expected b/dist/Mesa/src/glsl/glcpp/tests/087-if-comments.c.expected index 2783a9c14..827e548fe 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/087-if-comments.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/087-if-comments.c.expected @@ -3,3 +3,4 @@ win + diff --git a/dist/Mesa/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c b/dist/Mesa/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c index 422c65464..0e0666b8b 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c +++ b/dist/Mesa/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c @@ -1,5 +1,5 @@ #define abc 123 #define abc 123 +#define foo(x) (x)+23 #define foo(x) ( x ) + 23 -#define foo(x) ( x ) + 23 diff --git a/dist/Mesa/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected b/dist/Mesa/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected index 3f2ff2d6c..6fb66a5e2 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected @@ -3,3 +3,4 @@ + diff --git a/dist/Mesa/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected b/dist/Mesa/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected index a94516149..6209ead55 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected @@ -27,3 +27,4 @@ + diff --git a/dist/Mesa/src/glsl/glcpp/tests/090-hash-error.c.expected b/dist/Mesa/src/glsl/glcpp/tests/090-hash-error.c.expected index 876a6ea9c..f2f1fbeaf 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/090-hash-error.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/090-hash-error.c.expected @@ -1 +1,3 @@ -0:1(1): preprocessor error: #error human error +0:1(2): preprocessor error: #error human error + + diff --git a/dist/Mesa/src/glsl/glcpp/tests/091-hash-line.c.expected b/dist/Mesa/src/glsl/glcpp/tests/091-hash-line.c.expected index ac9ab252f..48af0b296 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/091-hash-line.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/091-hash-line.c.expected @@ -3,12 +3,17 @@ 1:0(1): preprocessor error: #error source 1, line 0 error 2:30(1): preprocessor error: #error source 2, line 30 error #line 0 + #line 25 + #line 0 1 + #line 30 2 + #line 45 2 #line 90 2 #line 180 2 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/096-paste-twice.c.expected b/dist/Mesa/src/glsl/glcpp/tests/096-paste-twice.c.expected index 96c57d2a6..e40194112 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/096-paste-twice.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/096-paste-twice.c.expected @@ -1,3 +1,4 @@ justonetoken + diff --git a/dist/Mesa/src/glsl/glcpp/tests/099-c99-example.c.expected b/dist/Mesa/src/glsl/glcpp/tests/099-c99-example.c.expected index 352bbff48..19be75055 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/099-c99-example.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/099-c99-example.c.expected @@ -14,3 +14,4 @@ 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/dist/Mesa/src/glsl/glcpp/tests/100-macro-with-colon.c.expected b/dist/Mesa/src/glsl/glcpp/tests/100-macro-with-colon.c.expected index 09f1f417b..36f98aa3e 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/100-macro-with-colon.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/100-macro-with-colon.c.expected @@ -2,6 +2,7 @@ switch (1) { - case 1 + 2: - break; + case 1 + 2: + break; } + diff --git a/dist/Mesa/src/glsl/glcpp/tests/101-macros-used-twice.c.expected b/dist/Mesa/src/glsl/glcpp/tests/101-macros-used-twice.c.expected index 1e0b30696..1a4bf1536 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/101-macros-used-twice.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/101-macros-used-twice.c.expected @@ -14,3 +14,4 @@ once once again + diff --git a/dist/Mesa/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected b/dist/Mesa/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected index 3fbeec48e..e89a2926f 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected @@ -1,2 +1,3 @@ #line 2 int foo(); + diff --git a/dist/Mesa/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected b/dist/Mesa/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected index 814cef1b8..fb8e1504c 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected @@ -3,3 +3,4 @@ #line 2 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected b/dist/Mesa/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected index 1c0cbc970..6f5ff2e32 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected @@ -4,3 +4,4 @@ int foo(); + diff --git a/dist/Mesa/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected b/dist/Mesa/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected index b0601d7ee..68d489b07 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected @@ -5,3 +5,4 @@ int foo(); + diff --git a/dist/Mesa/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected b/dist/Mesa/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected index 4f4243f94..da4544a55 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected @@ -1 +1,2 @@ -0:1(1): preprocessor error: Illegal non-directive after # +0:1(3): preprocessor error: Invalid tokens after # + diff --git a/dist/Mesa/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected b/dist/Mesa/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected index 4f4243f94..da4544a55 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected @@ -1 +1,2 @@ -0:1(1): preprocessor error: Illegal non-directive after # +0:1(3): preprocessor error: Invalid tokens after # + diff --git a/dist/Mesa/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected b/dist/Mesa/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected index 4d93de41d..6d5e9d1a5 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected @@ -1,3 +1,4 @@ -0:2(1): preprocessor error: Illegal non-directive after # +0:2(2): preprocessor error: Invalid tokens after # + diff --git a/dist/Mesa/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected b/dist/Mesa/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected index 5c005c393..e083008cd 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected @@ -17,3 +17,4 @@ success success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected b/dist/Mesa/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected index 86b37036b..3b5479a2b 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected @@ -22,3 +22,4 @@ success success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected b/dist/Mesa/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected index 55bc788ff..3562fb9ea 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected @@ -5,3 +5,4 @@ 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/dist/Mesa/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected b/dist/Mesa/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected index aa9711034..a3ad7da59 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected @@ -5,3 +5,4 @@ 5. Hexadecimal for 20560: 5050 6: Zip code for Nortonville, KS: 66060 7. James Bond, as a number: 007 + diff --git a/dist/Mesa/src/glsl/glcpp/tests/115-line-continuations.c.expected b/dist/Mesa/src/glsl/glcpp/tests/115-line-continuations.c.expected index 428b5e822..f67ba1cf7 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/115-line-continuations.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/115-line-continuations.c.expected @@ -7,3 +7,4 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected b/dist/Mesa/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected index 5ca78928a..9b9a8c5b6 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected @@ -11,3 +11,4 @@ success + diff --git a/dist/Mesa/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected b/dist/Mesa/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected index 8aaa04d28..292d6516f 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected @@ -10,3 +10,4 @@ + diff --git a/dist/Mesa/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected b/dist/Mesa/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected index 1fa8135cb..2adf5d1ba 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected @@ -2,3 +2,4 @@ first second + diff --git a/dist/Mesa/src/glsl/glcpp/tests/119-elif-after-else.c.expected b/dist/Mesa/src/glsl/glcpp/tests/119-elif-after-else.c.expected index 636956799..33f051361 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/119-elif-after-else.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/119-elif-after-else.c.expected @@ -5,3 +5,4 @@ int foo; int bar; + diff --git a/dist/Mesa/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected b/dist/Mesa/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected index 8cb7cb989..402a76381 100644 --- a/dist/Mesa/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected +++ b/dist/Mesa/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected @@ -1,2 +1,3 @@ - + + |