mirror/rabbitizer
1
0
Fork 0
mirror of https://github.com/Decompollaborate/rabbitizer.git synced 2025-02-15 12:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use proper hash function

Browse Source
This commit is contained in:
angie 2023-08-26 23:16:22 -04:00
parent eb407ec9d3
commit ed678cfeb6
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rabbitizer/enums/rabbitizer_type_Enum.c
View File

@ -91,15 +91,21 @@ static PyGetSetDef rabbitizer_type_Enum_getsetters[] = {
}; };
// Crappy hash
Py_hash_t rabbitizer_type_Enum_hash(PyRabbitizerEnum *self) { Py_hash_t rabbitizer_type_Enum_hash(PyRabbitizerEnum *self) {
Py_hash_t hash = PyObject_Hash(self->enumType); PyObject *tuple = PyTuple_Pack(2, self->enumType, PyLong_FromLong(self->value));
Py_hash_t hash;
if (tuple == NULL) {
return -1;
}
hash = PyObject_Hash(tuple);
if (hash == -1) { if (hash == -1) {
return -1; return -1;
} }
return hash + self->value; return hash;
} }
// Checks for the 6 basic comparisons (==, !=, <, <=, >, >=) // Checks for the 6 basic comparisons (==, !=, <, <=, >, >=)
@ -140,8 +146,8 @@ PyObject *rabbitizer_type_Enum_richcompare(PyRabbitizerEnum *self, PyObject *oth
switch (op) { switch (op) {
case Py_EQ: if ((self->value) == (otherValue)) Py_RETURN_TRUE; Py_RETURN_FALSE; case Py_EQ: if ((self->value) == (otherValue)) Py_RETURN_TRUE; Py_RETURN_FALSE;
case Py_NE: if ((self->value) != (otherValue)) Py_RETURN_TRUE; Py_RETURN_FALSE; case Py_NE: if ((self->value) != (otherValue)) Py_RETURN_TRUE; Py_RETURN_FALSE;
case Py_LT: if ((self->value) < (otherValue)) Py_RETURN_TRUE; Py_RETURN_FALSE; case Py_LT: if ((self->value) < (otherValue)) Py_RETURN_TRUE; Py_RETURN_FALSE;
case Py_GT: if ((self->value) > (otherValue)) Py_RETURN_TRUE; Py_RETURN_FALSE; case Py_GT: if ((self->value) > (otherValue)) Py_RETURN_TRUE; Py_RETURN_FALSE;
case Py_LE: if ((self->value) <= (otherValue)) Py_RETURN_TRUE; Py_RETURN_FALSE; case Py_LE: if ((self->value) <= (otherValue)) Py_RETURN_TRUE; Py_RETURN_FALSE;
case Py_GE: if ((self->value) >= (otherValue)) Py_RETURN_TRUE; Py_RETURN_FALSE; case Py_GE: if ((self->value) >= (otherValue)) Py_RETURN_TRUE; Py_RETURN_FALSE;
default: default:
@ -158,7 +164,7 @@ static PyObject *rabbitizer_type_Enum___reduce__(PyRabbitizerEnum *self, UNUSED
PyObject *name; PyObject *name;
PyObject *value; PyObject *value;
enumType = self->enumType; enumType = self->enumType;
Py_INCREF(enumType); Py_INCREF(enumType);
name = self->name; name = self->name;
Py_INCREF(name); Py_INCREF(name);