diff options
author | Damien George <damien.p.george@gmail.com> | 2014-05-10 13:55:11 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-05-10 13:55:11 +0100 |
commit | d0a5bf34f746276550aef9c8519160c033611571 (patch) | |
tree | 2c24601b11eeb11f161082a92b89eb559702cc4e /py/obj.h | |
parent | 2bb179e1248f045525b247981e3e5285800b63d6 (diff) | |
download | micropython-d0a5bf34f746276550aef9c8519160c033611571.tar.gz micropython-d0a5bf34f746276550aef9c8519160c033611571.zip |
py: Tidy up returning NULL which should be MP_OBJ_NOT_SUPPORTED.
Diffstat (limited to 'py/obj.h')
-rw-r--r-- | py/obj.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -255,8 +255,8 @@ struct _mp_obj_type_t { mp_make_new_fun_t make_new; // to make an instance of the type mp_call_fun_t call; - mp_unary_op_fun_t unary_op; // can return NULL if op not supported - mp_binary_op_fun_t binary_op; // can return NULL if op not supported + mp_unary_op_fun_t unary_op; // can return MP_OBJ_NOT_SUPPORTED if op not supported + mp_binary_op_fun_t binary_op; // can return MP_OBJ_NOT_SUPPORTED if op not supported mp_load_attr_fun_t load_attr; mp_store_attr_fun_t store_attr; // if value is MP_OBJ_NULL, then delete that attribute @@ -266,7 +266,7 @@ struct _mp_obj_type_t { // can return MP_OBJ_NOT_SUPPORTED mp_fun_1_t getiter; - mp_fun_1_t iternext; // may return MP_OBJ_NULL as an optimisation instead of raising StopIteration() (with no args) + mp_fun_1_t iternext; // may return MP_OBJ_STOP_ITERATION as an optimisation instead of raising StopIteration() (with no args) mp_buffer_p_t buffer_p; const mp_stream_p_t *stream_p; @@ -479,11 +479,11 @@ typedef struct _mp_obj_float_t { mp_float_t value; } mp_obj_float_t; mp_float_t mp_obj_float_get(mp_obj_t self_in); -mp_obj_t mp_obj_float_binary_op(int op, mp_float_t lhs_val, mp_obj_t rhs); // can return MP_OBJ_NULL +mp_obj_t mp_obj_float_binary_op(int op, mp_float_t lhs_val, mp_obj_t rhs); // can return MP_OBJ_NOT_SUPPORTED // complex void mp_obj_complex_get(mp_obj_t self_in, mp_float_t *real, mp_float_t *imag); -mp_obj_t mp_obj_complex_binary_op(int op, mp_float_t lhs_real, mp_float_t lhs_imag, mp_obj_t rhs_in); // can return MP_OBJ_NULL +mp_obj_t mp_obj_complex_binary_op(int op, mp_float_t lhs_real, mp_float_t lhs_imag, mp_obj_t rhs_in); // can return MP_OBJ_NOT_SUPPORTED #endif // tuple |