language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-08-01 17:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatically display evaluation results in REPL

Browse source
This commit is contained in:
Shunsuke Shibayama 2022-08-14 20:51:17 +09:00
parent 78e30b3867
commit beb0965cde
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/erg_common/config.rs
View file

@ -34,6 +34,10 @@ pub enum Input {
}
impl Input {
pub fn is_repl(&self) -> bool {
matches!(self, Input::REPL)
}
pub fn enclosed_name(&self) -> &str {
match self {
Self::File(filename) => &filename[..],

12
compiler/erg_compiler/codegen.rs
View file

@ -69,7 +69,7 @@ fn convert_to_python_name(name: Str) -> Str {
"import" => Str::ever("__import__"),
"input!" => Str::ever("input"),
"log" => Str::ever("print"), // TODO: log != print (prints after executing)
"p!" | "print!" => Str::ever("print"),
"print!" => Str::ever("print"),
"py" | "pyimport" => Str::ever("__import__"),
"quit" | "exit" => Str::ever("quit"),
_ => name,
@ -1223,6 +1223,9 @@ impl CodeGenerator {
"<module>",
1,
));
if self.input().is_repl() {
self.emit_load_name_instr(Str::ever("print")).unwrap();
}
for expr in hir.module.into_iter() {
self.codegen_expr(expr);
// TODO: discard
@ -1231,6 +1234,11 @@ impl CodeGenerator {
}
}
self.cancel_pop_top(); // 最後の値は戻り値として取っておく
if self.input().is_repl() {
self.write_instr(CALL_FUNCTION);
self.write_arg(1 as u8);
self.stack_dec();
}
if self.cur_block().stack_len == 0 {
self.emit_load_const(ValueObj::None);
} else if self.cur_block().stack_len > 1 {
@ -1243,7 +1251,7 @@ impl CodeGenerator {
block_id,
fn_name_full!(),
));
self.crash("error in codegen_module: invalid stack size");
self.crash("error in codegen: invalid stack size");
}
self.write_instr(RETURN_VALUE);
self.write_arg(0u8);

3
compiler/erg_compiler/initialize.rs
View file

@ -577,9 +577,6 @@ impl Context {
],
NoneType,
);
if cfg!(feature = "debug") {
self.register_impl("p!", t_print.clone(), Const, Private);
}
self.register_impl("print!", t_print, Const, Private);
self.register_impl("input!", t_input, Const, Private);
self.register_impl("if!", t_if, Const, Private);