TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py/{builtinimport,frozenmod}: Rework frozen modules support to support packages.

Browse Source 
Now frozen modules is treated just as a kind of VFS, and all operations
performed on it correspond to operations on normal filesystem. This allows
to support packages properly, and potentially also data files.

This change also have changes to rework frozen bytecode modules support to
use the same framework, but it's not finished (and actually may not work,
as older adhox handling of any type of frozen modules is removed).
This commit is contained in:
Paul Sokolovsky
2016-05-21 21:33:42 +03:00
parent b580958216
commit fb742cdc12
3 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
py/frozenmod.c
View File

@@ -43,6 +43,24 @@ extern const char mp_frozen_str_names[];
extern const uint32_t mp_frozen_str_sizes[];
extern const char mp_frozen_str_content[];
mp_import_stat_t mp_frozen_stat(const char *str) {
size_t len = strlen(str);
const char *name = mp_frozen_str_names;
for (int i = 0; *name != 0; i++) {
size_t l = strlen(name);
if (l >= len && !memcmp(str, name, len)) {
if (name[len] == 0) {
return MP_IMPORT_STAT_FILE;
} else if (name[len] == '/') {
return MP_IMPORT_STAT_DIR;
}
}
name += l + 1;
}
return MP_IMPORT_STAT_NO_EXIST;
}
STATIC mp_lexer_t *mp_find_frozen_str(const char *str, size_t len) {
const char *name = mp_frozen_str_names;