kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Check various method defitions in C++

Browse source
This commit is contained in:
Nobuyoshi Nakada 2019-09-20 16:48:42 +09:00
parent 4ffcadd39c
commit cb1f9fe918
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
2 changed files with 70 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

44
ext/-test-/cxxanyargs/cxxanyargs.cpp
View file

@ -337,6 +337,49 @@ namespace test_rb_ivar_foreach {
} }
} }
namespace test_rb_define_method {
static VALUE
m1(VALUE, VALUE)
{
return Qnil;
}
static VALUE
m2(VALUE, VALUE, VALUE)
{
return Qnil;
}
static VALUE
ma(VALUE, VALUE)
{
return Qnil;
}
static VALUE
mv(int, VALUE*, VALUE)
{
return Qnil;
}
VALUE
test(VALUE self)
{
// No cast
rb_define_method(self, "m1", m1, 1);
rb_define_method(self, "m2", m2, 2);
rb_define_method(self, "ma", ma, -2);
rb_define_method(self, "mv", mv, -1);
// Cast by RUBY_METHOD_FUNC
rb_define_method(self, "m1", RUBY_METHOD_FUNC(m1), 1);
rb_define_method(self, "m2", RUBY_METHOD_FUNC(m2), 2);
rb_define_method(self, "ma", RUBY_METHOD_FUNC(ma), -2);
rb_define_method(self, "mv", RUBY_METHOD_FUNC(mv), -1);
return self;
}
}
extern "C" void extern "C" void
Init_cxxanyargs(void) Init_cxxanyargs(void)
{ {
@ -361,4 +404,5 @@ Init_cxxanyargs(void)
test(st_foreach_safe); test(st_foreach_safe);
test(rb_hash_foreach); test(rb_hash_foreach);
test(rb_ivar_foreach); test(rb_ivar_foreach);
test(rb_define_method);
} }

36
include/ruby/ruby.h
View file

@ -2711,12 +2711,24 @@ RUBY_SYMBOL_EXPORT_END
# define rb_f_notimplement_p(f) 0 # define rb_f_notimplement_p(f) 0
#endif #endif
#if defined(__has_attribute) && (defined(__cplusplus) || defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P)) && !defined(_WIN32) && !defined(__CYGWIN__) #if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P)
#if (defined(__cplusplus) || __has_attribute(transparent_union)) && __has_attribute(unused) && __has_attribute(weakref) && __has_attribute(nonnull) #if defined(__has_attribute) && __has_attribute(transparent_union) && __has_attribute(unused) && __has_attribute(weakref) && __has_attribute(nonnull)
#define RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) \
__attribute__((__unused__,__weakref__(#def),__nonnull__ nonnull))static void defname(RB_UNWRAP_MACRO decl,VALUE(*func)funcargs,int arity);
#endif
#endif
#if defined(RB_METHOD_DEFINITION_DECL_C) || defined(__cplusplus)
#ifndef RB_METHOD_DEFINITION_DECL_C
#define RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) \
static inline void defname(RB_UNWRAP_MACRO decl,VALUE(*func)funcargs,int arity) \
{ \
def(RB_UNWRAP_MACRO vars,(VALUE(*)(ANYARGS))(func),arity); \
}
#endif
#define RB_UNWRAP_MACRO(...) __VA_ARGS__ #define RB_UNWRAP_MACRO(...) __VA_ARGS__
#define RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,funcargs) \
__attribute__((__unused__,__weakref__(#def),__nonnull__ nonnull))static void defname(RB_UNWRAP_MACRO decl,VALUE(*func)funcargs,int arity);
#ifdef __cplusplus #ifdef __cplusplus
#define RB_METHOD_DEFINITION_DECL_CXX_BEGIN(def) template <int Arity> struct def##_tmpl {}; #define RB_METHOD_DEFINITION_DECL_CXX_BEGIN(def) template <int Arity> struct def##_tmpl {};
#define RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) \ #define RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) \
@ -2728,7 +2740,7 @@ RUBY_SYMBOL_EXPORT_END
#define RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) /* nothing */ #define RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) /* nothing */
#endif #endif
#define RB_METHOD_DEFINITION_DECL_1(def,nonnull,defname,arity,decl,vars,funcargs) \ #define RB_METHOD_DEFINITION_DECL_1(def,nonnull,defname,arity,decl,vars,funcargs) \
RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,funcargs) \ RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,funcargs) \
RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity) RB_METHOD_DEFINITION_DECL_CXX(def,defname,decl,vars,funcargs,arity)
#define RB_METHOD_DEFINITION_DECL(def,nonnull,decl,vars) \ #define RB_METHOD_DEFINITION_DECL(def,nonnull,decl,vars) \
@ -2754,15 +2766,19 @@ RB_METHOD_DEFINITION_DECL_1(def,nonnull,def##m2,-2,decl,vars,(VALUE,VALUE)) \
RB_METHOD_DEFINITION_DECL_M1(def,nonnull,def##m1,decl,vars) /* END */ RB_METHOD_DEFINITION_DECL_M1(def,nonnull,def##m1,decl,vars) /* END */
#ifdef __cplusplus #ifdef __cplusplus
#define RB_METHOD_DEFINITION_DECL_M1(def,nonnull,defname,decl,vars) \ #define RB_METHOD_DEFINITION_DECL_M1(def,nonnull,defname,decl,vars) \
RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,(int,VALUE*,VALUE)) \ RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,VALUE*,VALUE)) \
RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,(int,const VALUE*,VALUE)) \ RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,const VALUE*,VALUE)) \
RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,(int,const VALUE*,VALUE,VALUE)) RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,const VALUE*,VALUE,VALUE)) \
template <> struct def##_tmpl<-1> { \
static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(int,VALUE*,VALUE)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \
static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(int,const VALUE*,VALUE)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \
static void define(RB_UNWRAP_MACRO decl, VALUE (*func)(int,const VALUE*,VALUE,VALUE)) {::defname(RB_UNWRAP_MACRO vars, func, -1);} \
};
#else #else
#define RB_METHOD_DEFINITION_DECL_M1(def,nonnull,defname,decl,vars) \ #define RB_METHOD_DEFINITION_DECL_M1(def,nonnull,defname,decl,vars) \
RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,(int,union{VALUE*x;const VALUE*y;}__attribute__((__transparent_union__)),VALUE)) RB_METHOD_DEFINITION_DECL_C(def,nonnull,defname,decl,vars,(int,union{VALUE*x;const VALUE*y;}__attribute__((__transparent_union__)),VALUE))
#endif #endif
#endif
#endif #endif
#ifdef RB_METHOD_DEFINITION_DECL #ifdef RB_METHOD_DEFINITION_DECL