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

Treat numbers as ad-hoc types for the purpose of checking ability obligations

Browse source
This commit is contained in:
Ayaz Hafiz 2022-07-13 11:18:21 -04:00
parent 568e8d9475
commit 7b23077265
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
3 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/compiler/solve/src/ability.rs
View file

@ -553,15 +553,6 @@ impl ObligationCache<'_> {
}
Erroneous(_) => return Err(var),
},
Alias(name, _, _, AliasKind::Opaque) => {
let opaque = *name;
if self
.check_opaque_and_read(subs, opaque, Symbol::ENCODE_ENCODING)
.is_err()
{
return Err(var);
}
}
Alias(
Symbol::NUM_U8
| Symbol::NUM_U16
@ -576,13 +567,23 @@ impl ObligationCache<'_> {
| Symbol::NUM_NAT
| Symbol::NUM_F32
| Symbol::NUM_F64
| Symbol::NUM_DEC,
| Symbol::NUM_DEC
| Symbol::NUM_NUM,
_,
_,
_,
) => {
// yes
}
Alias(name, _, _, AliasKind::Opaque) => {
let opaque = *name;
if self
.check_opaque_and_read(subs, opaque, Symbol::ENCODE_ENCODING)
.is_err()
{
return Err(var);
}
}
Alias(_, arguments, real_type_var, _) => {
push_var_slice!(arguments.all_variables());
stack.push(*real_type_var);

6
crates/compiler/solve/src/solve.rs
View file

@ -2233,7 +2233,10 @@ fn make_specialization_decision(subs: &Subs, var: Variable) -> SpecializeDecisio
use Content::*;
use SpecializationTypeKey::*;
match subs.get_content_without_compacting(var) {
Structure(_) | Alias(_, _, _, AliasKind::Structural) => {
Alias(opaque, _, _, AliasKind::Opaque) if opaque.module_id() != ModuleId::NUM => {
SpecializeDecision::Specialize(Opaque(*opaque))
}
Structure(_) | Alias(_, _, _, _) => {
// This is a structural type, find the name of the derived ability function it
// should use.
match roc_derive_key::Derived::encoding(subs, var) {
@ -2258,7 +2261,6 @@ fn make_specialization_decision(subs: &Subs, var: Variable) -> SpecializeDecisio
}
}
}
Alias(opaque, _, _, AliasKind::Opaque) => SpecializeDecision::Specialize(Opaque(*opaque)),
Error => SpecializeDecision::Drop,
FlexAbleVar(_, _)
| RigidAbleVar(..)