From 1ea4b77a9aa6d54b2acc32e2739f9084f4775d5e Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sun, 4 Oct 2015 01:56:40 +0300
Subject: [PATCH] unix/modjni: jclass.__str__/__repr__: Return Java .toString()
value.
---
unix/modjni.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/unix/modjni.c b/unix/modjni.c
index 684799053..f04ff148a 100644
--- a/unix/modjni.c
+++ b/unix/modjni.c
@@ -107,13 +107,24 @@ STATIC void check_exception(void) {
}
}
+STATIC void print_jobject(const mp_print_t *print, jobject obj) {
+ jobject str_o = JJ(CallObjectMethod, obj, Object_toString_mid);
+ const char *str = JJ(GetStringUTFChars, str_o, NULL);
+ mp_printf(print, str);
+ JJ(ReleaseStringUTFChars, str_o, str);
+}
+
// jclass
STATIC void jclass_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
- (void)kind;
mp_obj_jclass_t *self = self_in;
- // Variable value printed as cast to int
- mp_printf(print, "<jclass @%p>", self->cls);
+ if (kind == PRINT_REPR) {
+ mp_printf(print, "<jclass @%p \"", self->cls);
+ }
+ print_jobject(print, self->cls);
+ if (kind == PRINT_REPR) {
+ mp_printf(print, "\">");
+ }
}
STATIC void jclass_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
@@ -184,10 +195,7 @@ STATIC void jobject_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
if (kind == PRINT_REPR) {
mp_printf(print, "<jobject @%p \"", self->obj);
}
- jobject str_o = JJ(CallObjectMethod, self->obj, Object_toString_mid);
- const char *str = JJ(GetStringUTFChars, str_o, NULL);
- mp_printf(print, str);
- JJ(ReleaseStringUTFChars, str_o, str);
+ print_jobject(print, self->obj);
if (kind == PRINT_REPR) {
mp_printf(print, "\">");
}
--
GitLab