From d072178cef7910cc94b26d54b1004f71a834ce8e Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Tue, 6 Aug 2019 19:04:55 +0300
Subject: [PATCH] v run: recompile and execute changed file.v just once.

---
 compiler/main.v | 75 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 52 insertions(+), 23 deletions(-)

diff --git a/compiler/main.v b/compiler/main.v
index 35f077992c..81891f7eac 100644
--- a/compiler/main.v
+++ b/compiler/main.v
@@ -189,7 +189,24 @@ fn main() {
 		// v.gen_doc_html_for_module(args.last())
 		exit(0)
 	}
+  
+	if 'run' in args {
+		vsource := v.dir
+		vtarget := final_target_out_name( v.out_name )
+		if os.file_exists(vtarget) && ( os.file_last_mod_unix(vsource) <= os.file_last_mod_unix(vtarget) ) {
+			//println('ALREADY BUILD FROM vsource: $vsource | vtarget: $vtarget')
+			v.run_compiled_executable_and_exit()
+		}
+		v.compile()
+		v.run_compiled_executable_and_exit()
+	}
+  
 	v.compile()
+  
+	if v.pref.is_test {
+		v.run_compiled_executable_and_exit()
+	}
+  
 }
 
 fn (v mut V) compile() {
@@ -609,35 +626,47 @@ void reload_so() {
 	if v.pref.is_verbose {
 		v.log('flags=')
 		println(v.table.flags)
-	}
+	}  
 	v.cc()
-	if v.pref.is_test || v.pref.is_run {
-		if v.pref.is_verbose {
-			println('============ running $v.out_name ============') 
-		}
-		mut cmd := if v.out_name.starts_with('/') {
-			v.out_name
-		}
-		else {
-			'./' + v.out_name
-		}
-		$if windows {
-			cmd = v.out_name
-			cmd = cmd.replace('/', '\\')
-		} 
-		if os.args.len > 3 {
-			cmd += ' ' + os.args.right(3).join(' ')
-		}
+}
+
+fn final_target_out_name(out_name string) string {
+	mut cmd := if out_name.starts_with('/') {
+		out_name
+	}
+	else {
+		'./' + out_name
+	}
+	$if windows {
+		cmd = out_name
+		cmd = cmd.replace('/', '\\')
+	}
+	return cmd
+}
+
+fn (v V) run_compiled_executable_and_exit() {
+	if v.pref.is_verbose {
+		println('============ running $v.out_name ============') 
+	}	  
+	mut cmd := final_target_out_name(v.out_name)
+	if os.args.len > 3 {
+		cmd += ' ' + os.args.right(3).join(' ')
+	}
+	if v.pref.is_test {
 		ret := os.system(cmd)
 		if ret != 0 {
-			if !v.pref.is_test { 
-				s := os.exec(cmd)
-				println(s)
-				println('failed to run the compiled program')
-			} 
 			exit(1)
 		}
+	}    
+	if v.pref.is_run {
+		ret := os.system(cmd)
+		// TODO: make the runner wrapping as transparent as possible 
+		// (i.e. use execve when implemented). For now though, the runner 
+		// just returns the same exit code as the child process 
+		// (see man system, man 2 waitpid: C macro WEXITSTATUS section)
+		exit( ret >> 8 ) 
 	}
+	exit(0)
 }
 
 fn (c &V) cc_windows_cross() {