From: Carl Worth <cworth@cworth.org>
Date: Wed, 11 Aug 2010 20:50:51 +0000 (-0700)
Subject: glcpp: Reword diagnostic for #elif with no expression
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=624dd585c72103e5bffbc600cdf7bdfba5305a15;p=mesa.git

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 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 @@
 
 
 
-