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

fix naming of RClass when template of a shared_ptr

Browse source
This commit is contained in:
AndLLA 2022-10-01 19:18:08 +02:00 • committed by William S Fulton
commit a71bb2bc6e
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Modules/r.cxx
View file

@ -2092,9 +2092,21 @@ int R::functionWrapper(Node *n) {
Node * parent = Getattr(n, "parentNode"); Node * parent = Getattr(n, "parentNode");
String * smartname = Getattr(parent, "feature:smartptr"); String * smartname = Getattr(parent, "feature:smartptr");
if (smartname) { if (smartname) {
smartname = getRClassName(smartname, 1, 1); String * classtypeobj = NewString(Getattr(parent, "classtypeobj")); // this is the correct name, e.g. ClassName(int)
Replaceall(tm, "$R_class", smartname); String * classtype = NewString(Getattr(parent, "classtype")); // this is the "wrong" name e.g. ClassName<int>
Delete(smartname);
// we replace inside smartname ClassName<int> with ClassName<int>
String * smartname_fixed = NewString(smartname);
Replaceall(classtype, " ", ""); // classtype actually has spaces inside so we remove them
Replaceall(smartname_fixed, classtype, classtypeobj);
String * smartname_fixed_rclass = getRClassName(smartname_fixed, 1, 1);
Replaceall(tm, "$R_class", smartname_fixed_rclass);
Delete(classtypeobj);
Delete(classtype);
Delete(smartname_fixed);
Delete(smartname_fixed_rclass);
} }
} }
if (debugMode) { if (debugMode) {