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

repl: handle exit(n) (#13930)

pull/13942/head
pancake 2022-04-04 15:22:34 +02:00 committed by GitHub
parent 92bfd9b353
commit 5369379738
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/tools/vrepl.v
View File

@ -259,7 +259,7 @@ fn print_welcome_screen() {
} }
} }
fn run_repl(workdir string, vrepl_prefix string) { fn run_repl(workdir string, vrepl_prefix string) int {
if !is_stdin_a_pipe { if !is_stdin_a_pipe {
print_welcome_screen() print_welcome_screen()
} }
@ -297,6 +297,16 @@ fn run_repl(workdir string, vrepl_prefix string) {
if line.len <= -1 || line == '' || line == 'exit' { if line.len <= -1 || line == '' || line == 'exit' {
break break
} }
if exit_pos := line.index('exit') {
oparen := line[(exit_pos + 4)..].trim_space()
if oparen.starts_with('(') {
if closing := oparen.index(')') {
rc := oparen[1..closing].parse_int(0, 8) or { panic(err) }
return int(rc)
}
}
break
}
r.line = line r.line = line
if r.line == '\n' { if r.line == '\n' {
continue continue
@ -353,7 +363,7 @@ fn run_repl(workdir string, vrepl_prefix string) {
if r.line.starts_with('print') { if r.line.starts_with('print') {
source_code := r.current_source_code(false, false) + '\n$r.line\n' source_code := r.current_source_code(false, false) + '\n$r.line\n'
os.write_file(file, source_code) or { panic(err) } os.write_file(file, source_code) or { panic(err) }
s := repl_run_vfile(file) or { return } s := repl_run_vfile(file) or { return 1 }
print_output(s) print_output(s)
} else { } else {
mut temp_line := r.line mut temp_line := r.line
@ -423,7 +433,7 @@ fn run_repl(workdir string, vrepl_prefix string) {
temp_source_code = r.current_source_code(true, false) + '\n$temp_line\n' temp_source_code = r.current_source_code(true, false) + '\n$temp_line\n'
} }
os.write_file(temp_file, temp_source_code) or { panic(err) } os.write_file(temp_file, temp_source_code) or { panic(err) }
s := repl_run_vfile(temp_file) or { return } s := repl_run_vfile(temp_file) or { return 1 }
if !func_call && s.exit_code == 0 && !temp_flag { if !func_call && s.exit_code == 0 && !temp_flag {
for r.temp_lines.len > 0 { for r.temp_lines.len > 0 {
if !r.temp_lines[0].starts_with('print') { if !r.temp_lines[0].starts_with('print') {
@ -446,6 +456,7 @@ fn run_repl(workdir string, vrepl_prefix string) {
print_output(s) print_output(s)
} }
} }
return 0
} }
fn convert_output(os_result os.Result) string { fn convert_output(os_result os.Result) string {
@ -493,7 +504,7 @@ fn main() {
if !is_stdin_a_pipe { if !is_stdin_a_pipe {
os.setenv('VCOLORS', 'always', true) os.setenv('VCOLORS', 'always', true)
} }
run_repl(replfolder, replprefix) exit(run_repl(replfolder, replprefix))
} }
fn rerror(s string) { fn rerror(s string) {

2
vlib/os/os.c.v
View File

@ -203,7 +203,7 @@ pub fn mv(src string, dst string) ? {
} $else { } $else {
ret := C.rename(&char(src.str), &char(rdst.str)) ret := C.rename(&char(src.str), &char(rdst.str))
if ret != 0 { if ret != 0 {
return error_with_code('failed to rename $src to $dst', int(ret)) return error_with_code('failed to rename $src to $dst', ret)
} }
} }
} }