mirror of
https://github.com/python/cpython.git
synced 2024-12-01 11:15:56 +01:00
47b9ff6ba1
*ordering* between objects; there is only a default equality test (defined by an object being equal to itself only). Read the comment in object.c. The current implementation never uses a three-way comparison to compute a rich comparison, but it does use a rich comparison to compute a three-way comparison. I'm not quite done ripping out all the calls to PyObject_Compare/Cmp, or replacing tp_compare implementations with tp_richcompare implementations; but much of that has happened (to make most unit tests pass). The following tests still fail, because I need help deciding or understanding: test_codeop -- depends on comparing code objects test_datetime -- need Tim Peters' opinion test_marshal -- depends on comparing code objects test_mutants -- need help understanding it The problem with test_codeop and test_marshal is this: these tests compare two different code objects and expect them to be equal. Is that still a feature we'd like to support? I've temporarily removed the comparison and hash code from code objects, so they use the default (equality by pointer only) comparison. For the other two tests, run them to see for yourself. (There may be more failing test with "-u all".) A general problem with getting lots of these tests to pass is the reality that for object types that have a natural total ordering, implementing __cmp__ is much more convenient than implementing __eq__, __ne__, __lt__, and so on. Should we go back to allowing __cmp__ to provide a total ordering? Should we provide some other way to implement rich comparison with a single method override? Alex proposed a __key__() method; I've considered a __richcmp__() method. Or perhaps __cmp__() just shouldn't be killed off...
122 lines
2.4 KiB
C
122 lines
2.4 KiB
C
/* Cell object implementation */
|
|
|
|
#include "Python.h"
|
|
|
|
PyObject *
|
|
PyCell_New(PyObject *obj)
|
|
{
|
|
PyCellObject *op;
|
|
|
|
op = (PyCellObject *)PyObject_GC_New(PyCellObject, &PyCell_Type);
|
|
if (op == NULL)
|
|
return NULL;
|
|
op->ob_ref = obj;
|
|
Py_XINCREF(obj);
|
|
|
|
_PyObject_GC_TRACK(op);
|
|
return (PyObject *)op;
|
|
}
|
|
|
|
PyObject *
|
|
PyCell_Get(PyObject *op)
|
|
{
|
|
if (!PyCell_Check(op)) {
|
|
PyErr_BadInternalCall();
|
|
return NULL;
|
|
}
|
|
Py_XINCREF(((PyCellObject*)op)->ob_ref);
|
|
return PyCell_GET(op);
|
|
}
|
|
|
|
int
|
|
PyCell_Set(PyObject *op, PyObject *obj)
|
|
{
|
|
if (!PyCell_Check(op)) {
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
Py_XDECREF(((PyCellObject*)op)->ob_ref);
|
|
Py_XINCREF(obj);
|
|
PyCell_SET(op, obj);
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
cell_dealloc(PyCellObject *op)
|
|
{
|
|
_PyObject_GC_UNTRACK(op);
|
|
Py_XDECREF(op->ob_ref);
|
|
PyObject_GC_Del(op);
|
|
}
|
|
|
|
static PyObject *
|
|
cell_repr(PyCellObject *op)
|
|
{
|
|
if (op->ob_ref == NULL)
|
|
return PyString_FromFormat("<cell at %p: empty>", op);
|
|
|
|
return PyString_FromFormat("<cell at %p: %.80s object at %p>",
|
|
op, op->ob_ref->ob_type->tp_name,
|
|
op->ob_ref);
|
|
}
|
|
|
|
static int
|
|
cell_traverse(PyCellObject *op, visitproc visit, void *arg)
|
|
{
|
|
Py_VISIT(op->ob_ref);
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
cell_clear(PyCellObject *op)
|
|
{
|
|
Py_CLEAR(op->ob_ref);
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
cell_get_contents(PyCellObject *op, void *closure)
|
|
{
|
|
Py_XINCREF(op->ob_ref);
|
|
return op->ob_ref;
|
|
}
|
|
|
|
static PyGetSetDef cell_getsetlist[] = {
|
|
{"cell_contents", (getter)cell_get_contents, NULL},
|
|
{NULL} /* sentinel */
|
|
};
|
|
|
|
PyTypeObject PyCell_Type = {
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
0,
|
|
"cell",
|
|
sizeof(PyCellObject),
|
|
0,
|
|
(destructor)cell_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
(reprfunc)cell_repr, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
|
0, /* tp_doc */
|
|
(traverseproc)cell_traverse, /* tp_traverse */
|
|
(inquiry)cell_clear, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
0, /* tp_methods */
|
|
0, /* tp_members */
|
|
cell_getsetlist, /* tp_getset */
|
|
};
|