py/objint: Convert mp_uint_t to size_t where appropriate.

dpgeorge · dpgeorge · commit da36f5232dcf · 2017-02-16T16:51:17.000+11:00
diff --git a/py/obj.h b/py/obj.h
@@ -607,7 +607,7 @@ static inline mp_obj_t mp_obj_new_bool(mp_int_t x) { return x ? mp_const_true :
 mp_obj_t mp_obj_new_cell(mp_obj_t obj);
 mp_obj_t mp_obj_new_int(mp_int_t value);
 mp_obj_t mp_obj_new_int_from_uint(mp_uint_t value);
-mp_obj_t mp_obj_new_int_from_str_len(const char **str, mp_uint_t len, bool neg, mp_uint_t base);
+mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base);
 mp_obj_t mp_obj_new_int_from_ll(long long val); // this must return a multi-precision integer object (or raise an overflow exception)
 mp_obj_t mp_obj_new_int_from_ull(unsigned long long val); // this must return a multi-precision integer object (or raise an overflow exception)
 mp_obj_t mp_obj_new_str(const char* data, size_t len, bool make_qstr_if_not_already);
diff --git a/py/objint.c b/py/objint.c
@@ -291,7 +291,7 @@ mp_obj_t mp_obj_int_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
 }
 
 // This is called only with strings whose value doesn't fit in SMALL_INT
-mp_obj_t mp_obj_new_int_from_str_len(const char **str, mp_uint_t len, bool neg, mp_uint_t base) {
+mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base) {
     mp_raise_msg(&mp_type_OverflowError, "long int not supported in this build");
     return mp_const_none;
 }
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
@@ -273,7 +273,7 @@ mp_obj_t mp_obj_new_int_from_float(mp_float_t val) {
 }
 #endif
 
-mp_obj_t mp_obj_new_int_from_str_len(const char **str, mp_uint_t len, bool neg, mp_uint_t base) {
+mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base) {
     // TODO this does not honor the given length of the string, but it all cases it should anyway be null terminated
     // TODO check overflow
     mp_obj_int_t *o = m_new_obj(mp_obj_int_t);
diff --git a/py/objint_mpz.c b/py/objint_mpz.c
@@ -407,9 +407,9 @@ mp_obj_t mp_obj_new_int_from_float(mp_float_t val) {
 }
 #endif
 
-mp_obj_t mp_obj_new_int_from_str_len(const char **str, mp_uint_t len, bool neg, mp_uint_t base) {
+mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base) {
     mp_obj_int_t *o = mp_obj_int_new_mpz();
-    mp_uint_t n = mpz_set_from_str(&o->mpz, *str, len, neg, base);
+    size_t n = mpz_set_from_str(&o->mpz, *str, len, neg, base);
     *str += n;
     return MP_OBJ_FROM_PTR(o);
 }

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ mp_obj_t mp_obj_int_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`// This is called only with strings whose value doesn't fit in SMALL_INT`
`294`		`-mp_obj_t mp_obj_new_int_from_str_len(const char **str, mp_uint_t len, bool neg, mp_uint_t base) {`
	`294`	`+mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base) {`
`295`	`295`	`mp_raise_msg(&mp_type_OverflowError, "long int not supported in this build");`
`296`	`296`	`return mp_const_none;`
`297`	`297`	`}`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ mp_obj_t mp_obj_new_int_from_float(mp_float_t val) {`
`273`	`273`	`}`
`274`	`274`	`#endif`
`275`	`275`
`276`		`-mp_obj_t mp_obj_new_int_from_str_len(const char **str, mp_uint_t len, bool neg, mp_uint_t base) {`
	`276`	`+mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base) {`
`277`	`277`	`// TODO this does not honor the given length of the string, but it all cases it should anyway be null terminated`
`278`	`278`	`// TODO check overflow`
`279`	`279`	`mp_obj_int_t *o = m_new_obj(mp_obj_int_t);`
Original file line number	Diff line number	Diff line change
`@@ -407,9 +407,9 @@ mp_obj_t mp_obj_new_int_from_float(mp_float_t val) {`
`407`	`407`	`}`
`408`	`408`	`#endif`
`409`	`409`
`410`		`-mp_obj_t mp_obj_new_int_from_str_len(const char **str, mp_uint_t len, bool neg, mp_uint_t base) {`
	`410`	`+mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base) {`
`411`	`411`	`mp_obj_int_t *o = mp_obj_int_new_mpz();`
`412`		`- mp_uint_t n = mpz_set_from_str(&o->mpz, *str, len, neg, base);`
	`412`	`+ size_t n = mpz_set_from_str(&o->mpz, *str, len, neg, base);`
`413`	`413`	`*str += n;`
`414`	`414`	`return MP_OBJ_FROM_PTR(o);`
`415`	`415`	`}`