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

fix: clean up uniq and adjust PatternCategory for int type in constrain

Browse source
This commit is contained in:
rvcas 2020-12-21 17:57:23 -05:00
parent 3ea4858eb5
commit e91fc2f1ff
2 changed files with 17 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/constrain/src/pattern.rs
View file

@ -157,7 +157,7 @@ pub fn constrain_pattern(
IntLiteral(_) => { IntLiteral(_) => {
state.constraints.push(Constraint::Pattern( state.constraints.push(Constraint::Pattern(
region, region,
PatternCategory::Float, PatternCategory::Int,
builtins::num_int(), builtins::num_int(),
expected, expected,
)); ));

49
compiler/constrain/src/uniq.rs
View file

@ -12,6 +12,7 @@ use roc_module::ident::{Ident, Lowercase};
use roc_module::symbol::{ModuleId, Symbol}; use roc_module::symbol::{ModuleId, Symbol};
use roc_region::all::{Located, Region}; use roc_region::all::{Located, Region};
use roc_types::boolean_algebra::Bool; use roc_types::boolean_algebra::Bool;
use roc_types::builtin_aliases;
use roc_types::subs::{VarStore, Variable}; use roc_types::subs::{VarStore, Variable};
use roc_types::types::AnnotationSource::{self, *}; use roc_types::types::AnnotationSource::{self, *};
use roc_types::types::Type::{self, *}; use roc_types::types::Type::{self, *};
@ -423,48 +424,30 @@ fn unique_unbound_num(
(num_uvar, val_uvar, num_type, num_var) (num_uvar, val_uvar, num_type, num_var)
} }
fn unique_num(val_type: Type, uvar: Variable) -> Type {
let val_utype = attr_type(Bool::variable(uvar), val_type);
let num_utype = num_num(val_utype);
attr_type(Bool::variable(uvar), num_utype)
}
fn unique_integer(var_store: &mut VarStore, val_type: Type) -> (Variable, Type) {
let num_uvar = var_store.fresh();
let val_utype = attr_type(Bool::variable(num_uvar), val_type);
let num_type = num_integer(val_utype);
(num_uvar, num_type)
}
fn unique_int(var_store: &mut VarStore) -> (Variable, Type) { fn unique_int(var_store: &mut VarStore) -> (Variable, Type) {
let (var1, typ) = unique_integer(var_store, num_signed64());
let typ = unique_num(typ, var1);
(var1, typ)
}
fn unique_floatingpoint(var_store: &mut VarStore, val_type: Type) -> (Variable, Type) {
let num_uvar = var_store.fresh(); let num_uvar = var_store.fresh();
let val_utype = attr_type(Bool::variable(num_uvar), val_type); let signed_64 = num_signed64();
let attr_signed_64 = attr_type(Bool::variable(num_uvar), signed_64);
let integer = num_integer(attr_signed_64);
let attr_int = attr_type(Bool::variable(num_uvar), integer);
let num = num_num(attr_int);
let attr_num = attr_type(Bool::variable(num_uvar), num);
let num_type = num_floatingpoint(val_utype); (num_uvar, attr_num)
(num_uvar, num_type)
} }
fn unique_float(var_store: &mut VarStore) -> (Variable, Type) { fn unique_float(var_store: &mut VarStore) -> (Variable, Type) {
let (var1, typ) = unique_floatingpoint(var_store, num_binary64()); let num_uvar = var_store.fresh();
let typ = unique_num(typ, var1); let binary_64 = num_binary64();
let attr_binary_64 = attr_type(Bool::variable(num_uvar), binary_64);
let fp = num_floatingpoint(attr_binary_64);
let attr_fp = attr_type(Bool::variable(num_uvar), fp);
let num = num_num(attr_fp);
let attr_num = attr_type(Bool::variable(num_uvar), num);
(var1, typ) (num_uvar, attr_num)
} }
pub fn constrain_expr( pub fn constrain_expr(