1 files changed, 42 insertions, 11 deletions

diff --git a/py/runtime.c b/py/runtime.c
index 238c3a56e2..5c9df06a28 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -33,6 +33,14 @@ STATIC mp_map_t *map_locals;
 STATIC mp_map_t *map_globals;
 STATIC mp_map_t map_builtins;
 
+STATIC mp_map_t map_main;
+
+const mp_obj_module_t mp_module___main__ = {
+    .base = { &mp_type_module },
+    .name = MP_QSTR___main__,
+    .globals = (mp_map_t*)&map_main,
+};
+
 // a good optimising compiler will inline this if necessary
 STATIC void mp_map_add_qstr(mp_map_t *map, qstr qstr, mp_obj_t value) {
     mp_map_lookup(map, MP_OBJ_NEW_QSTR(qstr), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
@@ -41,17 +49,18 @@ STATIC void mp_map_add_qstr(mp_map_t *map, qstr qstr, mp_obj_t value) {
 void mp_init(void) {
     mp_emit_glue_init();
 
-    // locals = globals for outer module (see Objects/frameobject.c/PyFrame_New())
-    map_locals = map_globals = mp_map_new(1);
-
-    // init built-in hash table
-    mp_map_init(&map_builtins, 3);
-
     // init global module stuff
     mp_module_init();
 
+    mp_map_init(&map_main, 1);
     // add some builtins that can't be done in ROM
-    mp_map_add_qstr(map_globals, MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR___main__));
+    mp_map_add_qstr(&map_main, MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR___main__));
+
+    // locals = globals for outer module (see Objects/frameobject.c/PyFrame_New())
+    map_locals = map_globals = &map_main;
+
+    // init built-in hash table
+    mp_map_init(&map_builtins, 3);
 
 #if MICROPY_CPYTHON_COMPAT
     // Precreate sys module, so "import sys" didn't throw exceptions.
@@ -141,6 +150,7 @@ void mp_store_name(qstr qstr, mp_obj_t obj) {
 
 void mp_delete_name(qstr qstr) {
     DEBUG_OP_printf("delete name %s\n", qstr_str(qstr));
+    // TODO raise NameError if qstr not found
     mp_map_lookup(map_locals, MP_OBJ_NEW_QSTR(qstr), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
 }
 
@@ -680,12 +690,14 @@ too_long:
     nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "too many values to unpack (expected %d)", num));
 }
 
-mp_obj_t mp_load_attr(mp_obj_t base, qstr attr) {
+mp_obj_t mp_load_attr_default(mp_obj_t base, qstr attr, mp_obj_t defval) {
     DEBUG_OP_printf("load attr %p.%s\n", base, qstr_str(attr));
-    // use load_method
     mp_obj_t dest[2];
-    mp_load_method(base, attr, dest);
-    if (dest[1] == MP_OBJ_NULL) {
+    // use load_method, raising or not raising exception
+    ((defval == MP_OBJ_NULL) ? mp_load_method : mp_load_method_maybe)(base, attr, dest);
+    if (dest[0] == MP_OBJ_NULL) {
+        return defval;
+    } else if (dest[1] == MP_OBJ_NULL) {
         // load_method returned just a normal attribute
         return dest[0];
     } else {
@@ -694,6 +706,10 @@ mp_obj_t mp_load_attr(mp_obj_t base, qstr attr) {
     }
 }
 
+mp_obj_t mp_load_attr(mp_obj_t base, qstr attr) {
+    return mp_load_attr_default(base, attr, MP_OBJ_NULL);
+}
+
 // no attribute found, returns:     dest[0] == MP_OBJ_NULL, dest[1] == MP_OBJ_NULL
 // normal attribute found, returns: dest[0] == <attribute>, dest[1] == MP_OBJ_NULL
 // method attribute found, returns: dest[0] == <method>,    dest[1] == <self>
@@ -798,6 +814,21 @@ void mp_store_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
     }
 }
 
+void mp_delete_subscr(mp_obj_t base, mp_obj_t index) {
+    DEBUG_OP_printf("delete subscr %p[%p]\n", base, index);
+    /* list delete not implemented
+    if (MP_OBJ_IS_TYPE(base, &mp_type_list)) {
+        // list delete
+        mp_obj_list_delete(base, index);
+    } else */
+    if (MP_OBJ_IS_TYPE(base, &mp_type_dict)) {
+        // dict delete
+        mp_obj_dict_delete(base, index);
+    } else {
+        nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' object does not support item deletion", mp_obj_get_type_str(base)));
+    }
+}
+
 mp_obj_t mp_getiter(mp_obj_t o_in) {
     mp_obj_type_t *type = mp_obj_get_type(o_in);
     if (type->getiter != NULL) {