vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

pull/1347/head
Joe Conigliaro 2019-07-28 11:25:33 +10:00 committed by Alexander Medvednikov
parent dbb64ec149
commit 2a30564ed1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/main.v
View File

@ -918,6 +918,8 @@ fn (v mut V) add_user_v_files() {
}
// Parse lib imports
if v.pref.build_mode == .default_mode {
// strange ( for mod in v.table.imports ) dosent loop all items
// for mod in v.table.imports {
for i := 0; i < v.table.imports.len; i++ {
mod := v.table.imports[i]
mod_path := v.module_path(mod)
@ -935,14 +937,15 @@ fn (v mut V) add_user_v_files() {
}
}
else {
// TODO this used to crash compiler?
// strange ( for mod in v.table.imports ) dosent loop all items
// for mod in v.table.imports {
for i := 0; i < v.table.imports.len; i++ {
mod := v.table.imports[i]
mod_path := v.module_path(mod)
idir := os.getwd()
mut import_path := '$idir/$mod_path'
if !os.file_exists(import_path) {
//if !os.file_exists(import_path) || !os.is_dir(import_path){
if !os.is_dir(import_path){
import_path = '$v.lang_dir/vlib/$mod_path'
}
vfiles := v.v_files_from_dir(import_path)
@ -980,7 +983,7 @@ fn (v mut V) add_user_v_files() {
if v.pref.build_mode == .default_mode || v.pref.build_mode == .build {
module_path = '$ModPath/vlib/$mod_p'
}
if !os.file_exists(module_path) {
if !os.is_dir(module_path) {
module_path = '$v.lang_dir/vlib/$mod_p'
}
vfiles := v.v_files_from_dir(module_path)
@ -989,7 +992,6 @@ fn (v mut V) add_user_v_files() {
v.files << file
}
}
// TODO v.files.append_array(vfiles)
}
// add remaining files (not mods)
for fit in file_imports {