diff options
author | John R. Lenton <jlenton@gmail.com> | 2014-01-05 22:29:03 +0000 |
---|---|---|
committer | John R. Lenton <jlenton@gmail.com> | 2014-01-05 22:29:03 +0000 |
commit | ba3f87c94776538fece5e87ff1d7de547930397a (patch) | |
tree | 3112b328cff278168a1ef48fc37a65778ea9324a /py/vm.c | |
parent | 6e1e98f8648d327098a03ce8d175c9854dd06cc8 (diff) | |
parent | 12e2656472bf53e467c066eda6f3e177a97210ca (diff) | |
download | micropython-ba3f87c94776538fece5e87ff1d7de547930397a.tar.gz micropython-ba3f87c94776538fece5e87ff1d7de547930397a.zip |
Merge remote-tracking branch 'upstream/master' into list_reverse
Diffstat (limited to 'py/vm.c')
-rw-r--r-- | py/vm.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -99,6 +99,10 @@ bool mp_execute_byte_code_2(const byte **ip_in_out, mp_obj_t *fastn, mp_obj_t ** PUSH(mp_const_true); break; + case MP_BC_LOAD_CONST_ELLIPSIS: + PUSH(mp_const_ellipsis); + break; + case MP_BC_LOAD_CONST_SMALL_INT: unum = (ip[0] | (ip[1] << 8) | (ip[2] << 16)) - 0x800000; ip += 3; |