diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-03-26 23:35:13 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-03-27 00:11:36 +0200 |
| commit | e9137b94f27594ea1bdeb5fa4eaddffcbb7b9e9a (patch) | |
| tree | c14b5aea484651e297487f3612ac14b899b57bf9 /py | |
| parent | 9b196cddab80e24b9ce66b1c922cb757b11fb16a (diff) | |
| download | micropython-e9137b94f27594ea1bdeb5fa4eaddffcbb7b9e9a.tar.gz micropython-e9137b94f27594ea1bdeb5fa4eaddffcbb7b9e9a.zip | |
py: Implement getattr() builtin.
Diffstat (limited to 'py')
| -rw-r--r-- | py/builtin.c | 7 | ||||
| -rw-r--r-- | py/builtin.h | 1 | ||||
| -rw-r--r-- | py/builtintables.c | 1 | ||||
| -rw-r--r-- | py/qstrdefs.h | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/py/builtin.c b/py/builtin.c index fe9757fdf3..f9775a55a7 100644 --- a/py/builtin.c +++ b/py/builtin.c @@ -381,3 +381,10 @@ STATIC mp_obj_t mp_builtin_id(mp_obj_t o_in) { } MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_id_obj, mp_builtin_id); + +STATIC mp_obj_t mp_builtin_getattr(mp_obj_t o_in, mp_obj_t attr) { + assert(MP_OBJ_IS_QSTR(attr)); + return rt_load_attr(o_in, MP_OBJ_QSTR_VALUE(attr)); +} + +MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_getattr_obj, mp_builtin_getattr); diff --git a/py/builtin.h b/py/builtin.h index 45da172d10..50269dfe1f 100644 --- a/py/builtin.h +++ b/py/builtin.h @@ -12,6 +12,7 @@ MP_DECLARE_CONST_FUN_OBJ(mp_builtin_dir_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_divmod_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_eval_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_exec_obj); +MP_DECLARE_CONST_FUN_OBJ(mp_builtin_getattr_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_hash_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_id_obj); MP_DECLARE_CONST_FUN_OBJ(mp_builtin_isinstance_obj); diff --git a/py/builtintables.c b/py/builtintables.c index 0aa0b66a72..fd94f76783 100644 --- a/py/builtintables.c +++ b/py/builtintables.c @@ -60,6 +60,7 @@ STATIC const mp_builtin_elem_t builtin_object_table[] = { { MP_QSTR_divmod, (mp_obj_t)&mp_builtin_divmod_obj }, { MP_QSTR_eval, (mp_obj_t)&mp_builtin_eval_obj }, { MP_QSTR_exec, (mp_obj_t)&mp_builtin_exec_obj }, + { MP_QSTR_getattr, (mp_obj_t)&mp_builtin_getattr_obj }, { MP_QSTR_hash, (mp_obj_t)&mp_builtin_hash_obj }, { MP_QSTR_id, (mp_obj_t)&mp_builtin_id_obj }, { MP_QSTR_isinstance, (mp_obj_t)&mp_builtin_isinstance_obj }, diff --git a/py/qstrdefs.h b/py/qstrdefs.h index a2cdf84251..3be6295067 100644 --- a/py/qstrdefs.h +++ b/py/qstrdefs.h @@ -92,6 +92,7 @@ Q(eval) Q(exec) Q(filter) Q(float) +Q(getattr) Q(hash) Q(id) Q(int) |