language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-09-27 19:59:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: args expansion

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-08-20 00:05:42 +09:00
parent 33b0212002
commit d433bcbcce
10 changed files with 270 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/erg_compiler/codegen.rs
View file

@ -609,7 +609,7 @@ impl PyCodeGenerator {
}
fn stack_dec_n(&mut self, n: usize) {
if n > 0 && self.stack_len() == 0 {
if n as u32 > self.stack_len() {
let lasti = self.lasti();
let last = self.cur_block_codeobj().code.last().unwrap();
self.crash(&format!(
@ -2825,6 +2825,19 @@ impl PyCodeGenerator {
self.write_instr(Opcode310::LIST_TO_TUPLE);
self.write_arg(0);
}
self.stack_dec();
}
fn emit_kw_var_args_311(&mut self, pos_len: usize, kw_var: &PosArg) {
self.write_instr(BUILD_TUPLE);
self.write_arg(pos_len);
self.stack_dec_n(pos_len.saturating_sub(1));
self.write_instr(BUILD_MAP);
self.write_arg(0);
self.emit_expr(kw_var.expr.clone());
self.write_instr(Opcode311::DICT_MERGE);
self.write_arg(1);
self.stack_dec();
}
fn emit_var_args_308(&mut self, pos_len: usize, var_args: &PosArg) {
@ -2839,6 +2852,14 @@ impl PyCodeGenerator {
}
}
fn emit_kw_var_args_308(&mut self, pos_len: usize, kw_var: &PosArg) {
self.write_instr(BUILD_TUPLE);
self.write_arg(pos_len);
self.emit_expr(kw_var.expr.clone());
self.stack_dec_n(pos_len.saturating_sub(1));
self.stack_dec();
}
fn emit_args_311(&mut self, mut args: Args, kind: AccessKind) {
let argc = args.len();
let pos_len = args.pos_args.len();
@ -2857,6 +2878,13 @@ impl PyCodeGenerator {
kws.push(ValueObj::Str(arg.keyword.content));
self.emit_expr(arg.expr);
}
if let Some(kw_var) = &args.kw_var {
if self.py_version.minor >= Some(10) {
self.emit_kw_var_args_311(pos_len, kw_var);
} else {
self.emit_kw_var_args_308(pos_len, kw_var);
}
}
let kwsc = if !kws.is_empty() {
self.emit_call_kw_instr(argc, kws);
#[allow(clippy::bool_to_int_with_if)]
@ -2866,9 +2894,9 @@ impl PyCodeGenerator {
1
}
} else {
if args.var_args.is_some() {
if args.var_args.is_some() || args.kw_var.is_some() {
self.write_instr(CALL_FUNCTION_EX);
if kws.is_empty() {
if kws.is_empty() && args.kw_var.is_none() {
self.write_arg(0);
} else {
self.write_arg(1);