glcpp: Reword diagnostic for #elif with no expression

Rather than telling the user what to fix, the standard convention is to
describe what the detected problem is. With this change, test
081-elif-without-expression now passes.

diff --git a/src/glsl/glcpp/glcpp-parse.c b/src/glsl/glcpp/glcpp-parse.c
index 498d018764011aa90d10d9231af15b513c92cdc3..05bb7ca48b5c275eb326f1ea175e56ae056fd752 100644 (file)
--- a/src/glsl/glcpp/glcpp-parse.c
+++ b/src/glsl/glcpp/glcpp-parse.c
@@ -1950,7 +1950,7 @@ yyreduce:
                if (parser->skip_stack &&
                    parser->skip_stack->type == SKIP_TO_ELSE)
                {
-                       glcpp_error(& (yylsp[(1) - (2)]), parser, "#elif needs an expression");
+                       glcpp_error(& (yylsp[(1) - (2)]), parser, "#elif with no expression");
                }
                else
                {

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 643c449d0e17e808de9d388a75445d5b8ca96e5d..795030ecfe758ead5d2bbd540bff50897b013f1f 100644 (file)
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -276,7 +276,7 @@ control_line:
                if (parser->skip_stack &&
                    parser->skip_stack->type == SKIP_TO_ELSE)
                {
-                       glcpp_error(& @1, parser, "#elif needs an expression");
+                       glcpp_error(& @1, parser, "#elif with no expression");
                }
                else
                {

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 37dcdc3238a794346bbd1251a07fecfdaaec9b5d..974f0f550ebc230d8fbc07fee7b111eda021e55a 100644 (file)
--- a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected
+++ b/src/glsl/glcpp/tests/081-elif-without-expression.c.expected
@@ -3,4 +3,3 @@
 
 
 
-