Impl DictKey for &PyStringRef

coolreader18 · coolreader18 · commit 2224650fbbd0 · 2020-06-03T16:17:19.000-05:00
diff --git a/vm/src/dictdatatype.rs b/vm/src/dictdatatype.rs
@@ -1,4 +1,4 @@
-use crate::obj::objstr::PyString;
+use crate::obj::objstr::{PyString, PyStringRef};
 use crate::pyhash;
 use crate::pyobject::{IdProtocol, IntoPyObject, PyObjectRef, PyResult};
 use crate::vm::VirtualMachine;
@@ -438,6 +438,26 @@ impl DictKey for &PyObjectRef {
     }
 }
 
+impl DictKey for &PyStringRef {
+    fn do_hash(self, _vm: &VirtualMachine) -> PyResult<HashValue> {
+        Ok(self.hash())
+    }
+
+    fn do_is(self, other: &PyObjectRef) -> bool {
+        self.is(other)
+    }
+
+    fn do_eq(self, vm: &VirtualMachine, other_key: &PyObjectRef) -> PyResult<bool> {
+        if self.is(other_key) {
+            Ok(true)
+        } else if let Some(py_str_value) = other_key.payload::<PyString>() {
+            Ok(py_str_value.as_str() == self.as_str())
+        } else {
+            vm.bool_eq(self.clone().into_object(), other_key.clone())
+        }
+    }
+}
+
 /// Implement trait for the str type, so that we can use strings
 /// to index dictionaries.
 impl DictKey for &str {
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -292,7 +292,7 @@ impl PyString {
     }
 
     #[pymethod(name = "__hash__")]
-    fn hash(&self) -> pyhash::PyHash {
+    pub(crate) fn hash(&self) -> pyhash::PyHash {
         self.hash.load().unwrap_or_else(|| {
             let hash = pyhash::hash_value(&self.value);
             self.hash.store(Some(hash));

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ impl PyString {`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`#[pymethod(name = "__hash__")]`
`295`		`- fn hash(&self) -> pyhash::PyHash {`
	`295`	`+ pub(crate) fn hash(&self) -> pyhash::PyHash {`
`296`	`296`	`self.hash.load().unwrap_or_else(\|\| {`
`297`	`297`	`let hash = pyhash::hash_value(&self.value);`
`298`	`298`	`self.hash.store(Some(hash));`