1 files changed, 49 insertions, 7 deletions

diff --git a/py/objint.c b/py/objint.c
index bd0926840b..937bff7ae3 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -8,21 +8,27 @@
 #include "mpconfig.h"
 #include "mpqstr.h"
 #include "obj.h"
+#include "objint.h"
 
-typedef struct _mp_obj_int_t {
-    mp_obj_base_t base;
-} mp_obj_int_t;
-
+// This dispatcher function is expected to be independent of the implementation
+// of long int
 static mp_obj_t int_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) {
     switch (n_args) {
         case 0:
             return MP_OBJ_NEW_SMALL_INT(0);
 
         case 1:
-            return MP_OBJ_NEW_SMALL_INT(mp_obj_get_int(args[0]));
+            if (MP_OBJ_IS_TYPE(args[0], &str_type)) {
+                // a string, parse it
+                return MP_OBJ_NEW_SMALL_INT(strtonum(qstr_str(mp_obj_get_qstr(args[0])), 0));
+            } else {
+                return MP_OBJ_NEW_SMALL_INT(mp_obj_get_int(args[0]));
+            }
 
         case 2:
-            return MP_OBJ_NEW_SMALL_INT(mp_obj_get_int_base(args[1], args[0]));
+            // should be a string, parse it
+            // TODO proper error checking of argument types
+            return MP_OBJ_NEW_SMALL_INT(strtonum(qstr_str(mp_obj_get_qstr(args[1])), mp_obj_get_int(args[0])));
 
         default:
             nlr_jump(mp_obj_new_exception_msg_1_arg(MP_QSTR_TypeError, "int takes at most 2 arguments, %d given", (void*)(machine_int_t)n_args));
@@ -32,9 +38,45 @@ static mp_obj_t int_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args)
 const mp_obj_type_t int_type = {
     { &mp_const_type },
     "int",
+    .print = int_print,
     .make_new = int_make_new,
+    .binary_op = int_binary_op,
 };
 
+#if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_NONE
+// This is called only for non-SMALL_INT
+void int_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
+}
+
+// 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) {
+    // SMALL_INT accepts only signed numbers, of one bit less size
+    // then word size, which totals 2 bits less for unsigned numbers.
+    if ((value & (WORD_MSBIT_HIGH | (WORD_MSBIT_HIGH >> 1))) == 0) {
+        return MP_OBJ_NEW_SMALL_INT(value);
+    }
+    // TODO: Raise exception
+    assert(0);
+    return mp_const_none;
+}
+
 mp_obj_t mp_obj_new_int(machine_int_t value) {
-    return MP_OBJ_NEW_SMALL_INT(value);
+    if (MP_OBJ_FITS_SMALL_INT(value)) {
+        return MP_OBJ_NEW_SMALL_INT(value);
+    }
+    // TODO: Raise exception
+    assert(0);
+    return mp_const_none;
 }
+#endif