XS-MLVP
/
swig
mirror of https://github.com/swig/swig
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some comments about shared_ptr upcast code

This commit is contained in:
William S Fulton 2020-01-24 19:46:39 +00:00
parent 564a91864a
commit b3da344765
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Modules/csharp.cxx
View File

@ -1762,6 +1762,7 @@ public:
String *smartnamestr = SwigType_namestr(smart); String *smartnamestr = SwigType_namestr(smart);
String *bsmartnamestr = SwigType_namestr(smart); String *bsmartnamestr = SwigType_namestr(smart);
// TODO: SwigType_typedef_resolve_all on a String instead of SwigType is incorrect for templates
SwigType *rclassname = SwigType_typedef_resolve_all(classname); SwigType *rclassname = SwigType_typedef_resolve_all(classname);
SwigType *rbaseclassname = SwigType_typedef_resolve_all(baseclassname); SwigType *rbaseclassname = SwigType_typedef_resolve_all(baseclassname);
Replaceall(bsmartnamestr, rclassname, rbaseclassname); Replaceall(bsmartnamestr, rclassname, rbaseclassname);

1
Source/Modules/d.cxx
View File

@ -3381,6 +3381,7 @@ private:
String *smartnamestr = SwigType_namestr(smart); String *smartnamestr = SwigType_namestr(smart);
String *bsmartnamestr = SwigType_namestr(smart); String *bsmartnamestr = SwigType_namestr(smart);
// TODO: SwigType_typedef_resolve_all on a String instead of SwigType is incorrect for templates
SwigType *rclassname = SwigType_typedef_resolve_all(classname); SwigType *rclassname = SwigType_typedef_resolve_all(classname);
SwigType *rbaseclassname = SwigType_typedef_resolve_all(baseclassname); SwigType *rbaseclassname = SwigType_typedef_resolve_all(baseclassname);
Replaceall(bsmartnamestr, rclassname, rbaseclassname); Replaceall(bsmartnamestr, rclassname, rbaseclassname);

1
Source/Modules/java.cxx
View File

@ -1904,6 +1904,7 @@ public:
String *smartnamestr = SwigType_namestr(smart); String *smartnamestr = SwigType_namestr(smart);
String *bsmartnamestr = SwigType_namestr(smart); String *bsmartnamestr = SwigType_namestr(smart);
// TODO: SwigType_typedef_resolve_all on a String instead of SwigType is incorrect for templates
SwigType *rclassname = SwigType_typedef_resolve_all(classname); SwigType *rclassname = SwigType_typedef_resolve_all(classname);
SwigType *rbaseclassname = SwigType_typedef_resolve_all(baseclassname); SwigType *rbaseclassname = SwigType_typedef_resolve_all(baseclassname);
Replaceall(bsmartnamestr, rclassname, rbaseclassname); Replaceall(bsmartnamestr, rclassname, rbaseclassname);

8
Source/Modules/typepass.cxx
View File

@ -267,6 +267,8 @@ class TypePass:private Dispatcher {
and smart pointer to base class, so that smart pointer upcasts and smart pointer to base class, so that smart pointer upcasts
are automatically generated. */ are automatically generated. */
SwigType *bsmart = Copy(smart); SwigType *bsmart = Copy(smart);
// TODO: SwigType_typedef_resolve_all on a String instead of SwigType is incorrect for templates
SwigType *rclsname = SwigType_typedef_resolve_all(clsname); SwigType *rclsname = SwigType_typedef_resolve_all(clsname);
SwigType *rbname = SwigType_typedef_resolve_all(bname); SwigType *rbname = SwigType_typedef_resolve_all(bname);
int replace_count = Replaceall(bsmart, rclsname, rbname); int replace_count = Replaceall(bsmart, rclsname, rbname);
@ -276,6 +278,12 @@ class TypePass:private Dispatcher {
String *firstname = Getattr(first, "name"); String *firstname = Getattr(first, "name");
Replaceall(bsmart, firstname, rbname); Replaceall(bsmart, firstname, rbname);
} }
// The code above currently creates a smartptr of the base class by substitution, replacing Derived
// with Base resulting in something like: 'smartptr< Derived >' from 'smartptr< Base >'. Instead
// the feature:smartptr should be used as it also contains 'smartptr< Base >' as specified by the user.
// A similar fix should also be done in upcastsCode in java.cxx, csharp.cxx and writeClassUpcast in d.cxx.
// Printf(stdout, "smartcomparison %s <=> %s\n", SwigType_namestr(bsmart), Getattr(bclass, "feature:smartptr"));
Delete(rclsname); Delete(rclsname);
Delete(rbname); Delete(rbname);
String *smartnamestr = SwigType_namestr(smart); String *smartnamestr = SwigType_namestr(smart);