language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-09-30 12:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update: can use multi-line string in REPL

Browse source
This commit is contained in:
GreasySlug 2022-09-21 08:39:32 +09:00
parent 8daed047a8
commit 13ed754b64
1 changed files with 42 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

47
compiler/erg_common/traits.rs
View file

@ -308,13 +308,30 @@ pub trait LimitedDisplay {
// for Runnable::run // for Runnable::run
fn expect_block(src: &str) -> bool { fn expect_block(src: &str) -> bool {
let src = src.trim_end(); let src = src.trim_end();
src.ends_with(&['.', '=', ':']) || src.ends_with("->") || src.ends_with("=>") src.ends_with(&['.', '=', ':'])
|| src.ends_with("->")
|| src.ends_with("=>")
|| src.contains("\"\"\"")
} }
// In the REPL, it is invalid for these symbols to be at the beginning of a line // In the REPL, it is invalid for these symbols to be at the beginning of a line
fn expect_invalid_block(src: &str) -> bool { fn expect_invalid_block(src: &str) -> bool {
let src = src.trim_start(); let src = src.trim_start();
src.starts_with(&['.', '=', ':']) || src.starts_with("->") src.starts_with(&['.', '=', ':']) || src.starts_with("->") || src.starts_with("=>")
}
fn is_in_the_expected_block(src: &str, lines: &str, in_block: &mut bool) -> bool {
if lines.contains("\"\"\"") {
if src.ends_with("\"\"\"") {
*in_block = false;
false
} else {
true
}
} else {
*in_block = false;
!expect_invalid_block(src) || src.starts_with(' ') && lines.contains('\n')
}
} }
/// This trait implements REPL (Read-Eval-Print-Loop) automatically /// This trait implements REPL (Read-Eval-Print-Loop) automatically
@ -367,6 +384,7 @@ pub trait Runnable: Sized {
} }
output.write_all(instance.ps1().as_bytes()).unwrap(); output.write_all(instance.ps1().as_bytes()).unwrap();
output.flush().unwrap(); output.flush().unwrap();
let mut in_block = false;
let mut lines = String::new(); let mut lines = String::new();
loop { loop {
let line = chomp(&instance.input().read()); let line = chomp(&instance.input().read());
@ -392,14 +410,33 @@ pub trait Runnable: Sized {
&line[..] &line[..]
}; };
lines.push_str(line); lines.push_str(line);
if expect_block(line) && !expect_invalid_block(line)
|| line.starts_with(' ') && lines.contains('\n') // ブロック内ならブロック内の関数を使ってcontinueするかしないかを判断
{ // ブロック外ならexpect_blockかどうかを判断j
if in_block {
if is_in_the_expected_block(line, &lines, &mut in_block) {
lines += "\n";
output.write_all(instance.ps2().as_bytes()).unwrap();
output.flush().unwrap();
continue;
}
} else if expect_block(line) {
in_block = true;
lines += "\n"; lines += "\n";
output.write_all(instance.ps2().as_bytes()).unwrap(); output.write_all(instance.ps2().as_bytes()).unwrap();
output.flush().unwrap(); output.flush().unwrap();
continue; continue;
} }
// if (expect_block(line) && !in_block)
// || (is_in_the_expected_block(line, &lines, &mut in_block) && in_block)
// {
// lines += "\n";
// output.write_all(instance.ps2().as_bytes()).unwrap();
// output.flush().unwrap();
// continue;
// }
match instance.eval(mem::take(&mut lines)) { match instance.eval(mem::take(&mut lines)) {
Ok(out) => { Ok(out) => {
output.write_all((out + "\n").as_bytes()).unwrap(); output.write_all((out + "\n").as_bytes()).unwrap();