glcpp: Support #if(expression) with no intervening space.

And add a test case to ensure that this works.

diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index 53e85556c16f3a479b0375967d388a57fdeabdfb..a81c8f92c14e170de0b19aaae38774bc435e7116 100644 (file)
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/src/glsl/glcpp/glcpp-lex.l
@@ -99,7 +99,7 @@ HEXADECIMAL_INTEGER   0[xX][0-9a-fA-F]+[uU]?
        return HASH_IFNDEF;
 }
 
-{HASH}if{HSPACE}/.*\n {
+{HASH}if{HSPACE}*/[^_a-zA-Z0-9].*\n {
        yyextra->lexing_if = 1;
        yyextra->space_tokens = 0;
        return HASH_IF;

diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c b/src/glsl/glcpp/tests/066-if-nospace-expression.c
new file mode 100644 (file)
index 0000000..3b0b473
--- /dev/null
+++ b/src/glsl/glcpp/tests/066-if-nospace-expression.c
@@ -0,0 +1,3 @@
+#if(1)
+success
+#endif

diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected b/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected
new file mode 100644 (file)
index 0000000..0e84a7c
--- /dev/null
+++ b/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected
@@ -0,0 +1,4 @@
+
+success
+
+