summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Worth <[email protected]>2010-08-11 13:50:51 -0700
committerCarl Worth <[email protected]>2010-08-11 14:38:03 -0700
commit624dd585c72103e5bffbc600cdf7bdfba5305a15 (patch)
tree74dc724192433a6b750126050bc5a8c2024068b3
parentcb5ea0c79bd74ea6263d54302ed19c243ceb05de (diff)
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.
-rw-r--r--src/glsl/glcpp/glcpp-parse.c2
-rw-r--r--src/glsl/glcpp/glcpp-parse.y2
-rw-r--r--src/glsl/glcpp/tests/081-elif-without-expression.c.expected1
3 files changed, 2 insertions, 3 deletions
diff --git a/src/glsl/glcpp/glcpp-parse.c b/src/glsl/glcpp/glcpp-parse.c
index 498d0187640..05bb7ca48b5 100644
--- 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 643c449d0e1..795030ecfe7 100644
--- 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 37dcdc3238a..974f0f550eb 100644
--- 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 @@
-