glcpp: Add an explicit diagnostic for #if with no expression.

This is more clear than the previously-generated diagnostic which was
something confusing like "enexpected newline".

This change makse test 080-if-witout-expression.c now pass.

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 795030ecfe758ead5d2bbd540bff50897b013f1f..0e0d9d412b675aa3f41392d3f6ed6d2523e42acf 100644 (file)
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -241,6 +241,16 @@ control_line:
                        parser->skip_stack->type = SKIP_TO_ENDIF;
                }
        }
+|      HASH_IF NEWLINE {
+               /* #if without an expression is only an error if we
+                *  are not skipping */
+               if (parser->skip_stack == NULL ||
+                   parser->skip_stack->type == SKIP_NO_SKIP)
+               {
+                       glcpp_error(& @1, parser, "#if with no expression");
+               }       
+               _glcpp_parser_skip_stack_push_if (parser, & @1, 0);
+       }
 |      HASH_IFDEF IDENTIFIER junk NEWLINE {
                macro_t *macro = hash_table_find (parser->defines, $2);
                talloc_free ($2);

diff --git a/src/glsl/glcpp/tests/080-if-without-expression.c.expected b/src/glsl/glcpp/tests/080-if-without-expression.c.expected
index 1a3e383e9adc3832f7a38c1840a3859c3fe5383f..768ba0f473f7c816eb644403a684aeba9bcff780 100644 (file)
--- a/src/glsl/glcpp/tests/080-if-without-expression.c.expected
+++ b/src/glsl/glcpp/tests/080-if-without-expression.c.expected
@@ -1,3 +1,6 @@
 0:2(1): preprocessor error: #if with no expression
-
  
+
+
+
+