Merge pull request #3901 from rimi0108/add-dict-mapping

youknowone · web-flow · commit ceb7d68ef77c · 2022-07-16T16:12:46.000+09:00
Add a mapping property
diff --git a/vm/src/builtins/dict.rs b/vm/src/builtins/dict.rs
@@ -1,6 +1,6 @@
 use super::{
-    set::PySetInner, IterStatus, PositionIterInternal, PyBaseExceptionRef, PyGenericAlias, PySet,
-    PyStrRef, PyTupleRef, PyType, PyTypeRef,
+    set::PySetInner, IterStatus, PositionIterInternal, PyBaseExceptionRef, PyGenericAlias,
+    PyMappingProxy, PySet, PyStrRef, PyTupleRef, PyType, PyTypeRef,
 };
 use crate::{
     builtins::{
@@ -1041,6 +1041,11 @@ impl PyDictKeys {
     fn contains(zelf: PyRef<Self>, key: PyObjectRef, vm: &VirtualMachine) -> PyResult<bool> {
         zelf.dict().contains(key, vm)
     }
+
+    #[pyproperty]
+    fn mapping(zelf: PyRef<Self>) -> PyMappingProxy {
+        PyMappingProxy::from(zelf.dict().clone())
+    }
 }
 impl Unconstructible for PyDictKeys {}
 
@@ -1090,6 +1095,10 @@ impl PyDictItems {
         let found = PyDict::getitem(zelf.dict().clone(), key, vm)?;
         vm.identical_or_equal(&found, &value)
     }
+    #[pyproperty]
+    fn mapping(zelf: PyRef<Self>) -> PyMappingProxy {
+        PyMappingProxy::from(zelf.dict().clone())
+    }
 }
 impl Unconstructible for PyDictItems {}
 
@@ -1118,7 +1127,12 @@ impl AsSequence for PyDictItems {
 }
 
 #[pyimpl(with(DictView, Constructor, Iterable, AsSequence))]
-impl PyDictValues {}
+impl PyDictValues {
+    #[pyproperty]
+    fn mapping(zelf: PyRef<Self>) -> PyMappingProxy {
+        PyMappingProxy::from(zelf.dict().clone())
+    }
+}
 impl Unconstructible for PyDictValues {}
 
 impl AsSequence for PyDictValues {
diff --git a/vm/src/builtins/mappingproxy.rs b/vm/src/builtins/mappingproxy.rs
@@ -1,4 +1,4 @@
-use super::{PyDict, PyGenericAlias, PyList, PyTuple, PyType, PyTypeRef};
+use super::{PyDict, PyDictRef, PyGenericAlias, PyList, PyTuple, PyType, PyTypeRef};
 use crate::{
     class::PyClassImpl,
     convert::ToPyObject,
@@ -26,10 +26,18 @@ impl PyPayload for PyMappingProxy {
     }
 }
 
-impl PyMappingProxy {
-    pub fn new(class: PyTypeRef) -> Self {
+impl From<PyTypeRef> for PyMappingProxy {
+    fn from(dict: PyTypeRef) -> Self {
+        Self {
+            mapping: MappingProxyInner::Class(dict),
+        }
+    }
+}
+
+impl From<PyDictRef> for PyMappingProxy {
+    fn from(dict: PyDictRef) -> Self {
         Self {
-            mapping: MappingProxyInner::Class(class),
+            mapping: MappingProxyInner::Mapping(ArgMapping::from_dict_exact(dict)),
         }
     }
 }
diff --git a/vm/src/builtins/type.rs b/vm/src/builtins/type.rs
@@ -576,7 +576,7 @@ impl PyType {
 
     #[pyproperty(magic)]
     fn dict(zelf: PyRef<Self>) -> PyMappingProxy {
-        PyMappingProxy::new(zelf)
+        PyMappingProxy::from(zelf)
     }
 
     #[pyproperty(magic, setter)]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use super::{PyDict, PyGenericAlias, PyList, PyTuple, PyType, PyTypeRef};`
	`1`	`+use super::{PyDict, PyDictRef, PyGenericAlias, PyList, PyTuple, PyType, PyTypeRef};`
`2`	`2`	`use crate::{`
`3`	`3`	`class::PyClassImpl,`
`4`	`4`	`convert::ToPyObject,`
`@@ -26,10 +26,18 @@ impl PyPayload for PyMappingProxy {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-impl PyMappingProxy {`
`30`		`- pub fn new(class: PyTypeRef) -> Self {`
	`29`	`+impl From<PyTypeRef> for PyMappingProxy {`
	`30`	`+ fn from(dict: PyTypeRef) -> Self {`
	`31`	`+ Self {`
	`32`	`+ mapping: MappingProxyInner::Class(dict),`
	`33`	`+ }`
	`34`	`+ }`
	`35`	`+}`
	`36`	`+`
	`37`	`+impl From<PyDictRef> for PyMappingProxy {`
	`38`	`+ fn from(dict: PyDictRef) -> Self {`
`31`	`39`	`Self {`
`32`		`- mapping: MappingProxyInner::Class(class),`
	`40`	`+ mapping: MappingProxyInner::Mapping(ArgMapping::from_dict_exact(dict)),`
`33`	`41`	`}`
`34`	`42`	`}`
`35`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ impl PyType {`
`576`	`576`
`577`	`577`	`#[pyproperty(magic)]`
`578`	`578`	`fn dict(zelf: PyRef<Self>) -> PyMappingProxy {`
`579`		`- PyMappingProxy::new(zelf)`
	`579`	`+ PyMappingProxy::from(zelf)`
`580`	`580`	`}`
`581`	`581`
`582`	`582`	`#[pyproperty(magic, setter)]`