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

repl: handle print and one-line conditions

pull/2250/head
Henrixounez 2019-10-06 16:21:10 +02:00 committed by Alexander Medvednikov
parent 03bc5ab3d5
commit 30e7cd8ed5
4 changed files with 55 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
compiler/repl.v
View File

@ -11,34 +11,42 @@ struct Repl {
mut: mut:
indent int indent int
in_func bool in_func bool
line string
lines []string lines []string
temp_lines []string temp_lines []string
functions_name []string functions_name []string
functions []string functions []string
} }
fn (r mut Repl) checks(line string) 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 < line.len; i++ { for i := 0; i < r.line.len; i++ {
if line[i] == `\'` && (i == 0 || line[i - 1] != `\\`) { if r.line[i] == `\'` && (i == 0 || r.line[i - 1] != `\\`) {
in_string = !in_string in_string = !in_string
} }
if line[i] == `{` && !in_string { if r.line[i] == `{` && !in_string {
r.line = r.line.left(i + 1) + '\n' + r.line.right(i + 1)
is_cut = true
i++
r.indent++ r.indent++
} }
if line[i] == `}` && !in_string { if r.line[i] == `}` && !in_string {
r.line = r.line.left(i) + '\n' + r.line.right(i)
is_cut = true
i++
r.indent-- r.indent--
if r.indent == 0 { if r.indent == 0 {
r.in_func = false r.in_func = false
} }
} }
if i + 2 < line.len && r.indent == 0 && line[i + 1] == `f` && line[i + 2] == `n` { if i + 2 < r.line.len && r.indent == 0 && r.line[i + 1] == `f` && r.line[i + 2] == `n` {
r.in_func = true r.in_func = true
} }
} }
return r.in_func || (was_indent && r.indent <= 0) || r.indent > 0 return r.in_func || (was_indent && r.indent <= 0) || r.indent > 0 || is_cut
} }
fn (r &Repl) function_call(line string) bool { fn (r &Repl) function_call(line string) bool {
@ -81,47 +89,49 @@ fn run_repl() []string {
else { else {
print('... ') print('... ')
} }
mut line := os.get_raw_line() r.line = os.get_raw_line()
if line.trim_space() == '' && line.ends_with('\n') { if r.line.trim_space() == '' && r.line.ends_with('\n') {
continue continue
} }
line = line.trim_space() r.line = r.line.trim_space()
if line.len == -1 || line == '' || line == 'exit' { if r.line.len == -1 || r.line == '' || r.line == 'exit' {
break break
} }
if line == '\n' { if r.line == '\n' {
continue continue
} }
if line == 'clear' { if r.line == 'clear' {
term.erase_display('2') term.erase_display('2')
continue continue
} }
if line == 'help' { if r.line == 'help' {
repl_help() repl_help()
continue continue
} }
if line.starts_with('fn') { if r.line.starts_with('fn') {
r.in_func = true r.in_func = true
r.functions_name << line.all_after('fn').all_before('(').trim_space() r.functions_name << r.line.all_after('fn').all_before('(').trim_space()
} }
was_func := r.in_func was_func := r.in_func
if r.checks(line) { if r.checks() {
if r.in_func || was_func { for line in r.line.split('\n') {
r.functions << line if r.in_func || was_func {
} r.functions << line
else { }
r.temp_lines << line else {
r.temp_lines << line
}
} }
if r.indent > 0 { if r.indent > 0 {
continue continue
} }
line = '' r.line = ''
} }
// Save the source only if the user is printing something, // Save the source only if the user is printing something,
// but don't add this print call to the `lines` array, // but don't add this print call to the `lines` array,
// so that it doesn't get called during the next print. // so that it doesn't get called during the next print.
if line.starts_with('print') { if r.line.starts_with('print') {
source_code := r.functions.join('\n') + r.lines.join('\n') + '\n' + line source_code := r.functions.join('\n') + r.lines.join('\n') + '\n' + r.line
os.write_file(file, source_code) os.write_file(file, source_code)
s := os.exec('$vexe run $file -repl') or { s := os.exec('$vexe run $file -repl') or {
verror(err) verror(err)
@ -133,27 +143,27 @@ fn run_repl() []string {
} }
} }
else { else {
mut temp_line := line mut temp_line := r.line
mut temp_flag := false mut temp_flag := false
func_call := r.function_call(line) func_call := r.function_call(r.line)
if !(line.contains(' ') || line.contains(':') || line.contains('=') || line.contains(',') || line == '') && !func_call { if !(r.line.contains(' ') || r.line.contains(':') || r.line.contains('=') || r.line.contains(',') || r.line == '') && !func_call {
temp_line = 'println($line)' temp_line = 'println($r.line)'
temp_flag = true temp_flag = true
} }
temp_source_code := r.functions.join('\n') + r.lines.join('\n') + r.temp_lines.join('\n') + '\n' + temp_line temp_source_code := r.functions.join('\n') + r.lines.join('\n') + '\n' + r.temp_lines.join('\n') + '\n' + temp_line
os.write_file(temp_file, temp_source_code) os.write_file(temp_file, temp_source_code)
s := os.exec('$vexe run $temp_file -repl') or { s := os.exec('$vexe run $temp_file -repl') or {
verror(err) verror(err)
return []string return []string
} }
if !func_call && s.exit_code == 0 { 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') {
r.lines << r.temp_lines[0] r.lines << r.temp_lines[0]
} }
r.temp_lines.delete(0) r.temp_lines.delete(0)
} }
r.lines << line r.lines << r.line
} }
else { else {
for r.temp_lines.len > 0 { for r.temp_lines.len > 0 {

18
compiler/tests/repl/chained_fields.repl
View File

@ -32,47 +32,47 @@
/*(17)*/ e.v << 1 // Error (e immutable) /*(17)*/ e.v << 1 // Error (e immutable)
===output=== ===output===
.vrepl_temp.v:8:14: cannot modify immutable field `len` (type `string`) .vrepl_temp.v:27:14: cannot modify immutable field `len` (type `string`)
declare the field with `mut:` declare the field with `mut:`
struct string { struct string {
mut: mut:
len int len int
} }
.vrepl_temp.v:9:14: cannot modify immutable field `a` (type `B`) .vrepl_temp.v:30:14: cannot modify immutable field `a` (type `B`)
declare the field with `mut:` declare the field with `mut:`
struct B { struct B {
mut: mut:
a A a A
} }
.vrepl_temp.v:9:12: cannot modify immutable field `a` (type `B`) .vrepl_temp.v:29:12: cannot modify immutable field `a` (type `B`)
declare the field with `mut:` declare the field with `mut:`
struct B { struct B {
mut: mut:
a A a A
} }
.vrepl_temp.v:12:14: cannot modify immutable field `a` (type `B`) .vrepl_temp.v:41:14: cannot modify immutable field `a` (type `B`)
declare the field with `mut:` declare the field with `mut:`
struct B { struct B {
mut: mut:
a A a A
} }
.vrepl_temp.v:12:16: cannot modify immutable field `a` (type `B`) .vrepl_temp.v:42:16: cannot modify immutable field `a` (type `B`)
declare the field with `mut:` declare the field with `mut:`
struct B { struct B {
mut: mut:
a A a A
} }
.vrepl_temp.v:13:15: `c2` is immutable .vrepl_temp.v:44:15: `c2` is immutable
.vrepl_temp.v:16:12: cannot modify immutable field `e` (type `F`) .vrepl_temp.v:53:12: cannot modify immutable field `e` (type `F`)
declare the field with `mut:` declare the field with `mut:`
struct F { struct F {
mut: mut:
e []E e []E
} }
.vrepl_temp.v:16:17: cannot modify immutable field `e` (type `F`) .vrepl_temp.v:54:17: cannot modify immutable field `e` (type `F`)
declare the field with `mut:` declare the field with `mut:`
struct F { struct F {
mut: mut:
e []E e []E
} }
.vrepl_temp.v:17:17: `e` is immutable (can't <<) .vrepl_temp.v:57:17: `e` is immutable (can't <<)

2
compiler/tests/repl/error_nosave.repl
View File

@ -1,5 +1,5 @@
a a
33 33
===output=== ===output===
.vrepl_temp.v:2:9: undefined: `a` .vrepl_temp.v:3:9: undefined: `a`
33 33

6
compiler/tests/repl/immutable_len_fields.repl
View File

@ -9,19 +9,19 @@ ints.len = 0 // Error (field len immutable)
println('BYE') println('BYE')
===output=== ===output===
.vrepl_temp.v:2:5: cannot modify immutable field `len` (type `string`) .vrepl_temp.v:3:5: cannot modify immutable field `len` (type `string`)
declare the field with `mut:` declare the field with `mut:`
struct string { struct string {
mut: mut:
len int len int
} }
.vrepl_temp.v:3:5: cannot modify immutable field `len` (type `array`) .vrepl_temp.v:4:5: cannot modify immutable field `len` (type `array`)
declare the field with `mut:` declare the field with `mut:`
struct array { struct array {
mut: mut:
len int len int
} }
.vrepl_temp.v:4:8: cannot modify immutable field `len` (type `array`) .vrepl_temp.v:5:8: cannot modify immutable field `len` (type `array`)
declare the field with `mut:` declare the field with `mut:`
struct array { struct array {
mut: mut: