diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-05 18:00:04 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-05 18:00:04 +0100 |
| commit | 23419a2f8a2097c6ba00455eee4f7ae736fdf878 (patch) | |
| tree | 347bab7726fb05141dd39a1d103f8a8c3f4b01eb /py/builtin.c | |
| parent | 6d508666ea9f524f5fc16fa95052e06144ac728e (diff) | |
| parent | bfb7d6a26d6fe5b9a75447085514c609204eb469 (diff) | |
| download | micropython-23419a2f8a2097c6ba00455eee4f7ae736fdf878.tar.gz micropython-23419a2f8a2097c6ba00455eee4f7ae736fdf878.zip | |
Merge pull request #433 from pfalcon/getattr-3arg
py: Support 3-arg getattr() builtin (with default value).
Diffstat (limited to 'py/builtin.c')
| -rw-r--r-- | py/builtin.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/py/builtin.c b/py/builtin.c index 145bc65b14..2bf12e4928 100644 --- a/py/builtin.c +++ b/py/builtin.c @@ -400,9 +400,13 @@ 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 mp_load_attr(o_in, MP_OBJ_QSTR_VALUE(attr)); +STATIC mp_obj_t mp_builtin_getattr(uint n_args, const mp_obj_t *args) { + assert(MP_OBJ_IS_QSTR(args[1])); + mp_obj_t defval = MP_OBJ_NULL; + if (n_args > 2) { + defval = args[2]; + } + return mp_load_attr_default(args[0], MP_OBJ_QSTR_VALUE(args[1]), defval); } -MP_DEFINE_CONST_FUN_OBJ_2(mp_builtin_getattr_obj, mp_builtin_getattr); +MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_getattr_obj, 2, 3, mp_builtin_getattr); |