Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-08 05:00:26 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

py: Expand type equality flags to 3 separate ones, fix bool/namedtuple.

Browse Source 
Both bool and namedtuple will check against other types for equality; int,
float and complex for bool, and tuple for namedtuple.  So to make them work
after the recent commit 3aab54bf43 they would
need MP_TYPE_FLAG_NEEDS_FULL_EQ_TEST set.  But that makes all bool and
namedtuple equality checks less efficient because mp_obj_equal_not_equal()
could no longer short-cut x==x, and would need to try __ne__.  To improve
this, this commit splits the MP_TYPE_FLAG_NEEDS_FULL_EQ_TEST flags into 3
separate flags to give types more fine-grained control over how their
equality behaves.  These new flags are then used to fix bool and namedtuple
equality.

Fixes issue #5615 and #5620.
This commit is contained in:
Damien George
2020-02-10 21:41:22 +11:00
parent 0852acfc74
commit 9ec1caf42e
9 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
py/obj.h
View File

@@ -445,14 +445,17 @@ typedef mp_obj_t (*mp_fun_var_t)(size_t n, const mp_obj_t *);
typedef mp_obj_t (*mp_fun_kw_t)(size_t n, const mp_obj_t *, mp_map_t *);
// Flags for type behaviour (mp_obj_type_t.flags)
// If MP_TYPE_FLAG_NEEDS_FULL_EQ_TEST is clear then all the following hold:
// (a) the type only implements the __eq__ operator and not the __ne__ operator;
// (b) __eq__ returns a boolean result (False or True);
// (c) __eq__ is reflexive (A==A is True);
// (d) the type can't be equal to an instance of any different class that also clears this flag.
// If MP_TYPE_FLAG_EQ_NOT_REFLEXIVE is clear then __eq__ is reflexive (A==A returns True).
// If MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE is clear then the type can't be equal to an
// instance of any different class that also clears this flag. If this flag is set
// then the type may check for equality against a different type.
// If MP_TYPE_FLAG_EQ_HAS_NEQ_TEST is clear then the type only implements the __eq__
// operator and not the __ne__ operator. If it's set then __ne__ may be implemented.
#define MP_TYPE_FLAG_IS_SUBCLASSED (0x0001)
#define MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS (0x0002)
#define MP_TYPE_FLAG_NEEDS_FULL_EQ_TEST (0x0004)
#define MP_TYPE_FLAG_EQ_NOT_REFLEXIVE (0x0040)
#define MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE (0x0080)
#define MP_TYPE_FLAG_EQ_HAS_NEQ_TEST (0x0010)
typedef enum {
PRINT_STR = 0,