diff options
author | John R. Lenton <jlenton@gmail.com> | 2014-01-04 01:36:10 +0000 |
---|---|---|
committer | John R. Lenton <jlenton@gmail.com> | 2014-01-04 01:36:10 +0000 |
commit | f1c6ad46afa3eaf6df999cd51eb406110b6cac69 (patch) | |
tree | 157c99083d73b5fb2e74994601c7381a7de1300b /py/obj.h | |
parent | 45a87446179c0c629a2ae89e24fa61919a57c0e5 (diff) | |
parent | c8d1384fc0c7aafa5dee3445ece20f4e43dfa9c1 (diff) | |
download | micropython-f1c6ad46afa3eaf6df999cd51eb406110b6cac69.tar.gz micropython-f1c6ad46afa3eaf6df999cd51eb406110b6cac69.zip |
Merge remote-tracking branch 'upstream/master' into list_insert
Diffstat (limited to 'py/obj.h')
-rw-r--r-- | py/obj.h | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -146,6 +146,7 @@ mp_obj_t mp_obj_new_list(uint n, mp_obj_t *items); mp_obj_t mp_obj_new_list_reverse(uint n, mp_obj_t *items); mp_obj_t mp_obj_new_dict(int n_args); mp_obj_t mp_obj_new_set(int n_args, mp_obj_t *items); +mp_obj_t mp_obj_new_slice(mp_obj_t start, mp_obj_t stop, mp_obj_t step); mp_obj_t mp_obj_new_bound_meth(mp_obj_t self, mp_obj_t meth); mp_obj_t mp_obj_new_class(struct _mp_map_t *class_locals); mp_obj_t mp_obj_new_instance(mp_obj_t clas); @@ -216,6 +217,10 @@ mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value); // set void mp_obj_set_store(mp_obj_t self_in, mp_obj_t item); +// slice +extern const mp_obj_type_t slice_type; +void mp_obj_slice_get(mp_obj_t self_in, machine_int_t *start, machine_int_t *stop, machine_int_t *step); + // functions typedef struct _mp_obj_fun_native_t { // need this so we can define const objects (to go in ROM) mp_obj_base_t base; |