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

all: cleanup redundant `.ends_with(_test.v)` calls

pull/8438/head
Delyan Angelov 2021-01-30 11:05:59 +02:00
parent 6477748e88
commit 7f5d654c3a
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlib/v/builder/cc.v
View File

@ -545,8 +545,7 @@ fn (mut v Builder) cc() {
builtin_obj_path := v.rebuild_cached_module(vexe, 'vlib/builtin') builtin_obj_path := v.rebuild_cached_module(vexe, 'vlib/builtin')
libs << builtin_obj_path libs << builtin_obj_path
for ast_file in v.parsed_files { for ast_file in v.parsed_files {
is_test := ast_file.path.ends_with('_test.v') || ast_file.path.ends_with('_test.vv') if v.pref.is_test && ast_file.mod.name != 'main' {
if is_test && ast_file.mod.name != 'main' {
imp_path := v.find_module_path(ast_file.mod.name, ast_file.path) or { imp_path := v.find_module_path(ast_file.mod.name, ast_file.path) or {
verror('cannot import module "$ast_file.mod.name" (not found)') verror('cannot import module "$ast_file.mod.name" (not found)')
break break

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

@ -245,7 +245,7 @@ pub fn (v &Builder) get_user_files() []string {
if v.pref.is_prof { if v.pref.is_prof {
user_files << os.join_path(preludes_path, 'profiled_program.v') user_files << os.join_path(preludes_path, 'profiled_program.v')
} }
is_test := dir.ends_with('_test.v') || dir.ends_with('_test.vv') is_test := v.pref.is_test
mut is_internal_module_test := false mut is_internal_module_test := false
if is_test { if is_test {
tcontent := os.read_file(dir) or { tcontent := os.read_file(dir) or {

5
vlib/v/gen/cgen.v
View File

@ -215,8 +215,7 @@ pub fn cgen(files []ast.File, table &table.Table, pref &pref.Preferences) string
} }
// println('\ncgen "$g.file.path" nr_stmts=$file.stmts.len') // println('\ncgen "$g.file.path" nr_stmts=$file.stmts.len')
// building_v := true && (g.file.path.contains('/vlib/') || g.file.path.contains('cmd/v')) // building_v := true && (g.file.path.contains('/vlib/') || g.file.path.contains('cmd/v'))
is_test := g.file.path.ends_with('_test.vv') || g.file.path.ends_with('_test.v') g.is_test = g.pref.is_test
g.is_test = is_test
if g.file.path == '' || !g.pref.autofree { if g.file.path == '' || !g.pref.autofree {
// cgen test or building V // cgen test or building V
// println('autofree=false') // println('autofree=false')
@ -1046,7 +1045,7 @@ fn (mut g Gen) stmt(node ast.Stmt) {
// We are using prebuilt modules, we do not need to generate // We are using prebuilt modules, we do not need to generate
// their functions in main.c. // their functions in main.c.
if node.mod != 'main' && node.mod != 'help' && !should_bundle_module if node.mod != 'main' && node.mod != 'help' && !should_bundle_module
&& !g.file.path.ends_with('_test.v')&& node.generic_params.len == 0 { && !g.pref.is_test&& node.generic_params.len == 0 {
skip = true skip = true
} }
} }

4
vlib/v/gen/js/js.v
View File

@ -82,14 +82,14 @@ pub fn gen(files []ast.File, table &table.Table, pref &pref.Preferences) string
for file in files { for file in files {
g.file = file g.file = file
g.enter_namespace(g.file.mod.name) g.enter_namespace(g.file.mod.name)
g.is_test = g.file.path.ends_with('_test.v') || g.file.path.ends_with('_test.vv') g.is_test = g.pref.is_test
g.find_class_methods(file.stmts) g.find_class_methods(file.stmts)
g.escape_namespace() g.escape_namespace()
} }
for file in files { for file in files {
g.file = file g.file = file
g.enter_namespace(g.file.mod.name) g.enter_namespace(g.file.mod.name)
g.is_test = g.file.path.ends_with('_test.v') || g.file.path.ends_with('_test.vv') g.is_test = g.pref.is_test
// store imports // store imports
mut imports := []string{} mut imports := []string{}
for imp in g.file.imports { for imp in g.file.imports {