Merge remote-tracking branch 'upstream/master' into builtins

Conflicts:
	py/builtin.c
	py/builtin.h
	py/runtime.c

1 files changed, 5 insertions, 10 deletions

diff --git a/py/objint.c b/py/objint.c
index 26d3c0e337..c0bf756f1b 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -8,16 +8,7 @@
 #include "mpconfig.h"
 #include "mpqstr.h"
 #include "obj.h"
-
-typedef struct _mp_obj_int_t {
-    mp_obj_base_t base;
-#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
-    mp_longint_impl_t val;
-#endif
-} mp_obj_int_t;
-
-void int_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in);
-mp_obj_t int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in);
+#include "objint.h"
 
 // This dispatcher function is expected to be independent of the implementation
 // of long int
@@ -54,11 +45,13 @@ void int_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj
 // This is called only for non-SMALL_INT
 mp_obj_t int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     assert(0);
+    return mp_const_none;
 }
 
 // This is called only with strings whose value doesn't fit in SMALL_INT
 mp_obj_t mp_obj_new_int_from_long_str(const char *s) {
     assert(0);
+    return mp_const_none;
 }
 
 mp_obj_t mp_obj_new_int_from_uint(machine_uint_t value) {
@@ -69,6 +62,7 @@ mp_obj_t mp_obj_new_int_from_uint(machine_uint_t value) {
     }
     // TODO: Raise exception
     assert(0);
+    return mp_const_none;
 }
 
 mp_obj_t mp_obj_new_int(machine_int_t value) {
@@ -77,5 +71,6 @@ mp_obj_t mp_obj_new_int(machine_int_t value) {
     }
     // TODO: Raise exception
     assert(0);
+    return mp_const_none;
 }
 #endif