backup commit(soon will be removed)

Snowapril · Snowapril · commit 3ae90045b90a · 2021-09-24T23:02:44.000+09:00
diff --git a/vm/src/builtins/dict.rs b/vm/src/builtins/dict.rs
@@ -1,11 +1,13 @@
 use crossbeam_utils::atomic::AtomicCell;
 use std::fmt;
+use std::iter::FromIterator;
 use std::mem::size_of;
 
 use super::pystr::PyStrRef;
 use super::pytype::PyTypeRef;
 use super::set::PySet;
 use super::IterStatus;
+use crate::builtins::list::PyList;
 use crate::dictdatatype::{self, DictKey};
 use crate::exceptions::PyBaseExceptionRef;
 use crate::function::{ArgIterable, FuncArgs, KwArgs, OptionalArg};
@@ -15,7 +17,7 @@ use crate::vm::{ReprGuard, VirtualMachine};
 use crate::{
     IdProtocol, IntoPyObject, ItemProtocol, PyArithmaticValue::*, PyAttributes, PyClassDef,
     PyClassImpl, PyComparisonValue, PyContext, PyObjectRef, PyRef, PyResult, PyValue,
-    TryFromBorrowedObject, TypeProtocol,
+    TryFromBorrowedObject, TryFromObject, TypeProtocol,
 };
 
 pub type DictContentType = dictdatatype::Dict;
@@ -957,7 +959,47 @@ pub struct PyMapping {
         Option<fn(PyObjectRef, PyObjectRef, Option<PyObjectRef>, &VirtualMachine) -> PyResult<()>>,
 }
 
-impl PyMapping {}
+impl PyMapping {
+    fn method_output_as_list(obj: PyObjectRef, method_name: &str, vm: &VirtualMachine) -> PyResult {
+        let meth_output = vm.call_method(&obj, method_name, ())?;
+        if meth_output.is(&vm.ctx.types.list_type) {
+            return Ok(meth_output);
+        }
+
+        iterator::get_iter(vm, meth_output)
+        // TODO : iterator to pylist
+    }
+
+    #[inline]
+    pub fn check(cls: PyTypeRef, vm: &VirtualMachine) -> bool {
+        // TODO : do check mapping_protocol and subscript
+        true
+    }
+
+    fn items(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyDictItems> {
+        if obj.is(&vm.ctx.types.dict_type) {
+            Ok(PyDict::items(PyDictRef::try_from_object(vm, obj)?))
+        } else {
+            method_output_as_list(obj, "items", vm)
+        }
+    }
+
+    fn keys(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyDictKeys> {
+        if obj.is(&vm.ctx.types.dict_type) {
+            Ok(PyDict::keys(PyDictRef::try_from_object(vm, obj)?))
+        } else {
+            method_output_as_list(obj, "keys", vm)
+        }
+    }
+
+    fn values(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyDictValues> {
+        if obj.is(&vm.ctx.types.dict_type) {
+            Ok(PyDict::values(PyDictRef::try_from_object(vm, obj)?))
+        } else {
+            method_output_as_list(obj, "values", vm)
+        }
+    }
+}
 
 impl TryFromBorrowedObject for PyMapping {
     fn try_from_borrowed_object(vm: &VirtualMachine, obj: &PyObjectRef) -> PyResult<Self> {
diff --git a/vm/src/stdlib/winapi.rs b/vm/src/stdlib/winapi.rs
@@ -2,7 +2,7 @@
 
 use super::os::errno_err;
 use crate::{
-    builtins::{PyDictRef, PyStrRef},
+    builtins::{dict::PyMapping, PyDictRef, PyStrRef},
     exceptions::IntoPyException,
     function::OptionalArg,
     PyObjectRef, PyResult, PySequence, TryFromObject, VirtualMachine,
@@ -117,7 +117,7 @@ struct CreateProcessArgs {
     #[pyarg(positional)]
     creation_flags: u32,
     #[pyarg(positional)]
-    env_mapping: Option<PyDictRef>,
+    env_mapping: Option<PyMapping>,
     #[pyarg(positional)]
     current_dir: Option<PyStrRef>,
     #[pyarg(positional)]
