mirror of https://github.com/python/cpython
Neaten-up setobject.h
- Move all Py_LIMITED_API exclusions together under one #ifndef - Group PyAPI_FUNC functions and PyAPI_DATA together. - Bring related comments together and put them in the appropriate section.
This commit is contained in:
Raymond Hettinger
parent
0f9f7497d0
commit
404a45d91a
|
|
@ -6,9 +6,9 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef Py_LIMITED_API
|
||||
|
||||
/*
|
||||
There are three kinds of slots in the table:
|
||||
/* There are three kinds of entries in the table:
|
||||
|
||||
1. Unused: key == NULL
|
||||
2. Active: key != NULL and key != dummy
|
||||
|
|
@ -18,7 +18,7 @@ Note: .pop() abuses the hash field of an Unused or Dummy slot to
|
|||
hold a search finger. The hash field of Unused or Dummy slots has
|
||||
no meaning otherwise.
|
||||
*/
|
||||
#ifndef Py_LIMITED_API
|
||||
|
||||
#define PySet_MINSIZE 8
|
||||
|
||||
typedef struct {
|
||||
|
|
@ -27,17 +27,22 @@ typedef struct {
|
|||
Py_hash_t hash;
|
||||
} setentry;
|
||||
|
||||
/* The SetObject data structure is shared by set and frozenset objects.
|
||||
|
||||
Invariant for sets:
|
||||
- hash is -1
|
||||
|
||||
Invariants for frozensets:
|
||||
- data is immutable.
|
||||
- hash is the hash of the frozenset or -1 if not computed yet.
|
||||
|
||||
/*
|
||||
This data structure is shared by set and frozenset objects.
|
||||
*/
|
||||
|
||||
typedef struct _setobject PySetObject;
|
||||
struct _setobject {
|
||||
typedef struct _setobject {
|
||||
PyObject_HEAD
|
||||
|
||||
Py_ssize_t fill; /* # Active + # Dummy */
|
||||
Py_ssize_t used; /* # Active */
|
||||
Py_ssize_t fill; /* Number active and dummy entries*/
|
||||
Py_ssize_t used; /* Number active entries */
|
||||
|
||||
/* The table contains mask + 1 slots, and that's a power of 2.
|
||||
* We store the mask instead of the size because the mask is more
|
||||
|
|
@ -45,33 +50,42 @@ struct _setobject {
|
|||
*/
|
||||
Py_ssize_t mask;
|
||||
|
||||
/* table points to smalltable for small tables, else to
|
||||
* additional malloc'ed memory. table is never NULL! This rule
|
||||
* saves repeated runtime null-tests.
|
||||
/* The table points to a fixed-size smalltable for small tables
|
||||
* or to additional malloc'ed memory for bigger tables.
|
||||
* The table pointer is never NULL which saves us from repeated
|
||||
* runtime null-tests.
|
||||
*/
|
||||
setentry *table;
|
||||
setentry *(*lookup)(PySetObject *so, PyObject *key, Py_hash_t hash);
|
||||
Py_hash_t hash; /* only used by frozenset objects */
|
||||
setentry *(*lookup)(struct _setobject *so, PyObject *key, Py_hash_t hash);
|
||||
Py_hash_t hash; /* Only used by frozenset objects */
|
||||
setentry smalltable[PySet_MINSIZE];
|
||||
|
||||
PyObject *weakreflist; /* List of weak references */
|
||||
};
|
||||
#endif /* Py_LIMITED_API */
|
||||
} PySetObject;
|
||||
|
||||
#define PySet_GET_SIZE(so) (((PySetObject *)(so))->used)
|
||||
|
||||
PyAPI_DATA(PyObject *) _PySet_Dummy;
|
||||
|
||||
PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, Py_hash_t *hash);
|
||||
PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable);
|
||||
PyAPI_FUNC(int) PySet_ClearFreeList(void);
|
||||
|
||||
#endif /* Section excluded by Py_LIMITED_API */
|
||||
|
||||
PyAPI_DATA(PyTypeObject) PySet_Type;
|
||||
PyAPI_DATA(PyTypeObject) PyFrozenSet_Type;
|
||||
PyAPI_DATA(PyTypeObject) PySetIter_Type;
|
||||
#ifndef Py_LIMITED_API
|
||||
PyAPI_DATA(PyObject *) _PySet_Dummy;
|
||||
#endif
|
||||
|
||||
PyAPI_FUNC(PyObject *) PySet_New(PyObject *);
|
||||
PyAPI_FUNC(PyObject *) PyFrozenSet_New(PyObject *);
|
||||
|
||||
/* Invariants for frozensets:
|
||||
* data is immutable.
|
||||
* hash is the hash of the frozenset or -1 if not computed yet.
|
||||
* Invariants for sets:
|
||||
* hash is -1
|
||||
*/
|
||||
PyAPI_FUNC(int) PySet_Add(PyObject *set, PyObject *key);
|
||||
PyAPI_FUNC(int) PySet_Clear(PyObject *set);
|
||||
PyAPI_FUNC(int) PySet_Contains(PyObject *anyset, PyObject *key);
|
||||
PyAPI_FUNC(int) PySet_Discard(PyObject *set, PyObject *key);
|
||||
PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set);
|
||||
PyAPI_FUNC(Py_ssize_t) PySet_Size(PyObject *anyset);
|
||||
|
||||
#define PyFrozenSet_CheckExact(ob) (Py_TYPE(ob) == &PyFrozenSet_Type)
|
||||
#define PyAnySet_CheckExact(ob) \
|
||||
|
|
@ -87,26 +101,6 @@ PyAPI_DATA(PyObject *) _PySet_Dummy;
|
|||
(Py_TYPE(ob) == &PyFrozenSet_Type || \
|
||||
PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type))
|
||||
|
||||
PyAPI_FUNC(PyObject *) PySet_New(PyObject *);
|
||||
PyAPI_FUNC(PyObject *) PyFrozenSet_New(PyObject *);
|
||||
PyAPI_FUNC(Py_ssize_t) PySet_Size(PyObject *anyset);
|
||||
#ifndef Py_LIMITED_API
|
||||
#define PySet_GET_SIZE(so) (((PySetObject *)(so))->used)
|
||||
#endif
|
||||
PyAPI_FUNC(int) PySet_Clear(PyObject *set);
|
||||
PyAPI_FUNC(int) PySet_Contains(PyObject *anyset, PyObject *key);
|
||||
PyAPI_FUNC(int) PySet_Discard(PyObject *set, PyObject *key);
|
||||
PyAPI_FUNC(int) PySet_Add(PyObject *set, PyObject *key);
|
||||
#ifndef Py_LIMITED_API
|
||||
PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, Py_hash_t *hash);
|
||||
#endif
|
||||
PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set);
|
||||
#ifndef Py_LIMITED_API
|
||||
PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable);
|
||||
|
||||
PyAPI_FUNC(int) PySet_ClearFreeList(void);
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue