From 8a1324c1412c462f91d5a0e2571cbc597039bc31 Mon Sep 17 00:00:00 2001
From: Alexander Medvednikov <alexander@medvednikov.com>
Date: Sat, 17 Aug 2019 20:21:59 +0300
Subject: [PATCH] os: make exec() return ?Result with exit code and output

---
 compiler/cgen.v   |  2 +-
 compiler/main.v   | 12 +++++------
 compiler/msvc.v   | 10 +++++-----
 compiler/parser.v |  8 +++++---
 vlib/os/os.v      | 51 ++++++++++++++++++++++++++++-------------------
 5 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/compiler/cgen.v b/compiler/cgen.v
index 89659269da..238d8f613b 100644
--- a/compiler/cgen.v
+++ b/compiler/cgen.v
@@ -261,7 +261,7 @@ fn build_thirdparty_obj_file(flag string) {
 	res := os.exec('$cc -fPIC -c -o $obj_path $cfiles') or {
 		panic(err)
 	}
-	println(res) 
+	println(res.output) 
 } 
 
 fn os_name_to_ifdef(name string) string { 
diff --git a/compiler/main.v b/compiler/main.v
index e29449e332..b841c2b053 100644
--- a/compiler/main.v
+++ b/compiler/main.v
@@ -924,7 +924,7 @@ mut args := ''
 		'/usr/lib/x86_64-linux-gnu/crtn.o') or {
 			panic(err)
 		}
-		println(ress)
+		println(ress.output)
 		println('linux cross compilation done. resulting binary: "$v.out_name"')
 	}
 	if !v.pref.is_debug && v.out_name_c != 'v.c' && v.out_name_c != 'v_macos.c' {
@@ -1336,7 +1336,7 @@ fn run_repl() []string {
 			s := os.exec('$vexe run $file -repl') or {
 				panic(err)
 			}
-			vals := s.split('\n')
+			vals := s.output.split('\n')
 			for i:=0; i < vals.len; i++ {
 				println(vals[i])
 			}
@@ -1354,7 +1354,7 @@ fn run_repl() []string {
 				panic(err)
 			}
 			lines << line
-			vals := s.split('\n')
+			vals := s.output.split('\n')
 			for i:=0; i<vals.len; i++ {
 				println(vals[i])
 			}
@@ -1418,18 +1418,18 @@ fn update_v() {
 	s := os.exec('git -C "$vroot" pull --rebase origin master') or {
 		panic(err)
 	}
-	println(s) 
+	println(s.output) 
 	$if windows { 
 		os.mv('$vroot/v.exe', '$vroot/v_old.exe') 
 		s2 := os.exec('$vroot/make.bat') or {
 			panic(err)
 		}
-		println(s2) 
+		println(s2.output) 
 	} $else { 
 		s2 := os.exec('make -C "$vroot"') or {
 			panic(err)
 		}
-		println(s2) 
+		println(s2.output) 
 	} 
 } 
 
diff --git a/compiler/msvc.v b/compiler/msvc.v
index 8d7346762a..943f497d27 100644
--- a/compiler/msvc.v
+++ b/compiler/msvc.v
@@ -145,7 +145,7 @@ fn find_vs() ?VsInstallation {
 	}
 	// println('res: "$res"')
 
-	version := os.read_file('$res\\VC\\Auxiliary\\Build\\Microsoft.VCToolsVersion.default.txt') or {
+	version := os.read_file('$res.output\\VC\\Auxiliary\\Build\\Microsoft.VCToolsVersion.default.txt') or {
 		println('Unable to find msvc version')
 		return error('Unable to find vs installation')
 	}
@@ -158,11 +158,11 @@ fn find_vs() ?VsInstallation {
 		version
 	}
 
-	lib_path := '$res\\VC\\Tools\\MSVC\\$v\\lib\\x64'
-	include_path := '$res\\VC\\Tools\\MSVC\\$v\\include'
+	lib_path := '$res.output\\VC\\Tools\\MSVC\\$v\\lib\\x64'
+	include_path := '$res.output\\VC\\Tools\\MSVC\\$v\\include'
 
 	if os.file_exists('$lib_path\\vcruntime.lib') {
-		p := '$res\\VC\\Tools\\MSVC\\$v\\bin\\Hostx64\\x64'
+		p := '$res.output\\VC\\Tools\\MSVC\\$v\\bin\\Hostx64\\x64'
 
 		// println('$lib_path $include_path')
 
@@ -406,6 +406,6 @@ fn build_thirdparty_obj_file_with_msvc(flag string) {
 	res := os.exec('""$msvc.exe_path\\cl.exe" /volatile:ms /Z7 $include_string /c $cfiles /Fo"$obj_path" /D_UNICODE /DUNICODE"') or {
 		panic(err)
 	}
-	println(res)
+	println(res.output)
 }
 
diff --git a/compiler/parser.v b/compiler/parser.v
index 45cb5e8253..aeb50357ad 100644
--- a/compiler/parser.v
+++ b/compiler/parser.v
@@ -2385,9 +2385,11 @@ fn (p mut Parser) factor() string {
 		typ = p.if_st(true, 0)
 		return typ
 	default:
-		next := p.peek()
-		println('PREV=${p.prev_tok.str()}')
-		println('.neXT=${next.str()}')
+		if p.pref.is_verbose || p.pref.is_debug { 
+			next := p.peek()
+			println('prev=${p.prev_tok.str()}')
+			println('next=${next.str()}')
+		} 
 		p.error('unexpected token: `${p.tok.str()}`')
 	}
 	p.next()// TODO everything should next()
diff --git a/vlib/os/os.v b/vlib/os/os.v
index 318747c0a3..1ca717fb50 100644
--- a/vlib/os/os.v
+++ b/vlib/os/os.v
@@ -307,18 +307,6 @@ pub fn (f File) close() {
 }
 
 // system starts the specified command, waits for it to complete, and returns its code.
-pub fn system(cmd string) int {
-	mut ret := int(0)
-	$if windows {
-		ret = C._wsystem(cmd.to_wide())
-	} $else {
-		ret = C.system(cmd.str) 
-	}
-	if ret == -1 {
-		os.print_c_errno()
-	}
-	return ret
-}
 
 fn popen(path string) *FILE {
 	$if windows {
@@ -341,12 +329,19 @@ fn pclose(f *FILE) int {
 	}
 }
 
+struct Result {
+pub: 
+	exit_code int 
+	output string
+	//stderr string // TODO 
+} 
+
 // exec starts the specified command, waits for it to complete, and returns its output.
-pub fn exec(_cmd string) ?string {
-	cmd := '$_cmd 2>&1'
-	f := popen(cmd)
+pub fn exec(cmd string) ?Result {
+	pcmd := '$cmd 2>&1'
+	f := popen(pcmd)
 	if isnil(f) {
-		return error('popen $cmd failed')
+		return error('exec("$cmd") failed')
 	}
 	buf := [1000]byte 
 	mut res := ''
@@ -354,11 +349,27 @@ pub fn exec(_cmd string) ?string {
 		res += tos(buf, strlen(buf)) 
 	}
 	res = res.trim_space()
-	status_code := pclose(f)/256
-	if status_code != 0 {
-		return error(res)
+	exit_code := pclose(f)/256
+	//if exit_code != 0 {
+		//return error(res)
+	//}
+	return Result {
+		output: res
+		exit_code: exit_code 
+	} 
+}
+
+pub fn system(cmd string) int {
+	mut ret := int(0)
+	$if windows {
+		ret = C._wsystem(cmd.to_wide())
+	} $else {
+		ret = C.system(cmd.str) 
 	}
-	return res
+	if ret == -1 {
+		os.print_c_errno()
+	}
+	return ret
 }
 
 // `getenv` returns the value of the environment variable named by the key.