mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

gh-111178: Fix function signatures in sliceobject.c (#130575)

Browse source 
Rename slicehash() to slice_hash() for consistency.
This commit is contained in:
Victor Stinner 2025-02-26 21:37:22 +01:00 • committed by GitHub
parent 05aba4e799
commit daeb0efaf4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Objects/sliceobject.c
View file

@ -21,6 +21,9 @@ this type and there is exactly one in existence.
#include "pycore_object.h" // _PyObject_GC_TRACK() #include "pycore_object.h" // _PyObject_GC_TRACK()
#define _PySlice_CAST(op) _Py_CAST(PySliceObject*, (op))
static PyObject * static PyObject *
ellipsis_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) ellipsis_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
{ {
@ -341,8 +344,9 @@ slice(start, stop[, step])\n\
Create a slice object. This is used for extended slicing (e.g. a[0:10:2])."); Create a slice object. This is used for extended slicing (e.g. a[0:10:2]).");
static void static void
slice_dealloc(PySliceObject *r) slice_dealloc(PyObject *op)
{ {
PySliceObject *r = _PySlice_CAST(op);
PyObject_GC_UnTrack(r); PyObject_GC_UnTrack(r);
Py_DECREF(r->step); Py_DECREF(r->step);
Py_DECREF(r->start); Py_DECREF(r->start);
@ -351,9 +355,11 @@ slice_dealloc(PySliceObject *r)
} }
static PyObject * static PyObject *
slice_repr(PySliceObject *r) slice_repr(PyObject *op)
{ {
return PyUnicode_FromFormat("slice(%R, %R, %R)", r->start, r->stop, r->step); PySliceObject *r = _PySlice_CAST(op);
return PyUnicode_FromFormat("slice(%R, %R, %R)",
r->start, r->stop, r->step);
} }
static PyMemberDef slice_members[] = { static PyMemberDef slice_members[] = {
@ -614,8 +620,9 @@ slice_richcompare(PyObject *v, PyObject *w, int op)
} }
static int static int
slice_traverse(PySliceObject *v, visitproc visit, void *arg) slice_traverse(PyObject *op, visitproc visit, void *arg)
{ {
PySliceObject *v = _PySlice_CAST(op);
Py_VISIT(v->start); Py_VISIT(v->start);
Py_VISIT(v->stop); Py_VISIT(v->stop);
Py_VISIT(v->step); Py_VISIT(v->step);
@ -636,8 +643,9 @@ slice_traverse(PySliceObject *v, visitproc visit, void *arg)
#endif #endif
static Py_hash_t static Py_hash_t
slicehash(PySliceObject *v) slice_hash(PyObject *op)
{ {
PySliceObject *v = _PySlice_CAST(op);
Py_uhash_t acc = _PyHASH_XXPRIME_5; Py_uhash_t acc = _PyHASH_XXPRIME_5;
#define _PyHASH_SLICE_PART(com) { \ #define _PyHASH_SLICE_PART(com) { \
Py_uhash_t lane = PyObject_Hash(v->com); \ Py_uhash_t lane = PyObject_Hash(v->com); \
@ -663,16 +671,16 @@ PyTypeObject PySlice_Type = {
"slice", /* Name of this type */ "slice", /* Name of this type */
sizeof(PySliceObject), /* Basic object size */ sizeof(PySliceObject), /* Basic object size */
0, /* Item size for varobject */ 0, /* Item size for varobject */
(destructor)slice_dealloc, /* tp_dealloc */ slice_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */ 0, /* tp_vectorcall_offset */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
0, /* tp_as_async */ 0, /* tp_as_async */
(reprfunc)slice_repr, /* tp_repr */ slice_repr, /* tp_repr */
0, /* tp_as_number */ 0, /* tp_as_number */
0, /* tp_as_sequence */ 0, /* tp_as_sequence */
0, /* tp_as_mapping */ 0, /* tp_as_mapping */
(hashfunc)slicehash, /* tp_hash */ slice_hash, /* tp_hash */
0, /* tp_call */ 0, /* tp_call */
0, /* tp_str */ 0, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */ PyObject_GenericGetAttr, /* tp_getattro */
@ -680,7 +688,7 @@ PyTypeObject PySlice_Type = {
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
slice_doc, /* tp_doc */ slice_doc, /* tp_doc */
(traverseproc)slice_traverse, /* tp_traverse */ slice_traverse, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */
slice_richcompare, /* tp_richcompare */ slice_richcompare, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */