diff --git a/py/builtin.c b/py/builtin.c index d980454ccea64c8fc4485878c3135c3555609844..e8746c55c253f10c33067357d91c3c913432bc7d 100644 --- a/py/builtin.c +++ b/py/builtin.c @@ -388,3 +388,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 45da172d10dec30e252073da718c3a2b0886a9cb..50269dfe1facfa15e165e375fad401bce4b6bda8 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 0aa0b66a72e9ba438f3b726c276664bfa04ca587..fd94f767832c8bbac1725c5f318753a97edc5418 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 a2cdf842518a5d91af258be4ad88b72bb0ccc0f6..3be6295067edc42d85af32621bf5068e2c9b7007 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) diff --git a/tests/basics/getattr1.py b/tests/basics/getattr1.py new file mode 100644 index 0000000000000000000000000000000000000000..7b7e073922431d8810cf0a344e5d5bd37080080c --- /dev/null +++ b/tests/basics/getattr1.py @@ -0,0 +1,15 @@ +class A: + + var = 132 + + def __init__(self): + self.var2 = 34 + + def meth(self, i): + return 42 + i + + +a = A() +print(getattr(a, "var")) +print(getattr(a, "var2")) +print(getattr(a, "meth")(5))