diff options
| author | Carl Worth <[email protected]> | 2014-06-19 11:57:06 -0700 |
|---|---|---|
| committer | Carl Worth <[email protected]> | 2014-07-29 15:11:48 -0700 |
| commit | cc335c0e57a92fd78141894350607eca3622465a (patch) | |
| tree | d205bcd9ea62081d67a3bd74e6054d917eff42bf /src/glsl/glcpp/tests | |
| parent | ea2e9300ece89dffdc4a228dc86bea28a7cd58e2 (diff) | |
glsl/glcpp: Add support for comments between #define and macro identifier
The recent adddition of an error for "#define followed by a non-identifier"
was a bit to aggressive since it used a regular expression in the lexer to
flag any character that's not legal as the first character of an identifier.
But we need to allow comments to appear here, (since we aren't removing
comments in a preliminary pass). So we refine the error here to only flag
characters that could not be an identifier, nor a comment, nor whitespace.
We also augment the existing comment support to be active in the <DEFINE>
state as well.
Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/glsl/glcpp/tests')
| -rw-r--r-- | src/glsl/glcpp/tests/130-define-comment.c | 2 | ||||
| -rw-r--r-- | src/glsl/glcpp/tests/130-define-comment.c.expected | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/glsl/glcpp/tests/130-define-comment.c b/src/glsl/glcpp/tests/130-define-comment.c new file mode 100644 index 00000000000..33312362cc7 --- /dev/null +++ b/src/glsl/glcpp/tests/130-define-comment.c @@ -0,0 +1,2 @@ +#define /*...*/ FUNC( /*...*/ x /*...*/ ) /*...*/ FOO( /*...*/ x /*...*/ ) +FUNC(bar) diff --git a/src/glsl/glcpp/tests/130-define-comment.c.expected b/src/glsl/glcpp/tests/130-define-comment.c.expected new file mode 100644 index 00000000000..ed59055e306 --- /dev/null +++ b/src/glsl/glcpp/tests/130-define-comment.c.expected @@ -0,0 +1,3 @@ + +FOO( bar ) + |