v.util.version: centralise the use of @VCURRENTHASH, to minimise the vlang/vc diffs for each commit

Author: spytheman

vlib/builtin/builtin.c.v

@@ -71,7 +71,7 @@ fn panic_debug(line_no int, file string, mod string, fn_name string, s string) {
 		eprint('  message: '); eprintln(s)
 		eprint('     file: '); eprint(file); eprint(':');
 		C.fprintf(C.stderr, c'%d\n', line_no)
-		eprint('   v hash: '); eprintln(@VCURRENTHASH)
+		eprint('   v hash: '); eprintln(vcurrent_hash())
 		eprintln('=========================================')
 		// vfmt on
 		$if native {
@@ -117,6 +117,10 @@ pub fn panic_result_not_set(s string) {
 	panic('result not set (' + s + ')')
 }
 
+pub fn vcurrent_hash() string {
+	return @VCURRENTHASH
+}
+
 // panic prints a nice error message, then exits the process with exit code of 1.
 // It also shows a backtrace on most platforms.
 @[noreturn]
@@ -128,7 +132,7 @@ pub fn panic(s string) {
 		eprint('V panic: ')
 		eprintln(s)
 		eprint('v hash: ')
-		eprintln(@VCURRENTHASH)
+		eprintln(vcurrent_hash())
 		$if native {
 			C.exit(1) // TODO: native backtraces
 		} $else $if exit_after_panic_message ? {

vlib/v/checker/checker.v

@@ -154,6 +154,11 @@ pub fn new_checker(table &ast.Table, pref_ &pref.Preferences) &Checker {
 	$if time_checking ? {
 		timers_should_print = true
 	}
+	v_current_commit_hash := if pref_.building_v {
+		version.githash(pref_.vroot) or { vcurrent_hash() }
+	} else {
+		vcurrent_hash()
+	}
 	mut checker := &Checker{
 		table:                         table
 		pref:                          pref_
@@ -162,8 +167,7 @@ pub fn new_checker(table &ast.Table, pref_ &pref.Preferences) &Checker {
 			label:        'checker'
 		)
 		match_exhaustive_cutoff_limit: pref_.checker_match_exhaustive_cutoff_limit
-		v_current_commit_hash:         if pref_.building_v { version.githash(pref_.vroot) or {
-				@VCURRENTHASH} } else { @VCURRENTHASH }
+		v_current_commit_hash:         v_current_commit_hash
 	}
 	checker.type_resolver = type_resolver.TypeResolver.new(table, checker)
 	checker.comptime = &checker.type_resolver.info

vlib/v/eval/eval.v

@@ -289,7 +289,7 @@ fn (e &Eval) error(msg string) {
 
 fn (e &Eval) panic(s string) {
 	eprintln('V panic: ${s}')
-	eprintln('V hash: ${@VCURRENTHASH}')
+	eprintln('V hash: ${vcurrent_hash()}')
 	e.print_backtrace()
 	exit(1)
 }

vlib/v/util/version/version.v

@@ -6,19 +6,18 @@ pub const v_version = '0.4.9'
 
 pub fn full_hash() string {
 	build_hash := vhash()
-	current_hash := @VCURRENTHASH
-	if build_hash == current_hash {
+	if build_hash == vcurrent_hash() {
 		return build_hash
 	}
-	return '${build_hash}.${current_hash}'
+	return '${build_hash}.${vcurrent_hash()}'
 }
 
 // full_v_version() returns the full version of the V compiler
 pub fn full_v_version(is_verbose bool) string {
 	if is_verbose {
 		return 'V ${v_version} ${full_hash()}'
 	}
-	return 'V ${v_version} ${@VCURRENTHASH}'
+	return 'V ${v_version} ${vcurrent_hash()}'
 }
 
 // githash tries to find the current git commit hash for the specified