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

run test and copying typemaps to std::string

Browse source
This commit is contained in:
Richard Beare 2016-04-05 10:06:42 +10:00
commit f7b794a4f3
3 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Examples/test-suite/li_std_vector.i
View file

@ -130,3 +130,13 @@ namespace aa {
std::vector< ::aa::Holder > vec1(std::vector< ::aa::Holder > x) { return x; } std::vector< ::aa::Holder > vec1(std::vector< ::aa::Holder > x) { return x; }
%} %}
#endif #endif
// exercising vectors of strings
%inline %{
std::vector<std::string> RevStringVec (const std::vector<std::string> &In)
{
std::vector<std::string> result(In);
std::reverse(result.begin(), result.end());
return(result);
}
%}

4
Examples/test-suite/r/li_std_vector_runme.R
View file

@ -9,6 +9,10 @@ testvec <- c(1, 2, 3)
unittest(half(testvec), testvec/2) unittest(half(testvec), testvec/2)
unittest(average(testvec), mean(testvec)) unittest(average(testvec), mean(testvec))
## string vector test
vlen <- 13
stringvec <- paste(letters[1:vlen], as.character(rnorm(vlen)))
unittest(rev(stringvec), RevStringVec(stringvec))
q(save="no") q(save="no")

18
Lib/r/std_vector.i
View file

@ -870,16 +870,26 @@
%typemap("scoercein") std::vector<int> , std::vector<int> const, std::vector<int> const& "$input = as.integer($input);"; %typemap("scoercein") std::vector<int> , std::vector<int> const, std::vector<int> const& "$input = as.integer($input);";
// strings // strings
%typemap("rtype") std::vector< std::basic_string<char> >, std::vector< std::basic_string<char> > *, %typemap("rtype") std::vector< std::basic_string<char> >,
std::vector< std::basic_string<char> > & "character"; std::vector< std::basic_string<char> > *,
std::vector< std::basic_string<char> > & "character"
%typemap("scoercein") std::vector< std::basic_string<char> >, std::vector< std::basic_string<char> > *, %typemap("rtypecheck") std::vector< std::basic_string<char> >,
std::vector< std::basic_string<char> > *,
std::vector< std::basic_string<char> > &
%{ is.character($arg) %}
%typemap("scoercein") std::vector< std::basic_string<char> >,
std::vector< std::basic_string<char> > *,
std::vector< std::basic_string<char> > & "$input = as.character($input);"; std::vector< std::basic_string<char> > & "$input = as.character($input);";
%typemap("scoerceout") std::vector< std::basic_string<char> >, std::vector< std::basic_string<char> > *, %typemap("scoerceout") std::vector< std::basic_string<char> >,
std::vector< std::basic_string<char> > *,
std::vector< std::basic_string<char> > & std::vector< std::basic_string<char> > &
%{ %} %{ %}
%apply std::vector< std::basic_string<char> > { std::vector< std::string> };
// all the related integer vectors // all the related integer vectors
// signed // signed
%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<signed char>); %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector<signed char>);