mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-04-27 00:10:40 +02:00
glsl/glcpp: Fixup glcpp tests for redefining a macro with whitespace changes.
Previously, the test suite was expecting the compiler to allow a redefintion of a macro with whitespace added, but gcc is more strict and allows only for changes in the amounts of whitespace, (but insists that whitespace exist or not in exactly the same places). See: https://gcc.gnu.org/onlinedocs/cpp/Undefining-and-Redefining-Macros.html: These definitions are effectively the same: #define FOUR (2 + 2) #define FOUR (2 + 2) #define FOUR (2 /* two */ + 2) but these are not: #define FOUR (2 + 2) #define FOUR ( 2+2 ) #define FOUR (2 * 2) #define FOUR(score,and,seven,years,ago) (2 + 2) This change adjusts the existing "redefine-macro-legitimate" test to work with the more strict understanding, and adds a new "redefine-whitespace" test to verify that changes in the position of whitespace are flagged as errors. Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
parent
a6e9cd14ca
commit
1d862a0b39
3 changed files with 40 additions and 1 deletions
|
|
@ -1,5 +1,5 @@
|
|||
#define abc 123
|
||||
#define abc 123
|
||||
|
||||
#define foo(x) (x)+23
|
||||
#define foo(x) ( x ) + 23
|
||||
#define foo(x) ( x ) + 23
|
||||
|
|
|
|||
16
src/glsl/glcpp/tests/122-redefine-whitespace.c
Normal file
16
src/glsl/glcpp/tests/122-redefine-whitespace.c
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
/* Original definitions. */
|
||||
#define TWO ( 1+1 )
|
||||
#define FOUR (2 + 2)
|
||||
#define SIX (3 + 3)
|
||||
|
||||
/* Redefinitions with whitespace in same places, but different amounts, (so no
|
||||
* error). */
|
||||
#define TWO ( 1+1 )
|
||||
#define FOUR (2 + 2)
|
||||
#define SIX (3/*comment is whitespace*/+ /* collapsed */ /* to */ /* one */ /* space */ 3)
|
||||
|
||||
/* Redefinitions with whitespace in different places. Each of these should
|
||||
* trigger an error. */
|
||||
#define TWO (1 + 1)
|
||||
#define FOUR ( 2+2 )
|
||||
#define SIX (/*not*/3 + 3/*expected*/)
|
||||
23
src/glsl/glcpp/tests/122-redefine-whitespace.c.expected
Normal file
23
src/glsl/glcpp/tests/122-redefine-whitespace.c.expected
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
0:14(9): preprocessor error: Redefinition of macro TWO
|
||||
|
||||
0:15(9): preprocessor error: Redefinition of macro FOUR
|
||||
|
||||
0:16(9): preprocessor error: Redefinition of macro SIX
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Add table
Reference in a new issue