language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-08-04 18:58:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(REPL): add assign block and inherit case

Browse source
This commit is contained in:
GreasrySlug 2023-02-06 16:42:53 +09:00
parent a498b906c4
commit 7a8fc44f29
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/erg_common/traits.rs
View file

@ -532,8 +532,10 @@ impl VirtualMachine {
if self.now == BlockKind::AtMark && bk == BlockKind::AtMark {
return;
}
// Change from AtMark to ClassDef
if self.now == BlockKind::AtMark && bk == BlockKind::ClassDef {
// Change from AtMark to ClassDef or Assignment
if (bk == BlockKind::ClassDef || bk == BlockKind::Assignment)
&& self.now == BlockKind::AtMark
{
self.now_block.pop();
}
// Change from ClassDef to ClassPriv or ClassPub
@ -646,7 +648,7 @@ pub trait Runnable: Sized + Default {
if src.ends_with("->") && !src.starts_with("->") {
return BlockKind::Lambda;
}
if src.contains("Class") {
if src.contains("Class") || src.contains("Inherit") {
return BlockKind::ClassDef;
}
BlockKind::None
@ -782,6 +784,8 @@ pub trait Runnable: Sized + Default {
continue;
}
}
vm.push_code(indent.as_str());
instance.input().insert_whitespace(indent.as_str());
vm.push_code(line);
vm.push_code("\n");
continue;
@ -789,7 +793,9 @@ pub trait Runnable: Sized + Default {
// Intentionally code will be evaluated and make an error
vm.now = BlockKind::Main;
}
BlockKind::ClassDef if vm.now == BlockKind::AtMark => {
BlockKind::ClassDef | BlockKind::Assignment
if vm.now == BlockKind::AtMark =>
{
vm.push_block_kind(bk);
vm.push_code(indent.as_str());
instance.input().insert_whitespace(indent.as_str());