2014-05-03 18:27:38 -04:00
|
|
|
/*
|
|
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
|
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
2014-05-13 01:44:45 -04:00
|
|
|
* Copyright (c) 2014 Paul Sokolovsky
|
2014-05-03 18:27:38 -04:00
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2014-01-03 09:03:48 -05:00
|
|
|
#include <stdint.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
2014-05-02 10:47:01 -04:00
|
|
|
#include "mpconfig.h"
|
2014-01-03 09:03:48 -05:00
|
|
|
#include "nlr.h"
|
|
|
|
#include "misc.h"
|
2014-01-21 16:40:13 -05:00
|
|
|
#include "qstr.h"
|
2014-01-03 09:03:48 -05:00
|
|
|
#include "lexer.h"
|
|
|
|
#include "lexerunix.h"
|
|
|
|
#include "parse.h"
|
|
|
|
#include "obj.h"
|
2014-03-25 10:18:18 -04:00
|
|
|
#include "objmodule.h"
|
2014-02-15 11:10:44 -05:00
|
|
|
#include "parsehelper.h"
|
2014-01-03 09:22:03 -05:00
|
|
|
#include "compile.h"
|
2014-01-03 09:03:48 -05:00
|
|
|
#include "runtime0.h"
|
|
|
|
#include "runtime.h"
|
|
|
|
#include "builtin.h"
|
|
|
|
|
2014-04-11 16:08:29 -04:00
|
|
|
#if 0 // print debugging info
|
|
|
|
#define DEBUG_PRINT (1)
|
|
|
|
#define DEBUG_printf DEBUG_printf
|
|
|
|
#else // don't print debugging info
|
|
|
|
#define DEBUG_printf(...) (void)0
|
|
|
|
#endif
|
|
|
|
|
2014-02-05 18:57:48 -05:00
|
|
|
#define PATH_SEP_CHAR '/'
|
|
|
|
|
2014-06-11 14:55:46 -04:00
|
|
|
STATIC mp_import_stat_t stat_dir_or_file(vstr_t *path) {
|
2014-02-05 18:57:48 -05:00
|
|
|
//printf("stat %s\n", vstr_str(path));
|
|
|
|
mp_import_stat_t stat = mp_import_stat(vstr_str(path));
|
|
|
|
if (stat == MP_IMPORT_STAT_DIR) {
|
|
|
|
return stat;
|
2014-01-03 09:03:48 -05:00
|
|
|
}
|
2014-02-05 18:57:48 -05:00
|
|
|
vstr_add_str(path, ".py");
|
|
|
|
stat = mp_import_stat(vstr_str(path));
|
|
|
|
if (stat == MP_IMPORT_STAT_FILE) {
|
|
|
|
return stat;
|
2014-01-19 17:03:34 -05:00
|
|
|
}
|
2014-02-05 18:57:48 -05:00
|
|
|
return MP_IMPORT_STAT_NO_EXIST;
|
|
|
|
}
|
2014-01-19 17:03:34 -05:00
|
|
|
|
2014-06-11 14:55:46 -04:00
|
|
|
STATIC mp_import_stat_t find_file(const char *file_str, uint file_len, vstr_t *dest) {
|
2014-02-05 18:57:48 -05:00
|
|
|
// extract the list of paths
|
2014-08-30 09:04:14 -04:00
|
|
|
mp_uint_t path_num = 0;
|
2014-02-04 17:47:06 -05:00
|
|
|
mp_obj_t *path_items;
|
2014-05-24 18:03:12 -04:00
|
|
|
#if MICROPY_PY_SYS
|
2014-04-12 23:43:18 -04:00
|
|
|
mp_obj_list_get(mp_sys_path, &path_num, &path_items);
|
2014-04-13 08:05:16 -04:00
|
|
|
#endif
|
2014-02-04 17:47:06 -05:00
|
|
|
|
|
|
|
if (path_num == 0) {
|
2014-03-30 08:35:08 -04:00
|
|
|
// mp_sys_path is empty, so just use the given file name
|
2014-02-05 18:57:48 -05:00
|
|
|
vstr_add_strn(dest, file_str, file_len);
|
|
|
|
return stat_dir_or_file(dest);
|
2014-02-04 17:47:06 -05:00
|
|
|
} else {
|
2014-02-05 18:57:48 -05:00
|
|
|
// go through each path looking for a directory or file
|
2014-10-03 13:44:14 -04:00
|
|
|
for (mp_uint_t i = 0; i < path_num; i++) {
|
2014-02-05 18:57:48 -05:00
|
|
|
vstr_reset(dest);
|
2014-08-30 09:19:41 -04:00
|
|
|
mp_uint_t p_len;
|
2014-02-08 13:17:23 -05:00
|
|
|
const char *p = mp_obj_str_get_data(path_items[i], &p_len);
|
2014-02-04 17:47:06 -05:00
|
|
|
if (p_len > 0) {
|
2014-02-08 13:17:23 -05:00
|
|
|
vstr_add_strn(dest, p, p_len);
|
2014-02-05 18:57:48 -05:00
|
|
|
vstr_add_char(dest, PATH_SEP_CHAR);
|
2014-02-04 17:47:06 -05:00
|
|
|
}
|
2014-02-05 18:57:48 -05:00
|
|
|
vstr_add_strn(dest, file_str, file_len);
|
|
|
|
mp_import_stat_t stat = stat_dir_or_file(dest);
|
|
|
|
if (stat != MP_IMPORT_STAT_NO_EXIST) {
|
|
|
|
return stat;
|
2014-02-04 17:47:06 -05:00
|
|
|
}
|
|
|
|
}
|
2014-02-05 18:57:48 -05:00
|
|
|
|
|
|
|
// could not find a directory or file
|
|
|
|
return MP_IMPORT_STAT_NO_EXIST;
|
2014-02-04 17:47:06 -05:00
|
|
|
}
|
2014-02-05 18:57:48 -05:00
|
|
|
}
|
|
|
|
|
2014-06-11 14:55:46 -04:00
|
|
|
STATIC void do_load(mp_obj_t module_obj, vstr_t *file) {
|
2014-02-05 18:57:48 -05:00
|
|
|
// create the lexer
|
|
|
|
mp_lexer_t *lex = mp_lexer_new_from_file(vstr_str(file));
|
2014-02-04 17:47:06 -05:00
|
|
|
|
2014-01-03 09:03:48 -05:00
|
|
|
if (lex == NULL) {
|
2014-02-05 18:57:48 -05:00
|
|
|
// we verified the file exists using stat, but lexer could still fail
|
2014-04-09 14:56:38 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "No module named '%s'", vstr_str(file)));
|
2014-01-03 09:03:48 -05:00
|
|
|
}
|
|
|
|
|
2014-02-05 18:57:48 -05:00
|
|
|
qstr source_name = mp_lexer_source_name(lex);
|
2014-01-03 09:03:48 -05:00
|
|
|
|
|
|
|
// save the old context
|
2014-04-05 17:36:42 -04:00
|
|
|
mp_obj_dict_t *old_locals = mp_locals_get();
|
|
|
|
mp_obj_dict_t *old_globals = mp_globals_get();
|
2014-01-03 09:03:48 -05:00
|
|
|
|
|
|
|
// set the new context
|
2014-04-05 17:36:42 -04:00
|
|
|
mp_locals_set(mp_obj_module_get_globals(module_obj));
|
|
|
|
mp_globals_set(mp_obj_module_get_globals(module_obj));
|
2014-07-25 04:00:15 -04:00
|
|
|
#if MICROPY_PY___FILE__
|
|
|
|
mp_store_attr(module_obj, MP_QSTR___file__, mp_obj_new_str(vstr_str(file), vstr_len(file), false));
|
|
|
|
#endif
|
2014-01-03 09:03:48 -05:00
|
|
|
|
|
|
|
// parse the imported script
|
2014-02-15 11:10:44 -05:00
|
|
|
mp_parse_error_kind_t parse_error_kind;
|
|
|
|
mp_parse_node_t pn = mp_parse(lex, MP_PARSE_FILE_INPUT, &parse_error_kind);
|
2014-01-03 09:03:48 -05:00
|
|
|
|
|
|
|
if (pn == MP_PARSE_NODE_NULL) {
|
2014-01-15 16:23:31 -05:00
|
|
|
// parse error; clean up and raise exception
|
2014-04-13 06:56:02 -04:00
|
|
|
mp_obj_t exc = mp_parse_make_exception(lex, parse_error_kind);
|
|
|
|
mp_lexer_free(lex);
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_locals_set(old_locals);
|
|
|
|
mp_globals_set(old_globals);
|
2014-04-13 06:56:02 -04:00
|
|
|
nlr_raise(exc);
|
2014-01-03 09:03:48 -05:00
|
|
|
}
|
|
|
|
|
2014-04-13 06:56:02 -04:00
|
|
|
mp_lexer_free(lex);
|
|
|
|
|
2014-01-15 16:23:31 -05:00
|
|
|
// compile the imported script
|
2014-04-06 06:48:15 -04:00
|
|
|
mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, false);
|
2014-01-04 10:57:35 -05:00
|
|
|
|
|
|
|
if (module_fun == mp_const_none) {
|
2014-01-03 09:03:48 -05:00
|
|
|
// TODO handle compile error correctly
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_locals_set(old_locals);
|
|
|
|
mp_globals_set(old_globals);
|
2014-04-21 19:53:20 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_SyntaxError, "Syntax error in imported module"));
|
2014-01-03 09:03:48 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// complied successfully, execute it
|
|
|
|
nlr_buf_t nlr;
|
|
|
|
if (nlr_push(&nlr) == 0) {
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_call_function_0(module_fun);
|
2014-01-03 09:03:48 -05:00
|
|
|
nlr_pop();
|
|
|
|
} else {
|
|
|
|
// exception; restore context and re-raise same exception
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_locals_set(old_locals);
|
|
|
|
mp_globals_set(old_globals);
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(nlr.ret_val);
|
2014-01-03 09:03:48 -05:00
|
|
|
}
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_locals_set(old_locals);
|
|
|
|
mp_globals_set(old_globals);
|
2014-02-05 18:57:48 -05:00
|
|
|
}
|
|
|
|
|
2014-08-30 09:59:21 -04:00
|
|
|
mp_obj_t mp_builtin___import__(mp_uint_t n_args, mp_obj_t *args) {
|
2014-04-11 16:08:29 -04:00
|
|
|
#if DEBUG_PRINT
|
2014-09-23 05:59:05 -04:00
|
|
|
DEBUG_printf("__import__:\n");
|
2014-10-03 13:44:14 -04:00
|
|
|
for (mp_uint_t i = 0; i < n_args; i++) {
|
2014-09-23 05:59:05 -04:00
|
|
|
DEBUG_printf(" ");
|
2014-02-19 17:29:54 -05:00
|
|
|
mp_obj_print(args[i], PRINT_REPR);
|
2014-09-23 05:59:05 -04:00
|
|
|
DEBUG_printf("\n");
|
2014-02-05 18:57:48 -05:00
|
|
|
}
|
2014-04-11 16:08:29 -04:00
|
|
|
#endif
|
2014-02-05 18:57:48 -05:00
|
|
|
|
2014-04-12 10:46:54 -04:00
|
|
|
mp_obj_t module_name = args[0];
|
2014-02-19 17:29:54 -05:00
|
|
|
mp_obj_t fromtuple = mp_const_none;
|
2014-10-03 13:44:14 -04:00
|
|
|
mp_int_t level = 0;
|
2014-02-19 17:29:54 -05:00
|
|
|
if (n_args >= 4) {
|
|
|
|
fromtuple = args[3];
|
2014-02-20 18:15:20 -05:00
|
|
|
if (n_args >= 5) {
|
|
|
|
level = MP_OBJ_SMALL_INT_VALUE(args[4]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-30 09:19:41 -04:00
|
|
|
mp_uint_t mod_len;
|
|
|
|
const char *mod_str = mp_obj_str_get_data(module_name, &mod_len);
|
2014-04-12 10:46:54 -04:00
|
|
|
|
2014-02-20 18:15:20 -05:00
|
|
|
if (level != 0) {
|
2014-04-12 10:46:54 -04:00
|
|
|
// What we want to do here is to take name of current module,
|
|
|
|
// chop <level> trailing components, and concatenate with passed-in
|
|
|
|
// module name, thus resolving relative import name into absolue.
|
|
|
|
// This even appears to be correct per
|
|
|
|
// http://legacy.python.org/dev/peps/pep-0328/#relative-imports-and-name
|
|
|
|
// "Relative imports use a module's __name__ attribute to determine that
|
|
|
|
// module's position in the package hierarchy."
|
|
|
|
mp_obj_t this_name_q = mp_obj_dict_get(mp_globals_get(), MP_OBJ_NEW_QSTR(MP_QSTR___name__));
|
|
|
|
assert(this_name_q != MP_OBJ_NULL);
|
|
|
|
#if DEBUG_PRINT
|
2014-09-23 05:59:05 -04:00
|
|
|
DEBUG_printf("Current module: ");
|
2014-04-12 10:46:54 -04:00
|
|
|
mp_obj_print(this_name_q, PRINT_REPR);
|
2014-09-23 05:59:05 -04:00
|
|
|
DEBUG_printf("\n");
|
2014-04-12 10:46:54 -04:00
|
|
|
#endif
|
2014-02-19 17:29:54 -05:00
|
|
|
|
2014-08-30 09:19:41 -04:00
|
|
|
mp_uint_t this_name_l;
|
|
|
|
const char *this_name = mp_obj_str_get_data(this_name_q, &this_name_l);
|
2014-04-12 10:46:54 -04:00
|
|
|
|
|
|
|
uint dots_seen = 0;
|
|
|
|
const char *p = this_name + this_name_l - 1;
|
|
|
|
while (p > this_name) {
|
|
|
|
if (*p == '.') {
|
|
|
|
dots_seen++;
|
|
|
|
if (--level == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
p--;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dots_seen == 0 && level == 1) {
|
|
|
|
// http://legacy.python.org/dev/peps/pep-0328/#relative-imports-and-name
|
|
|
|
// "If the module's name does not contain any package information
|
|
|
|
// (e.g. it is set to '__main__') then relative imports are
|
|
|
|
// resolved as if the module were a top level module, regardless
|
|
|
|
// of where the module is actually located on the file system."
|
|
|
|
// Supposedly this if catches this condition and resolve it properly
|
|
|
|
// TODO: But nobody knows for sure. This condition happens when
|
|
|
|
// package's __init__.py does something like "import .submod". So,
|
|
|
|
// maybe we should check for package here? But quote above doesn't
|
|
|
|
// talk about packages, it talks about dot-less module names.
|
|
|
|
p = this_name + this_name_l;
|
|
|
|
} else if (level != 0) {
|
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ImportError, "Invalid relative import"));
|
|
|
|
}
|
|
|
|
|
|
|
|
uint new_mod_l = (mod_len == 0 ? p - this_name : p - this_name + 1 + mod_len);
|
|
|
|
char *new_mod = alloca(new_mod_l);
|
|
|
|
memcpy(new_mod, this_name, p - this_name);
|
|
|
|
if (mod_len != 0) {
|
|
|
|
new_mod[p - this_name] = '.';
|
|
|
|
memcpy(new_mod + (p - this_name) + 1, mod_str, mod_len);
|
|
|
|
}
|
|
|
|
|
|
|
|
qstr new_mod_q = qstr_from_strn(new_mod, new_mod_l);
|
|
|
|
DEBUG_printf("Resolved relative name: %s\n", qstr_str(new_mod_q));
|
|
|
|
module_name = MP_OBJ_NEW_QSTR(new_mod_q);
|
|
|
|
mod_str = new_mod;
|
|
|
|
mod_len = new_mod_l;
|
|
|
|
}
|
2014-02-15 19:53:44 -05:00
|
|
|
|
2014-02-05 18:57:48 -05:00
|
|
|
// check if module already exists
|
2014-04-12 10:46:54 -04:00
|
|
|
mp_obj_t module_obj = mp_module_get(mp_obj_str_get_qstr(module_name));
|
2014-02-05 18:57:48 -05:00
|
|
|
if (module_obj != MP_OBJ_NULL) {
|
2014-04-11 16:08:29 -04:00
|
|
|
DEBUG_printf("Module already loaded\n");
|
2014-02-15 19:53:44 -05:00
|
|
|
// If it's not a package, return module right away
|
|
|
|
char *p = strchr(mod_str, '.');
|
|
|
|
if (p == NULL) {
|
|
|
|
return module_obj;
|
|
|
|
}
|
2014-02-19 17:29:54 -05:00
|
|
|
// If fromlist is not empty, return leaf module
|
|
|
|
if (fromtuple != mp_const_none) {
|
|
|
|
return module_obj;
|
|
|
|
}
|
2014-02-15 19:53:44 -05:00
|
|
|
// Otherwise, we need to return top-level package
|
|
|
|
qstr pkg_name = qstr_from_strn(mod_str, p - mod_str);
|
2014-03-25 10:18:18 -04:00
|
|
|
return mp_module_get(pkg_name);
|
2014-02-05 18:57:48 -05:00
|
|
|
}
|
2014-04-11 16:08:29 -04:00
|
|
|
DEBUG_printf("Module not yet loaded\n");
|
2014-02-05 18:57:48 -05:00
|
|
|
|
|
|
|
uint last = 0;
|
2014-05-21 15:32:59 -04:00
|
|
|
VSTR_FIXED(path, MICROPY_ALLOC_PATH_MAX)
|
2014-02-05 18:57:48 -05:00
|
|
|
module_obj = MP_OBJ_NULL;
|
2014-02-15 19:53:44 -05:00
|
|
|
mp_obj_t top_module_obj = MP_OBJ_NULL;
|
|
|
|
mp_obj_t outer_module_obj = MP_OBJ_NULL;
|
2014-02-05 18:57:48 -05:00
|
|
|
uint i;
|
|
|
|
for (i = 1; i <= mod_len; i++) {
|
|
|
|
if (i == mod_len || mod_str[i] == '.') {
|
|
|
|
// create a qstr for the module name up to this depth
|
|
|
|
qstr mod_name = qstr_from_strn(mod_str, i);
|
2014-04-11 16:08:29 -04:00
|
|
|
DEBUG_printf("Processing module: %s\n", qstr_str(mod_name));
|
2014-05-10 12:00:03 -04:00
|
|
|
DEBUG_printf("Previous path: %s\n", vstr_str(&path));
|
2014-02-05 18:57:48 -05:00
|
|
|
|
|
|
|
// find the file corresponding to the module name
|
|
|
|
mp_import_stat_t stat;
|
2014-02-06 16:11:19 -05:00
|
|
|
if (vstr_len(&path) == 0) {
|
2014-02-05 18:57:48 -05:00
|
|
|
// first module in the dotted-name; search for a directory or file
|
2014-02-06 16:11:19 -05:00
|
|
|
stat = find_file(mod_str, i, &path);
|
2014-02-05 18:57:48 -05:00
|
|
|
} else {
|
|
|
|
// latter module in the dotted-name; append to path
|
2014-02-06 16:11:19 -05:00
|
|
|
vstr_add_char(&path, PATH_SEP_CHAR);
|
|
|
|
vstr_add_strn(&path, mod_str + last, i - last);
|
|
|
|
stat = stat_dir_or_file(&path);
|
2014-02-05 18:57:48 -05:00
|
|
|
}
|
2014-05-10 12:00:03 -04:00
|
|
|
DEBUG_printf("Current path: %s\n", vstr_str(&path));
|
2014-02-05 18:57:48 -05:00
|
|
|
|
|
|
|
// fail if we couldn't find the file
|
|
|
|
if (stat == MP_IMPORT_STAT_NO_EXIST) {
|
2014-04-09 14:56:38 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ImportError, "No module named '%s'", qstr_str(mod_name)));
|
2014-02-05 18:57:48 -05:00
|
|
|
}
|
|
|
|
|
2014-03-25 10:18:18 -04:00
|
|
|
module_obj = mp_module_get(mod_name);
|
2014-02-05 18:57:48 -05:00
|
|
|
if (module_obj == MP_OBJ_NULL) {
|
|
|
|
// module not already loaded, so load it!
|
|
|
|
|
|
|
|
module_obj = mp_obj_new_module(mod_name);
|
|
|
|
|
|
|
|
if (stat == MP_IMPORT_STAT_DIR) {
|
2014-04-11 16:08:29 -04:00
|
|
|
DEBUG_printf("%s is dir\n", vstr_str(&path));
|
2014-06-05 13:51:03 -04:00
|
|
|
// https://docs.python.org/3/reference/import.html
|
2014-05-10 11:46:02 -04:00
|
|
|
// "Specifically, any module that contains a __path__ attribute is considered a package."
|
2014-05-25 17:27:57 -04:00
|
|
|
mp_store_attr(module_obj, MP_QSTR___path__, mp_obj_new_str(vstr_str(&path), vstr_len(&path), false));
|
2014-02-06 16:11:19 -05:00
|
|
|
vstr_add_char(&path, PATH_SEP_CHAR);
|
|
|
|
vstr_add_str(&path, "__init__.py");
|
2014-02-15 18:51:46 -05:00
|
|
|
if (mp_import_stat(vstr_str(&path)) != MP_IMPORT_STAT_FILE) {
|
2014-03-15 10:33:09 -04:00
|
|
|
vstr_cut_tail_bytes(&path, sizeof("/__init__.py") - 1); // cut off /__init__.py
|
2014-04-14 18:23:40 -04:00
|
|
|
printf("Notice: %s is imported as namespace package\n", vstr_str(&path));
|
|
|
|
} else {
|
|
|
|
do_load(module_obj, &path);
|
2014-05-10 12:00:03 -04:00
|
|
|
vstr_cut_tail_bytes(&path, sizeof("/__init__.py") - 1); // cut off /__init__.py
|
2014-02-05 18:57:48 -05:00
|
|
|
}
|
|
|
|
} else { // MP_IMPORT_STAT_FILE
|
2014-02-06 16:11:19 -05:00
|
|
|
do_load(module_obj, &path);
|
2014-02-15 19:53:44 -05:00
|
|
|
// TODO: We cannot just break here, at the very least, we must execute
|
|
|
|
// trailer code below. But otherwise if there're remaining components,
|
|
|
|
// that would be (??) object path within module, not modules path within FS.
|
|
|
|
// break;
|
2014-02-05 18:57:48 -05:00
|
|
|
}
|
|
|
|
}
|
2014-02-15 19:53:44 -05:00
|
|
|
if (outer_module_obj != MP_OBJ_NULL) {
|
|
|
|
qstr s = qstr_from_strn(mod_str + last, i - last);
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_store_attr(outer_module_obj, s, module_obj);
|
2014-02-15 19:53:44 -05:00
|
|
|
}
|
|
|
|
outer_module_obj = module_obj;
|
|
|
|
if (top_module_obj == MP_OBJ_NULL) {
|
|
|
|
top_module_obj = module_obj;
|
|
|
|
}
|
|
|
|
last = i + 1;
|
2014-02-05 18:57:48 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i < mod_len) {
|
|
|
|
// we loaded a package, now need to load objects from within that package
|
|
|
|
// TODO
|
|
|
|
assert(0);
|
|
|
|
}
|
|
|
|
|
2014-02-19 17:29:54 -05:00
|
|
|
// If fromlist is not empty, return leaf module
|
|
|
|
if (fromtuple != mp_const_none) {
|
|
|
|
return module_obj;
|
|
|
|
}
|
|
|
|
// Otherwise, we need to return top-level package
|
2014-02-15 19:53:44 -05:00
|
|
|
return top_module_obj;
|
2014-01-03 09:03:48 -05:00
|
|
|
}
|
2014-02-03 17:46:17 -05:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin___import___obj, 1, 5, mp_builtin___import__);
|