py: Make dir report instance members

dhylands · pfalcon · commit 7281d95aee40 · 2016-01-03T20:37:18.000+02:00
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
@@ -31,6 +31,7 @@
 #include "py/smallint.h"
 #include "py/objint.h"
 #include "py/objstr.h"
+#include "py/objtype.h"
 #include "py/runtime0.h"
 #include "py/runtime.h"
 #include "py/builtin.h"
@@ -196,6 +197,7 @@ STATIC mp_obj_t mp_builtin_dir(mp_uint_t n_args, const mp_obj_t *args) {
     // TODO make this function more general and less of a hack
 
     mp_obj_dict_t *dict = NULL;
+    mp_map_t *members = NULL;
     if (n_args == 0) {
         // make a list of names in the local name space
         dict = mp_locals_get();
@@ -214,6 +216,10 @@ STATIC mp_obj_t mp_builtin_dir(mp_uint_t n_args, const mp_obj_t *args) {
                 dict = type->locals_dict;
             }
         }
+        if (mp_obj_is_instance_type(mp_obj_get_type(args[0]))) {
+            mp_obj_instance_t *inst = args[0];
+            members = &inst->members;
+        }
     }
 
     mp_obj_t dir = mp_obj_new_list(0, NULL);
@@ -224,7 +230,13 @@ STATIC mp_obj_t mp_builtin_dir(mp_uint_t n_args, const mp_obj_t *args) {
             }
         }
     }
-
+    if (members != NULL) {
+        for (mp_uint_t i = 0; i < members->alloc; i++) {
+            if (MP_MAP_SLOT_IS_FILLED(members, i)) {
+                mp_obj_list_append(dir, members->table[i].key);
+            }
+        }
+    }
     return dir;
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_dir_obj, 0, 1, mp_builtin_dir);
diff --git a/tests/basics/builtin_dir.py b/tests/basics/builtin_dir.py
@@ -7,3 +7,10 @@
 import sys
 print('platform' in dir(sys))
 
+class Foo:
+    def __init__(self):
+        self.x = 1
+foo = Foo()
+print('__init__' in dir(foo))
+print('x' in dir(foo))
+

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`#include "py/smallint.h"`
`32`	`32`	`#include "py/objint.h"`
`33`	`33`	`#include "py/objstr.h"`
	`34`	`+#include "py/objtype.h"`
`34`	`35`	`#include "py/runtime0.h"`
`35`	`36`	`#include "py/runtime.h"`
`36`	`37`	`#include "py/builtin.h"`
`@@ -196,6 +197,7 @@ STATIC mp_obj_t mp_builtin_dir(mp_uint_t n_args, const mp_obj_t *args) {`
`196`	`197`	`// TODO make this function more general and less of a hack`
`197`	`198`
`198`	`199`	`mp_obj_dict_t *dict = NULL;`
	`200`	`+ mp_map_t *members = NULL;`
`199`	`201`	`if (n_args == 0) {`
`200`	`202`	`// make a list of names in the local name space`
`201`	`203`	`dict = mp_locals_get();`
`@@ -214,6 +216,10 @@ STATIC mp_obj_t mp_builtin_dir(mp_uint_t n_args, const mp_obj_t *args) {`
`214`	`216`	`dict = type->locals_dict;`
`215`	`217`	`}`
`216`	`218`	`}`
	`219`	`+ if (mp_obj_is_instance_type(mp_obj_get_type(args[0]))) {`
	`220`	`+ mp_obj_instance_t *inst = args[0];`
	`221`	`+ members = &inst->members;`
	`222`	`+ }`
`217`	`223`	`}`
`218`	`224`
`219`	`225`	`mp_obj_t dir = mp_obj_new_list(0, NULL);`
`@@ -224,7 +230,13 @@ STATIC mp_obj_t mp_builtin_dir(mp_uint_t n_args, const mp_obj_t *args) {`
`224`	`230`	`}`
`225`	`231`	`}`
`226`	`232`	`}`
`227`		`-`
	`233`	`+ if (members != NULL) {`
	`234`	`+ for (mp_uint_t i = 0; i < members->alloc; i++) {`
	`235`	`+ if (MP_MAP_SLOT_IS_FILLED(members, i)) {`
	`236`	`+ mp_obj_list_append(dir, members->table[i].key);`
	`237`	`+ }`
	`238`	`+ }`
	`239`	`+ }`
`228`	`240`	`return dir;`
`229`	`241`	`}`
`230`	`242`	`MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_dir_obj, 0, 1, mp_builtin_dir);`