Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 1 | #include <stdint.h> |
| 2 | #include <stdlib.h> |
| 3 | #include <stdio.h> |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 4 | #include <string.h> |
| 5 | #include <assert.h> |
| 6 | |
| 7 | #include "nlr.h" |
| 8 | #include "misc.h" |
| 9 | #include "mpconfig.h" |
Damien George | 55baff4 | 2014-01-21 21:40:13 +0000 | [diff] [blame] | 10 | #include "qstr.h" |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 11 | #include "lexer.h" |
| 12 | #include "lexerunix.h" |
| 13 | #include "parse.h" |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 14 | #include "obj.h" |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 15 | #include "objmodule.h" |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 16 | #include "parsehelper.h" |
Damien George | 1fb0317 | 2014-01-03 14:22:03 +0000 | [diff] [blame] | 17 | #include "compile.h" |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 18 | #include "runtime0.h" |
| 19 | #include "runtime.h" |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 20 | #include "builtin.h" |
| 21 | |
Paul Sokolovsky | e081329 | 2014-04-11 23:08:29 +0300 | [diff] [blame] | 22 | #if 0 // print debugging info |
| 23 | #define DEBUG_PRINT (1) |
| 24 | #define DEBUG_printf DEBUG_printf |
| 25 | #else // don't print debugging info |
| 26 | #define DEBUG_printf(...) (void)0 |
| 27 | #endif |
| 28 | |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 29 | #define PATH_SEP_CHAR '/' |
| 30 | |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 31 | mp_import_stat_t stat_dir_or_file(vstr_t *path) { |
| 32 | //printf("stat %s\n", vstr_str(path)); |
| 33 | mp_import_stat_t stat = mp_import_stat(vstr_str(path)); |
| 34 | if (stat == MP_IMPORT_STAT_DIR) { |
| 35 | return stat; |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 36 | } |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 37 | vstr_add_str(path, ".py"); |
| 38 | stat = mp_import_stat(vstr_str(path)); |
| 39 | if (stat == MP_IMPORT_STAT_FILE) { |
| 40 | return stat; |
Paul Sokolovsky | d720ab5 | 2014-01-20 00:03:34 +0200 | [diff] [blame] | 41 | } |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 42 | return MP_IMPORT_STAT_NO_EXIST; |
| 43 | } |
Paul Sokolovsky | d720ab5 | 2014-01-20 00:03:34 +0200 | [diff] [blame] | 44 | |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 45 | mp_import_stat_t find_file(const char *file_str, uint file_len, vstr_t *dest) { |
| 46 | // extract the list of paths |
Paul Sokolovsky | e11b17c | 2014-02-05 00:47:06 +0200 | [diff] [blame] | 47 | uint path_num = 0; |
| 48 | mp_obj_t *path_items; |
Damien George | 49f20b8 | 2014-04-13 13:05:16 +0100 | [diff] [blame] | 49 | #if MICROPY_ENABLE_MOD_SYS |
Paul Sokolovsky | 5500cde | 2014-04-13 06:43:18 +0300 | [diff] [blame] | 50 | mp_obj_list_get(mp_sys_path, &path_num, &path_items); |
Damien George | 49f20b8 | 2014-04-13 13:05:16 +0100 | [diff] [blame] | 51 | #endif |
Paul Sokolovsky | e11b17c | 2014-02-05 00:47:06 +0200 | [diff] [blame] | 52 | |
| 53 | if (path_num == 0) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 54 | // mp_sys_path is empty, so just use the given file name |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 55 | vstr_add_strn(dest, file_str, file_len); |
| 56 | return stat_dir_or_file(dest); |
Paul Sokolovsky | e11b17c | 2014-02-05 00:47:06 +0200 | [diff] [blame] | 57 | } else { |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 58 | // go through each path looking for a directory or file |
Paul Sokolovsky | e11b17c | 2014-02-05 00:47:06 +0200 | [diff] [blame] | 59 | for (int i = 0; i < path_num; i++) { |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 60 | vstr_reset(dest); |
Paul Sokolovsky | e11b17c | 2014-02-05 00:47:06 +0200 | [diff] [blame] | 61 | uint p_len; |
Damien George | 698ec21 | 2014-02-08 18:17:23 +0000 | [diff] [blame] | 62 | const char *p = mp_obj_str_get_data(path_items[i], &p_len); |
Paul Sokolovsky | e11b17c | 2014-02-05 00:47:06 +0200 | [diff] [blame] | 63 | if (p_len > 0) { |
Damien George | 698ec21 | 2014-02-08 18:17:23 +0000 | [diff] [blame] | 64 | vstr_add_strn(dest, p, p_len); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 65 | vstr_add_char(dest, PATH_SEP_CHAR); |
Paul Sokolovsky | e11b17c | 2014-02-05 00:47:06 +0200 | [diff] [blame] | 66 | } |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 67 | vstr_add_strn(dest, file_str, file_len); |
| 68 | mp_import_stat_t stat = stat_dir_or_file(dest); |
| 69 | if (stat != MP_IMPORT_STAT_NO_EXIST) { |
| 70 | return stat; |
Paul Sokolovsky | e11b17c | 2014-02-05 00:47:06 +0200 | [diff] [blame] | 71 | } |
| 72 | } |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 73 | |
| 74 | // could not find a directory or file |
| 75 | return MP_IMPORT_STAT_NO_EXIST; |
Paul Sokolovsky | e11b17c | 2014-02-05 00:47:06 +0200 | [diff] [blame] | 76 | } |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 77 | } |
| 78 | |
| 79 | void do_load(mp_obj_t module_obj, vstr_t *file) { |
| 80 | // create the lexer |
| 81 | mp_lexer_t *lex = mp_lexer_new_from_file(vstr_str(file)); |
Paul Sokolovsky | e11b17c | 2014-02-05 00:47:06 +0200 | [diff] [blame] | 82 | |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 83 | if (lex == NULL) { |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 84 | // we verified the file exists using stat, but lexer could still fail |
Andrew Scheller | f78cfaf | 2014-04-09 19:56:38 +0100 | [diff] [blame] | 85 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "No module named '%s'", vstr_str(file))); |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 86 | } |
| 87 | |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 88 | qstr source_name = mp_lexer_source_name(lex); |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 89 | |
| 90 | // save the old context |
Damien George | 7efc5b3 | 2014-04-05 22:36:42 +0100 | [diff] [blame] | 91 | mp_obj_dict_t *old_locals = mp_locals_get(); |
| 92 | mp_obj_dict_t *old_globals = mp_globals_get(); |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 93 | |
| 94 | // set the new context |
Damien George | 7efc5b3 | 2014-04-05 22:36:42 +0100 | [diff] [blame] | 95 | mp_locals_set(mp_obj_module_get_globals(module_obj)); |
| 96 | mp_globals_set(mp_obj_module_get_globals(module_obj)); |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 97 | |
| 98 | // parse the imported script |
Damien George | c596612 | 2014-02-15 16:10:44 +0000 | [diff] [blame] | 99 | mp_parse_error_kind_t parse_error_kind; |
| 100 | mp_parse_node_t pn = mp_parse(lex, MP_PARSE_FILE_INPUT, &parse_error_kind); |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 101 | |
| 102 | if (pn == MP_PARSE_NODE_NULL) { |
Damien George | 9528cd6 | 2014-01-15 21:23:31 +0000 | [diff] [blame] | 103 | // parse error; clean up and raise exception |
Damien George | 4b01de4 | 2014-04-13 11:56:02 +0100 | [diff] [blame] | 104 | mp_obj_t exc = mp_parse_make_exception(lex, parse_error_kind); |
| 105 | mp_lexer_free(lex); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 106 | mp_locals_set(old_locals); |
| 107 | mp_globals_set(old_globals); |
Damien George | 4b01de4 | 2014-04-13 11:56:02 +0100 | [diff] [blame] | 108 | nlr_raise(exc); |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 109 | } |
| 110 | |
Damien George | 4b01de4 | 2014-04-13 11:56:02 +0100 | [diff] [blame] | 111 | mp_lexer_free(lex); |
| 112 | |
Damien George | 9528cd6 | 2014-01-15 21:23:31 +0000 | [diff] [blame] | 113 | // compile the imported script |
Damien George | 65cad12 | 2014-04-06 11:48:15 +0100 | [diff] [blame] | 114 | mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, false); |
Damien George | b829b5c | 2014-01-25 13:51:19 +0000 | [diff] [blame] | 115 | mp_parse_node_free(pn); |
Damien George | eb7bfcb | 2014-01-04 15:57:35 +0000 | [diff] [blame] | 116 | |
| 117 | if (module_fun == mp_const_none) { |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 118 | // TODO handle compile error correctly |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 119 | mp_locals_set(old_locals); |
| 120 | mp_globals_set(old_globals); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 121 | return; |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 122 | } |
| 123 | |
| 124 | // complied successfully, execute it |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 125 | nlr_buf_t nlr; |
| 126 | if (nlr_push(&nlr) == 0) { |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 127 | mp_call_function_0(module_fun); |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 128 | nlr_pop(); |
| 129 | } else { |
| 130 | // exception; restore context and re-raise same exception |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 131 | mp_locals_set(old_locals); |
| 132 | mp_globals_set(old_globals); |
Damien George | ea13f40 | 2014-04-05 18:32:08 +0100 | [diff] [blame] | 133 | nlr_raise(nlr.ret_val); |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 134 | } |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 135 | mp_locals_set(old_locals); |
| 136 | mp_globals_set(old_globals); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 137 | } |
| 138 | |
Paul Sokolovsky | a5afc90 | 2014-04-12 17:46:54 +0300 | [diff] [blame] | 139 | // TODO: Move to objdict? |
| 140 | STATIC inline mp_obj_t mp_obj_dict_get(mp_obj_t dict_in, mp_obj_t key) { |
| 141 | mp_obj_dict_t *dict = dict_in; |
| 142 | mp_map_elem_t *elem = mp_map_lookup(&dict->map, key, MP_MAP_LOOKUP); |
| 143 | if (elem == NULL) { |
| 144 | return elem; |
| 145 | } |
| 146 | return elem->value; |
| 147 | } |
| 148 | |
Damien George | 24ff063 | 2014-03-24 10:47:13 +0000 | [diff] [blame] | 149 | mp_obj_t mp_builtin___import__(uint n_args, mp_obj_t *args) { |
Paul Sokolovsky | e081329 | 2014-04-11 23:08:29 +0300 | [diff] [blame] | 150 | #if DEBUG_PRINT |
| 151 | printf("__import__:\n"); |
Paul Sokolovsky | fb7f943 | 2014-02-20 00:29:54 +0200 | [diff] [blame] | 152 | for (int i = 0; i < n_args; i++) { |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 153 | printf(" "); |
Paul Sokolovsky | fb7f943 | 2014-02-20 00:29:54 +0200 | [diff] [blame] | 154 | mp_obj_print(args[i], PRINT_REPR); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 155 | printf("\n"); |
| 156 | } |
Paul Sokolovsky | e081329 | 2014-04-11 23:08:29 +0300 | [diff] [blame] | 157 | #endif |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 158 | |
Paul Sokolovsky | a5afc90 | 2014-04-12 17:46:54 +0300 | [diff] [blame] | 159 | mp_obj_t module_name = args[0]; |
Paul Sokolovsky | fb7f943 | 2014-02-20 00:29:54 +0200 | [diff] [blame] | 160 | mp_obj_t fromtuple = mp_const_none; |
Paul Sokolovsky | feacaa1 | 2014-02-21 01:15:20 +0200 | [diff] [blame] | 161 | int level = 0; |
Paul Sokolovsky | fb7f943 | 2014-02-20 00:29:54 +0200 | [diff] [blame] | 162 | if (n_args >= 4) { |
| 163 | fromtuple = args[3]; |
Paul Sokolovsky | feacaa1 | 2014-02-21 01:15:20 +0200 | [diff] [blame] | 164 | if (n_args >= 5) { |
| 165 | level = MP_OBJ_SMALL_INT_VALUE(args[4]); |
| 166 | } |
| 167 | } |
| 168 | |
Paul Sokolovsky | a5afc90 | 2014-04-12 17:46:54 +0300 | [diff] [blame] | 169 | uint mod_len; |
| 170 | const char *mod_str = (const char*)mp_obj_str_get_data(module_name, &mod_len); |
| 171 | |
Paul Sokolovsky | feacaa1 | 2014-02-21 01:15:20 +0200 | [diff] [blame] | 172 | if (level != 0) { |
Paul Sokolovsky | a5afc90 | 2014-04-12 17:46:54 +0300 | [diff] [blame] | 173 | // What we want to do here is to take name of current module, |
| 174 | // chop <level> trailing components, and concatenate with passed-in |
| 175 | // module name, thus resolving relative import name into absolue. |
| 176 | // This even appears to be correct per |
| 177 | // http://legacy.python.org/dev/peps/pep-0328/#relative-imports-and-name |
| 178 | // "Relative imports use a module's __name__ attribute to determine that |
| 179 | // module's position in the package hierarchy." |
| 180 | mp_obj_t this_name_q = mp_obj_dict_get(mp_globals_get(), MP_OBJ_NEW_QSTR(MP_QSTR___name__)); |
| 181 | assert(this_name_q != MP_OBJ_NULL); |
| 182 | #if DEBUG_PRINT |
| 183 | printf("Current module: "); |
| 184 | mp_obj_print(this_name_q, PRINT_REPR); |
| 185 | printf("\n"); |
| 186 | #endif |
| 187 | |
| 188 | uint this_name_l; |
| 189 | const char *this_name = (const char*)mp_obj_str_get_data(this_name_q, &this_name_l); |
| 190 | |
| 191 | uint dots_seen = 0; |
| 192 | const char *p = this_name + this_name_l - 1; |
| 193 | while (p > this_name) { |
| 194 | if (*p == '.') { |
| 195 | dots_seen++; |
| 196 | if (--level == 0) { |
| 197 | break; |
| 198 | } |
| 199 | } |
| 200 | p--; |
| 201 | } |
| 202 | |
| 203 | if (dots_seen == 0 && level == 1) { |
| 204 | // http://legacy.python.org/dev/peps/pep-0328/#relative-imports-and-name |
| 205 | // "If the module's name does not contain any package information |
| 206 | // (e.g. it is set to '__main__') then relative imports are |
| 207 | // resolved as if the module were a top level module, regardless |
| 208 | // of where the module is actually located on the file system." |
| 209 | // Supposedly this if catches this condition and resolve it properly |
| 210 | // TODO: But nobody knows for sure. This condition happens when |
| 211 | // package's __init__.py does something like "import .submod". So, |
| 212 | // maybe we should check for package here? But quote above doesn't |
| 213 | // talk about packages, it talks about dot-less module names. |
| 214 | p = this_name + this_name_l; |
| 215 | } else if (level != 0) { |
| 216 | nlr_raise(mp_obj_new_exception_msg(&mp_type_ImportError, "Invalid relative import")); |
| 217 | } |
| 218 | |
| 219 | uint new_mod_l = (mod_len == 0 ? p - this_name : p - this_name + 1 + mod_len); |
| 220 | char *new_mod = alloca(new_mod_l); |
| 221 | memcpy(new_mod, this_name, p - this_name); |
| 222 | if (mod_len != 0) { |
| 223 | new_mod[p - this_name] = '.'; |
| 224 | memcpy(new_mod + (p - this_name) + 1, mod_str, mod_len); |
| 225 | } |
| 226 | |
| 227 | qstr new_mod_q = qstr_from_strn(new_mod, new_mod_l); |
| 228 | DEBUG_printf("Resolved relative name: %s\n", qstr_str(new_mod_q)); |
| 229 | module_name = MP_OBJ_NEW_QSTR(new_mod_q); |
| 230 | mod_str = new_mod; |
| 231 | mod_len = new_mod_l; |
Paul Sokolovsky | fb7f943 | 2014-02-20 00:29:54 +0200 | [diff] [blame] | 232 | } |
| 233 | |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 234 | // check if module already exists |
Paul Sokolovsky | a5afc90 | 2014-04-12 17:46:54 +0300 | [diff] [blame] | 235 | mp_obj_t module_obj = mp_module_get(mp_obj_str_get_qstr(module_name)); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 236 | if (module_obj != MP_OBJ_NULL) { |
Paul Sokolovsky | e081329 | 2014-04-11 23:08:29 +0300 | [diff] [blame] | 237 | DEBUG_printf("Module already loaded\n"); |
Paul Sokolovsky | 91ba7a5 | 2014-02-16 02:53:44 +0200 | [diff] [blame] | 238 | // If it's not a package, return module right away |
| 239 | char *p = strchr(mod_str, '.'); |
| 240 | if (p == NULL) { |
| 241 | return module_obj; |
| 242 | } |
Paul Sokolovsky | fb7f943 | 2014-02-20 00:29:54 +0200 | [diff] [blame] | 243 | // If fromlist is not empty, return leaf module |
| 244 | if (fromtuple != mp_const_none) { |
| 245 | return module_obj; |
| 246 | } |
Paul Sokolovsky | 91ba7a5 | 2014-02-16 02:53:44 +0200 | [diff] [blame] | 247 | // Otherwise, we need to return top-level package |
Paul Sokolovsky | 91ba7a5 | 2014-02-16 02:53:44 +0200 | [diff] [blame] | 248 | qstr pkg_name = qstr_from_strn(mod_str, p - mod_str); |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 249 | return mp_module_get(pkg_name); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 250 | } |
Paul Sokolovsky | e081329 | 2014-04-11 23:08:29 +0300 | [diff] [blame] | 251 | DEBUG_printf("Module not yet loaded\n"); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 252 | |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 253 | uint last = 0; |
Damien George | 354d15a | 2014-02-06 21:11:19 +0000 | [diff] [blame] | 254 | VSTR_FIXED(path, MICROPY_PATH_MAX) |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 255 | module_obj = MP_OBJ_NULL; |
Paul Sokolovsky | 91ba7a5 | 2014-02-16 02:53:44 +0200 | [diff] [blame] | 256 | mp_obj_t top_module_obj = MP_OBJ_NULL; |
| 257 | mp_obj_t outer_module_obj = MP_OBJ_NULL; |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 258 | uint i; |
| 259 | for (i = 1; i <= mod_len; i++) { |
| 260 | if (i == mod_len || mod_str[i] == '.') { |
| 261 | // create a qstr for the module name up to this depth |
| 262 | qstr mod_name = qstr_from_strn(mod_str, i); |
Paul Sokolovsky | e081329 | 2014-04-11 23:08:29 +0300 | [diff] [blame] | 263 | DEBUG_printf("Processing module: %s\n", qstr_str(mod_name)); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 264 | |
| 265 | // find the file corresponding to the module name |
| 266 | mp_import_stat_t stat; |
Damien George | 354d15a | 2014-02-06 21:11:19 +0000 | [diff] [blame] | 267 | if (vstr_len(&path) == 0) { |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 268 | // first module in the dotted-name; search for a directory or file |
Damien George | 354d15a | 2014-02-06 21:11:19 +0000 | [diff] [blame] | 269 | stat = find_file(mod_str, i, &path); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 270 | } else { |
| 271 | // latter module in the dotted-name; append to path |
Damien George | 354d15a | 2014-02-06 21:11:19 +0000 | [diff] [blame] | 272 | vstr_add_char(&path, PATH_SEP_CHAR); |
| 273 | vstr_add_strn(&path, mod_str + last, i - last); |
| 274 | stat = stat_dir_or_file(&path); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 275 | } |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 276 | |
| 277 | // fail if we couldn't find the file |
| 278 | if (stat == MP_IMPORT_STAT_NO_EXIST) { |
Andrew Scheller | f78cfaf | 2014-04-09 19:56:38 +0100 | [diff] [blame] | 279 | nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "No module named '%s'", qstr_str(mod_name))); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 280 | } |
| 281 | |
Damien George | caac542 | 2014-03-25 14:18:18 +0000 | [diff] [blame] | 282 | module_obj = mp_module_get(mod_name); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 283 | if (module_obj == MP_OBJ_NULL) { |
| 284 | // module not already loaded, so load it! |
| 285 | |
| 286 | module_obj = mp_obj_new_module(mod_name); |
| 287 | |
| 288 | if (stat == MP_IMPORT_STAT_DIR) { |
Paul Sokolovsky | e081329 | 2014-04-11 23:08:29 +0300 | [diff] [blame] | 289 | DEBUG_printf("%s is dir\n", vstr_str(&path)); |
Paul Sokolovsky | 2ff3d9d | 2014-04-12 02:44:47 +0300 | [diff] [blame] | 290 | mp_store_attr(module_obj, MP_QSTR___path__, mp_obj_new_str((byte*)vstr_str(&path), vstr_len(&path), false)); |
Damien George | 354d15a | 2014-02-06 21:11:19 +0000 | [diff] [blame] | 291 | vstr_add_char(&path, PATH_SEP_CHAR); |
| 292 | vstr_add_str(&path, "__init__.py"); |
Paul Sokolovsky | d378357 | 2014-02-16 01:51:46 +0200 | [diff] [blame] | 293 | if (mp_import_stat(vstr_str(&path)) != MP_IMPORT_STAT_FILE) { |
Damien George | 280e720 | 2014-03-15 14:33:09 +0000 | [diff] [blame] | 294 | vstr_cut_tail_bytes(&path, sizeof("/__init__.py") - 1); // cut off /__init__.py |
Paul Sokolovsky | a5854d2 | 2014-04-15 01:23:40 +0300 | [diff] [blame^] | 295 | printf("Notice: %s is imported as namespace package\n", vstr_str(&path)); |
| 296 | } else { |
| 297 | do_load(module_obj, &path); |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 298 | } |
Damien George | 280e720 | 2014-03-15 14:33:09 +0000 | [diff] [blame] | 299 | vstr_cut_tail_bytes(&path, sizeof("/__init__.py") - 1); // cut off /__init__.py |
Paul Sokolovsky | 13d52df | 2014-04-11 23:25:35 +0300 | [diff] [blame] | 300 | // https://docs.python.org/3.3/reference/import.html |
| 301 | // "Specifically, any module that contains a __path__ attribute is considered a package." |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 302 | } else { // MP_IMPORT_STAT_FILE |
Damien George | 354d15a | 2014-02-06 21:11:19 +0000 | [diff] [blame] | 303 | do_load(module_obj, &path); |
Paul Sokolovsky | 91ba7a5 | 2014-02-16 02:53:44 +0200 | [diff] [blame] | 304 | // TODO: We cannot just break here, at the very least, we must execute |
| 305 | // trailer code below. But otherwise if there're remaining components, |
| 306 | // that would be (??) object path within module, not modules path within FS. |
| 307 | // break; |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 308 | } |
| 309 | } |
Paul Sokolovsky | 91ba7a5 | 2014-02-16 02:53:44 +0200 | [diff] [blame] | 310 | if (outer_module_obj != MP_OBJ_NULL) { |
| 311 | qstr s = qstr_from_strn(mod_str + last, i - last); |
Damien George | d17926d | 2014-03-30 13:35:08 +0100 | [diff] [blame] | 312 | mp_store_attr(outer_module_obj, s, module_obj); |
Paul Sokolovsky | 91ba7a5 | 2014-02-16 02:53:44 +0200 | [diff] [blame] | 313 | } |
| 314 | outer_module_obj = module_obj; |
| 315 | if (top_module_obj == MP_OBJ_NULL) { |
| 316 | top_module_obj = module_obj; |
| 317 | } |
| 318 | last = i + 1; |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 319 | } |
| 320 | } |
| 321 | |
| 322 | if (i < mod_len) { |
| 323 | // we loaded a package, now need to load objects from within that package |
| 324 | // TODO |
| 325 | assert(0); |
| 326 | } |
| 327 | |
Paul Sokolovsky | fb7f943 | 2014-02-20 00:29:54 +0200 | [diff] [blame] | 328 | // If fromlist is not empty, return leaf module |
| 329 | if (fromtuple != mp_const_none) { |
| 330 | return module_obj; |
| 331 | } |
| 332 | // Otherwise, we need to return top-level package |
Paul Sokolovsky | 91ba7a5 | 2014-02-16 02:53:44 +0200 | [diff] [blame] | 333 | return top_module_obj; |
Damien George | 66028ab | 2014-01-03 14:03:48 +0000 | [diff] [blame] | 334 | } |
Damien George | e09ffa1 | 2014-02-05 23:57:48 +0000 | [diff] [blame] | 335 | |
Paul Sokolovsky | 1d938c9 | 2014-02-04 00:46:17 +0200 | [diff] [blame] | 336 | MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin___import___obj, 1, 5, mp_builtin___import__); |