diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-02-08 23:17:51 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-02-08 23:17:51 +0200 |
| commit | ee4aaf7cddd044afb3e6f2d4ead0635ee6607630 (patch) | |
| tree | 19a2d822847c714f5206f9fd7dedd4b0fc145003 /py/objlist.c | |
| parent | e827e98a6f51dc45c81b0de56aa3f09ffcb7b869 (diff) | |
| download | micropython-ee4aaf7cddd044afb3e6f2d4ead0635ee6607630.tar.gz micropython-ee4aaf7cddd044afb3e6f2d4ead0635ee6607630.zip | |
Implement tuple addition.
Diffstat (limited to 'py/objlist.c')
| -rw-r--r-- | py/objlist.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/py/objlist.c b/py/objlist.c index 29d0c92c52..9f20acbd41 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -114,8 +114,7 @@ static mp_obj_t list_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) { } mp_obj_list_t *p = rhs; mp_obj_list_t *s = list_new(o->len + p->len); - memcpy(s->items, o->items, sizeof(mp_obj_t) * o->len); - memcpy(s->items + o->len, p->items, sizeof(mp_obj_t) * p->len); + m_seq_cat(s->items, o->items, o->len, p->items, p->len, mp_obj_t); return s; } case RT_BINARY_OP_INPLACE_ADD: |