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

vrepl: fix array_init error 

* optimize print conditions
pull/4834/head
yuyi 2020-05-11 12:15:08 +08:00 committed by GitHub
parent 8f6d69b763
commit 14bba54ddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/tools/vrepl.v
View File

@ -23,7 +23,6 @@ mut:
fn (r mut Repl) checks() bool { fn (r mut Repl) checks() bool {
mut in_string := false mut in_string := false
mut is_cut := false
was_indent := r.indent > 0 was_indent := r.indent > 0
for i := 0; i < r.line.len; i++ { for i := 0; i < r.line.len; i++ {
@ -32,13 +31,11 @@ fn (r mut Repl) checks() bool {
} }
if r.line[i] == `{` && !in_string { if r.line[i] == `{` && !in_string {
r.line = r.line[..i + 1] + '\n' + r.line[i + 1..] r.line = r.line[..i + 1] + '\n' + r.line[i + 1..]
is_cut = true
i++ i++
r.indent++ r.indent++
} }
if r.line[i] == `}` && !in_string { if r.line[i] == `}` && !in_string {
r.line = r.line[..i] + '\n' + r.line[i..] r.line = r.line[..i] + '\n' + r.line[i..]
is_cut = true
i++ i++
r.indent-- r.indent--
if r.indent == 0 { if r.indent == 0 {
@ -49,7 +46,7 @@ fn (r mut Repl) checks() bool {
r.in_func = true r.in_func = true
} }
} }
return r.in_func || (was_indent && r.indent <= 0) || r.indent > 0 || is_cut return r.in_func || (was_indent && r.indent <= 0) || r.indent > 0
} }
fn (r &Repl) function_call(line string) bool { fn (r &Repl) function_call(line string) bool {
@ -160,8 +157,7 @@ fn run_repl(workdir string, vrepl_prefix string) {
mut temp_flag := false mut temp_flag := false
func_call := r.function_call(r.line) func_call := r.function_call(r.line)
filter_line := r.line.replace(r.line.find_between('\'', '\''), '').replace(r.line.find_between('"', '"'), '') filter_line := r.line.replace(r.line.find_between('\'', '\''), '').replace(r.line.find_between('"', '"'), '')
if !(filter_line.contains(':') || filter_line.contains('=') || if !(filter_line.contains('=') || filter_line.contains('++') ||
filter_line.contains(',') || filter_line.contains('++') ||
filter_line.contains('--') || filter_line.contains('<<') || filter_line.contains('--') || filter_line.contains('<<') ||
filter_line.contains('//') || filter_line.contains('/*') || filter_line.contains('//') || filter_line.contains('/*') ||
filter_line.starts_with('import') || r.line == '') && !func_call { filter_line.starts_with('import') || r.line == '') && !func_call {

3
vlib/v/tests/repl/array_init.repl 100644
View File

@ -0,0 +1,3 @@
[]int{len:3}
===output===
[0, 0, 0]