djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix/modjni: Need to really use per-rettype Call*Method functions.

Browse Source
This commit is contained in:
Paul Sokolovsky 2015-09-25 17:11:24 -07:00
parent 7e18d3b6ff
commit c0a79cc919
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
unix/modjni.c
View File

@ -359,11 +359,22 @@ STATIC mp_obj_t call_method(jobject obj, const char *name, jarray methods, bool
JJ(ReleaseStringUTFChars, name_o, decl);
return new_jobject(res);
} else {
res = JJ(CallObjectMethodA, obj, method_id, jargs);
mp_obj_t ret = jvalue2py(ret_type, res);
JJ(ReleaseStringUTFChars, name_o, decl);
if (ret != MP_OBJ_NULL) {
return ret;
if (MATCH(ret_type, "void")) {
JJ(CallVoidMethodA, obj, method_id, jargs);
return mp_const_none;
} else if (MATCH(ret_type, "int")) {
jint res = JJ(CallIntMethodA, obj, method_id, jargs);
return mp_obj_new_int(res);
} else if (MATCH(ret_type, "boolean")) {
jboolean res = JJ(CallBooleanMethodA, obj, method_id, jargs);
return mp_obj_new_bool(res);
} else if (is_object_type(ret_type)) {
res = JJ(CallObjectMethodA, obj, method_id, jargs);
mp_obj_t ret = jvalue2py(ret_type, res);
JJ(ReleaseStringUTFChars, name_o, decl);
if (ret != MP_OBJ_NULL) {
return ret;
}
}
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "cannot handle return type"));
}