diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-05-11 12:25:19 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-05-12 22:46:02 +0100 |
| commit | c2a4e4effc81d8ab21bb014e34355643e5ca0da2 (patch) | |
| tree | d08f5921b2053c5d49ba7b10688eb8a771ddd7d0 /py/objstr.c | |
| parent | 6738c1dded8e436686f85008ec0a4fc47406ab7a (diff) | |
| download | micropython-c2a4e4effc81d8ab21bb014e34355643e5ca0da2.tar.gz micropython-c2a4e4effc81d8ab21bb014e34355643e5ca0da2.zip | |
py: Convert hash API to use MP_UNARY_OP_HASH instead of ad-hoc function.
Hashing is now done using mp_unary_op function with MP_UNARY_OP_HASH as
the operator argument. Hashing for int, str and bytes still go via
fast-path in mp_unary_op since they are the most common objects which
need to be hashed.
This lead to quite a bit of code cleanup, and should be more efficient
if anything. It saves 176 bytes code space on Thumb2, and 360 bytes on
x86.
The only loss is that the error message "unhashable type" is now the
more generic "unsupported type for __hash__".
Diffstat (limited to 'py/objstr.c')
| -rw-r--r-- | py/objstr.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/py/objstr.c b/py/objstr.c index 7d307f5885..40e3c3bedf 100644 --- a/py/objstr.c +++ b/py/objstr.c @@ -1982,16 +1982,6 @@ STATIC void bad_implicit_conversion(mp_obj_t self_in) { } } -mp_uint_t mp_obj_str_get_hash(mp_obj_t self_in) { - // TODO: This has too big overhead for hash accessor - if (MP_OBJ_IS_STR_OR_BYTES(self_in)) { - GET_STR_HASH(self_in, h); - return h; - } else { - bad_implicit_conversion(self_in); - } -} - mp_uint_t mp_obj_str_get_len(mp_obj_t self_in) { // TODO This has a double check for the type, one in obj.c and one here if (MP_OBJ_IS_STR_OR_BYTES(self_in)) { |