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

checker: fix looking for unprefixed os functions (#9968)

Browse Source
This commit is contained in:
Enzo 2021-05-02 20:46:12 +02:00 committed by GitHub
parent 53ae9dda4b
commit fb7ddcd4c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vlib/os/os_test.v
View File

@ -229,31 +229,31 @@ fn test_mv() {
os.mv(tfile1, tdir1) or { panic(err) }
mut expected := os.join_path(tdir1, 'file')
assert os.exists(expected)
assert !is_dir(expected)
assert !os.is_dir(expected)
// Move dir with contents to other dir
os.mv(tdir1, tdir2) or { panic(err) }
expected = os.join_path(tdir2, 'dir')
assert os.exists(expected)
assert is_dir(expected)
assert os.is_dir(expected)
expected = os.join_path(tdir2, 'dir', 'file')
assert os.exists(expected)
assert !is_dir(expected)
assert !os.is_dir(expected)
// Move dir with contents to other dir (by renaming)
os.mv(os.join_path(tdir2, 'dir'), tdir3) or { panic(err) }
expected = tdir3
assert os.exists(expected)
assert is_dir(expected)
assert os.is_dir(expected)
assert os.is_dir_empty(tdir2)
// Move file with extension to dir
os.mv(tfile2, tdir2) or { panic(err) }
expected = os.join_path(tdir2, 'file.test')
assert os.exists(expected)
assert !is_dir(expected)
assert !os.is_dir(expected)
// Move file to dir (by renaming)
os.mv(os.join_path(tdir2, 'file.test'), tfile3) or { panic(err) }
expected = tfile3
assert os.exists(expected)
assert !is_dir(expected)
assert !os.is_dir(expected)
}
fn test_cp_all() {
@ -520,8 +520,8 @@ fn test_posix_set_bit() {
assert true
} $else {
fpath := '/tmp/permtest'
create(fpath) or { panic("Couldn't create file") }
chmod(fpath, 0o7777)
os.create(fpath) or { panic("Couldn't create file") }
os.chmod(fpath, 0o7777)
c_fpath := &char(fpath.str)
mut s := C.stat{}
unsafe {
@ -531,37 +531,37 @@ fn test_posix_set_bit() {
mut mode := u32(s.st_mode) & 0o7777
assert mode == 0o7777
// `chmod u-r`
posix_set_permission_bit(fpath, os.s_irusr, false)
os.posix_set_permission_bit(fpath, os.s_irusr, false)
unsafe {
C.stat(c_fpath, &s)
}
mode = u32(s.st_mode) & 0o7777
assert mode == 0o7377
// `chmod u+r`
posix_set_permission_bit(fpath, os.s_irusr, true)
os.posix_set_permission_bit(fpath, os.s_irusr, true)
unsafe {
C.stat(c_fpath, &s)
}
mode = u32(s.st_mode) & 0o7777
assert mode == 0o7777
// `chmod -s -g -t`
posix_set_permission_bit(fpath, os.s_isuid, false)
posix_set_permission_bit(fpath, os.s_isgid, false)
posix_set_permission_bit(fpath, os.s_isvtx, false)
os.posix_set_permission_bit(fpath, os.s_isuid, false)
os.posix_set_permission_bit(fpath, os.s_isgid, false)
os.posix_set_permission_bit(fpath, os.s_isvtx, false)
unsafe {
C.stat(c_fpath, &s)
}
mode = u32(s.st_mode) & 0o7777
assert mode == 0o0777
// `chmod g-w o-w`
posix_set_permission_bit(fpath, os.s_iwgrp, false)
posix_set_permission_bit(fpath, os.s_iwoth, false)
os.posix_set_permission_bit(fpath, os.s_iwgrp, false)
os.posix_set_permission_bit(fpath, os.s_iwoth, false)
unsafe {
C.stat(c_fpath, &s)
}
mode = u32(s.st_mode) & 0o7777
assert mode == 0o0755
rm(fpath) or {}
os.rm(fpath) or {}
}
}

2
vlib/v/checker/checker.v
View File

@ -2223,7 +2223,7 @@ pub fn (mut c Checker) fn_call(mut call_expr ast.CallExpr) ast.Type {
return ast.void_type
}
}
if !found && c.pref.is_script && !found {
if !found && c.pref.is_vsh {
os_name := 'os.$fn_name'
if f := c.table.find_fn(os_name) {
if f.generic_names.len == call_expr.concrete_types.len {

18
vlib/v/checker/tests/os_prefix.out Normal file
View File

@ -0,0 +1,18 @@
vlib/v/checker/tests/os_prefix.vv:1:8: warning: module 'os' is imported but never used
1 | import os
| ~~
2 |
3 | fn main() {
vlib/v/checker/tests/os_prefix.vv:5:12: error: unknown function: execute
3 | fn main() {
4 | cmd := "ls"
5 | result := execute(cmd)
| ~~~~~~~~~~~~
6 | println(result)
7 | }
vlib/v/checker/tests/os_prefix.vv:6:2: error: `println` can not print void expressions
4 | cmd := "ls"
5 | result := execute(cmd)
6 | println(result)
| ~~~~~~~~~~~~~~~
7 | }

7
vlib/v/checker/tests/os_prefix.vv Normal file
View File

@ -0,0 +1,7 @@
import os
fn main() {
cmd := "ls"
result := execute(cmd)
println(result)
}