diff options
| author | Carl Worth <cworth@cworth.org> | 2014-06-20 19:11:27 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-07-29 15:11:49 -0700 |
| commit | 0742e0acd302d90dd7f326cf641da61ac60a8508 (patch) | |
| tree | bac0153b80470893d94f6b588b5c68d3ae3c8a49 /src/glsl | |
| parent | f583f214d5b8292aca91ec2217296b7ed17d9df4 (diff) | |
| download | external_mesa3d-0742e0acd302d90dd7f326cf641da61ac60a8508.zip external_mesa3d-0742e0acd302d90dd7f326cf641da61ac60a8508.tar.gz external_mesa3d-0742e0acd302d90dd7f326cf641da61ac60a8508.tar.bz2 | |
glsl/glcpp: Minor tweak to wording of error message
It makes more sense to print the directive name with the preceding '#'.
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/glcpp/glcpp-parse.y | 2 | ||||
| -rw-r--r-- | src/glsl/glcpp/tests/077-else-without-if.c.expected | 2 | ||||
| -rw-r--r-- | src/glsl/glcpp/tests/078-elif-without-if.c.expected | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y index a93c1e3..840003b 100644 --- a/src/glsl/glcpp/glcpp-parse.y +++ b/src/glsl/glcpp/glcpp-parse.y @@ -2119,7 +2119,7 @@ _glcpp_parser_skip_stack_change_if (glcpp_parser_t *parser, YYLTYPE *loc, const char *type, int condition) { if (parser->skip_stack == NULL) { - glcpp_error (loc, parser, "%s without #if\n", type); + glcpp_error (loc, parser, "#%s without #if\n", type); return; } 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 cc1c379..64e6d1a 100644 --- a/src/glsl/glcpp/tests/077-else-without-if.c.expected +++ b/src/glsl/glcpp/tests/077-else-without-if.c.expected @@ -1,3 +1,3 @@ -0:1(2): preprocessor error: else without #if +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 ee34501..f3530ed 100644 --- a/src/glsl/glcpp/tests/078-elif-without-if.c.expected +++ b/src/glsl/glcpp/tests/078-elif-without-if.c.expected @@ -1,3 +1,3 @@ -0:1(2): preprocessor error: elif without #if +0:1(2): preprocessor error: #elif without #if |