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

avoid using of temporal value for wrapping type user + const reference argument

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6895 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-12-18 05:57:08 +00:00
commit aa048182d7
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
SWIG/Examples/test-suite/python/kwargs.i
View file

@ -52,3 +52,23 @@
%template(templatedfunction) templatedfunction<int>; %template(templatedfunction) templatedfunction<int>;
// Deafult args with references
%inline
%{
typedef int size_type;
struct Hello
{
static const size_type hello = 3;
};
int rfoo( const size_type& x = Hello::hello, const Hello& y = Hello() )
{
return x;
}
%}

13
SWIG/Source/Swig/cwrap.c
View file

@ -173,15 +173,24 @@ int Swig_cargs(Wrapper *w, ParmList *p) {
if (tycode == T_REFERENCE) { if (tycode == T_REFERENCE) {
if (pvalue) { if (pvalue) {
SwigType *tvalue; SwigType *tvalue;
String *defname, *defvalue, *rvalue; String *defname, *defvalue, *rvalue, *qvalue;
rvalue = SwigType_typedef_resolve_all(pvalue); rvalue = SwigType_typedef_resolve_all(pvalue);
qvalue = SwigType_typedef_qualified(rvalue);
defname = NewStringf("%s_defvalue", lname); defname = NewStringf("%s_defvalue", lname);
tvalue = Copy(type); tvalue = Copy(type);
SwigType_del_reference(tvalue); SwigType_del_reference(tvalue);
defvalue = NewStringf("%s = %s", SwigType_lstr(tvalue,defname), rvalue); tycode = SwigType_type(tvalue);
if (tycode != T_USER) {
/* plain primitive type, we copy the the def value */
defvalue = NewStringf("%s = %s", SwigType_lstr(tvalue,defname),qvalue);
} else {
/* user type, we copy the reference value */
defvalue = NewStringf("%s = %s",SwigType_str(type,defname),qvalue);
}
Wrapper_add_localv(w,defname, defvalue, NIL); Wrapper_add_localv(w,defname, defvalue, NIL);
Delete(tvalue); Delete(tvalue);
Delete(rvalue); Delete(rvalue);
Delete(qvalue);
Delete(defname); Delete(defname);
Delete(defvalue); Delete(defvalue);
} }