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

chore: change logical operations order

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-09-02 19:38:41 +09:00
parent 57559b6b9f
commit 7cd895a30e
5 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/erg_compiler/context/inquire.rs
View file

@ -2626,7 +2626,7 @@ impl Context {
);
log!(info "Substituted:\ninstance: {instance}");
debug_assert!(
self.subtype_of(&instance, &Type::Type) || instance.has_no_qvar(),
instance.has_no_qvar() || self.subtype_of(&instance, &Type::Type),
"{instance} has qvar (obj: {obj}, attr: {}",
fmt_option!(attr_name)
);
@ -4072,7 +4072,7 @@ impl Context {
pub(crate) fn recover_typarams(&self, base: &Type, guard: &GuardType) -> TyCheckResult<Type> {
let intersec = self.intersection(&guard.to, base);
let is_never =
self.subtype_of(&intersec, &Type::Never) && guard.to.as_ref() != &Type::Never;
guard.to.as_ref() != &Type::Never && self.subtype_of(&intersec, &Type::Never);
if !is_never {
return Ok(intersec);
}