roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-11-10 10:02:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Promote flex vars to flex-able in obligation checking

Browse Source
This commit is contained in:
Ayaz Hafiz 2022-08-16 14:40:24 -05:00
parent 286e27547e
commit 6255332cee
No known key found for this signature in database
GPG Key ID: 0E2A37416A25EF58
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/compiler/solve/src/ability.rs
View File

@ -442,16 +442,6 @@ trait DerivableVisitor {
false
}
#[inline(always)]
fn visit_flex(var: Variable) -> Result<(), DerivableError> {
Err(DerivableError::NotDerivable(var))
}
#[inline(always)]
fn visit_rigid(var: Variable) -> Result<(), DerivableError> {
Err(DerivableError::NotDerivable(var))
}
#[inline(always)]
fn visit_flex_able(var: Variable, ability: Symbol) -> Result<(), DerivableError> {
if ability != Self::ABILITY {
@ -529,7 +519,7 @@ trait DerivableVisitor {
fn is_derivable(
obligation_cache: &mut ObligationCache,
abilities_store: &AbilitiesStore,
subs: &Subs,
subs: &mut Subs,
var: Variable,
) -> Result<(), DerivableError> {
let mut stack = vec![var];
@ -552,8 +542,11 @@ trait DerivableVisitor {
use DerivableError::*;
use FlatType::*;
match *content {
FlexVar(_) => Self::visit_flex(var)?,
RigidVar(_) => Self::visit_rigid(var)?,
FlexVar(opt_name) => {
// Promote the flex var to be bound to the ability.
subs.set_content(var, Content::FlexAbleVar(opt_name, Self::ABILITY));
}
RigidVar(_) => return Err(NotDerivable(var)),
FlexAbleVar(_, ability) => Self::visit_flex_able(var, ability)?,
RigidAbleVar(_, ability) => Self::visit_rigid_able(var, ability)?,
RecursionVar {