From 18e88d2fc8ec27ae8f8ee700c461c8565a1dd9f9 Mon Sep 17 00:00:00 2001 From: Lukas Neubert Date: Sun, 21 Feb 2021 19:17:12 +0100 Subject: [PATCH] test-cleancode: add more of vlib/v (#8882) --- cmd/tools/vtest-cleancode.v | 26 +++++++++++------------ vlib/v/live/common.v | 34 +++++++++++++++--------------- vlib/v/preludes/tests_with_stats.v | 4 ++-- 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/cmd/tools/vtest-cleancode.v b/cmd/tools/vtest-cleancode.v index 71d7fbfaf3..546f4dab1d 100644 --- a/cmd/tools/vtest-cleancode.v +++ b/cmd/tools/vtest-cleancode.v @@ -37,28 +37,26 @@ const ( 'vlib/v/checker/', 'vlib/v/depgraph/', 'vlib/v/doc/', + 'vlib/v/embed_file/', 'vlib/v/errors/', 'vlib/v/eval/', 'vlib/v/fmt/', - 'vlib/v/gen/c/auto_str_methods.v', - 'vlib/v/gen/c/cgen.v', - 'vlib/v/gen/c/cgen_test.v', - 'vlib/v/gen/c/cmain.v', - 'vlib/v/gen/c/comptime.v', - 'vlib/v/gen/c/fn.v', - 'vlib/v/gen/c/json.v', - 'vlib/v/gen/c/live.v', - 'vlib/v/gen/c/profile.v', - 'vlib/v/gen/c/sql.v', - 'vlib/v/gen/c/str.v', - 'vlib/v/gen/x64/elf.v', - 'vlib/v/gen/x64/elf_obj.v', - 'vlib/v/gen/x64/gen.v', + 'vlib/v/gen/c/', + /* 'vlib/v/gen/js/', */ + 'vlib/v/gen/tests/', + 'vlib/v/gen/x64/', + 'vlib/v/live/', + 'vlib/v/markused/', 'vlib/v/parser/', + /* 'vlib/v/pkgconfig/', */ 'vlib/v/pref/', + 'vlib/v/preludes', 'vlib/v/scanner/', 'vlib/v/table/', + /* 'vlib/v/tests/', */ + 'vlib/v/token/', 'vlib/v/util/', + 'vlib/v/vcache/', 'vlib/v/vet/', 'vlib/v/vmod/', 'vlib/cli/', diff --git a/vlib/v/live/common.v b/vlib/v/live/common.v index ff242ef6e7..bab77ab923 100644 --- a/vlib/v/live/common.v +++ b/vlib/v/live/common.v @@ -10,19 +10,19 @@ pub type FNLiveReloadCB = fn (info &LiveReloadInfo) pub struct LiveReloadInfo { pub: - vexe string // full path to the v compiler - vopts string // v compiler options for a live shared library - original string // full path to the original source file, compiled with -live - live_fn_mutex voidptr // the address of the C mutex, that locks the [live] fns during reloads. - live_linkfn FNLinkLiveSymbols // generated C callback; receives a dlopen handle - so_extension string // .so or .dll - so_name_template string // a sprintf template for the shared libraries location + vexe string // full path to the v compiler + vopts string // v compiler options for a live shared library + original string // full path to the original source file, compiled with -live + live_fn_mutex voidptr // the address of the C mutex, that locks the [live] fns during reloads. + live_linkfn FNLinkLiveSymbols // generated C callback; receives a dlopen handle + so_extension string // .so or .dll + so_name_template string // a sprintf template for the shared libraries location pub mut: - live_lib voidptr // the result of dl.open - reloads int // how many times a reloading was tried - reloads_ok int // how many times the reloads succeeded - reload_time_ms int // how much time the last reload took (compilation + loading) - last_mod_ts int // a timestamp for when the original was last changed + live_lib voidptr // the result of dl.open + reloads int // how many times a reloading was tried + reloads_ok int // how many times the reloads succeeded + reload_time_ms int // how much time the last reload took (compilation + loading) + last_mod_ts int // a timestamp for when the original was last changed recheck_period_ms int = 100 // how often do you want to check for changes cb_recheck FNLiveReloadCB = voidptr(0) // executed periodically cb_compile_failed FNLiveReloadCB = voidptr(0) // executed when a reload compilation failed @@ -30,7 +30,7 @@ pub mut: cb_after FNLiveReloadCB = voidptr(0) // executed after a reload try happened, even if failed cb_locked_before FNLiveReloadCB = voidptr(0) // executed before lib reload, in the mutex section cb_locked_after FNLiveReloadCB = voidptr(0) // executed after lib reload, in the mutex section - user_ptr voidptr = voidptr(0) // you can set it to anything, then retrieve it in the cb_ fns + user_ptr voidptr = voidptr(0) // you can set it to anything, then retrieve it in the cb_ fns } // LiveReloadInfo.live_linkfn should be called by the reloader @@ -52,7 +52,7 @@ pub mut: // so that the user can set callbacks, read meta information, etc. pub fn info() &LiveReloadInfo { if C.g_live_info != 0 { - return unsafe {&LiveReloadInfo(C.g_live_info)} + return unsafe { &LiveReloadInfo(C.g_live_info) } } // When the current program is not compiled with -live, simply // return a new empty struct LiveReloadInfo in order to prevent @@ -60,9 +60,9 @@ pub fn info() &LiveReloadInfo { // started, and the structure LiveReloadInfo will not get updated. // All its fields will be 0, but still safe to access. mut x := &LiveReloadInfo{} - unsafe { + unsafe { mut p := &u64(&C.g_live_info) - *p = &u64(x) - } + *p = &u64(x) + } return x } diff --git a/vlib/v/preludes/tests_with_stats.v b/vlib/v/preludes/tests_with_stats.v index 88575db4be..861073e31e 100644 --- a/vlib/v/preludes/tests_with_stats.v +++ b/vlib/v/preludes/tests_with_stats.v @@ -78,8 +78,8 @@ fn (b &BenchedTests) fn_name() string { // Called at the end of the test program produced by `v -stats file_test.v` fn (mut b BenchedTests) end_testing() { b.bench.stop() - println(inner_indent + b.bench.total_message('running V tests in "' + os.file_name(b.test_suit_file) + - '"')) + println(inner_indent + b.bench.total_message('running V tests in "' + + os.file_name(b.test_suit_file) + '"')) } // ///////////////////////////////////////////////////////////////////