language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 05:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Recover default layouts for floats

Browse source
This commit is contained in:
Ayaz Hafiz 2022-07-04 23:19:01 -04:00 • committed by ayazhafiz
parent 4ef8ceef9e
commit 26148b8b12
No known key found for this signature in database
GPG key ID: B443F7A3030C9AED
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/compiler/mono/src/layout.rs
View file

@ -1208,6 +1208,16 @@ pub fn is_unresolved_var(subs: &Subs, var: Variable) -> bool {
) )
} }
#[inline(always)]
pub fn is_any_float_range(subs: &Subs, var: Variable) -> bool {
use {roc_types::num::IntLitWidth::*, Content::*, NumericRange::*};
let content = subs.get_content_without_compacting(var);
matches!(
content,
RangedNumber(NumAtLeastEitherSign(I8) | NumAtLeastSigned(I8)),
)
}
impl<'a> Layout<'a> { impl<'a> Layout<'a> {
pub const VOID: Self = Layout::Union(UnionLayout::NonRecursive(&[])); pub const VOID: Self = Layout::Union(UnionLayout::NonRecursive(&[]));
pub const UNIT: Self = Layout::Struct { pub const UNIT: Self = Layout::Struct {
@ -1255,7 +1265,8 @@ impl<'a> Layout<'a> {
} }
Symbol::NUM_FRAC | Symbol::NUM_FLOATINGPOINT Symbol::NUM_FRAC | Symbol::NUM_FLOATINGPOINT
if is_unresolved_var(env.subs, actual_var) => if is_unresolved_var(env.subs, actual_var)
|| is_any_float_range(env.subs, actual_var) =>
{ {
// default to f64 // default to f64
return Ok(Layout::f64()); return Ok(Layout::f64());

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

@ -594,7 +594,7 @@ fn check_and_merge_valid_range<M: MetaCollector>(
merge_if!(range.contains_int_width(IntLitWidth::U128)) merge_if!(range.contains_int_width(IntLitWidth::U128))
} }
Symbol::NUM_DEC => { Symbol::NUM_DEC | Symbol::NUM_DECIMAL => {
merge_if!(range.contains_float_width(FloatWidth::Dec)) merge_if!(range.contains_float_width(FloatWidth::Dec))
} }
Symbol::NUM_F32 | Symbol::NUM_BINARY32 => { Symbol::NUM_F32 | Symbol::NUM_BINARY32 => {