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

Revert "modules: fix "is not a directory" error" 

This reverts commit d38940ad57.
pull/1337/head
Alexander Medvednikov 2019-07-28 01:22:15 +02:00
parent d38940ad57
commit dbb64ec149
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/main.v
View File

@ -918,7 +918,8 @@ fn (v mut V) add_user_v_files() {
} }
// Parse lib imports // Parse lib imports
if v.pref.build_mode == .default_mode { if v.pref.build_mode == .default_mode {
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) mod_path := v.module_path(mod)
import_path := '$ModPath/vlib/$mod_path' import_path := '$ModPath/vlib/$mod_path'
vfiles := v.v_files_from_dir(import_path) vfiles := v.v_files_from_dir(import_path)
@ -934,12 +935,14 @@ fn (v mut V) add_user_v_files() {
} }
} }
else { else {
for mod in v.table.imports { // TODO this used to crash compiler?
// 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) mod_path := v.module_path(mod)
idir := os.getwd() idir := os.getwd()
mut import_path := '$idir/$mod_path' mut import_path := '$idir/$mod_path'
//if !os.file_exists(import_path) || !os.is_dir(import_path){ if !os.file_exists(import_path) {
if !os.is_dir(import_path){
import_path = '$v.lang_dir/vlib/$mod_path' import_path = '$v.lang_dir/vlib/$mod_path'
} }
vfiles := v.v_files_from_dir(import_path) vfiles := v.v_files_from_dir(import_path)
@ -977,7 +980,7 @@ fn (v mut V) add_user_v_files() {
if v.pref.build_mode == .default_mode || v.pref.build_mode == .build { if v.pref.build_mode == .default_mode || v.pref.build_mode == .build {
module_path = '$ModPath/vlib/$mod_p' module_path = '$ModPath/vlib/$mod_p'
} }
if !os.is_dir(module_path) { if !os.file_exists(module_path) {
module_path = '$v.lang_dir/vlib/$mod_p' module_path = '$v.lang_dir/vlib/$mod_p'
} }
vfiles := v.v_files_from_dir(module_path) vfiles := v.v_files_from_dir(module_path)
@ -986,6 +989,7 @@ fn (v mut V) add_user_v_files() {
v.files << file v.files << file
} }
} }
// TODO v.files.append_array(vfiles)
} }
// add remaining files (not mods) // add remaining files (not mods)
for fit in file_imports { for fit in file_imports {