Remove unneeded semicolons from the core library

This commit is contained in:
gingerBill
2021-08-31 22:21:13 +01:00
parent b176af2742
commit 251da264ed
187 changed files with 27227 additions and 27227 deletions
+28 -28
View File
@@ -14,7 +14,7 @@ import "core:slice"
// The sole exception is if 'skip_dir' is returned as true:
// when 'skip_dir' is invoked on a directory. 'walk' skips directory contents
// when 'skip_dir' is invoked on a non-directory. 'walk' skips the remaining files in the containing directory
Walk_Proc :: #type proc(info: os.File_Info, in_err: os.Errno) -> (err: os.Errno, skip_dir: bool);
Walk_Proc :: #type proc(info: os.File_Info, in_err: os.Errno) -> (err: os.Errno, skip_dir: bool)
// walk walks the file tree rooted at 'root', calling 'walk_proc' for each file or directory in the tree, including 'root'
// All errors that happen visiting files and directories are filtered by walk_proc
@@ -23,16 +23,16 @@ Walk_Proc :: #type proc(info: os.File_Info, in_err: os.Errno) -> (err: os.Errno,
// NOTE: walk does not follow symbolic links
// NOTE: os.File_Info uses the 'context.temp_allocator' to allocate, and will delete when it is done
walk :: proc(root: string, walk_proc: Walk_Proc) -> os.Errno {
info, err := os.lstat(root, context.temp_allocator);
defer os.file_info_delete(info, context.temp_allocator);
info, err := os.lstat(root, context.temp_allocator)
defer os.file_info_delete(info, context.temp_allocator)
skip_dir: bool;
skip_dir: bool
if err != 0 {
err, skip_dir = walk_proc(info, err);
err, skip_dir = walk_proc(info, err)
} else {
err, skip_dir = _walk(info, walk_proc);
err, skip_dir = _walk(info, walk_proc)
}
return 0 if skip_dir else err;
return 0 if skip_dir else err
}
@@ -41,48 +41,48 @@ _walk :: proc(info: os.File_Info, walk_proc: Walk_Proc) -> (err: os.Errno, skip_
if !info.is_dir {
if info.fullpath == "" && info.name == "" {
// ignore empty things
return;
return
}
return walk_proc(info, 0);
return walk_proc(info, 0)
}
fis: []os.File_Info;
err1: os.Errno;
fis, err = read_dir(info.fullpath, context.temp_allocator);
defer os.file_info_slice_delete(fis, context.temp_allocator);
fis: []os.File_Info
err1: os.Errno
fis, err = read_dir(info.fullpath, context.temp_allocator)
defer os.file_info_slice_delete(fis, context.temp_allocator)
err1, skip_dir = walk_proc(info, err);
err1, skip_dir = walk_proc(info, err)
if err != 0 || err1 != 0 || skip_dir {
err = err1;
return;
err = err1
return
}
for fi in fis {
err, skip_dir = _walk(fi, walk_proc);
err, skip_dir = _walk(fi, walk_proc)
if err != 0 || skip_dir {
if !fi.is_dir || !skip_dir {
return;
return
}
}
}
return;
return
}
@(private)
read_dir :: proc(dir_name: string, allocator := context.temp_allocator) -> ([]os.File_Info, os.Errno) {
f, err := os.open(dir_name);
f, err := os.open(dir_name)
if err != 0 {
return nil, err;
return nil, err
}
fis: []os.File_Info;
fis, err = os.read_dir(f, -1, allocator);
os.close(f);
fis: []os.File_Info
fis, err = os.read_dir(f, -1, allocator)
os.close(f)
if err != 0 {
return nil, err;
return nil, err
}
slice.sort_by(fis, proc(a, b: os.File_Info) -> bool {
return a.name < b.name;
});
return fis, 0;
return a.name < b.name
})
return fis, 0
}