Skip to content
Snippets Groups Projects
Commit c3388838 authored by moon2's avatar moon2 :speech_balloon:
Browse files

third time wasn't the charm.

we're not very good at this :/
parent 1b8aedce
No related branches found
No related tags found
1 merge request!707third time wasn't the charm.
Pipeline #13115 passed
......@@ -95,7 +95,9 @@ STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
mp_print_str(print, "{");
size_t cur = 0;
mp_map_elem_t *next = NULL;
if(kind == PRINT_JSON){
MP_PRINT_GET_EXT(print)->indent_depth++;
}
while ((next = dict_iter_next(self, &cur)) != NULL) {
if (!first) {
mp_print_str(print, item_separator);
......@@ -113,7 +115,9 @@ STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
mp_print_str(print, key_separator);
mp_obj_print_helper(print, next->value, kind);
}
if(kind == PRINT_JSON){
MP_PRINT_GET_EXT(print)->indent_depth--;
}
mp_print_indent(print, indent_str);
mp_print_str(print, "}");
if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict && kind != PRINT_JSON) {
......
......@@ -58,7 +58,9 @@ STATIC void list_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t k
}
mp_print_str(print, "[");
if(kind == PRINT_JSON){
MP_PRINT_GET_EXT(print)->indent_depth++;
}
for (size_t i = 0; i < o->len; i++) {
if (i > 0) {
mp_print_str(print, item_separator);
......@@ -66,7 +68,9 @@ STATIC void list_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t k
mp_print_indent(print, indent_str);
mp_obj_print_helper(print, o->items[i], kind);
}
if(kind == PRINT_JSON){
MP_PRINT_GET_EXT(print)->indent_depth--;
}
mp_print_indent(print, indent_str);
mp_print_str(print, "]");
}
......
......@@ -54,7 +54,9 @@ void mp_obj_tuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
if(kind == PRINT_JSON){
indent_str = MP_PRINT_GET_EXT(print)->indent;
}
if(kind == PRINT_JSON){
MP_PRINT_GET_EXT(print)->indent_depth++;
}
for (size_t i = 0; i < o->len; i++) {
if (i > 0) {
mp_print_str(print, item_separator);
......@@ -62,7 +64,9 @@ void mp_obj_tuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
mp_print_indent(print, indent_str);
mp_obj_print_helper(print, o->items[i], kind);
}
if(kind == PRINT_JSON){
MP_PRINT_GET_EXT(print)->indent_depth--;
}
mp_print_indent(print, indent_str);
if (MICROPY_PY_UJSON && kind == PRINT_JSON) {
mp_print_str(print, "]");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment