commit 729f7b42d65c016c9d5f27fb8a8122869f06c129
author Damien George <damien.p.george@gmail.com> Thu Apr 17 22:10:53 2014 +0100
committer Damien George <damien.p.george@gmail.com> Thu Apr 17 22:10:53 2014 +0100
tree 8d8d8c2a89ff9011b06650c256a2d5f2458c930c
parent de7c425139c92745280b62f7ebb756def96d072a

py: Merge BINARY_OP_SUBSCR and store_subscr (w/ delete) into subscr.

mp_obj_t->subscr now does load/store/delete.

py/vm.c

diff --git a/py/vm.c b/py/vm.c
index e42e549..dbefdc3 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -342,6 +342,11 @@
                     PUSH(mp_load_build_class());
                     DISPATCH();
 
+                ENTRY(MP_BC_LOAD_SUBSCR):
+                    obj1 = POP();
+                    SET_TOP(mp_obj_subscr(TOP(), obj1, MP_OBJ_SENTINEL));
+                    DISPATCH();
+
                 ENTRY(MP_BC_STORE_FAST_0):
                     fastn[0] = POP();
                     DISPATCH();
@@ -381,7 +386,7 @@
                     DISPATCH();
 
                 ENTRY(MP_BC_STORE_SUBSCR):
-                    mp_store_subscr(sp[-1], sp[0], sp[-2]);
+                    mp_obj_subscr(sp[-1], sp[0], sp[-2]);
                     sp -= 3;
                     DISPATCH();