Add: pyproperty dict values, items mapping

rimi0108 · rimi0108 · commit f9a17b0e545e · 2022-07-16T15:40:12.000+09:00
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, PyMappingProxy,
+    set::PySetInner, IterStatus, PositionIterInternal, PyBaseExceptionRef, PyGenericAlias,
+    PyMappingProxy, PySet, PyStrRef, PyTupleRef, PyType, PyTypeRef,
 };
 use crate::{
     builtins::{
@@ -1095,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 {}
 
@@ -1123,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, PyDictRef};
+use super::{PyDict, PyDictRef, PyGenericAlias, PyList, PyTuple, PyType, PyTypeRef};
 use crate::{
     class::PyClassImpl,
     convert::ToPyObject,
@@ -44,7 +44,7 @@ impl From<PyTypeRef> for PyMappingProxy {
 
 impl From<PyDictRef> for PyMappingProxy {
     fn from(dict: PyDictRef) -> Self {
-        Self { 
+        Self {
             mapping: MappingProxyInner::Mapping(ArgMapping::from_dict_exact(dict)),
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use super::{PyDict, PyGenericAlias, PyList, PyTuple, PyType, PyTypeRef, PyDictRef};`
	`1`	`+use super::{PyDict, PyDictRef, PyGenericAlias, PyList, PyTuple, PyType, PyTypeRef};`
`2`	`2`	`use crate::{`
`3`	`3`	`class::PyClassImpl,`
`4`	`4`	`convert::ToPyObject,`
`@@ -44,7 +44,7 @@ impl From<PyTypeRef> for PyMappingProxy {`
`44`	`44`
`45`	`45`	`impl From<PyDictRef> for PyMappingProxy {`
`46`	`46`	`fn from(dict: PyDictRef) -> Self {`
`47`		`- Self {`
	`47`	`+ Self {`
`48`	`48`	`mapping: MappingProxyInner::Mapping(ArgMapping::from_dict_exact(dict)),`
`49`	`49`	`}`
`50`	`50`	`}`