TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py: Add native json printing using existing print framework.

Browse Source 
Also add start of ujson module with dumps implemented.  Enabled in unix
and stmhal ports.  Test passes on both.
This commit is contained in:
Damien George
2014-09-17 22:56:34 +01:00
parent 8a9b999f1c
commit 612045f53f
18 changed files with 227 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
py/objtuple.c
View File

@@ -43,17 +43,26 @@ STATIC mp_obj_t mp_obj_new_tuple_iterator(mp_obj_tuple_t *tuple, mp_uint_t cur);
void mp_obj_tuple_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) {
mp_obj_tuple_t *o = o_in;
print(env, "(");
if (MICROPY_PY_UJSON && kind == PRINT_JSON) {
print(env, "[");
} else {
print(env, "(");
kind = PRINT_REPR;
}
for (mp_uint_t i = 0; i < o->len; i++) {
if (i > 0) {
print(env, ", ");
}
mp_obj_print_helper(print, env, o->items[i], PRINT_REPR);
mp_obj_print_helper(print, env, o->items[i], kind);
}
if (o->len == 1) {
print(env, ",");
if (MICROPY_PY_UJSON && kind == PRINT_JSON) {
print(env, "]");
} else {
if (o->len == 1) {
print(env, ",");
}
print(env, ")");
}
print(env, ")");
}
STATIC mp_obj_t mp_obj_tuple_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {