diff options
| author | Damien George <damien.p.george@gmail.com> | 2017-02-03 00:27:56 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2017-02-03 00:27:56 +1100 |
| commit | 2486c4ff469fdb69555476e342eadda91a4ceadf (patch) | |
| tree | 997f59d846eacf48a3ccdd2628f29e2bf02429ed /py | |
| parent | 8a39e18f5fc960eb0901b8e219b7026ebe466f3d (diff) | |
| download | micropython-2486c4ff469fdb69555476e342eadda91a4ceadf.tar.gz micropython-2486c4ff469fdb69555476e342eadda91a4ceadf.zip | |
py/objset: Fix inplace binary ops so frozensets are not modified.
Diffstat (limited to 'py')
| -rw-r--r-- | py/objset.c | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/py/objset.c b/py/objset.c index 246f505d98..778bbe15b8 100644 --- a/py/objset.c +++ b/py/objset.c @@ -479,6 +479,11 @@ STATIC mp_obj_t set_unary_op(mp_uint_t op, mp_obj_t self_in) { STATIC mp_obj_t set_binary_op(mp_uint_t op, mp_obj_t lhs, mp_obj_t rhs) { mp_obj_t args[] = {lhs, rhs}; + #if MICROPY_PY_BUILTINS_FROZENSET + bool update = MP_OBJ_IS_TYPE(lhs, &mp_type_set); + #else + bool update = true; + #endif switch (op) { case MP_BINARY_OP_OR: return set_union(lhs, rhs); @@ -489,16 +494,28 @@ STATIC mp_obj_t set_binary_op(mp_uint_t op, mp_obj_t lhs, mp_obj_t rhs) { case MP_BINARY_OP_SUBTRACT: return set_diff(2, args); case MP_BINARY_OP_INPLACE_OR: - set_update(2, args); - return lhs; + if (update) { + set_update(2, args); + return lhs; + } else { + return set_union(lhs, rhs); + } case MP_BINARY_OP_INPLACE_XOR: - set_symmetric_difference_update(lhs, rhs); - return lhs; + if (update) { + set_symmetric_difference_update(lhs, rhs); + return lhs; + } else { + return set_symmetric_difference(lhs, rhs); + } case MP_BINARY_OP_INPLACE_AND: - set_intersect_int(lhs, rhs, true); - return lhs; + rhs = set_intersect_int(lhs, rhs, update); + if (update) { + return lhs; + } else { + return rhs; + } case MP_BINARY_OP_INPLACE_SUBTRACT: - return set_diff_int(2, args, true); + return set_diff_int(2, args, update); case MP_BINARY_OP_LESS: return set_issubset_proper(lhs, rhs); case MP_BINARY_OP_MORE: |