From 346d712e87f09b434706ee21de02860f104c1c3c Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Thu, 26 Jun 2014 10:08:34 -0700 Subject: [PATCH] glsl/glcpp: Test that macro parameters substitute immediately after periods At one point while rewriting the lexing rule for pre-processing numbers, I made it a bit too aggressive and within a replacement list sucked up a parameter name that appeared immediately after a period. This caused the parameter name to be unreplaced when the macro was expanded. It was in some piglit tests that I originally found this issue. Here, I'm adding a test to "make check" to ensure that this behavior remains correct. Reviewed-by: Jordan Justen --- src/glsl/glcpp/tests/137-expand-macro-after-period.c | 4 ++++ src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 src/glsl/glcpp/tests/137-expand-macro-after-period.c create mode 100644 src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected diff --git a/src/glsl/glcpp/tests/137-expand-macro-after-period.c b/src/glsl/glcpp/tests/137-expand-macro-after-period.c new file mode 100644 index 00000000000..c8cd47fb57e --- /dev/null +++ b/src/glsl/glcpp/tests/137-expand-macro-after-period.c @@ -0,0 +1,4 @@ +#define FIELD(x) foo.x +#define FIELD_OF(s, x) s.x +FIELD(bar) +FIELD_OF(foo, bar) diff --git a/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected b/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected new file mode 100644 index 00000000000..f9f5be13e01 --- /dev/null +++ b/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected @@ -0,0 +1,4 @@ + + +foo.bar +foo.bar -- 2.30.2