mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

compiler: import modules relative to v.mod

Browse Source
This commit is contained in:
Delyan Angelov
2020-03-01 16:49:39 +02:00
committed by GitHub
parent 615a4b3452
commit 1066ec5cd9
17 changed files with 133 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vlib/compiler/modules.v
View File

@@ -182,9 +182,18 @@ fn (v mut V) set_module_lookup_paths() {
}
}
fn (p &Parser) find_module_path(mod string) ?string {
fn (p mut Parser) find_module_path(mod string) ?string {
vmod_file_location := p.v.mod_file_cacher.get( p.file_path_dir )
mut module_lookup_paths := []string
if vmod_file_location.vmod_file.len != 0 {
if ! vmod_file_location.vmod_folder in p.v.module_lookup_paths {
module_lookup_paths << vmod_file_location.vmod_folder
}
}
module_lookup_paths << p.v.module_lookup_paths
mod_path := p.v.module_path(mod)
for lookup_path in p.v.module_lookup_paths {
for lookup_path in module_lookup_paths {
try_path := filepath.join(lookup_path,mod_path)
if p.v.pref.is_verbose {
println(' >> trying to find $mod in $try_path ...')
@@ -196,7 +205,7 @@ fn (p &Parser) find_module_path(mod string) ?string {
return try_path
}
}
return error('module "$mod" not found in ${p.v.module_lookup_paths}')
return error('module "$mod" not found in ${module_lookup_paths}')
}
[inline]