Showing the changes to src/vm/module_resolver.cpp (1 of 31 files). Show all
Unified · Split
| @@ -12,7 +12,12 @@ · 11 unmodified lines | |||
| 12 | #include <exceptions.h> | 12 | #include <exceptions.h> |
| 13 | #include "module_resolver.h" | 13 | #include "module_resolver.h" |
| 14 | 14 | ||
| 15 | using namespace disvm::runtime; | 15 | using disvm::debug::component_trace_t; |
| 16 | using disvm::debug::log_level_t; | ||
| 17 | |||
| 18 | using disvm::runtime::default_resolver_t; | ||
| 19 | using disvm::runtime::vm_module_t; | ||
| 20 | using disvm::runtime::vm_module_resolver_t; | ||
| 16 | 21 | ||
| 17 | // Empty destructor for vm module resolver 'interface' | 22 | // Empty destructor for vm module resolver 'interface' |
| 18 | vm_module_resolver_t::~vm_module_resolver_t() | 23 | vm_module_resolver_t::~vm_module_resolver_t() |
| @@ -34,9 +39,9 @@ bool default_resolver_t::try_resolve_module(const char *path, std::unique_ptr<vm · 15 unmodified lines | |||
| 34 | { | 39 | { |
| 35 | assert(path != nullptr); | 40 | assert(path != nullptr); |
| 36 | 41 | ||
| 37 | auto log = debug::is_component_tracing_enabled<debug::component_trace_t::module>(); | 42 | auto log = disvm::debug::is_component_tracing_enabled<component_trace_t::module>(); |
| 38 | if (log) | 43 | if (log) |
| 39 | debug::log_msg(debug::component_trace_t::module, debug::log_level_t::debug, "resolve: try module path: >>%s<<", path); | 44 | disvm::debug::log_msg(component_trace_t::module, log_level_t::debug, "resolve: try module path: >>%s<<", path); |
| 40 | 45 | ||
| 41 | auto module_file = std::ifstream{ path, std::ifstream::binary }; | 46 | auto module_file = std::ifstream{ path, std::ifstream::binary }; |
| 42 | if (!module_file.is_open()) | 47 | if (!module_file.is_open()) |
| @@ -46,13 +51,13 @@ bool default_resolver_t::try_resolve_module(const char *path, std::unique_ptr<vm · 3 unmodified lines | |||
| 46 | { | 51 | { |
| 47 | p.append(path); | 52 | p.append(path); |
| 48 | if (log) | 53 | if (log) |
| 49 | debug::log_msg(debug::component_trace_t::module, debug::log_level_t::debug, "resolve: try module path: >>%s<<", p.c_str()); | 54 | disvm::debug::log_msg(component_trace_t::module, log_level_t::debug, "resolve: try module path: >>%s<<", p.c_str()); |
| 50 | 55 | ||
| 51 | module_file = std::ifstream{ p, std::ifstream::binary }; | 56 | module_file = std::ifstream{ p, std::ifstream::binary }; |
| 52 | if (module_file.is_open()) | 57 | if (module_file.is_open()) |
| 53 | { | 58 | { |
| 54 | if (log) | 59 | if (log) |
| 55 | debug::log_msg(debug::component_trace_t::module, debug::log_level_t::debug, "resolve: successful modified module path: >>%s<< >>%s<<", path, p.c_str()); | 60 | disvm::debug::log_msg(component_trace_t::module, log_level_t::debug, "resolve: successful modified module path: >>%s<< >>%s<<", path, p.c_str()); |
| 56 | 61 | ||
| 57 | break; | 62 | break; |
| 58 | } | 63 | } |