Implement missing slots for NoneType

moreal · moreal · commit 6d863fbd49ea · 2026-03-15T23:53:22.000+09:00
diff --git a/crates/vm/src/builtins/singletons.rs b/crates/vm/src/builtins/singletons.rs
@@ -2,12 +2,15 @@ use super::{PyStrRef, PyType, PyTypeRef};
 use crate::{
     Context, Py, PyObjectRef, PyPayload, PyResult, VirtualMachine,
     class::PyClassImpl,
+    common::hash::PyHash,
     convert::ToPyObject,
-    function::FuncArgs,
+    function::{FuncArgs, PyComparisonValue},
     protocol::PyNumberMethods,
-    types::{AsNumber, Constructor, Representable},
+    types::{AsNumber, Comparable, Constructor, Hashable, PyComparisonOp, Representable},
 };
 
+const NONE_HASH: PyHash = 0xFCA8_6420;
+
 #[pyclass(module = false, name = "NoneType")]
 #[derive(Debug)]
 pub struct PyNone;
@@ -49,7 +52,7 @@ impl Constructor for PyNone {
     }
 }
 
-#[pyclass(with(Constructor, AsNumber, Representable))]
+#[pyclass(with(Constructor, AsNumber, Comparable, Hashable, Representable))]
 impl PyNone {}
 
 impl Representable for PyNone {
@@ -74,6 +77,26 @@ impl AsNumber for PyNone {
     }
 }
 
+impl Comparable for PyNone {
+    fn cmp(
+        zelf: &Py<Self>,
+        other: &crate::PyObject,
+        op: PyComparisonOp,
+        _vm: &VirtualMachine,
+    ) -> PyResult<PyComparisonValue> {
+        Ok(op
+            .identical_optimization(zelf, other)
+            .map(PyComparisonValue::Implemented)
+            .unwrap_or(PyComparisonValue::NotImplemented))
+    }
+}
+
+impl Hashable for PyNone {
+    fn hash(_zelf: &Py<Self>, _vm: &VirtualMachine) -> PyResult<PyHash> {
+        Ok(NONE_HASH)
+    }
+}
+
 #[pyclass(module = false, name = "NotImplementedType")]
 #[derive(Debug)]
 pub struct PyNotImplemented;
diff --git a/extra_tests/snippets/builtin_none.py b/extra_tests/snippets/builtin_none.py
@@ -26,3 +26,15 @@ def none2():
 assert None.__ne__(3) is NotImplemented
 assert None.__eq__(None) is True
 assert None.__ne__(None) is False
+assert None.__lt__(3) is NotImplemented
+assert None.__le__(3) is NotImplemented
+assert None.__gt__(3) is NotImplemented
+assert None.__ge__(3) is NotImplemented
+
+none_type_dict = type(None).__dict__
+for name in ("__eq__", "__ne__", "__lt__", "__le__", "__gt__", "__ge__", "__hash__"):
+    assert name in none_type_dict
+    assert none_type_dict[name] is not object.__dict__[name]
+    assert type(none_type_dict[name]).__name__ == "wrapper_descriptor"
+
+assert hash(None) & 0xFFFFFFFF == 0xFCA86420
