move dir in builtins to vm

Signed-off-by: snowapril <[email protected]>

Author: Snowapril

vm/src/stdlib/builtins.rs

@@ -191,15 +191,7 @@ mod builtins {
 
     #[pyfunction]
     fn dir(obj: OptionalArg<PyObjectRef>, vm: &VirtualMachine) -> PyResult<PyList> {
-        let seq = match obj {
-            OptionalArg::Present(obj) => vm
-                .get_special_method(obj, "__dir__")?
-                .map_err(|_obj| vm.new_type_error("object does not provide __dir__".to_owned()))?
-                .invoke((), vm)?,
-            OptionalArg::Missing => vm.call_method(vm.current_locals()?.as_object(), "keys", ())?,
-        };
-        let sorted = sorted(seq, Default::default(), vm)?;
-        Ok(sorted)
+        vm.dir(obj.into_option())
     }
 
     #[pyfunction]

vm/src/vm.rs

@@ -1174,6 +1174,20 @@ impl VirtualMachine {
             .invoke(args, self)
     }
 
+    pub fn dir(&self, obj: Option<PyObjectRef>) -> PyResult<PyList> {
+        let seq = match obj {
+            Some(obj) => self
+                .get_special_method(obj, "__dir__")?
+                .map_err(|_obj| self.new_type_error("object does not provide __dir__".to_owned()))?
+                .invoke((), self)?,
+            None => self.call_method(self.current_locals()?.as_object(), "keys", ())?,
+        };
+        let items = self.extract_elements(&seq)?;
+        let lst = PyList::from(items);
+        lst.sort(Default::default(), self)?;
+        Ok(lst)
+    }
+
     #[inline]
     pub(crate) fn get_special_method(
         &self,