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

repl: show short version

pull/5646/head
Alexander Medvednikov 2020-07-03 22:30:34 +02:00
parent 244d61f8d0
commit e9e437ce05
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/tools/vrepl.v
View File

@ -76,7 +76,7 @@ fn (r &Repl) current_source_code(should_add_temp_lines bool) string {
} }
fn repl_help() { fn repl_help() {
println(util.full_v_version(true)) println(util.full_v_version(false))
println(' println('
help Displays this information. help Displays this information.
list Show the program so far. list Show the program so far.
@ -87,7 +87,7 @@ fn repl_help() {
} }
fn run_repl(workdir string, vrepl_prefix string) { fn run_repl(workdir string, vrepl_prefix string) {
println(util.full_v_version(true)) println(util.full_v_version(false))
println('Use Ctrl-C or `exit` to exit') println('Use Ctrl-C or `exit` to exit')
file := os.join_path(workdir, '.${vrepl_prefix}vrepl.v') file := os.join_path(workdir, '.${vrepl_prefix}vrepl.v')

14
vlib/v/util/util.v
View File

@ -37,16 +37,16 @@ pub fn full_hash() string {
if build_hash == current_hash { if build_hash == current_hash {
return build_hash return build_hash
} }
return '${build_hash}.${current_hash}' return '${build_hash}.$current_hash'
} }
// full_v_version() returns the full version of the V compiler // full_v_version() returns the full version of the V compiler
pub fn full_v_version(is_verbose bool) string { pub fn full_v_version(is_verbose bool) string {
if is_verbose { if is_verbose {
return 'V ${v_version} ${full_hash()}' return 'V $v_version $full_hash()'
} }
hash := githash(false) hash := githash(false)
return 'V ${v_version} $hash' return 'V $v_version $hash'
} }
// githash(x) returns the current git commit hash. // githash(x) returns the current git commit hash.
@ -182,7 +182,7 @@ pub fn launch_tool(is_verbose bool, tool_name string, args []string) {
pub fn quote_path_with_spaces(s string) string { pub fn quote_path_with_spaces(s string) string {
if s.contains(' ') { if s.contains(' ') {
return '"${s}"' return '"$s"'
} }
return s return s
} }
@ -282,7 +282,7 @@ pub fn check_module_is_installed(modulename string, is_verbose bool) ?bool {
} }
if os.exists(mod_v_file) { if os.exists(mod_v_file) {
vexe := pref.vexe_path() vexe := pref.vexe_path()
update_cmd := '"$vexe" update "${modulename}"' update_cmd := '"$vexe" update "$modulename"'
if is_verbose { if is_verbose {
eprintln('check_module_is_installed: updating with $update_cmd ...') eprintln('check_module_is_installed: updating with $update_cmd ...')
} }
@ -290,9 +290,9 @@ pub fn check_module_is_installed(modulename string, is_verbose bool) ?bool {
return error('can not start $update_cmd, error: $err') return error('can not start $update_cmd, error: $err')
} }
if update_res.exit_code != 0 { if update_res.exit_code != 0 {
eprintln('Warning: `${modulename}` exists, but is not updated. eprintln('Warning: `$modulename` exists, but is not updated.
V will continue, since updates can fail due to temporary network problems, V will continue, since updates can fail due to temporary network problems,
and the existing module `${modulename}` may still work.') and the existing module `$modulename` may still work.')
if is_verbose { if is_verbose {
eprintln('Details:') eprintln('Details:')
eprintln(update_res.output) eprintln(update_res.output)