mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
repl: moved as a tool and using readline
This commit is contained in:
Henrixounez
committed by
Alexander Medvednikov
Alexander Medvednikov
parent
114953f28d
commit
55f6e810cf
@ -1048,6 +1048,23 @@ pub fn install_v(args[]string) {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn run_repl() {
|
||||
vexec := vexe_path()
|
||||
vroot := os.dir(vexec)
|
||||
vrepl := '$vroot/tools/vrepl'
|
||||
|
||||
os.chdir(vroot + '/tools')
|
||||
vrepl_compilation := os.exec('"$vexec" -o $vrepl vrepl.v') or {
|
||||
verror(err)
|
||||
return
|
||||
}
|
||||
if vrepl_compilation.exit_code != 0 {
|
||||
verror(vrepl_compilation.output)
|
||||
return
|
||||
}
|
||||
vreplresult := os.system('$vrepl "$vexec"')
|
||||
}
|
||||
|
||||
pub fn create_symlink() {
|
||||
vexe := vexe_path()
|
||||
link_path := '/usr/local/bin/v'
|
||||
|
||||
@ -1,180 +0,0 @@
|
||||
// Copyright (c) 2019 Alexander Medvednikov. All rights reserved.
|
||||
// Use of this source code is governed by an MIT license
|
||||
// that can be found in the LICENSE file.
|
||||
|
||||
module compiler
|
||||
|
||||
import os
|
||||
import term
|
||||
|
||||
struct Repl {
|
||||
mut:
|
||||
indent int
|
||||
in_func bool
|
||||
line string
|
||||
lines []string
|
||||
temp_lines []string
|
||||
functions_name []string
|
||||
functions []string
|
||||
}
|
||||
|
||||
fn (r mut Repl) checks() bool {
|
||||
mut in_string := false
|
||||
mut is_cut := false
|
||||
was_indent := r.indent > 0
|
||||
|
||||
for i := 0; i < r.line.len; i++ {
|
||||
if r.line[i] == `\'` && (i == 0 || r.line[i - 1] != `\\`) {
|
||||
in_string = !in_string
|
||||
}
|
||||
if r.line[i] == `{` && !in_string {
|
||||
r.line = r.line[..i + 1] + '\n' + r.line[i + 1..]
|
||||
is_cut = true
|
||||
i++
|
||||
r.indent++
|
||||
}
|
||||
if r.line[i] == `}` && !in_string {
|
||||
r.line = r.line[..i] + '\n' + r.line[i..]
|
||||
is_cut = true
|
||||
i++
|
||||
r.indent--
|
||||
if r.indent == 0 {
|
||||
r.in_func = false
|
||||
}
|
||||
}
|
||||
if i + 2 < r.line.len && r.indent == 0 && r.line[i + 1] == `f` && r.line[i + 2] == `n` {
|
||||
r.in_func = true
|
||||
}
|
||||
}
|
||||
return r.in_func || (was_indent && r.indent <= 0) || r.indent > 0 || is_cut
|
||||
}
|
||||
|
||||
fn (r &Repl) function_call(line string) bool {
|
||||
for function in r.functions_name {
|
||||
if line.starts_with(function) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
pub fn repl_help() {
|
||||
version_hash := vhash()
|
||||
println('
|
||||
V $Version $version_hash
|
||||
help Displays this information.
|
||||
Ctrl-C, Ctrl-D, exit Exits the REPL.
|
||||
clear Clears the screen.
|
||||
')
|
||||
}
|
||||
|
||||
pub fn run_repl() []string {
|
||||
version_hash := vhash()
|
||||
println('V $Version $version_hash')
|
||||
println('Use Ctrl-C or `exit` to exit')
|
||||
file := '.vrepl.v'
|
||||
temp_file := '.vrepl_temp.v'
|
||||
defer {
|
||||
os.rm(file)
|
||||
os.rm(temp_file)
|
||||
os.rm(file[..file.len - 2])
|
||||
os.rm(temp_file[..temp_file.len - 2])
|
||||
}
|
||||
mut r := Repl{}
|
||||
vexe := os.args[0]
|
||||
for {
|
||||
if r.indent == 0 {
|
||||
print('>>> ')
|
||||
}
|
||||
else {
|
||||
print('... ')
|
||||
}
|
||||
r.line = os.get_raw_line()
|
||||
if r.line.trim_space() == '' && r.line.ends_with('\n') {
|
||||
continue
|
||||
}
|
||||
r.line = r.line.trim_space()
|
||||
if r.line.len == -1 || r.line == '' || r.line == 'exit' {
|
||||
break
|
||||
}
|
||||
if r.line == '\n' {
|
||||
continue
|
||||
}
|
||||
if r.line == 'clear' {
|
||||
term.erase_display('2')
|
||||
continue
|
||||
}
|
||||
if r.line == 'help' {
|
||||
repl_help()
|
||||
continue
|
||||
}
|
||||
if r.line.starts_with('fn') {
|
||||
r.in_func = true
|
||||
r.functions_name << r.line.all_after('fn').all_before('(').trim_space()
|
||||
}
|
||||
was_func := r.in_func
|
||||
if r.checks() {
|
||||
for line in r.line.split('\n') {
|
||||
if r.in_func || was_func {
|
||||
r.functions << line
|
||||
}
|
||||
else {
|
||||
r.temp_lines << line
|
||||
}
|
||||
}
|
||||
if r.indent > 0 {
|
||||
continue
|
||||
}
|
||||
r.line = ''
|
||||
}
|
||||
// Save the source only if the user is printing something,
|
||||
// but don't add this print call to the `lines` array,
|
||||
// so that it doesn't get called during the next print.
|
||||
if r.line.starts_with('print') {
|
||||
source_code := r.functions.join('\n') + r.lines.join('\n') + '\n' + r.line
|
||||
os.write_file(file, source_code)
|
||||
s := os.exec('"$vexe" run $file -repl') or {
|
||||
verror(err)
|
||||
return []string
|
||||
}
|
||||
vals := s.output.split('\n')
|
||||
for i:=0; i < vals.len; i++ {
|
||||
println(vals[i])
|
||||
}
|
||||
}
|
||||
else {
|
||||
mut temp_line := r.line
|
||||
mut temp_flag := false
|
||||
func_call := r.function_call(r.line)
|
||||
if !(r.line.contains(' ') || r.line.contains(':') || r.line.contains('=') || r.line.contains(',') || r.line == '') && !func_call {
|
||||
temp_line = 'println($r.line)'
|
||||
temp_flag = true
|
||||
}
|
||||
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)
|
||||
s := os.exec('"$vexe" run $temp_file -repl') or {
|
||||
verror(err)
|
||||
return []string
|
||||
}
|
||||
if !func_call && s.exit_code == 0 && !temp_flag {
|
||||
for r.temp_lines.len > 0 {
|
||||
if !r.temp_lines[0].starts_with('print') {
|
||||
r.lines << r.temp_lines[0]
|
||||
}
|
||||
r.temp_lines.delete(0)
|
||||
}
|
||||
r.lines << r.line
|
||||
}
|
||||
else {
|
||||
for r.temp_lines.len > 0 {
|
||||
r.temp_lines.delete(0)
|
||||
}
|
||||
}
|
||||
vals := s.output.split('\n')
|
||||
for i:=0; i<vals.len; i++ {
|
||||
println(vals[i])
|
||||
}
|
||||
}
|
||||
}
|
||||
return r.lines
|
||||
}
|
||||
Reference in New Issue
Block a user