diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2019-05-04 06:46:18 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2019-05-04 06:46:18 +0000 |
| commit | cb1beee76f520857b985db2af6117ad97aa45c4e (patch) | |
| tree | 3dd01f89ff7cd37c28716d6510143561ece28839 /clang/test | |
| parent | 5ddd564e190f10b0b001c203fbfbfd521a22c0c4 (diff) | |
| download | bcm5719-llvm-cb1beee76f520857b985db2af6117ad97aa45c4e.tar.gz bcm5719-llvm-cb1beee76f520857b985db2af6117ad97aa45c4e.zip | |
[c++20] Implement tweaked __VA_OPT__ rules from P1042R1:
* __VA_OPT__ is expanded if the *expanded* __VA_ARGS__ is non-empty,
not if the original argument contained no tokens.
* Placemarkers at the start and end of __VA_OPT__ are retained just
long enough to paste them with adjacent ## operators. We never paste
"across" a discarded placemarker.
llvm-svn: 359964
Diffstat (limited to 'clang/test')
| -rw-r--r-- | clang/test/Preprocessor/macro_vaopt_expand.cpp | 8 | ||||
| -rw-r--r-- | clang/test/Preprocessor/macro_vaopt_p1042r1.cpp | 30 |
2 files changed, 34 insertions, 4 deletions
diff --git a/clang/test/Preprocessor/macro_vaopt_expand.cpp b/clang/test/Preprocessor/macro_vaopt_expand.cpp index 52f18afb4e6..7ec4f6128cf 100644 --- a/clang/test/Preprocessor/macro_vaopt_expand.cpp +++ b/clang/test/Preprocessor/macro_vaopt_expand.cpp @@ -129,8 +129,8 @@ #define G(a,...) __VA_OPT__(B a) ## 1
26: F(,1)
26_1: G(,1)
-// CHECK: 26: B1
-// CHECK: 26_1: B1
+// CHECK: 26: B 1
+// CHECK: 26_1: B 1
#undef F
#undef G
@@ -140,9 +140,9 @@ 27: F(,1)
27_1: F(A0,1)
28: G(,1)
-// CHECK: 27: B11
+// CHECK: 27: B 11
// CHECK: 27_1: BexpandedA0 11
-// CHECK: 28: B11
+// CHECK: 28: B 11
#undef F
#undef G
diff --git a/clang/test/Preprocessor/macro_vaopt_p1042r1.cpp b/clang/test/Preprocessor/macro_vaopt_p1042r1.cpp new file mode 100644 index 00000000000..f12dd20b821 --- /dev/null +++ b/clang/test/Preprocessor/macro_vaopt_p1042r1.cpp @@ -0,0 +1,30 @@ + RUN: %clang_cc1 -E %s -pedantic -std=c++2a | FileCheck -strict-whitespace %s
+
+#define LPAREN() (
+#define G(Q) 42
+#define F1(R, X, ...) __VA_OPT__(G R X) )
+1: int x = F1(LPAREN(), 0, <:-);
+// CHECK: 1: int x = 42;
+
+#define F2(...) f(0 __VA_OPT__(,) __VA_ARGS__)
+#define EMP
+2: F2(EMP)
+// CHECK: 2: f(0 )
+
+#define H3(X, ...) #__VA_OPT__(X##X X##X)
+3: H3(, 0)
+// CHECK: 3: ""
+
+#define H4(X, ...) __VA_OPT__(a X ## X) ## b
+4: H4(, 1)
+// CHECK: 4: a b
+
+#define H4B(X, ...) a ## __VA_OPT__(X ## X b)
+4B: H4B(, 1)
+// CHECK: 4B: a b
+
+#define H5A(...) __VA_OPT__()/**/__VA_OPT__()
+#define H5B(X) a ## X ## b
+#define H5C(X) H5B(X)
+5: H5C(H5A())
+// CHECK: 5: ab
|
