Move get_attributes to objtype file

Author: windelbouwman

vm/src/builtins.rs

@@ -4,7 +4,6 @@ use std::collections::HashMap;
 use std::io::{self, Write};
 
 use super::compile;
-use super::obj::objdict;
 use super::obj::objstr;
 use super::obj::objtype;
 use super::objbool;
@@ -35,32 +34,8 @@ fn dir_locals(vm: &mut VirtualMachine) -> PyObjectRef {
 
 fn dir_object(vm: &mut VirtualMachine, obj: &PyObjectRef) -> PyObjectRef {
     // Gather all members here:
-    let mut members: Vec<String> = vec![];
-
-    // Get class attributes:
-    let mut base_classes = objtype::base_classes(obj);
-    base_classes.reverse();
-    for bc in base_classes {
-        if let PyObjectKind::Class {
-            name: _,
-            dict,
-            mro: _,
-        } = &bc.borrow().kind
-        {
-            let elements = objdict::get_elements(dict);
-            for (name, _value) in elements {
-                members.push(name.to_string());
-            }
-        }
-    }
-
-    // Get instance attributes:
-    if let PyObjectKind::Instance { dict } = &obj.borrow().kind {
-        let elements = objdict::get_elements(dict);
-        for (name, _value) in elements {
-            members.push(name.to_string());
-        }
-    }
+    let attributes = objtype::get_attributes(obj);
+    let mut members: Vec<String> = attributes.into_iter().map(|(n, _o)| n).collect();
 
     // Sort members:
     members.sort();

vm/src/obj/objtype.rs

@@ -5,6 +5,7 @@ use super::super::pyobject::{
 use super::super::vm::VirtualMachine;
 use super::objdict;
 use super::objtype; // Required for arg_check! to use isinstance
+use std::collections::HashMap;
 
 /*
  * The magical type type
@@ -165,6 +166,37 @@ pub fn get_attribute(vm: &mut VirtualMachine, obj: PyObjectRef, name: &str) -> P
     }
 }
 
+pub fn get_attributes(obj: &PyObjectRef) -> HashMap<String, PyObjectRef> {
+    // Gather all members here:
+    let mut attributes: HashMap<String, PyObjectRef> = HashMap::new();
+
+    // Get class attributes:
+    let mut base_classes = objtype::base_classes(obj);
+    base_classes.reverse();
+    for bc in base_classes {
+        if let PyObjectKind::Class {
+            name: _,
+            dict,
+            mro: _,
+        } = &bc.borrow().kind
+        {
+            let elements = objdict::get_elements(dict);
+            for (name, value) in elements {
+                attributes.insert(name.to_string(), value.clone());
+            }
+        }
+    }
+
+    // Get instance attributes:
+    if let PyObjectKind::Instance { dict } = &obj.borrow().kind {
+        let elements = objdict::get_elements(dict);
+        for (name, value) in elements {
+            attributes.insert(name.to_string(), value.clone());
+        }
+    }
+    attributes
+}
+
 fn take_next_base(
     mut bases: Vec<Vec<PyObjectRef>>,
 ) -> Option<(PyObjectRef, Vec<Vec<PyObjectRef>>)> {