language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-10-02 21:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: codegen bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-02-13 11:47:51 +09:00
parent 3cef64816a
commit c120cb802f
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/erg_compiler/codegen.rs
View file

@ -958,13 +958,13 @@ impl PyCodeGenerator {
} }
} }
fn emit_load_method_instr(&mut self, ident: Identifier) { fn emit_load_method_instr(&mut self, ident: Identifier, acc_kind: AccessKind) {
log!(info "entered {} ({ident})", fn_name!()); log!(info "entered {} ({ident})", fn_name!());
let escaped = escape_ident(ident); let escaped = escape_ident(ident);
let name = self let name = self
.local_search(&escaped, BoundAttr) .local_search(&escaped, acc_kind)
.unwrap_or_else(|| self.register_method(escaped)); .unwrap_or_else(|| self.register_method(escaped));
let instr = self.select_load_instr(name.kind, BoundAttr); let instr = self.select_load_instr(name.kind, acc_kind);
self.write_instr(instr); self.write_instr(instr);
self.write_arg(name.idx); self.write_arg(name.idx);
if self.py_version.minor >= Some(11) { if self.py_version.minor >= Some(11) {
@ -2783,12 +2783,17 @@ impl PyCodeGenerator {
return self.emit_call_fake_method(obj, func_name, method_name, args); return self.emit_call_fake_method(obj, func_name, method_name, args);
} }
let is_type = method_name.ref_t().is_poly_type_meta(); let is_type = method_name.ref_t().is_poly_type_meta();
let kind = if self.py_version.minor >= Some(11) || method_name.vi.t.is_method() {
BoundAttr
} else {
UnboundAttr
};
self.emit_expr(obj); self.emit_expr(obj);
self.emit_load_method_instr(method_name); self.emit_load_method_instr(method_name, kind);
if is_type { if is_type {
self.emit_index_args(args); self.emit_index_args(args);
} else { } else {
self.emit_args_311(args, BoundAttr); self.emit_args_311(args, kind);
} }
} }
@ -3897,7 +3902,7 @@ impl PyCodeGenerator {
)], )],
); );
self.emit_load_name_instr(Identifier::private("#path")); self.emit_load_name_instr(Identifier::private("#path"));
self.emit_load_method_instr(Identifier::public("append")); self.emit_load_method_instr(Identifier::public("append"), BoundAttr);
self.emit_load_const(erg_core_path().to_str().unwrap()); self.emit_load_const(erg_core_path().to_str().unwrap());
self.emit_call_instr(1, BoundAttr); self.emit_call_instr(1, BoundAttr);
self.stack_dec(); self.stack_dec();