Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-06 20:20:14 +01:00
Code Issues Actions 52 Packages Projects Releases Wiki Activity

Merge branch 'master' into unicode

Browse Source 
Conflicts:
	py/mpconfig.h
This commit is contained in:
Damien George
2014-06-28 10:27:15 +01:00
parent ed07d035d5 8993fb6cf0
commit b3a50f0f3e
19 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
py/obj.c
View File

@@ -35,6 +35,7 @@
#include "obj.h"
#include "runtime0.h"
#include "runtime.h"
#include "stackctrl.h"
mp_obj_type_t *mp_obj_get_type(mp_const_obj_t o_in) {
if (MP_OBJ_IS_SMALL_INT(o_in)) {
@@ -59,6 +60,8 @@ void printf_wrapper(void *env, const char *fmt, ...) {
}
void mp_obj_print_helper(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) {
// There can be data structures nested too deep, or just recursive
STACK_CHECK();
#if !NDEBUG
if (o_in == NULL) {
print(env, "(nil)");