v: refactor $var to ${var} across entire repository, make vfmt always output the newer form ${expr} (#26494)

Author: revosw

.github/workflows/android_cross_compile.vsh

@@ -24,8 +24,8 @@ fn main() {
 	include_path := os.join_path(sysroot_path, 'usr', 'include')
 	android_include_path := os.join_path(include_path, 'android')
 
-	//'-I"$include_path"'
-	cflags := ['-I"$android_include_path"', '-Wno-unused-value', '-Wno-implicit-function-declaration',
+	//'-I"${include_path}"'
+	cflags := ['-I"${android_include_path}"', '-Wno-unused-value', '-Wno-implicit-function-declaration',
 		'-Wno-int-conversion']
 	for arch in ndk.supported_archs {
 		for level in ['min', 'max'] {
@@ -46,22 +46,22 @@ fn main() {
 			o_file := os.join_path(work_dir, arch + '-' + level + '.o')
 
 			// x.v -> x.c
-			v_compile_cmd := '$vexe -o $c_file -os android -gc none $v_example'
+			v_compile_cmd := '${vexe} -o ${c_file} -os android -gc none ${v_example}'
 			vres := os.execute(v_compile_cmd)
 			if vres.exit_code != 0 {
-				panic('"$v_compile_cmd" failed: $vres.output')
+				panic('"${v_compile_cmd}" failed: ${vres.output}')
 			}
 			assert os.exists(c_file)
 
 			// x.c -> x.o
-			compile_cmd := '$compiler_api ${cflags.join(' ')} -c $c_file -o $o_file'
+			compile_cmd := '${compiler_api} ${cflags.join(' ')} -c ${c_file} -o ${o_file}'
 			cres := os.execute(compile_cmd)
 			if cres.exit_code != 0 {
-				panic('"$compile_cmd" failed: $cres.output')
+				panic('"${compile_cmd}" failed: ${cres.output}')
 			}
 			assert os.exists(o_file)
 			compiler_exe_name := os.file_name(compiler_api)
-			println('Compiled examples/toml.v successfully for ($level) $arch $compiler_exe_name')
+			println('Compiled examples/toml.v successfully for (${level}) ${arch} ${compiler_exe_name}')
 		}
 	}
 }

cmd/tools/changelog_helper.v

@@ -162,7 +162,7 @@ fn (mut app App) process_line(text string) ! {
 		category = .interpreter
 	} else if is_examples(text) {
 		category = .examples
-		// println("Skipping line (example) $text")
+		// println("Skipping line (example) ${text}")
 		// return
 	} else if is_skip(text) {
 		// Always skip cleanups, typos etc

cmd/tools/fast/fast.v

@@ -123,7 +123,7 @@ fn main() {
 	// measure
 	diff1 := measure('${vdir}/vprod ${voptions} -o v.c cmd/v', 'v.c')
 	diff2 := measure('${vdir}/vprod ${voptions} -cc ${ccompiler_path} -o v2 cmd/v', 'v2')
-	diff3 := 0 // measure('$vdir/vprod -native $vdir/cmd/tools/1mil.v', 'native 1mil')
+	diff3 := 0 // measure('${vdir}/vprod -native ${vdir}/cmd/tools/1mil.v', 'native 1mil')
 	diff4 := measure('${vdir}/vprod ${voptions} -cc ${ccompiler_path} examples/hello_world.v',
 		'hello.v')
 	vc_size := os.file_size('v.c') / 1000

cmd/tools/git_pre_commit_hook.vsh

@@ -58,7 +58,7 @@ fn main() {
 		eprintln('The V pre commit hook will format ${vfiles.len} V file(s):')
 		// vfmt off
 		for vfile in vfiles {
-			eprintln('    ${term.bold('$vfile')}')
+			eprintln('    ${term.bold('${vfile}')}')
 		}
 		// vfmt on
 		all_vfiles_on_a_line := vfiles.map(os.quoted_path(it)).join(' ')

cmd/tools/modules/scripting/scripting.v

@@ -195,6 +195,6 @@ pub fn used_tools_must_exist(tools []string) {
 pub fn show_sizes_of_files(files []string) {
 	for f in files {
 		size := os.file_size(f)
-		println('${size} ${f}') // println('${size:10d} $f')
+		println('${size} ${f}') // println('${size:10d} ${f}')
 	}
 }

cmd/tools/modules/testing/common.v

@@ -616,7 +616,7 @@ fn worker_trunner(mut p pool.PoolProcessor, idx int, thread_id int) voidptr {
 		for cretry in 0 .. max_compilation_retries {
 			compile_r = ts.execute(cmd, mtc)
 			compile_cmd_duration = compile_d_cmd.elapsed()
-			// eprintln('>>>> cretry: $cretry | compile_r.exit_code: $compile_r.exit_code | compile_cmd_duration: ${compile_cmd_duration:8} | file: $normalised_relative_file')
+			// eprintln('>>>> cretry: ${cretry} | compile_r.exit_code: ${compile_r.exit_code} | compile_cmd_duration: ${compile_cmd_duration:8} | file: ${normalised_relative_file}')
 			if compile_r.exit_code == 0 {
 				break
 			}

cmd/tools/modules/testing/output_normal.v

@@ -134,7 +134,7 @@ pub fn (r &NormalReporter) session_stop(message string, mut ts TestSession) {
 // the most general form; it may be useful for other reporters
 // in the normal one, it currently does nothing
 pub fn (mut r NormalReporter) report(index int, message LogMessage) {
-	// eprintln('> ${@METHOD} index: $index | message: $message')
+	// eprintln('> ${@METHOD} index: ${index} | message: ${message}')
 	if message.kind == .compile_begin {
 		lock r.compiling {
 			r.compiling[message.file] = message

cmd/tools/vbuild-tools.v

@@ -42,8 +42,8 @@ fn main() {
 	for stool in tools_in_subfolders {
 		session.add(os.join_path(tfolder, stool))
 	}
-	// eprintln('> session.files: $session.files')
-	// eprintln('> session.skip_files: $session.skip_files')
+	// eprintln('> session.files: ${session.files}')
+	// eprintln('> session.skip_files: ${session.skip_files}')
 	session.test()
 	eprintln(session.benchmark.total_message(finish_label))
 	if session.failed_cmds.len > 0 {

cmd/tools/vcheck-md.v

@@ -213,7 +213,7 @@ fn (mut f MDFile) echeck(actual int, limit int, ctx CheckResultContext, msg_temp
 fn (mut f MDFile) check() CheckResult {
 	mut anchor_data := AnchorData{}
 	for j, line in f.lines {
-		// f.progress('line: $j')
+		// f.progress('line: ${j}')
 		if !f.skip_line_length_check {
 			ctx := CheckResultContext{f.path, j, line}
 			if f.state == .vexample {
@@ -466,7 +466,7 @@ fn (mut f MDFile) check_examples() {
 		vfile := os.join_path(vcheckfolder, 'check_${fname}_example_${e.sline}__${e.eline}__${uid}.v')
 		efile := os.join_path(vcheckfolder, 'check_${fname}_example_${e.sline}__${e.eline}__${uid}.exe')
 		mut should_cleanup_vfile := true
-		// eprintln('>>> checking example $vfile ...')
+		// eprintln('>>> checking example ${vfile} ...')
 		vcontent := e.text.join('\n') + '\n'
 		os.write_file(vfile, vcontent) or { panic(err) }
 		mut acommands := e.command.split(' ')

cmd/tools/vcomplete.v

@@ -798,6 +798,6 @@ Register-ArgumentCompleter -Native -CommandName v -ScriptBlock {
 
 fn main() {
 	args := os.args[1..]
-	// println('"$args"')
+	// println('"${args}"')
 	auto_complete(args)
 }