From 1a1d11fa32ba043d22995d28cbc039cfa5f3cc46 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 5 Dec 2015 00:09:10 +0200
Subject: [PATCH] py/modsys: Implement sys.modules.

This for example will allow people to reload modules which didn't load
successfully (e.g. due to syntax error).
---
 py/modsys.c    |  3 +++
 py/mpconfig.h  |  5 +++++
 py/mpstate.h   |  5 ++---
 py/objmodule.c | 13 ++++++++-----
 py/qstrdefs.h  |  3 +++
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/py/modsys.c b/py/modsys.c
index 57ac2bf058..dd4d4d5546 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -185,6 +185,9 @@ STATIC const mp_rom_map_elem_t mp_module_sys_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_stderr), MP_ROM_PTR(&mp_sys_stderr_obj) },
     #endif
 
+    #if MICROPY_PY_SYS_MODULES
+    { MP_OBJ_NEW_QSTR(MP_QSTR_modules), MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_loaded_modules_dict)) },
+    #endif
     #if MICROPY_PY_SYS_EXC_INFO
     { MP_ROM_QSTR(MP_QSTR_exc_info), MP_ROM_PTR(&mp_sys_exc_info_obj) },
     #endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index ef078d3b72..4d81f25d3f 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -704,6 +704,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_SYS_MAXSIZE (0)
 #endif
 
+// Whether to provide "sys.modules" dictionary
+#ifndef MICROPY_PY_SYS_MODULES
+#define MICROPY_PY_SYS_MODULES (1)
+#endif
+
 // Whether to provide "sys.exc_info" function
 // Avoid enabling this, this function is Python2 heritage
 #ifndef MICROPY_PY_SYS_EXC_INFO
diff --git a/py/mpstate.h b/py/mpstate.h
index d0baad2b78..e9e38606e7 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -100,9 +100,8 @@ typedef struct _mp_state_vm_t {
     #endif
     #endif
 
-    // map with loaded modules
-    // TODO: expose as sys.modules
-    mp_map_t mp_loaded_modules_map;
+    // dictionary with loaded modules (may be exposed as sys.modules)
+    mp_obj_dict_t mp_loaded_modules_dict;
 
     // pending exception object (MP_OBJ_NULL if not pending)
     volatile mp_obj_t mp_pending_exception;
diff --git a/py/objmodule.c b/py/objmodule.c
index 46c5081600..1f1b7ab1f5 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -95,7 +95,8 @@ const mp_obj_type_t mp_type_module = {
 };
 
 mp_obj_t mp_obj_new_module(qstr module_name) {
-    mp_map_elem_t *el = mp_map_lookup(&MP_STATE_VM(mp_loaded_modules_map), MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
+    mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
+    mp_map_elem_t *el = mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
     // We could error out if module already exists, but let C extensions
     // add new members to existing modules.
     if (el->value != MP_OBJ_NULL) {
@@ -200,17 +201,18 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
 STATIC MP_DEFINE_CONST_MAP(mp_builtin_module_map, mp_builtin_module_table);
 
 void mp_module_init(void) {
-    mp_map_init(&MP_STATE_VM(mp_loaded_modules_map), 3);
+    mp_obj_dict_init(&MP_STATE_VM(mp_loaded_modules_dict), 3);
 }
 
 void mp_module_deinit(void) {
-    mp_map_deinit(&MP_STATE_VM(mp_loaded_modules_map));
+    //mp_map_deinit(&MP_STATE_VM(mp_loaded_modules_map));
 }
 
 // returns MP_OBJ_NULL if not found
 mp_obj_t mp_module_get(qstr module_name) {
+    mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
     // lookup module
-    mp_map_elem_t *el = mp_map_lookup(&MP_STATE_VM(mp_loaded_modules_map), MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
+    mp_map_elem_t *el = mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
 
     if (el == NULL) {
         // module not found, look for builtin module names
@@ -236,5 +238,6 @@ mp_obj_t mp_module_get(qstr module_name) {
 }
 
 void mp_module_register(qstr qst, mp_obj_t module) {
-    mp_map_lookup(&MP_STATE_VM(mp_loaded_modules_map), MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = module;
+    mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
+    mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = module;
 }
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index 99304a9976..e6c0fdcf1a 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -474,6 +474,9 @@ Q(implementation)
 #if MICROPY_PY_SYS_MAXSIZE
 Q(maxsize)
 #endif
+#if MICROPY_PY_SYS_MODULES
+Q(modules)
+#endif
 #if MICROPY_PY_SYS_EXC_INFO
 Q(exc_info)
 #endif