py: Add mp_obj_get_int_truncated and use it where appropriate.

dpgeorge · dpgeorge · commit c50772d19fe2 · 2015-05-12T23:05:53.000+01:00
mp_obj_get_int_truncated will raise a TypeError if the argument is not
an integral type.  Use mp_obj_int_get_truncated only when you know the
argument is a small or big int.
diff --git a/cc3200/mods/modusocket.c b/cc3200/mods/modusocket.c
@@ -285,7 +285,7 @@ STATIC mp_obj_t socket_setsockopt(mp_uint_t n_args, const mp_obj_t *args) {
     mp_uint_t optlen;
     mp_int_t val;
     if (mp_obj_is_integer(args[3])) {
-        val = mp_obj_int_get_truncated(args[3]);
+        val = mp_obj_get_int_truncated(args[3]);
         optval = &val;
         optlen = sizeof(val);
     } else {
diff --git a/extmod/modure.c b/extmod/modure.c
@@ -59,7 +59,7 @@ STATIC void match_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind
 
 STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) {
     mp_obj_match_t *self = self_in;
-    mp_int_t no = mp_obj_int_get_truncated(no_in);
+    mp_int_t no = mp_obj_get_int(no_in);
     if (no < 0 || no >= self->num_matches) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, no_in));
     }
@@ -135,7 +135,7 @@ STATIC mp_obj_t re_split(uint n_args, const mp_obj_t *args) {
 
     int maxsplit = 0;
     if (n_args > 2) {
-        maxsplit = mp_obj_int_get_truncated(args[2]);
+        maxsplit = mp_obj_get_int(args[2]);
     }
 
     mp_obj_t retval = mp_obj_new_list(0, NULL);
diff --git a/py/obj.c b/py/obj.c
@@ -231,6 +231,14 @@ mp_int_t mp_obj_get_int(mp_const_obj_t arg) {
     }
 }
 
+mp_int_t mp_obj_get_int_truncated(mp_const_obj_t arg) {
+    if (MP_OBJ_IS_INT(arg)) {
+        return mp_obj_int_get_truncated(arg);
+    } else {
+        return mp_obj_get_int(arg);
+    }
+}
+
 // returns false if arg is not of integral type
 // returns true and sets *value if it is of integral type
 // can throw OverflowError if arg is of integral type, but doesn't fit in a mp_int_t
diff --git a/py/obj.h b/py/obj.h
@@ -511,6 +511,7 @@ bool mp_obj_is_callable(mp_obj_t o_in);
 bool mp_obj_equal(mp_obj_t o1, mp_obj_t o2);
 
 mp_int_t mp_obj_get_int(mp_const_obj_t arg);
+mp_int_t mp_obj_get_int_truncated(mp_const_obj_t arg);
 bool mp_obj_get_int_maybe(mp_const_obj_t arg, mp_int_t *value);
 #if MICROPY_PY_BUILTINS_FLOAT
 mp_float_t mp_obj_get_float(mp_obj_t self_in);
diff --git a/py/objtype.c b/py/objtype.c
@@ -359,7 +359,7 @@ STATIC mp_obj_t instance_unary_op(mp_uint_t op, mp_obj_t self_in) {
         mp_obj_t val = mp_call_function_1(member[0], self_in);
         // __hash__ must return a small int
         if (op == MP_UNARY_OP_HASH) {
-            val = MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_truncated(val));
+            val = MP_OBJ_NEW_SMALL_INT(mp_obj_get_int_truncated(val));
         }
         return val;
     } else {
diff --git a/py/stream.c b/py/stream.c
@@ -225,7 +225,7 @@ STATIC mp_obj_t stream_readinto(mp_uint_t n_args, const mp_obj_t *args) {
     // https://docs.python.org/3/library/socket.html#socket.socket.recv_into
     mp_uint_t len = bufinfo.len;
     if (n_args > 2) {
-        len = mp_obj_int_get_truncated(args[2]);
+        len = mp_obj_get_int(args[2]);
         if (len > bufinfo.len) {
             len = bufinfo.len;
         }
diff --git a/stmhal/modusocket.c b/stmhal/modusocket.c
@@ -287,7 +287,7 @@ STATIC mp_obj_t socket_setsockopt(mp_uint_t n_args, const mp_obj_t *args) {
     mp_uint_t optlen;
     mp_int_t val;
     if (mp_obj_is_integer(args[3])) {
-        val = mp_obj_int_get_truncated(args[3]);
+        val = mp_obj_get_int_truncated(args[3]);
         optval = &val;
         optlen = sizeof(val);
     } else {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ STATIC void match_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind`
`59`	`59`
`60`	`60`	`STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) {`
`61`	`61`	`mp_obj_match_t *self = self_in;`
`62`		`- mp_int_t no = mp_obj_int_get_truncated(no_in);`
	`62`	`+ mp_int_t no = mp_obj_get_int(no_in);`
`63`	`63`	`if (no < 0 \|\| no >= self->num_matches) {`
`64`	`64`	`nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, no_in));`
`65`	`65`	`}`
`@@ -135,7 +135,7 @@ STATIC mp_obj_t re_split(uint n_args, const mp_obj_t *args) {`
`135`	`135`
`136`	`136`	`int maxsplit = 0;`
`137`	`137`	`if (n_args > 2) {`
`138`		`- maxsplit = mp_obj_int_get_truncated(args[2]);`
	`138`	`+ maxsplit = mp_obj_get_int(args[2]);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`mp_obj_t retval = mp_obj_new_list(0, NULL);`
Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,14 @@ mp_int_t mp_obj_get_int(mp_const_obj_t arg) {`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`
	`234`	`+mp_int_t mp_obj_get_int_truncated(mp_const_obj_t arg) {`
	`235`	`+ if (MP_OBJ_IS_INT(arg)) {`
	`236`	`+ return mp_obj_int_get_truncated(arg);`
	`237`	`+ } else {`
	`238`	`+ return mp_obj_get_int(arg);`
	`239`	`+ }`
	`240`	`+}`
	`241`	`+`
`234`	`242`	`// returns false if arg is not of integral type`
`235`	`243`	`// returns true and sets *value if it is of integral type`
`236`	`244`	`// can throw OverflowError if arg is of integral type, but doesn't fit in a mp_int_t`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ STATIC mp_obj_t instance_unary_op(mp_uint_t op, mp_obj_t self_in) {`
`359`	`359`	`mp_obj_t val = mp_call_function_1(member[0], self_in);`
`360`	`360`	`// __hash__ must return a small int`
`361`	`361`	`if (op == MP_UNARY_OP_HASH) {`
`362`		`- val = MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_truncated(val));`
	`362`	`+ val = MP_OBJ_NEW_SMALL_INT(mp_obj_get_int_truncated(val));`
`363`	`363`	`}`
`364`	`364`	`return val;`
`365`	`365`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ STATIC mp_obj_t stream_readinto(mp_uint_t n_args, const mp_obj_t *args) {`
`225`	`225`	`// https://docs.python.org/3/library/socket.html#socket.socket.recv_into`
`226`	`226`	`mp_uint_t len = bufinfo.len;`
`227`	`227`	`if (n_args > 2) {`
`228`		`- len = mp_obj_int_get_truncated(args[2]);`
	`228`	`+ len = mp_obj_get_int(args[2]);`
`229`	`229`	`if (len > bufinfo.len) {`
`230`	`230`	`len = bufinfo.len;`
`231`	`231`	`}`