v: prepare for making -W impure-v the default (#19940)

vlang · Nov 20, 2023 · 0da00cc · 0da00cc
1 parent 6cc51f2
commit 0da00cc
Show file tree

Hide file tree

Showing 47 changed files with 33 additions and 24 deletions.
diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml
@@ -203,8 +203,8 @@ jobs:
         run: ./v -autofree -o tetris examples/tetris/tetris.v
       - name: Build blog tutorial with -autofree
         run: ./v -autofree -o blog tutorials/building_a_simple_web_blog_with_vweb/code/blog
-      - name: Build option_test.v with -autofree
-        run: ./v -autofree vlib/v/tests/option_test.v
+      - name: Build option_test.c.v with -autofree
+        run: ./v -autofree vlib/v/tests/option_test.c.v
       - name: V self compilation with -parallel-cc
         run: |
           ./v -o v2 -parallel-cc cmd/v

diff --git a/.github/workflows/windows_ci.yml b/.github/workflows/windows_ci.yml
@@ -41,8 +41,8 @@ jobs:
         run: .\v.exe test-self
       # - name: Test
       #   run: .\v.exe test-all
-      - name: Build option_test.v with -autofree
-        run: .\v.exe -autofree vlib/v/tests/option_test.v
+      - name: Build option_test.c.v with -autofree
+        run: .\v.exe -autofree vlib/v/tests/option_test.c.v
       - name: Test v->js
         run: ./v -o hi.js examples/hello_v_js.v && node hi.js
       - name: Test v binaries

diff --git a/cmd/tools/modules/testing/common.v b/cmd/tools/modules/testing/common.v
@@ -204,7 +204,7 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession {
 		skip_files << 'examples/coroutines/coroutines_bench.v'
 		$if msvc {
 			skip_files << 'vlib/v/tests/const_comptime_eval_before_vinit_test.v' // _constructor used
-			skip_files << 'vlib/v/tests/project_with_cpp_code/compiling_cpp_files_with_a_cplusplus_compiler_test.v'
+			skip_files << 'vlib/v/tests/project_with_cpp_code/compiling_cpp_files_with_a_cplusplus_compiler_test.c.v'
 		}
 		$if solaris {
 			skip_files << 'examples/gg/gg2.v'

diff --git a/cmd/tools/vcomplete.v b/cmd/tools/vcomplete.v
@@ -74,7 +74,7 @@ SUBCMD:
   powershell: [QUERY]       - returns PowerShell compatible completion code with completions computed from QUERY"
 )
 
-// Snooped from cmd/v/v.v, vlib/v/pref/pref.v
+// Snooped from cmd/v/v.v, vlib/v/pref/pref.c.v
 const (
 	auto_complete_commands      = [
 		// simple_cmd

diff --git a/cmd/tools/vtest-self.v b/cmd/tools/vtest-self.v
@@ -180,7 +180,7 @@ const (
 		'vlib/v/tests/orm_enum_test.v',
 		'vlib/v/tests/orm_sub_array_struct_test.v',
 		'vlib/v/tests/orm_handle_error_for_select_from_not_created_table_test.v',
-		'vlib/v/tests/project_with_cpp_code/compiling_cpp_files_with_a_cplusplus_compiler_test.v', // fails compilation with: undefined reference to vtable for __cxxabiv1::__function_type_info'
+		'vlib/v/tests/project_with_cpp_code/compiling_cpp_files_with_a_cplusplus_compiler_test.c.v', // fails compilation with: undefined reference to vtable for __cxxabiv1::__function_type_info'
 	]
 	skip_with_werror              = [
 		'do_not_remove',
@@ -259,7 +259,7 @@ const (
 		'vlib/v/tests/const_and_global_with_same_name_test.v', // error C2099: initializer is not a constant
 		'vlib/v/tests/sumtype_as_cast_1_test.v', // error: cannot support compound statement expression ({expr; expr; expr;})
 		'vlib/v/tests/sumtype_as_cast_2_test.v', // error: cannot support compound statement expression ({expr; expr; expr;})
-		'vlib/v/tests/project_with_cpp_code/compiling_cpp_files_with_a_cplusplus_compiler_test.v', // TODO
+		'vlib/v/tests/project_with_cpp_code/compiling_cpp_files_with_a_cplusplus_compiler_test.c.v', // TODO
 	]
 	skip_on_windows               = [
 		'do_not_remove',
@@ -350,7 +350,7 @@ fn main() {
 
 	$if windows {
 		if github_job == 'tcc' {
-			tsession.skip_files << 'vlib/v/tests/project_with_cpp_code/compiling_cpp_files_with_a_cplusplus_compiler_test.v'
+			tsession.skip_files << 'vlib/v/tests/project_with_cpp_code/compiling_cpp_files_with_a_cplusplus_compiler_test.c.v'
 		}
 	}
 

diff --git a/vlib/v/builder/compile.v b/vlib/v/builder/compile.v
@@ -308,7 +308,11 @@ pub fn (v &Builder) get_user_files() []string {
 		user_files << os.join_path(preludes_path, 'live_shared.v')
 	}
 	if v.pref.is_test {
-		user_files << os.join_path(preludes_path, 'test_runner.v')
+		if v.pref.backend == .js_node {
+			user_files << os.join_path(preludes_path, 'test_runner.v')
+		} else {
+			user_files << os.join_path(preludes_path, 'test_runner.c.v')
+		}
 		//
 		mut v_test_runner_prelude := os.getenv('VTEST_RUNNER')
 		if v.pref.test_runner != '' {

diff --git a/vlib/v/checker/tests/modules/module_with_redeclaration.out b/vlib/v/checker/tests/modules/module_with_redeclaration.out
@@ -1,5 +1,5 @@
-vlib/v/checker/tests/modules/module_with_redeclaration/redeclare_time_structs.v:1:1: error: project must include a `main` module or be a shared library (compile with `v -shared`)
+vlib/v/checker/tests/modules/module_with_redeclaration/redeclare_time_structs.c.v:1:1: error: project must include a `main` module or be a shared library (compile with `v -shared`)
     1 | module module_with_redeclaration
       | ^
-    2 | 
-    3 | import sokol.memory
+    2 |
+    3 | import sokol.memory
diff --git a/...th_redeclaration/redeclare_time_structs.v → ..._redeclaration/redeclare_time_structs.c.v b/...th_redeclaration/redeclare_time_structs.v → ..._redeclaration/redeclare_time_structs.c.v
diff --git a/vlib/v/eval/expr.v → vlib/v/eval/expr.c.v b/vlib/v/eval/expr.v → vlib/v/eval/expr.c.v
diff --git a/vlib/v/gen/native/readdll.v → vlib/v/gen/native/readdll.c.v b/vlib/v/gen/native/readdll.v → vlib/v/gen/native/readdll.c.v
diff --git a/vlib/v/gen/native/stmt.v → vlib/v/gen/native/stmt.c.v b/vlib/v/gen/native/stmt.v → vlib/v/gen/native/stmt.c.v
diff --git a/vlib/v/live/common.v → vlib/v/live/common.c.v b/vlib/v/live/common.v → vlib/v/live/common.c.v
diff --git a/vlib/v/live/executable/reloader.v → vlib/v/live/executable/reloader.c.v b/vlib/v/live/executable/reloader.v → vlib/v/live/executable/reloader.c.v
diff --git a/vlib/v/pref/pref.v → vlib/v/pref/pref.c.v b/vlib/v/pref/pref.v → vlib/v/pref/pref.c.v
diff --git a/vlib/v/preludes/test_runner.v → vlib/v/preludes/test_runner.c.v b/vlib/v/preludes/test_runner.v → vlib/v/preludes/test_runner.c.v
diff --git a/vlib/v/preludes/test_runner_normal.v b/vlib/v/preludes/test_runner_normal.v
@@ -7,7 +7,7 @@ import term
 // This file gets compiled as part of the main program, for
 // each _test.v file. It implements the default/normal test
 // output for `v run file_test.v`
-// See also test_runner.v .
+// See also test_runner.c.v .
 ///////////////////////////////////////////////////////////
 
 fn vtest_init() {

diff --git a/vlib/v/slow_tests/keep_args_alive_test.v → vlib/v/slow_tests/keep_args_alive_test.c.v b/vlib/v/slow_tests/keep_args_alive_test.v → vlib/v/slow_tests/keep_args_alive_test.c.v
@@ -4,7 +4,7 @@
 * To verify the effect of "[keep_args_alive]", this attribute may be commented out.
 * However it is not guaranteed that then this test will fail.
 * To provoke a failure it seems to be best to use `gcc` with optimization:
-* `gcc -gc boehm -cc gcc-9 -prod test keep_args_alive_test.v`.
+* `gcc -gc boehm -cc gcc-9 -prod test keep_args_alive_test.c.v`.
 * Without optimization, pointer variables may remain on the stack even if
 * not used any more.
 */

diff --git a/vlib/v/slow_tests/valgrind/base64.v b/vlib/v/slow_tests/valgrind/base64.v
@@ -21,7 +21,7 @@ fn main() {
 	//
 	encoded_size := base64.encode_in_buffer(s_original, ebuffer)
 	mut encoded_in_buf := []u8{len: encoded_size}
-	unsafe { C.memcpy(encoded_in_buf.data, ebuffer, encoded_size) }
+	unsafe { vmemcpy(encoded_in_buf.data, ebuffer, encoded_size) }
 	assert input_size * 4 / 3 == encoded_size
 	assert encoded_in_buf[0] == `Y`
 	assert encoded_in_buf[1] == `W`
@@ -38,7 +38,7 @@ fn main() {
 	decoded_size := base64.decode_in_buffer(s_encoded, dbuffer)
 	assert decoded_size == input_size
 	mut decoded_in_buf := []u8{len: decoded_size}
-	unsafe { C.memcpy(decoded_in_buf.data, dbuffer, decoded_size) }
+	unsafe { vmemcpy(decoded_in_buf.data, dbuffer, decoded_size) }
 	assert decoded_in_buf == s_original
 
 	mut s := 0

diff --git a/vlib/v/slow_tests/valgrind/free_heap_foos.v → .../v/slow_tests/valgrind/free_heap_foos.c.v b/vlib/v/slow_tests/valgrind/free_heap_foos.v → .../v/slow_tests/valgrind/free_heap_foos.c.v
diff --git a/..._variables_in_reverse_order_of_creation.v → ...ariables_in_reverse_order_of_creation.c.v b/..._variables_in_reverse_order_of_creation.v → ...ariables_in_reverse_order_of_creation.c.v
diff --git a/vlib/v/slow_tests/valgrind/valgrind_test.v b/vlib/v/slow_tests/valgrind/valgrind_test.v
@@ -84,7 +84,12 @@ fn test_all() {
 			}
 		}
 		//
-		base_filename := os.file_name(test).replace('.v', '')
+		mut base_filename := os.file_name(test)
+		if base_filename.ends_with('.c.v') {
+			base_filename = base_filename#[..-4]
+		} else if base_filename.ends_with('.v') {
+			base_filename = base_filename#[..-2]
+		}
 		exe_filename := '${wrkdir}/${base_filename}'
 		full_path_to_source_file := os.join_path(vroot, test)
 		compile_cmd := '${os.quoted_path(vexe)} -o ${os.quoted_path(exe_filename)} -cg -cflags ' +

diff --git a/...perator_overload_of_c_struct_alias_test.v → ...rator_overload_of_c_struct_alias_test.c.v b/...perator_overload_of_c_struct_alias_test.v → ...rator_overload_of_c_struct_alias_test.c.v
diff --git a/...ts/bench/bench_random_number_generation.v → .../bench/bench_random_number_generation.c.v b/...ts/bench/bench_random_number_generation.v → .../bench/bench_random_number_generation.c.v
diff --git a/vlib/v/tests/c_array_test.v → vlib/v/tests/c_array_test.c.v b/vlib/v/tests/c_array_test.v → vlib/v/tests/c_array_test.c.v
diff --git a/.../v/tests/c_function_mut_param/code_test.v → .../tests/c_function_mut_param/code_test.c.v b/.../v/tests/c_function_mut_param/code_test.v → .../tests/c_function_mut_param/code_test.c.v
diff --git a/...s/c_function_mut_param/option_args_test.v → ...c_function_mut_param/option_args_test.c.v b/...s/c_function_mut_param/option_args_test.v → ...c_function_mut_param/option_args_test.c.v
diff --git a/...struct_free/c_struct_free_property_test.v → ...ruct_free/c_struct_free_property_test.c.v b/...struct_free/c_struct_free_property_test.v → ...ruct_free/c_struct_free_property_test.c.v
diff --git a/.../v/tests/cflags/vmodroot_and_vroot_test.v → .../tests/cflags/vmodroot_and_vroot_test.c.v b/.../v/tests/cflags/vmodroot_and_vroot_test.v → .../tests/cflags/vmodroot_and_vroot_test.c.v
diff --git a/vlib/v/tests/closure_data_with_gc_test.v → vlib/v/tests/closure_data_with_gc_test.c.v b/vlib/v/tests/closure_data_with_gc_test.v → vlib/v/tests/closure_data_with_gc_test.c.v
@@ -16,7 +16,7 @@ fn test_closure_data_is_kept_alive() {
 	for _ in 0 .. 1000 {
 		unsafe {
 			p := malloc(8)
-			C.memset(p, 0x33, 8)
+			vmemset(p, 0x33, 8)
 		}
 	}
 	$if gcboehm ? {

diff --git a/vlib/v/tests/create_dll/create_win_dll.v → vlib/v/tests/create_dll/create_win_dll.c.v b/vlib/v/tests/create_dll/create_win_dll.v → vlib/v/tests/create_dll/create_win_dll.c.v
diff --git a/vlib/v/tests/create_dll/create_win_dll_test.v b/vlib/v/tests/create_dll/create_win_dll_test.v
@@ -16,7 +16,7 @@ fn run_test(cc_used string) {
 		else { '' }
 	}
 
-	assert os.system('${os.quoted_path(@VEXE)} ${cc_flag} -o create_win_${cc_used}.dll -shared create_win_dll.v') == 0
+	assert os.system('${os.quoted_path(@VEXE)} ${cc_flag} -o create_win_${cc_used}.dll -shared create_win_dll.c.v') == 0
 	assert os.exists('create_win_${cc_used}.dll')
 	handle := dl.open('create_win_${cc_used}.dll', 0)
 	assert handle != 0

diff --git a/vlib/v/tests/cstrings_test.v → vlib/v/tests/cstrings_test.c.v b/vlib/v/tests/cstrings_test.v → vlib/v/tests/cstrings_test.c.v
diff --git a/...tests/dump_c_structs/dump_c_struct_test.v → ...sts/dump_c_structs/dump_c_struct_test.c.v b/...tests/dump_c_structs/dump_c_struct_test.v → ...sts/dump_c_structs/dump_c_struct_test.c.v
diff --git a/vlib/v/tests/fn_test.v → vlib/v/tests/fn_test.c.v b/vlib/v/tests/fn_test.v → vlib/v/tests/fn_test.c.v
diff --git a/vlib/v/tests/generics_with_pointer_index_test.v b/vlib/v/tests/generics_with_pointer_index_test.v
@@ -12,8 +12,8 @@ mut:
 }
 
 pub fn with_cap[T](cap int) Vec[T] {
-	new_data := unsafe { C.malloc(cap * int(sizeof(T))) }
-	unsafe { C.memset(new_data, 0, cap * int(sizeof(T))) }
+	new_data := unsafe { malloc(cap * int(sizeof(T))) }
+	unsafe { vmemset(new_data, 0, cap * int(sizeof(T))) }
 
 	return Vec[T]{
 		data: new_data

diff --git a/vlib/v/tests/modules/sub/foo.v → vlib/v/tests/modules/sub/foo.c.v b/vlib/v/tests/modules/sub/foo.v → vlib/v/tests/modules/sub/foo.c.v
diff --git a/vlib/v/tests/option_test.v → vlib/v/tests/option_test.c.v b/vlib/v/tests/option_test.v → vlib/v/tests/option_test.c.v
diff --git a/...ing_c_structs/string_interpolation_test.v → ...g_c_structs/string_interpolation_test.c.v b/...ing_c_structs/string_interpolation_test.v → ...g_c_structs/string_interpolation_test.c.v
diff --git a/.../tests/project_with_c_code/mod1/wrapper.v → ...ests/project_with_c_code/mod1/wrapper.c.v b/.../tests/project_with_c_code/mod1/wrapper.v → ...ests/project_with_c_code/mod1/wrapper.c.v
diff --git a/...ests/project_with_c_code_2/modc/wrapper.v → ...ts/project_with_c_code_2/modc/wrapper.c.v b/...ests/project_with_c_code_2/modc/wrapper.v → ...ts/project_with_c_code_2/modc/wrapper.c.v
diff --git a/vlib/v/tests/project_with_c_code_3/mod1/wrapper.js.v b/vlib/v/tests/project_with_c_code_3/mod1/wrapper.js.v
@@ -1,6 +1,6 @@
 module mod1
 
-// Note: the function here, overrides the one from wrapper.v
+// Note: the function here, overrides the one from wrapper.c.v
 pub fn vadd(a int, b int) int {
 	return 2003
 }
diff --git a/...project_with_c_code_ct_ifs/ctimeifblock.v → ...oject_with_c_code_ct_ifs/ctimeifblock.c.v b/...project_with_c_code_ct_ifs/ctimeifblock.v → ...oject_with_c_code_ct_ifs/ctimeifblock.c.v
diff --git a/...pp_files_with_a_cplusplus_compiler_test.v → ..._files_with_a_cplusplus_compiler_test.c.v b/...pp_files_with_a_cplusplus_compiler_test.v → ..._files_with_a_cplusplus_compiler_test.c.v
diff --git a/vlib/v/tests/unsafe_test.v → vlib/v/tests/unsafe_test.c.v b/vlib/v/tests/unsafe_test.v → vlib/v/tests/unsafe_test.c.v
diff --git a/vlib/v/trace_calls/tracing_calls.v → vlib/v/trace_calls/tracing_calls.c.v b/vlib/v/trace_calls/tracing_calls.v → vlib/v/trace_calls/tracing_calls.c.v
diff --git a/vlib/v/util/version/version.v → vlib/v/util/version/version.c.v b/vlib/v/util/version/version.v → vlib/v/util/version/version.c.v
diff --git a/vlib/v/vmod/vmod.v b/vlib/v/vmod/vmod.v
@@ -18,7 +18,7 @@ pub fn get_cache() &ModFileCacher {
 // examples/hanoi.v
 // vlib/v.mod
 // vlib/v/tests/project_with_c_code/mod1/v.mod
-// vlib/v/tests/project_with_c_code/mod1/wrapper.v
+// vlib/v/tests/project_with_c_code/mod1/wrapper.c.v
 // -----------------
 // ModFileCacher.get('examples')
 // => ModFileAndFolder{'', 'examples'}