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

builder: handle bad extensions and support .vv

pull/6219/head
Alexander Medvednikov 2020-08-25 13:32:22 +02:00
parent 818db91a9e
commit 33b4ff75d0
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vlib/v/builder/compile.v
View File

@ -33,8 +33,8 @@ pub fn compile(command string, pref &pref.Preferences) {
mut output_folder := odir mut output_folder := odir
if odir.len == pref.out_name.len { if odir.len == pref.out_name.len {
output_folder = os.getwd() output_folder = os.getwd()
} }
os.is_writable_folder(output_folder) or { os.is_writable_folder(output_folder) or {
// An early error here, is better than an unclear C error later: // An early error here, is better than an unclear C error later:
verror(err) verror(err)
exit(1) exit(1)
@ -266,19 +266,24 @@ pub fn (v &Builder) get_user_files() []string {
dir = os.base_dir(single_test_v_file) dir = os.base_dir(single_test_v_file)
} }
is_real_file := os.exists(dir) && !os.is_dir(dir) is_real_file := os.exists(dir) && !os.is_dir(dir)
if is_real_file && (dir.ends_with('.v') || dir.ends_with('.vsh')) { if is_real_file && (dir.ends_with('.v') || dir.ends_with('.vsh') || dir.ends_with('.vv')) {
single_v_file := dir single_v_file := dir
// Just compile one file and get parent dir // Just compile one file and get parent dir
user_files << single_v_file user_files << single_v_file
if v.pref.is_verbose { if v.pref.is_verbose {
v.log('> just compile one file: "$single_v_file"') v.log('> just compile one file: "$single_v_file"')
} }
} else { } else if os.is_dir(dir) {
if v.pref.is_verbose { if v.pref.is_verbose {
v.log('> add all .v files from directory "$dir" ...') v.log('> add all .v files from directory "$dir" ...')
} }
// Add .v files from the directory being compiled // Add .v files from the directory being compiled
user_files << v.v_files_from_dir(dir) user_files << v.v_files_from_dir(dir)
} else {
println('usage: `v file.v` or `v directory`')
ext := os.file_ext(dir)
println('unknown file extension `$ext`')
exit(1)
} }
if user_files.len == 0 { if user_files.len == 0 {
println('No input .v files') println('No input .v files')

1
vlib/v/tests/interface_test.v
View File

@ -251,6 +251,7 @@ fn new_animal2() Animal {
} }
/* /*
// TODO
fn animal_match(a Animal) { fn animal_match(a Animal) {
match a { match a {
Dog { println('(dog)') } Dog { println('(dog)') }