comparison core/modulemanager.lua @ 7950:f91e7ec9654e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 06 Mar 2017 01:14:32 +0100
parents 24170d74b00b
children 4f0f5b49bb03
comparison
equal deleted inserted replaced
7946:c92102fe409b 7950:f91e7ec9654e
37 -- We need this to let modules access the real global namespace 37 -- We need this to let modules access the real global namespace
38 local _G = _G; 38 local _G = _G;
39 39
40 local _ENV = nil; 40 local _ENV = nil;
41 41
42 local load_modules_for_host, load, unload, reload, get_module, get_items, get_modules, is_loaded, module_has_method, call_module_method; 42 local load_modules_for_host, load, unload, reload, get_module, get_items;
43 local get_modules, is_loaded, module_has_method, call_module_method;
43 44
44 -- [host] = { [module] = module_env } 45 -- [host] = { [module] = module_env }
45 local modulemap = { ["*"] = {} }; 46 local modulemap = { ["*"] = {} };
46 47
47 -- Load modules when a host is activated 48 -- Load modules when a host is activated