language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 04:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Materialize extension variable polarity in error type reporting

Browse source
This commit is contained in:
Ayaz Hafiz 2022-10-25 15:30:19 -05:00
parent 3c15ff4694
commit 4d48ea7c2f
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
12 changed files with 277 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

43
crates/compiler/unify/src/unify.rs
View file

@ -13,7 +13,9 @@ use roc_types::subs::{
OptVariable, RecordFields, Subs, SubsIndex, SubsSlice, UlsOfVar, UnionLabels, UnionLambdas,
UnionTags, Variable, VariableSubsSlice,
};
use roc_types::types::{AliasKind, DoesNotImplementAbility, ErrorType, Mismatch, RecordField, Uls};
use roc_types::types::{
AliasKind, DoesNotImplementAbility, ErrorType, Mismatch, Polarity, RecordField, Uls,
};
macro_rules! mismatch {
() => {{
@ -340,9 +342,21 @@ impl<'a> Env<'a> {
}
}
/// Unifies two types.
/// The [mode][Mode] enables or disables certain extensional features of unification.
///
/// `observed_pol` describes the [polarity][Polarity] of the type observed to be under unification.
/// This is only relevant for producing error types, and is not material to the unification
/// algorithm.
#[inline(always)]
pub fn unify(env: &mut Env, var1: Variable, var2: Variable, mode: Mode) -> Unified {
unify_help(env, var1, var2, mode)
pub fn unify(
env: &mut Env,
var1: Variable,
var2: Variable,
mode: Mode,
observed_pol: Polarity,
) -> Unified {
unify_help(env, var1, var2, mode, observed_pol)
}
#[inline(always)]
@ -353,7 +367,13 @@ pub fn unify_introduced_ability_specialization(
specialization_var: Variable,
mode: Mode,
) -> Unified<SpecializationLsetCollector> {
unify_help(env, ability_member_signature, specialization_var, mode)
unify_help(
env,
ability_member_signature,
specialization_var,
mode,
Polarity::OF_VALUE,
)
}
#[inline(always)]
@ -363,8 +383,9 @@ pub fn unify_with_collector<M: MetaCollector>(
var1: Variable,
var2: Variable,
mode: Mode,
observed_pol: Polarity,
) -> Unified<M> {
unify_help(env, var1, var2, mode)
unify_help(env, var1, var2, mode, observed_pol)
}
#[inline(always)]
@ -374,6 +395,7 @@ fn unify_help<M: MetaCollector>(
var1: Variable,
var2: Variable,
mode: Mode,
observed_pol: Polarity,
) -> Unified<M> {
let mut vars = Vec::new();
let Outcome {
@ -397,8 +419,12 @@ fn unify_help<M: MetaCollector>(
ErrorTypeContext::None
};
let (type1, mut problems) = env.subs.var_to_error_type_contextual(var1, error_context);
let (type2, problems2) = env.subs.var_to_error_type_contextual(var2, error_context);
let (type1, mut problems) =
env.subs
.var_to_error_type_contextual(var1, error_context, observed_pol);
let (type2, problems2) =
env.subs
.var_to_error_type_contextual(var2, error_context, observed_pol);
problems.extend(problems2);
@ -412,7 +438,8 @@ fn unify_help<M: MetaCollector>(
.filter_map(|mismatch| match mismatch {
Mismatch::DoesNotImplementAbiity(var, ab) => {
let (err_type, _new_problems) =
env.subs.var_to_error_type_contextual(var, error_context);
env.subs
.var_to_error_type_contextual(var, error_context, observed_pol);
Some((err_type, ab))
}
_ => None,