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

fix: dict update! bug

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-10-14 21:38:12 +09:00
parent a8c1113df7
commit 0a24c0cb77
15 changed files with 97 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/erg_compiler/context/eval.rs
View file

@ -1524,6 +1524,18 @@ impl Context {
}
}
fn _eval_tp_into_value(&self, tp: TyParam) -> EvalResult<ValueObj> {
self.eval_tp(tp).and_then(|tp| {
self.convert_tp_into_value(tp).map_err(|_| {
EvalErrors::from(EvalError::unreachable(
self.cfg.input.clone(),
fn_name!(),
line!(),
))
})
})
}
/// Evaluate `substituted`.
/// If the evaluation fails, return a harmless type (filled with `Failure`) and errors
pub(crate) fn eval_t_params(

26
crates/erg_compiler/context/initialize/classes.rs
View file

@ -2244,11 +2244,12 @@ impl Context {
vec![],
NoneType,
);
float_mut_mutable.register_builtin_erg_impl(
float_mut_mutable.register_builtin_py_impl(
PROC_UPDATE,
t,
Immutable,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_UPDATE),
);
float_mut.register_trait(mono(MUT_FLOAT), float_mut_mutable);
/* Ratio! */
@ -2268,11 +2269,12 @@ impl Context {
vec![],
NoneType,
);
ratio_mut_mutable.register_builtin_erg_impl(
ratio_mut_mutable.register_builtin_py_impl(
PROC_UPDATE,
t,
Immutable,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_UPDATE),
);
ratio_mut.register_trait(mono(MUT_RATIO), ratio_mut_mutable);
/* Int! */
@ -2308,11 +2310,12 @@ impl Context {
vec![],
NoneType,
);
int_mut_mutable.register_builtin_erg_impl(
int_mut_mutable.register_builtin_py_impl(
PROC_UPDATE,
t,
Immutable,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_UPDATE),
);
int_mut.register_trait(mono(MUT_INT), int_mut_mutable);
let mut nat_mut = Self::builtin_mono_class(MUT_NAT, 2);
@ -2333,11 +2336,12 @@ impl Context {
vec![],
NoneType,
);
nat_mut_mutable.register_builtin_erg_impl(
nat_mut_mutable.register_builtin_py_impl(
PROC_UPDATE,
t,
Immutable,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_UPDATE),
);
nat_mut.register_trait(mono(MUT_NAT), nat_mut_mutable);
/* Bool! */
@ -2358,11 +2362,12 @@ impl Context {
vec![],
NoneType,
);
bool_mut_mutable.register_builtin_erg_impl(
bool_mut_mutable.register_builtin_py_impl(
PROC_UPDATE,
t,
Immutable,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_UPDATE),
);
bool_mut.register_trait(mono(MUT_BOOL), bool_mut_mutable);
let t = pr0_met(mono(MUT_BOOL), NoneType);
@ -2390,11 +2395,12 @@ impl Context {
vec![],
NoneType,
);
str_mut_mutable.register_builtin_erg_impl(
str_mut_mutable.register_builtin_py_impl(
PROC_UPDATE,
t,
Immutable,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_UPDATE),
);
str_mut.register_trait(mono(MUT_STR), str_mut_mutable);
let t = pr_met(
@ -2626,11 +2632,12 @@ impl Context {
)
.quantify();
let mut array_mut_mutable = Self::builtin_methods(Some(mono(MUTABLE)), 2);
array_mut_mutable.register_builtin_erg_impl(
array_mut_mutable.register_builtin_py_impl(
PROC_UPDATE,
t,
Immutable,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_UPDATE),
);
array_mut_.register_trait(array_mut_t.clone(), array_mut_mutable);
/* ByteArray! */
@ -2766,7 +2773,10 @@ impl Context {
poly(ITERABLE, vec![ty_tp(tuple_t(vec![K.clone(), V.clone()]))]),
)],
None,
vec![],
vec![kw(
KW_CONFLICT_RESOLVER,
func2(V.clone(), V.clone(), V.clone()),
)],
NoneType,
)
.quantify();

7
crates/erg_compiler/context/initialize/const_func.rs
View file

@ -6,6 +6,7 @@ use erg_common::dict::Dict;
use erg_common::log;
use erg_common::{dict, set};
use crate::context::eval::UndoableLinkedList;
use crate::context::Context;
use crate::feature_error;
use crate::ty::constructors::{and, mono, tuple_t, v_enum};
@ -237,7 +238,8 @@ pub(crate) fn sub_vdict_get<'d>(
}
}
for (idx, kt, v) in matches.into_iter() {
match ctx.sub_unify(idx.typ(), kt.typ(), &(), None) {
let list = UndoableLinkedList::new();
match ctx.undoable_sub_unify(idx.typ(), kt.typ(), &(), &list, None) {
Ok(_) => {
return Some(v);
}
@ -269,7 +271,8 @@ pub(crate) fn sub_tpdict_get<'d>(
}
}
for (idx, kt, v) in matches.into_iter() {
match ctx.sub_unify(idx, kt, &(), None) {
let list = UndoableLinkedList::new();
match ctx.undoable_sub_unify(idx, kt, &(), &list, None) {
Ok(_) => {
return Some(v);
}

1
crates/erg_compiler/context/initialize/mod.rs
View file

@ -562,6 +562,7 @@ const KW_OFFSET: &str = "offset";
const KW_WHENCE: &str = "whence";
const KW_CHARS: &str = "chars";
const KW_OTHER: &str = "other";
const KW_CONFLICT_RESOLVER: &str = "conflict_resolver";
pub fn builtins_path() -> PathBuf {
erg_pystd_path().join("builtins.d.er")

7
crates/erg_compiler/context/unify.rs
View file

@ -1005,8 +1005,7 @@ impl<'c, 'l, 'u, L: Locational> Unifier<'c, 'l, 'u, L> {
if sup.contains_union(&new_sub) {
maybe_sup.link(&new_sub, self.undoable); // Bool <: ?T <: Bool or Y ==> ?T == Bool
} else {
let constr = Constraint::new_sandwiched(new_sub, mem::take(&mut sup));
maybe_sup.update_constraint(constr, self.undoable, true);
maybe_sup.update_tyvar(new_sub, mem::take(&mut sup), self.undoable, true);
}
}
// sub_unify(Nat, ?T(: Type)): (/* ?T(:> Nat) */)
@ -1072,8 +1071,7 @@ impl<'c, 'l, 'u, L: Locational> Unifier<'c, 'l, 'u, L> {
{
maybe_sub.link(&sub, self.undoable);
} else {
let constr = Constraint::new_sandwiched(sub, new_sup);
maybe_sub.update_constraint(constr, self.undoable, true);
maybe_sub.update_tyvar(sub, new_sup, self.undoable, true);
}
}
// sub_unify(?T(: Type), Int): (?T(<: Int))
@ -1570,6 +1568,7 @@ impl Context {
unifier.sub_unify_tp(maybe_sub, maybe_sup, variance, is_structural)
}
/// Use `undoable_sub_unify` to temporarily impose type constraints.
pub(crate) fn sub_unify(
&self,
maybe_sub: &Type,