summaryrefslogtreecommitdiffstatshomepage
path: root/py/obj.h
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-02-08 23:17:51 +0200
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-02-08 23:17:51 +0200
commitee4aaf7cddd044afb3e6f2d4ead0635ee6607630 (patch)
tree19a2d822847c714f5206f9fd7dedd4b0fc145003 /py/obj.h
parente827e98a6f51dc45c81b0de56aa3f09ffcb7b869 (diff)
downloadmicropython-ee4aaf7cddd044afb3e6f2d4ead0635ee6607630.tar.gz
micropython-ee4aaf7cddd044afb3e6f2d4ead0635ee6607630.zip
Implement tuple addition.
Diffstat (limited to 'py/obj.h')
-rw-r--r--py/obj.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/py/obj.h b/py/obj.h
index f372030b7e..43c0ed5e78 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -398,6 +398,7 @@ typedef struct _mp_obj_static_class_method_t {
// sequence helpers
void mp_seq_multiply(const void *items, uint item_sz, uint len, uint times, void *dest);
bool m_seq_get_fast_slice_indexes(machine_uint_t len, mp_obj_t slice, machine_uint_t *begin, machine_uint_t *end);
-#define m_seq_copy(dest, src, len, item_sz) memcpy(dest, src, len * sizeof(item_sz))
+#define m_seq_copy(dest, src, len, item_t) memcpy(dest, src, len * sizeof(item_t))
+#define m_seq_cat(dest, src1, len1, src2, len2, item_t) { memcpy(dest, src1, len1 * sizeof(item_t)); memcpy(dest + len1, src2, len2 * sizeof(item_t)); }
bool mp_seq_cmp_bytes(int op, const byte *data1, uint len1, const byte *data2, uint len2);
bool mp_seq_cmp_objs(int op, const mp_obj_t *items1, uint len1, const mp_obj_t *items2, uint len2);