unix/modjni: jvalue2py: Handle boolean.

pfalcon · pfalcon · commit 6196aa45edcf · 2015-09-20T00:36:51.000+03:00
diff --git a/unix/modjni.c b/unix/modjni.c
@@ -242,9 +242,12 @@ STATIC bool py2jvalue(const char **jtypesig, mp_obj_t arg, jvalue *out) {
 // it.
 #define MATCH(s, static) (!strncmp(s, static, sizeof(static) - 1))
 STATIC mp_obj_t jvalue2py(const char *jtypesig, jobject arg) {
+    const char *org_jtype = jtypesig;
     mp_obj_t ret;
     if (arg == NULL || MATCH(jtypesig, "void")) {
         return mp_const_none;
+    } else if (MATCH(jtypesig, "boolean")) {
+        return mp_obj_new_bool((bool)arg);
     } else if (MATCH(jtypesig, "int")) {
         return mp_obj_new_int((mp_int_t)arg);
     } else if (MATCH(jtypesig, "java.lang.String")) {
@@ -269,7 +272,7 @@ ret_string:;
         }
     }
 
-    printf("Unknown return type: %s\n", jtypesig);
+    printf("Unknown return type: %s\n", org_jtype);
 
     return MP_OBJ_NULL;
 }

Original file line number	Diff line number	Diff line change
`@@ -242,9 +242,12 @@ STATIC bool py2jvalue(const char *jtypesig, mp_obj_t arg, jvalue out) {`
`242`	`242`	`// it.`
`243`	`243`	`#define MATCH(s, static) (!strncmp(s, static, sizeof(static) - 1))`
`244`	`244`	`STATIC mp_obj_t jvalue2py(const char *jtypesig, jobject arg) {`
	`245`	`+ const char *org_jtype = jtypesig;`
`245`	`246`	`mp_obj_t ret;`
`246`	`247`	`if (arg == NULL \|\| MATCH(jtypesig, "void")) {`
`247`	`248`	`return mp_const_none;`
	`249`	`+ } else if (MATCH(jtypesig, "boolean")) {`
	`250`	`+ return mp_obj_new_bool((bool)arg);`
`248`	`251`	`} else if (MATCH(jtypesig, "int")) {`
`249`	`252`	`return mp_obj_new_int((mp_int_t)arg);`
`250`	`253`	`} else if (MATCH(jtypesig, "java.lang.String")) {`
`@@ -269,7 +272,7 @@ ret_string:;`
`269`	`272`	`}`
`270`	`273`	`}`
`271`	`274`
`272`		`- printf("Unknown return type: %s\n", jtypesig);`
	`275`	`+ printf("Unknown return type: %s\n", org_jtype);`
`273`	`276`
`274`	`277`	`return MP_OBJ_NULL;`
`275`	`278`	`}`