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

SF Patch#268 - Add 'pre', 'post' and 'terminator' attributes to the csdirectorin typemap

Browse source 
"csdirectorin" "pre:" and "post" code attributes in C# module. Without them it is
not trivial to marshal strings and smart-pointers back and forth
between user callback code and native code. (especially by reference)

Also fixes 2 minor issues in director code generation that are
difficult to come by until "csdirectorin" attribute is extended.
The first is that "ref" types used in directors lead to invalid
signature generation (the type array used to match methods possibly
overloaded by user). typeof(ref T) is used instead of
typeof().MakeByRefType()
The second is that ignored director methods are not completely ignored
- if there was a %typemap(imtype, "directorinattributes") it is not
skipped for ignored method.
This commit is contained in:
Vladimir Kalinin 2013-01-08 18:20:01 +04:00 • committed by William S Fulton
commit 2b407f4b27
4 changed files with 147 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Examples/test-suite/csharp_prepost.i
View file

@ -1,4 +1,4 @@
%module csharp_prepost
%module (directors="1") csharp_prepost
// Test the pre, post, terminate and cshin attributes for csin typemaps
@ -64,9 +64,11 @@ bool globalfunction2(std::vector<double> & v, std::vector<double> &v2, std::vect
struct PrePost2 {
PrePost2() {
}
virtual ~PrePost2() {
}
PrePost2(std::vector<double> & v, std::vector<double> &v2, std::vector<double> & vpre, std::vector<double> & vpost) {
}
bool method(std::vector<double> & v, std::vector<double> &v2, std::vector<double> & vpre, std::vector<double> & vpost) {
virtual bool method(std::vector<double> & v, std::vector<double> &v2, std::vector<double> & vpre, std::vector<double> & vpost) {
return true;
}
static bool staticmethod(std::vector<double> & v, std::vector<double> &v2, std::vector<double> & vpre, std::vector<double> & vpost) {
@ -75,6 +77,39 @@ struct PrePost2 {
};
%}
// Check csdirectorin pre and post attributes
// ref param
%typemap(csdirectorin,
pre=" DoubleVector d$iminput = new DoubleVector($iminput, false);\n"
" int count$iminput = d$iminput.Count;\n"
" double[] v$iminput = new double[count$iminput];\n"
" for (int i=0; i<count$iminput; ++i) {\n"
" v$iminput[i] = d$iminput[i];\n"
" }\n",
post=" foreach (double d in v$iminput) {\n"
" d$iminput.Add(d);\n"
" }\n"
) std::vector<double> &vpre
"ref v$iminput"
// post only in csdirectorin typemap
%typemap(csdirectorin, post=" DoubleVector d$iminput = new DoubleVector($iminput, false);\n"
" int size = d$iminput.Count;\n"
" for (int i=0; i<size; ++i) {\n"
" d$iminput[i] /= 100;\n"
" }") std::vector<double> &vpost
"new $csclassname($iminput, false)"
%feature("director") PrePost3;
%inline %{
struct PrePost3 {
PrePost3() {
}
virtual ~PrePost3(){}
virtual void method(std::vector<double> & vpre, std::vector<double> & vpost) {}
};
%}
%template(DoubleVector) std::vector<double>;
// Check attributes in the typemaps