summaryrefslogtreecommitdiff
path: root/py/objarray.c
diff options
context:
space:
mode:
authorJeff Epler <jepler@unpythonic.net>2018-03-22 21:52:25 -0500
committerJeff Epler <jepler@unpythonic.net>2018-03-23 07:37:07 -0500
commitcdb83b18ece63b13d6796e315f0737f833c1ee16 (patch)
tree90cba3fbf859cd9ea74ae630024d76f15a540e04 /py/objarray.c
parent9ab39eb2d286276edd5dd70612d2d6f6c48b71a0 (diff)
Implement * and *= for array.array
Diffstat (limited to 'py/objarray.c')
-rw-r--r--py/objarray.c33
1 files changed, 33 insertions, 0 deletions
diff --git a/py/objarray.c b/py/objarray.c
index a1a979b56..eb053bd8a 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -241,6 +241,39 @@ STATIC mp_obj_t array_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
STATIC mp_obj_t array_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
mp_obj_array_t *lhs = MP_OBJ_TO_PTR(lhs_in);
switch (op) {
+ case MP_BINARY_OP_MULTIPLY:
+ case MP_BINARY_OP_INPLACE_MULTIPLY: {
+ if (!MP_OBJ_IS_INT(rhs_in)) {
+ return MP_OBJ_NULL; // op not supported
+ }
+ mp_uint_t repeat = mp_obj_get_int(rhs_in);
+ bool inplace = (op == MP_BINARY_OP_INPLACE_MULTIPLY);
+ mp_buffer_info_t lhs_bufinfo;
+ array_get_buffer(lhs_in, &lhs_bufinfo, MP_BUFFER_READ);
+ mp_obj_array_t *res;
+ byte *ptr;
+ size_t orig_lhs_bufinfo_len = lhs_bufinfo.len;
+ if(inplace) {
+ res = lhs;
+ size_t item_sz = mp_binary_get_size('@', lhs->typecode, NULL);
+ lhs->items = m_renew(byte, lhs->items, (lhs->len + lhs->free) * item_sz, lhs->len * repeat * item_sz);
+ lhs->len = lhs->len * repeat;
+ lhs->free = 0;
+ if (!repeat)
+ return MP_OBJ_FROM_PTR(res);
+ repeat--;
+ ptr = (byte*)res->items + orig_lhs_bufinfo_len;
+ } else {
+ res = array_new(lhs_bufinfo.typecode, lhs->len * repeat);
+ ptr = (byte*)res->items;
+ }
+ if(orig_lhs_bufinfo_len) {
+ for(;repeat--; ptr += orig_lhs_bufinfo_len) {
+ memcpy(ptr, lhs_bufinfo.buf, orig_lhs_bufinfo_len);
+ }
+ }
+ return MP_OBJ_FROM_PTR(res);
+ }
case MP_BINARY_OP_ADD: {
// allow to add anything that has the buffer protocol (extension to CPython)
mp_buffer_info_t lhs_bufinfo;