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

fixes from code review

Browse source
This commit is contained in:
AndLLA 2022-10-08 16:19:02 +02:00 • committed by William S Fulton
commit b885c22f11
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Examples/test-suite/r/Makefile.in
View file

@ -25,8 +25,7 @@ CPP_TEST_CASES += \
r_overload_array \ r_overload_array \
r_sexp \ r_sexp \
r_overload_comma \ r_overload_comma \
r_use_isnull \ r_use_isnull
li_boost_shared_ptr
# These tests are failing because enums currently cannot handle # These tests are failing because enums currently cannot handle
# arithmetic expressions # arithmetic expressions

3
Source/Modules/r.cxx
View file

@ -2092,7 +2092,7 @@ 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) {
String * classtypeobj = NewString(Getattr(parent, "classtypeobj")); // this is the correct name, e.g. ClassName(int) String * classtypeobj = Getattr(parent, "classtypeobj"); // this is the correct name, e.g. ClassName(int)
String * classtype = NewString(Getattr(parent, "classtype")); // this is the "wrong" name e.g. ClassName<int> String * classtype = NewString(Getattr(parent, "classtype")); // this is the "wrong" name e.g. ClassName<int>
// we replace inside smartname ClassName<int> with ClassName(int) // we replace inside smartname ClassName<int> with ClassName(int)
@ -2103,7 +2103,6 @@ int R::functionWrapper(Node *n) {
String * smartname_fixed_rclass = getRClassName(smartname_fixed, 1, 1); String * smartname_fixed_rclass = getRClassName(smartname_fixed, 1, 1);
Replaceall(tm, "$R_class", smartname_fixed_rclass); Replaceall(tm, "$R_class", smartname_fixed_rclass);
Delete(classtypeobj);
Delete(classtype); Delete(classtype);
Delete(smartname_fixed); Delete(smartname_fixed);
Delete(smartname_fixed_rclass); Delete(smartname_fixed_rclass);