jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ruby] add %typemap(directorin) for shared_ptr.

Browse source
This commit is contained in:
Takashi Tamura 2017-04-12 12:20:05 +09:00
commit 0020fc97b0
3 changed files with 93 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Examples/test-suite/cpp11_shared_ptr_director.i
View file

@ -23,6 +23,8 @@ struct Base {
virtual int take_c_by_value(C c) = 0;
virtual int take_c_shared_ptr_by_value(std::shared_ptr<C> c) = 0;
virtual int take_c_shared_ptr_by_ref(std::shared_ptr<C>& c) = 0;
virtual int take_c_shared_ptr_by_pointer(std::shared_ptr<C>* c) = 0;
virtual int take_c_shared_ptr_by_pointer_ref(std::shared_ptr<C>*const&c) = 0;
virtual ~Base() {}
};
@ -50,9 +52,39 @@ int call_take_c_shared_ptr_by_value(Base* b) {
return b->take_c_shared_ptr_by_value(ptr);
}
int call_take_c_shared_ptr_by_value_with_null(Base* b) {
std::shared_ptr<C> ptr;
return b->take_c_shared_ptr_by_value(ptr);
}
int call_take_c_shared_ptr_by_ref(Base* b) {
std::shared_ptr<C> ptr(new C(7));
return b->take_c_shared_ptr_by_ref(ptr);
}
int call_take_c_shared_ptr_by_ref_with_null(Base* b) {
std::shared_ptr<C> ptr;
return b->take_c_shared_ptr_by_ref(ptr);
}
int call_take_c_shared_ptr_by_pointer(Base* b) {
std::shared_ptr<C> ptr(new C(8));
return b->take_c_shared_ptr_by_pointer(&ptr);
}
int call_take_c_shared_ptr_by_pointer_with_null(Base* b) {
std::shared_ptr<C> ptr;
return b->take_c_shared_ptr_by_pointer(&ptr);
}
int call_take_c_shared_ptr_by_pointer_ref(Base* b) {
auto ptr = new std::shared_ptr<C>(new C(9));
return b->take_c_shared_ptr_by_pointer_ref(ptr);
}
int call_take_c_shared_ptr_by_pointer_ref_with_null(Base* b) {
auto ptr = new std::shared_ptr<C>();
return b->take_c_shared_ptr_by_pointer_ref(ptr);
}
%}

41
Examples/test-suite/ruby/cpp11_shared_ptr_director_runme.rb
View file

@ -26,11 +26,35 @@ class Derived < Base
end
def take_c_shared_ptr_by_value(c)
c.get_m
if c
c.get_m
else
-2
end
end
def take_c_shared_ptr_by_ref(c)
c.get_m
if c
c.get_m
else
-3
end
end
def take_c_shared_ptr_by_pointer(c)
if c
c.get_m
else
-4
end
end
def take_c_shared_ptr_by_pointer_ref(c)
if c
c.get_m
else
-5
end
end
end
@ -42,7 +66,14 @@ raise unless call_ret_c_shared_ptr(a) == 1
raise unless call_ret_c_shared_ptr(b) == -1
raise unless call_ret_c_by_value(a) == 1
raise unless call_take_c_by_value(a) == 5
raise unless call_take_c_shared_ptr_by_value(a) == 6
raise unless call_take_c_shared_ptr_by_ref(a) == 7
raise unless call_take_c_by_value(a) == 5
raise unless call_take_c_shared_ptr_by_value(a) == 6
raise unless call_take_c_shared_ptr_by_ref(a) == 7
raise unless call_take_c_shared_ptr_by_pointer(a) == 8
raise unless call_take_c_shared_ptr_by_pointer_ref(a) == 9
raise unless call_take_c_shared_ptr_by_value_with_null(a) == -2
raise unless call_take_c_shared_ptr_by_ref_with_null(a) == -3
raise unless call_take_c_shared_ptr_by_pointer_with_null(a) == -4
raise unless call_take_c_shared_ptr_by_pointer_ref_with_null(a) == -5

26
Lib/ruby/boost_shared_ptr.i
View file

@ -260,11 +260,19 @@
%set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
}
%typemap(directorin,noblock=1) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
if ($1) {
SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1);
$input = SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN | %newpointer_flags);
} else {
$input = Qnil;
}
}
%typemap(directorout,noblock=1) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > (void * swig_argp, int swig_res = 0) {
if (NIL_P($input)) {
$result = $ltype();
} else {
swig_res = SWIG_ConvertPtr($input,&swig_argp,$&descriptor, %convertptr_flags);
swig_res = SWIG_ConvertPtr($input, &swig_argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags);
if (!SWIG_IsOK(swig_res)) {
%dirout_fail(swig_res,"$type");
}
@ -301,6 +309,14 @@
#error "varout typemap not implemented"
%}
%typemap(directorin,noblock=1) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & {
if ($1) {
$input = SWIG_NewPointerObj(%as_voidptr(&$1), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %newpointer_flags);
} else {
$input = Qnil;
}
}
//
// shared_ptr by pointer
//
@ -331,6 +347,14 @@
#error "varout typemap not implemented"
%}
%typemap(directorin,noblock=1) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *const& {
if ($1 && *$1) {
$input = SWIG_NewPointerObj(%as_voidptr($1), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %newpointer_flags);
} else {
$input = Qnil;
}
}
//
// shared_ptr by pointer reference
//