diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-12-05 23:13:52 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-12-05 23:13:52 +0000 |
| commit | be6d8be91e133e98117025062df0e63aaf87efd2 (patch) | |
| tree | 692495154f547612c148312b4abc0afc3f4a50d6 /extmod/modure.c | |
| parent | 451a0870753be89f5a284fd39727705a3ad2109b (diff) | |
py: Rename mp_obj_int_get to mp_obj_int_get_truncated; fix struct.pack.
mp_obj_int_get_truncated is used as a "fast path" int accessor that
doesn't check for overflow and returns the int truncated to the machine
word size, ie mp_int_t.
Use mp_obj_int_get_truncated to fix struct.pack when packing maximum word
sized values.
Addresses issues #779 and #998.
Diffstat (limited to 'extmod/modure.c')
| -rw-r--r-- | extmod/modure.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extmod/modure.c b/extmod/modure.c index eb010faf9..910166249 100644 --- a/extmod/modure.c +++ b/extmod/modure.c @@ -62,7 +62,7 @@ STATIC void match_print(void (*print)(void *env, const char *fmt, ...), void *en 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(no_in); + mp_int_t no = mp_obj_int_get_truncated(no_in); if (no < 0 || no >= self->num_matches / 2) { nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, no_in)); } @@ -130,7 +130,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(args[2]); + maxsplit = mp_obj_int_get_truncated(args[2]); } mp_obj_t retval = mp_obj_new_list(0, NULL); |