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

WIP - Use the non-encoded type string for upcasting a shared_ptr of a derived type to a shared_ptr of the base type

Browse source
This commit is contained in:
Eric Tse 2019-04-25 15:44:57 -04:00 • committed by etse
commit f9efe5b5bd
1 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Source/Modules/java.cxx
View file

@ -1893,18 +1893,32 @@ public:
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
void upcastsCode(SwigType *smart, String *upcast_method_name, String *c_classname, String *c_baseclass) { void upcastsCode(SwigType *smart, String *upcast_method_name, String *c_classname, String *c_baseclass) {
Swig_warning(0, NULL, NULL, "******************************************\n");
Swig_warning(0, NULL, NULL, "Smart: %s, Class name: '%s', baseclass: '%s' \n", smart, c_classname, c_baseclass);
String *jniname = makeValidJniName(upcast_method_name); String *jniname = makeValidJniName(upcast_method_name);
String *wname = Swig_name_wrapper(jniname); String *wname = Swig_name_wrapper(jniname);
Printf(imclass_cppcasts_code, " public final static native long %s(long jarg1);\n", upcast_method_name); Printf(imclass_cppcasts_code, " public final static native long %s(long jarg1);\n", upcast_method_name);
if (smart) { if (smart) {
SwigType *bsmart = Copy(smart); String *smartnamestr = SwigType_namestr(smart);
String *bsmartnamestr = SwigType_namestr(smart);
SwigType *rclassname = SwigType_typedef_resolve_all(c_classname); SwigType *rclassname = SwigType_typedef_resolve_all(c_classname);
Swig_warning(0, NULL, NULL, "SwigType_typedef_resolve_all - c_classname(%s): '%s'\n", c_classname, rclassname);
SwigType *rbaseclass = SwigType_typedef_resolve_all(c_baseclass); SwigType *rbaseclass = SwigType_typedef_resolve_all(c_baseclass);
Replaceall(bsmart, rclassname, rbaseclass); Swig_warning(0, NULL, NULL, "SwigType_typedef_resolve_all - c_baseclass(%s): '%s'\n", c_baseclass, rbaseclass);
Swig_warning(0, NULL, NULL, "Replaceall - PRE(%s, %s, %s)\n", bsmartnamestr, rclassname, rbaseclass);
Replaceall(bsmartnamestr, rclassname, rbaseclass);
Swig_warning(0, NULL, NULL, "Replaceall - POST(%s, %s, %s)\n", bsmartnamestr, rclassname, rbaseclass);
Delete(rclassname); Delete(rclassname);
Delete(rbaseclass); Delete(rbaseclass);
String *smartnamestr = SwigType_namestr(smart); //String *smartnamestr = SwigType_namestr(smart);
String *bsmartnamestr = SwigType_namestr(bsmart); //String *bsmartnamestr = SwigType_namestr(bsmart);
Swig_warning(0, NULL, NULL, "bsmartnamestr: '%s', smartnamestr: '%s' \n", bsmartnamestr, smartnamestr);
Printv(upcasts_code, Printv(upcasts_code,
"SWIGEXPORT jlong JNICALL ", wname, "(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n", "SWIGEXPORT jlong JNICALL ", wname, "(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n",
" jlong baseptr = 0;\n" " jlong baseptr = 0;\n"
@ -1917,7 +1931,6 @@ public:
"}\n", "\n", NIL); "}\n", "\n", NIL);
Delete(bsmartnamestr); Delete(bsmartnamestr);
Delete(smartnamestr); Delete(smartnamestr);
Delete(bsmart);
} else { } else {
Printv(upcasts_code, Printv(upcasts_code,
"SWIGEXPORT jlong JNICALL ", wname, "(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n", "SWIGEXPORT jlong JNICALL ", wname, "(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n",
@ -1928,6 +1941,8 @@ public:
" return baseptr;\n" " return baseptr;\n"
"}\n", "\n", NIL); "}\n", "\n", NIL);
} }
Swig_warning(0, NULL, NULL, "******************************************\n");
Delete(wname); Delete(wname);
Delete(jniname); Delete(jniname);
} }