cpython: fc8aaa073eb4 (original) (raw)
Mercurial > cpython
changeset 103345:fc8aaa073eb4
Reindeint DK_xxx macros Issue #27350. [#27350]
| Victor Stinner victor.stinner@gmail.com | |
|---|---|
| date | Thu, 08 Sep 2016 11:37:36 -0700 |
| parents | 48a1f97d03b4 |
| children | 378e000a6878 |
| files | Objects/dictobject.c |
| diffstat | 1 files changed, 11 insertions(+), 6 deletions(-)[+] [-] Objects/dictobject.c 17 |
line wrap: on
line diff
--- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -281,14 +281,19 @@ PyDict_Fini(void) #define DK_SIZE(dk) ((dk)->dk_size) #if SIZEOF_VOID_P > 4 -#define DK_IXSIZE(dk) (DK_SIZE(dk) <= 0xff ? 1 : DK_SIZE(dk) <= 0xffff ? 2 : [](#l1.7)
DK_SIZE(dk) <= 0xffffffff ? 4 : sizeof(Py_ssize_t))[](#l1.8)
+#define DK_IXSIZE(dk) [](#l1.9)
- (DK_SIZE(dk) <= 0xff ? [](#l1.10)
1 : DK_SIZE(dk) <= 0xffff ? \[](#l1.11)2 : DK_SIZE(dk) <= 0xffffffff ? \[](#l1.12)4 : sizeof(Py_ssize_t))[](#l1.13)
#else -#define DK_IXSIZE(dk) (DK_SIZE(dk) <= 0xff ? 1 : DK_SIZE(dk) <= 0xffff ? 2 : [](#l1.15)
sizeof(Py_ssize_t))[](#l1.16)
+#define DK_IXSIZE(dk) [](#l1.17)
- (DK_SIZE(dk) <= 0xff ? [](#l1.18)
1 : DK_SIZE(dk) <= 0xffff ? \[](#l1.19)2 : sizeof(Py_ssize_t))[](#l1.20)
#endif -#define DK_ENTRIES(dk) ((PyDictKeyEntry*)(&(dk)->dk_indicesDK_SIZE(dk) * [
DK_IXSIZE(dk)]))[](#l1.23)
+#define DK_ENTRIES(dk) [](#l1.24)
#define DK_DEBUG_INCREF _Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA #define DK_DEBUG_DECREF _Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA