rmliddle
diff --git a/‎vm/src/builtins.rs
Lines changed: 36 additions & 9 deletions b/‎vm/src/builtins.rs
Lines changed: 36 additions & 9 deletions
diff --git a/‎vm/src/obj/objtype.rs
Lines changed: 4 additions & 0 deletions b/‎vm/src/obj/objtype.rs
Lines changed: 4 additions & 0 deletions
@@ -4,6 +4,7 @@ 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;
@@ -32,14 +33,40 @@ fn dir_locals(vm: &mut VirtualMachine) -> PyObjectRef {
     get_locals(vm)
 }
 
-fn dir_object(vm: &mut VirtualMachine, _obj: PyObjectRef) -> PyObjectRef {
-    let d = vm.new_dict();
-    // TODO: loop over dict of instance, next of class?
-    // TODO: Implement dir for objects
-    // for i in obj.iter_items() {
-    //    d.set_item(k, v);
-    // }
-    d
+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());
+        }
+    }
+
+    // Sort members:
+    members.sort();
+
+    let members_pystr = members.into_iter().map(|m| vm.ctx.new_str(m)).collect();
+    vm.ctx.new_list(members_pystr)
 }
 
 // builtin_abs
@@ -115,7 +142,7 @@ fn builtin_dir(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
         Ok(dir_locals(vm))
     } else {
         let obj = args.args.into_iter().next().unwrap();
-        Ok(dir_object(vm, obj))
+        Ok(dir_object(vm, &obj))
     }
 }
 
 
@@ -54,6 +54,10 @@ fn _mro(cls: PyObjectRef) -> Option<Vec<PyObjectRef>> {
     }
 }
 
+pub fn base_classes(obj: &PyObjectRef) -> Vec<PyObjectRef> {
+    _mro(obj.typ()).unwrap()
+}
+
 pub fn isinstance(obj: &PyObjectRef, cls: PyObjectRef) -> bool {
     let mro = _mro(obj.typ()).unwrap();
     mro.into_iter().any(|c| c.is(&cls))
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,10 @@ fn _mro(cls: PyObjectRef) -> Option<Vec<PyObjectRef>> {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
	`57`	`+pub fn base_classes(obj: &PyObjectRef) -> Vec<PyObjectRef> {`
	`58`	`+ _mro(obj.typ()).unwrap()`
	`59`	`+}`
	`60`	`+`
`57`	`61`	`pub fn isinstance(obj: &PyObjectRef, cls: PyObjectRef) -> bool {`
`58`	`62`	`let mro = _mro(obj.typ()).unwrap();`
`59`	`63`	`mro.into_iter().any(\|c\| c.is(&cls))`