Skip to content

Commit 0c7a01e

Browse files
ericnieblerericniebler
authored
Merge pull request #1763 from ericniebler/preprocessor-library-naming
give all macros in the preprocessor lib a `STDEXEC_PP_` prefix
2 parents c6b5ff3 + ab704ed commit 0c7a01e

11 files changed

Lines changed: 138 additions & 134 deletions

File tree

‎.clang-format‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ AlignConsecutiveDeclarations: None
99
AlignConsecutiveMacros:
1010
Enabled: true
1111
AcrossEmptyLines: true
12-
AcrossComments: true
12+
AcrossComments: false
1313
AlignEscapedNewlines: Right
1414
AlignOperands: AlignAfterOperator
1515
AlignTrailingComments: true

‎include/exec/sequence/ignore_all_values.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ namespace exec {
200200
}
201201

202202
// nvc++ needs this destructor to be defined to avoid a codegen issue
203-
STDEXEC_WHEN(STDEXEC_NVHPC(), ~__t(){})
203+
STDEXEC_PP_WHEN(STDEXEC_NVHPC(), ~__t(){})
204204

205205
template <sender _Item>
206206
[[nodiscard]]

‎include/nvexec/detail/throw_on_cuda_error.cuh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ namespace nvexec::detail {
9191
} else { \
9292
[[maybe_unused]] auto _ign = ::nvexec::detail::log_on_cuda_error(status, __FILE__, __LINE__); \
9393
STDEXEC_ASSERT(!"CUDA ERROR: " __FILE__ \
94-
STDEXEC_STRINGIZE(:__LINE__: STDEXEC_STRINGIZE(__VA_ARGS__))); /*NOLINT*/ \
94+
STDEXEC_PP_STRINGIZE(:__LINE__: STDEXEC_PP_STRINGIZE(__VA_ARGS__))); /*NOLINT*/ \
9595
}
9696

9797
#define STDEXEC_LOG_CUDA_API(...) \

‎include/stdexec/__detail/__completion_signatures.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,13 +402,13 @@ namespace STDEXEC {
402402

403403
#if STDEXEC_NO_STD_CONSTEXPR_EXCEPTIONS()
404404

405-
# define STDEXEC_PP_EAT_AUTO_auto(_ID) _ID STDEXEC_EAT STDEXEC_LPAREN
405+
# define STDEXEC_PP_EAT_AUTO_auto(_ID) _ID STDEXEC_PP_EAT STDEXEC_PP_LPAREN
406406
# define STDEXEC_PP_EXPAND_AUTO_auto(_ID) auto _ID
407407
# define STDEXEC_COMPLSIGS_LET_ID(...) \
408-
STDEXEC_EXPAND(STDEXEC_CAT(STDEXEC_PP_EAT_AUTO_, __VA_ARGS__) STDEXEC_RPAREN)
408+
STDEXEC_PP_EXPAND(STDEXEC_PP_CAT(STDEXEC_PP_EAT_AUTO_, __VA_ARGS__) STDEXEC_PP_RPAREN)
409409

410410
# define STDEXEC_COMPLSIGS_LET(...) \
411-
if constexpr (STDEXEC_CAT(STDEXEC_PP_EXPAND_AUTO_, __VA_ARGS__); \
411+
if constexpr (STDEXEC_PP_CAT(STDEXEC_PP_EXPAND_AUTO_, __VA_ARGS__); \
412412
!STDEXEC::__valid_completion_signatures<decltype(STDEXEC_COMPLSIGS_LET_ID( \
413413
__VA_ARGS__))>) { \
414414
return STDEXEC_COMPLSIGS_LET_ID(__VA_ARGS__); \

‎include/stdexec/__detail/__config.hpp‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
#if STDEXEC_MSVC()
117117
# define STDEXEC_PRAGMA(_ARG) __pragma(_ARG)
118118
#else
119-
# define STDEXEC_PRAGMA(_ARG) _Pragma(STDEXEC_STRINGIZE(_ARG))
119+
# define STDEXEC_PRAGMA(_ARG) _Pragma(STDEXEC_PP_STRINGIZE(_ARG))
120120
#endif
121121

122122
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -186,9 +186,9 @@ namespace STDEXEC::__std {
186186
//
187187
// STDEXEC_ATTRIBUTE(attr1, attr2, ...)
188188
// void foo() { ... }
189-
#define STDEXEC_ATTRIBUTE(...) STDEXEC_FOR_EACH(STDEXEC__ATTRIBUTE_DETAIL, __VA_ARGS__)
189+
#define STDEXEC_ATTRIBUTE(...) STDEXEC_PP_FOR_EACH(STDEXEC__ATTRIBUTE_DETAIL, __VA_ARGS__)
190190
#define STDEXEC__ATTRIBUTE_DETAIL(_ATTR) \
191-
STDEXEC_CAT(STDEXEC_ATTR_WHICH_, STDEXEC_CHECK(STDEXEC_CAT(STDEXEC_ATTR_, _ATTR)))(_ATTR)
191+
STDEXEC_PP_CAT(STDEXEC_ATTR_WHICH_, STDEXEC_PP_CHECK(STDEXEC_PP_CAT(STDEXEC_ATTR_, _ATTR)))(_ATTR)
192192

193193
// unknown attributes are treated like C++-style attributes
194194
#define STDEXEC_ATTR_WHICH_0(_ATTR) [[_ATTR]]
@@ -199,16 +199,16 @@ namespace STDEXEC::__std {
199199
#else
200200
# define STDEXEC_ATTR_WHICH_1(_ATTR)
201201
#endif
202-
#define STDEXEC_ATTR_host STDEXEC_PROBE(~, 1)
203-
#define STDEXEC_ATTR___host__ STDEXEC_PROBE(~, 1)
202+
#define STDEXEC_ATTR_host STDEXEC_PP_PROBE(~, 1)
203+
#define STDEXEC_ATTR___host__ STDEXEC_PP_PROBE(~, 1)
204204

205205
#if defined(__CUDACC__) && !STDEXEC_NVHPC()
206206
# define STDEXEC_ATTR_WHICH_2(_ATTR) __device__
207207
#else
208208
# define STDEXEC_ATTR_WHICH_2(_ATTR)
209209
#endif
210-
#define STDEXEC_ATTR_device STDEXEC_PROBE(~, 2)
211-
#define STDEXEC_ATTR___device__ STDEXEC_PROBE(~, 2)
210+
#define STDEXEC_ATTR_device STDEXEC_PP_PROBE(~, 2)
211+
#define STDEXEC_ATTR___device__ STDEXEC_PP_PROBE(~, 2)
212212

213213
#if STDEXEC_NVHPC()
214214
// NVBUG #4067067: NVHPC does not fully support [[no_unique_address]]
@@ -235,7 +235,7 @@ namespace STDEXEC::__std {
235235
#else
236236
# define STDEXEC_ATTR_WHICH_3(_ATTR) [[no_unique_address]]
237237
#endif
238-
#define STDEXEC_ATTR_no_unique_address STDEXEC_PROBE(~, 3)
238+
#define STDEXEC_ATTR_no_unique_address STDEXEC_PP_PROBE(~, 3)
239239

240240
#if STDEXEC_MSVC()
241241
# define STDEXEC_ATTR_WHICH_4(_ATTR) __forceinline
@@ -247,40 +247,40 @@ namespace STDEXEC::__std {
247247
#else
248248
# define STDEXEC_ATTR_WHICH_4(_ATTR) /*nothing*/
249249
#endif
250-
#define STDEXEC_ATTR_always_inline STDEXEC_PROBE(~, 4)
250+
#define STDEXEC_ATTR_always_inline STDEXEC_PP_PROBE(~, 4)
251251

252252
#if STDEXEC_CLANG() || STDEXEC_GCC()
253253
# define STDEXEC_ATTR_WHICH_5(_ATTR) __attribute__((__weak__))
254254
#else
255255
# define STDEXEC_ATTR_WHICH_5(_ATTR) /*nothing*/
256256
#endif
257-
#define STDEXEC_ATTR_weak STDEXEC_PROBE(~, 5)
258-
#define STDEXEC_ATTR___weak__ STDEXEC_PROBE(~, 5)
257+
#define STDEXEC_ATTR_weak STDEXEC_PP_PROBE(~, 5)
258+
#define STDEXEC_ATTR___weak__ STDEXEC_PP_PROBE(~, 5)
259259

260260
#if STDEXEC_HAS_ATTRIBUTE(__preferred_name__)
261261
# define STDEXEC_ATTR_WHICH_6(_ATTR) __attribute__((_ATTR))
262262
#else
263263
# define STDEXEC_ATTR_WHICH_6(_ATTR) /*nothing*/
264264
#endif
265-
#define STDEXEC_ATTR_preferred_name STDEXEC_PROBE(~, 6)
266-
#define STDEXEC_ATTR___preferred_name__ STDEXEC_PROBE(~, 6)
265+
#define STDEXEC_ATTR_preferred_name STDEXEC_PP_PROBE(~, 6)
266+
#define STDEXEC_ATTR___preferred_name__ STDEXEC_PP_PROBE(~, 6)
267267

268268
#if defined(__launch_bounds__) && !STDEXEC_NVHPC()
269-
# define STDEXEC_ATTR_WHICH_7(_ATTR) STDEXEC_CAT(STDEXEC_ATTR_NORMALIZE_, _ATTR)
269+
# define STDEXEC_ATTR_WHICH_7(_ATTR) STDEXEC_PP_CAT(STDEXEC_ATTR_NORMALIZE_, _ATTR)
270270
#else
271271
# define STDEXEC_ATTR_WHICH_7(_ATTR)
272272
#endif
273273
#define STDEXEC_ATTR_NORMALIZE_launch_bounds(...) __launch_bounds__(__VA_ARGS__)
274274
#define STDEXEC_ATTR_NORMALIZE___launch_bounds__(...) __launch_bounds__(__VA_ARGS__)
275-
#define STDEXEC_ATTR_launch_bounds(...) STDEXEC_PROBE(~, 7)
276-
#define STDEXEC_ATTR___launch_bounds__(...) STDEXEC_PROBE(~, 7)
275+
#define STDEXEC_ATTR_launch_bounds(...) STDEXEC_PP_PROBE(~, 7)
276+
#define STDEXEC_ATTR___launch_bounds__(...) STDEXEC_PP_PROBE(~, 7)
277277

278278
#if STDEXEC_MSVC() && !STDEXEC_CLANG_CL()
279279
# define STDEXEC_ATTR_WHICH_8(_ATTR) __declspec(_ATTR)
280280
#else
281281
# define STDEXEC_ATTR_WHICH_8(_ATTR) /*nothing*/
282282
#endif
283-
#define STDEXEC_ATTR_empty_bases STDEXEC_PROBE(~, 8)
283+
#define STDEXEC_ATTR_empty_bases STDEXEC_PP_PROBE(~, 8)
284284

285285
////////////////////////////////////////////////////////////////////////////////////////////////////
286286
// warning push/pop portability macros
@@ -680,32 +680,32 @@ namespace STDEXEC {
680680
#else
681681

682682
# define STDEXEC_EXPLICIT_THIS_BEGIN(...) \
683-
static STDEXEC_EXPAND(STDEXEC_CAT(STDEXEC_EXPLICIT_THIS_MANGLE_, __VA_ARGS__) STDEXEC_RPAREN) \
684-
STDEXEC_LPAREN STDEXEC_EXPLICIT_THIS_ARGS
683+
static STDEXEC_PP_EXPAND(STDEXEC_PP_CAT(STDEXEC_EXPLICIT_THIS_MANGLE_, __VA_ARGS__) STDEXEC_PP_RPAREN) \
684+
STDEXEC_PP_LPAREN STDEXEC_EXPLICIT_THIS_ARGS
685685

686686
# define STDEXEC_EXPLICIT_THIS_ARGS(...) \
687-
STDEXEC_CAT(STDEXEC_EXPLICIT_THIS_EAT_, __VA_ARGS__) STDEXEC_RPAREN
687+
STDEXEC_PP_CAT(STDEXEC_EXPLICIT_THIS_EAT_, __VA_ARGS__) STDEXEC_PP_RPAREN
688688

689689
# define STDEXEC_EXPLICIT_THIS_END(_FN) \
690690
template <class... Ts> \
691691
STDEXEC_ATTRIBUTE(always_inline) \
692692
auto _FN(Ts&&... ts) \
693693
&& STDEXEC_AUTO_RETURN( \
694694
decltype(STDEXEC::__get_self<Ts...>( \
695-
*this))::STDEXEC_CAT(static_, _FN)(std::move(*this), static_cast<Ts&&>(ts)...)) \
695+
*this))::STDEXEC_PP_CAT(static_, _FN)(std::move(*this), static_cast<Ts&&>(ts)...)) \
696696
\
697697
template <class... Ts> \
698698
STDEXEC_ATTRIBUTE(always_inline) \
699699
auto _FN(Ts&&... ts) const & STDEXEC_AUTO_RETURN( \
700700
decltype(STDEXEC::__get_self<Ts...>( \
701-
*this))::STDEXEC_CAT(static_, _FN)(*this, static_cast<Ts&&>(ts)...))
701+
*this))::STDEXEC_PP_CAT(static_, _FN)(*this, static_cast<Ts&&>(ts)...))
702702

703703
# define STDEXEC_EXPLICIT_THIS_EAT_this
704704
# define STDEXEC_EXPLICIT_THIS_EAT_auto
705705
# define STDEXEC_EXPLICIT_THIS_EAT_void
706-
# define STDEXEC_EXPLICIT_THIS_MANGLE_auto auto STDEXEC_EXPLICIT_THIS_MANGLE STDEXEC_LPAREN
707-
# define STDEXEC_EXPLICIT_THIS_MANGLE_void void STDEXEC_EXPLICIT_THIS_MANGLE STDEXEC_LPAREN
708-
# define STDEXEC_EXPLICIT_THIS_MANGLE(_NAME) STDEXEC_CAT(static_, _NAME)
706+
# define STDEXEC_EXPLICIT_THIS_MANGLE_auto auto STDEXEC_EXPLICIT_THIS_MANGLE STDEXEC_PP_LPAREN
707+
# define STDEXEC_EXPLICIT_THIS_MANGLE_void void STDEXEC_EXPLICIT_THIS_MANGLE STDEXEC_PP_LPAREN
708+
# define STDEXEC_EXPLICIT_THIS_MANGLE(_NAME) STDEXEC_PP_CAT(static_, _NAME)
709709

710710
namespace STDEXEC {
711711
template <class... _Ts, class _Self>

‎include/stdexec/__detail/__cpo.hpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,33 +39,33 @@
3939
/// }
4040
/// @endcode
4141
#define STDEXEC_MEMFN_DECL_IMPL(...) \
42-
friend STDEXEC_EVAL( \
42+
friend STDEXEC_PP_EVAL( \
4343
STDEXEC_MEMFN_DECL_TAG_INVOKE, STDEXEC_MEMFN_DECL_WHICH(__VA_ARGS__), __VA_ARGS__)
4444

4545
#define STDEXEC_MEMFN_DECL_WHICH(_A1, ...) \
46-
STDEXEC_CAT(STDEXEC_MEMFN_DECL_WHICH_, STDEXEC_FRONT(__VA_OPT__(1, ) 0))(_A1, __VA_ARGS__)
46+
STDEXEC_PP_CAT(STDEXEC_MEMFN_DECL_WHICH_, STDEXEC_PP_FRONT(__VA_OPT__(1, ) 0))(_A1, __VA_ARGS__)
4747
#define STDEXEC_MEMFN_DECL_WHICH_0(_A1, ...) \
48-
STDEXEC_CHECK(STDEXEC_MEMFN_DECL_PROBE_##_A1), STDEXEC_CHECK(_A1##_STDEXEC_MEMFN_DECL_PROBE)
48+
STDEXEC_PP_CHECK(STDEXEC_MEMFN_DECL_PROBE_##_A1), STDEXEC_PP_CHECK(_A1##_STDEXEC_MEMFN_DECL_PROBE)
4949
#define STDEXEC_MEMFN_DECL_WHICH_1(_A1, ...) \
50-
0, STDEXEC_CHECK(STDEXEC_CAT(STDEXEC_BACK(__VA_ARGS__), _STDEXEC_MEMFN_DECL_PROBE))
50+
0, STDEXEC_PP_CHECK(STDEXEC_PP_CAT(STDEXEC_PP_BACK(__VA_ARGS__), _STDEXEC_MEMFN_DECL_PROBE))
5151

5252
#define STDEXEC_MEMFN_DECL_TAG_INVOKE(_WHICH, _QUERY, ...) \
5353
STDEXEC_MEMFN_DECL_RETURN_ ## _WHICH(__VA_ARGS__) \
5454
tag_invoke(STDEXEC_MEMFN_DECL_TAG_ ## _WHICH ## _QUERY(__VA_ARGS__)
5555

5656
#define STDEXEC_MEMFN_DECL_ARGS(...) \
57-
STDEXEC_CAT(STDEXEC_EAT_THIS_, __VA_ARGS__))
57+
STDEXEC_PP_CAT(STDEXEC_EAT_THIS_, __VA_ARGS__))
5858

5959
#define STDEXEC_MEMFN_DECL_QUERY(_SELF, _TAG, ...) \
60-
_TAG, STDEXEC_CAT(STDEXEC_EAT_THIS_, _SELF) __VA_OPT__(, __VA_ARGS__))
60+
_TAG, STDEXEC_PP_CAT(STDEXEC_EAT_THIS_, _SELF) __VA_OPT__(, __VA_ARGS__))
6161

6262
#define STDEXEC_EAT_THIS_this
6363
#define STDEXEC_EAT_AUTO_auto
6464
#define STDEXEC_EAT_VOID_void
6565

66-
#define query_STDEXEC_MEMFN_DECL_PROBE STDEXEC_PROBE(~, 1)
67-
#define STDEXEC_MEMFN_DECL_PROBE_auto STDEXEC_PROBE(~, 1)
68-
#define STDEXEC_MEMFN_DECL_PROBE_void STDEXEC_PROBE(~, 2)
66+
#define query_STDEXEC_MEMFN_DECL_PROBE STDEXEC_PP_PROBE(~, 1)
67+
#define STDEXEC_MEMFN_DECL_PROBE_auto STDEXEC_PP_PROBE(~, 1)
68+
#define STDEXEC_MEMFN_DECL_PROBE_void STDEXEC_PP_PROBE(~, 2)
6969

7070
#define STDEXEC_MEMFN_DECL_RETURN_0(...) ::STDEXEC::__arg_type_t<void(__VA_ARGS__())>
7171
#define STDEXEC_MEMFN_DECL_RETURN_1(...) auto
@@ -81,7 +81,7 @@
8181
#define STDEXEC_MEMFN_DECL_TAG_11(...) STDEXEC_MEMFN_DECL_QUERY
8282
#define STDEXEC_MEMFN_DECL_TAG_21(...) STDEXEC_MEMFN_DECL_QUERY
8383

84-
#define STDEXEC_MEMFN_FRIEND(_TAG) using STDEXEC_CAT(_TAG, _t) = STDEXEC_CAT(STDEXEC::_TAG, _t)
84+
#define STDEXEC_MEMFN_FRIEND(_TAG) using STDEXEC_PP_CAT(_TAG, _t) = STDEXEC_PP_CAT(STDEXEC::_TAG, _t)
8585

8686
#if STDEXEC_GCC() || (STDEXEC_CLANG() && STDEXEC_CLANG_VERSION < 14'00)
8787
# define STDEXEC_CUSTOM \

‎include/stdexec/__detail/__get_completion_signatures.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ namespace STDEXEC {
112112
namespace __cmplsigs {
113113
#define STDEXEC_GET_COMPLSIGS(...) \
114114
STDEXEC_REMOVE_REFERENCE( \
115-
STDEXEC_FRONT(__VA_ARGS__))::template get_completion_signatures<__VA_ARGS__>()
115+
STDEXEC_PP_FRONT(__VA_ARGS__))::template get_completion_signatures<__VA_ARGS__>()
116116

117117
#define STDEXEC_CHECKED_COMPLSIGS(...) \
118118
(static_cast<void>(__VA_ARGS__), \

0 commit comments

Comments
 (0)