1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract RBIMPL_VA_OPT_ARGS

Browse Source 
Similar to splat argument in Ruby, which be expanded to `__VA_ARGS__`
with a leading comma if any arguments given, otherwise empty.
This commit is contained in:
Nobuyoshi Nakada 2024-02-08 11:41:26 +09:00
parent f3cc1f9a70
commit 34581410f2
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
include/ruby/assert.h
View File

@ -159,13 +159,19 @@ RBIMPL_SYMBOL_EXPORT_END()
* cases. */ * cases. */
RBIMPL_WARNING_IGNORED(-Wgnu-zero-variadic-macro-arguments) RBIMPL_WARNING_IGNORED(-Wgnu-zero-variadic-macro-arguments)
# endif # endif
# define RBIMPL_VA_OPT_ARGS(...) __VA_OPT__(,) __VA_ARGS__
# define RUBY_ASSERT_FAIL(mesg, ...) \ # define RUBY_ASSERT_FAIL(mesg, ...) \
rb_assert_failure##__VA_OPT__(_detail)( \ rb_assert_failure##__VA_OPT__(_detail)( \
__FILE__, __LINE__, RBIMPL_ASSERT_FUNC, mesg __VA_OPT__(,) __VA_ARGS__) __FILE__, __LINE__, RBIMPL_ASSERT_FUNC, mesg RBIMPL_VA_OPT_ARGS(__VA_ARGS__))
#elif !defined(__cplusplus) #elif !defined(__cplusplus)
# define RBIMPL_VA_OPT_ARGS(...)
# define RUBY_ASSERT_FAIL(mesg, ...) \ # define RUBY_ASSERT_FAIL(mesg, ...) \
rb_assert_failure(__FILE__, __LINE__, RBIMPL_ASSERT_FUNC, mesg) rb_assert_failure(__FILE__, __LINE__, RBIMPL_ASSERT_FUNC, mesg)
#else #else
# undef RBIMPL_VA_OPT_ARGS
# define RUBY_ASSERT_FAIL(mesg) \ # define RUBY_ASSERT_FAIL(mesg) \
rb_assert_failure(__FILE__, __LINE__, RBIMPL_ASSERT_FUNC, mesg) rb_assert_failure(__FILE__, __LINE__, RBIMPL_ASSERT_FUNC, mesg)
#endif #endif
@ -176,7 +182,7 @@ RBIMPL_WARNING_IGNORED(-Wgnu-zero-variadic-macro-arguments)
* @param expr What supposedly evaluates to true. * @param expr What supposedly evaluates to true.
* @param mesg The message to display on failure. * @param mesg The message to display on failure.
*/ */
#if defined(HAVE___VA_OPT__) || !defined(__cplusplus) #if defined(RBIMPL_VA_OPT_ARGS)
# define RUBY_ASSERT_MESG(expr, ...) \ # define RUBY_ASSERT_MESG(expr, ...) \
(RB_LIKELY(expr) ? RBIMPL_ASSERT_NOTHING : RUBY_ASSERT_FAIL(__VA_ARGS__)) (RB_LIKELY(expr) ? RBIMPL_ASSERT_NOTHING : RUBY_ASSERT_FAIL(__VA_ARGS__))
#else #else
@ -189,11 +195,9 @@ RBIMPL_WARNING_IGNORED(-Wgnu-zero-variadic-macro-arguments)
* *
* @copydetails #RUBY_ASSERT * @copydetails #RUBY_ASSERT
*/ */
#if defined(HAVE___VA_OPT__) #if defined(RBIMPL_VA_OPT_ARGS)
# define RUBY_ASSERT_ALWAYS(expr, ...) \ # define RUBY_ASSERT_ALWAYS(expr, ...) \
RUBY_ASSERT_MESG(expr, #expr __VA_OPT__(,) __VA_ARGS__) RUBY_ASSERT_MESG(expr, #expr RBIMPL_VA_OPT_ARGS(__VA_ARGS__))
#elif !defined(__cplusplus)
# define RUBY_ASSERT_ALWAYS(expr, ...) RUBY_ASSERT_MESG(expr, #expr)
#else #else
# define RUBY_ASSERT_ALWAYS(expr) RUBY_ASSERT_MESG((expr), #expr) # define RUBY_ASSERT_ALWAYS(expr) RUBY_ASSERT_MESG((expr), #expr)
#endif #endif
@ -204,16 +208,14 @@ RBIMPL_WARNING_IGNORED(-Wgnu-zero-variadic-macro-arguments)
* @param expr What supposedly evaluates to true. * @param expr What supposedly evaluates to true.
*/ */
#if RUBY_DEBUG #if RUBY_DEBUG
# if defined(HAVE___VA_OPT__) # if defined(RBIMPL_VA_OPT_ARGS)
# define RUBY_ASSERT(expr, ...) \ # define RUBY_ASSERT(expr, ...) \
RUBY_ASSERT_MESG((expr), #expr __VA_OPT__(,) __VA_ARGS__) RUBY_ASSERT_MESG((expr), #expr RBIMPL_VA_OPT_ARGS(__VA_ARGS__))
# elif !defined(__cplusplus)
# define RUBY_ASSERT(expr, ...) RUBY_ASSERT_MESG((expr), #expr)
# else # else
# define RUBY_ASSERT(expr) RUBY_ASSERT_MESG((expr), #expr) # define RUBY_ASSERT(expr) RUBY_ASSERT_MESG((expr), #expr)
# endif # endif
#else #else
# if defined(HAVE___VA_OPT__) || !defined(__cplusplus) # if defined(RBIMPL_VA_OPT_ARGS)
# define RUBY_ASSERT(/* expr, */...) RBIMPL_ASSERT_NOTHING # define RUBY_ASSERT(/* expr, */...) RBIMPL_ASSERT_NOTHING
# else # else
# define RUBY_ASSERT(expr) RBIMPL_ASSERT_NOTHING # define RUBY_ASSERT(expr) RBIMPL_ASSERT_NOTHING
@ -230,17 +232,15 @@ RBIMPL_WARNING_IGNORED(-Wgnu-zero-variadic-macro-arguments)
/* Currently `RUBY_DEBUG == ! defined(NDEBUG)` is always true. There is no /* Currently `RUBY_DEBUG == ! defined(NDEBUG)` is always true. There is no
* difference any longer between this one and `RUBY_ASSERT`. */ * difference any longer between this one and `RUBY_ASSERT`. */
#if defined(NDEBUG) #if defined(NDEBUG)
# if defined(HAVE___VA_OPT__) || !defined(__cplusplus) # if defined(RBIMPL_VA_OPT_ARGS)
# define RUBY_ASSERT_NDEBUG(/* expr, */...) RBIMPL_ASSERT_NOTHING # define RUBY_ASSERT_NDEBUG(/* expr, */...) RBIMPL_ASSERT_NOTHING
# else # else
# define RUBY_ASSERT_NDEBUG(expr) RBIMPL_ASSERT_NOTHING # define RUBY_ASSERT_NDEBUG(expr) RBIMPL_ASSERT_NOTHING
# endif # endif
#else #else
# if defined(HAVE___VA_OPT__) # if defined(RBIMPL_VA_OPT_ARGS)
# define RUBY_ASSERT_NDEBUG(expr, ...) \ # define RUBY_ASSERT_NDEBUG(expr, ...) \
RUBY_ASSERT_MESG((expr), #expr __VA_OPT__(,) __VA_ARGS__) RUBY_ASSERT_MESG((expr), #expr RBIMPL_VA_OPT_ARGS(__VA_ARGS__))
# elif !defined(__cplusplus)
# define RUBY_ASSERT_NDEBUG(expr, ...) RUBY_ASSERT_MESG((expr), #expr)
# else # else
# define RUBY_ASSERT_NDEBUG(expr) RUBY_ASSERT_MESG((expr), #expr) # define RUBY_ASSERT_NDEBUG(expr) RUBY_ASSERT_MESG((expr), #expr)
# endif # endif
@ -251,14 +251,14 @@ RBIMPL_WARNING_IGNORED(-Wgnu-zero-variadic-macro-arguments)
* @param mesg The message to display on failure. * @param mesg The message to display on failure.
*/ */
#if RUBY_DEBUG #if RUBY_DEBUG
# if defined(HAVE___VA_OPT__) || !defined(__cplusplus) # if defined(RBIMPL_VA_OPT_ARGS)
# define RUBY_ASSERT_MESG_WHEN(cond, /* expr, */...) \ # define RUBY_ASSERT_MESG_WHEN(cond, /* expr, */...) \
RUBY_ASSERT_MESG(__VA_ARGS__) RUBY_ASSERT_MESG(__VA_ARGS__)
# else # else
# define RUBY_ASSERT_MESG_WHEN(cond, expr, mesg) RUBY_ASSERT_MESG((expr), (mesg)) # define RUBY_ASSERT_MESG_WHEN(cond, expr, mesg) RUBY_ASSERT_MESG((expr), (mesg))
# endif # endif
#else #else
# if defined(HAVE___VA_OPT__) || !defined(__cplusplus) # if defined(RBIMPL_VA_OPT_ARGS)
# define RUBY_ASSERT_MESG_WHEN(cond, expr, ...) \ # define RUBY_ASSERT_MESG_WHEN(cond, expr, ...) \
((cond) ? RUBY_ASSERT_MESG((expr), __VA_ARGS__) : RBIMPL_ASSERT_NOTHING) ((cond) ? RUBY_ASSERT_MESG((expr), __VA_ARGS__) : RBIMPL_ASSERT_NOTHING)
# else # else
@ -274,11 +274,9 @@ RBIMPL_WARNING_IGNORED(-Wgnu-zero-variadic-macro-arguments)
* @param cond Extra condition that shall hold for assertion to take effect. * @param cond Extra condition that shall hold for assertion to take effect.
* @param expr What supposedly evaluates to true. * @param expr What supposedly evaluates to true.
*/ */
#if defined(HAVE___VA_OPT__) #if defined(RBIMPL_VA_OPT_ARGS)
# define RUBY_ASSERT_WHEN(cond, expr, ...) \ # define RUBY_ASSERT_WHEN(cond, expr, ...) \
RUBY_ASSERT_MESG_WHEN(cond, expr, #expr __VA_OPT__(,) __VA_ARGS__) RUBY_ASSERT_MESG_WHEN(cond, expr, #expr RBIMPL_VA_OPT_ARGS(__VA_ARGS__))
#elif !defined(__cplusplus)
# define RUBY_ASSERT_WHEN(cond, expr, ...) RUBY_ASSERT_MESG_WHEN(cond, expr, #expr)
#else #else
# define RUBY_ASSERT_WHEN(cond, expr) RUBY_ASSERT_MESG_WHEN((cond), (expr), #expr) # define RUBY_ASSERT_WHEN(cond, expr) RUBY_ASSERT_MESG_WHEN((cond), (expr), #expr)
#endif #endif