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

implement solve crate

Browse source
This commit is contained in:
Folkert 2022-03-17 19:31:54 +01:00
parent b1612384c7
commit 426bfe3ff1
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 42 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

72
compiler/solve/src/solve.rs
View file

@ -13,7 +13,7 @@ use roc_types::subs::{
}; };
use roc_types::types::Type::{self, *}; use roc_types::types::Type::{self, *};
use roc_types::types::{ use roc_types::types::{
gather_fields_unsorted_iter, AliasKind, Category, ErrorType, PatternCategory, gather_fields_unsorted_iter, AliasKind, Category, ErrorType, PatternCategory, TypeExtension,
}; };
use roc_unify::unify::{unify, Mode, Unified::*}; use roc_unify::unify::{unify, Mode, Unified::*};
@ -807,7 +807,7 @@ fn solve(
let actual = type_to_var(subs, rank, pools, cached_aliases, typ); let actual = type_to_var(subs, rank, pools, cached_aliases, typ);
let tag_ty = Type::TagUnion( let tag_ty = Type::TagUnion(
vec![(tag_name.clone(), tys.to_vec())], vec![(tag_name.clone(), tys.to_vec())],
Box::new(Type::EmptyTagUnion), TypeExtension::Closed,
); );
let includes = type_to_var(subs, rank, pools, cached_aliases, &tag_ty); let includes = type_to_var(subs, rank, pools, cached_aliases, &tag_ty);
@ -1106,7 +1106,7 @@ fn type_to_variable<'a>(
Record(fields, ext) => { Record(fields, ext) => {
// An empty fields is inefficient (but would be correct) // An empty fields is inefficient (but would be correct)
// If hit, try to turn the value into an EmptyRecord in canonicalization // If hit, try to turn the value into an EmptyRecord in canonicalization
debug_assert!(!fields.is_empty() || !ext.is_empty_record()); debug_assert!(!fields.is_empty() || !ext.is_closed());
let mut field_vars = Vec::with_capacity_in(fields.len(), arena); let mut field_vars = Vec::with_capacity_in(fields.len(), arena);
@ -1123,7 +1123,10 @@ fn type_to_variable<'a>(
field_vars.push((field.clone(), field_var)); field_vars.push((field.clone(), field_var));
} }
let temp_ext_var = helper!(ext); let temp_ext_var = match ext {
TypeExtension::Open(ext) => helper!(ext),
TypeExtension::Closed => Variable::EMPTY_RECORD,
};
let (it, new_ext_var) = let (it, new_ext_var) =
gather_fields_unsorted_iter(subs, RecordFields::empty(), temp_ext_var) gather_fields_unsorted_iter(subs, RecordFields::empty(), temp_ext_var)
@ -1146,7 +1149,7 @@ fn type_to_variable<'a>(
TagUnion(tags, ext) => { TagUnion(tags, ext) => {
// An empty tags is inefficient (but would be correct) // An empty tags is inefficient (but would be correct)
// If hit, try to turn the value into an EmptyTagUnion in canonicalization // If hit, try to turn the value into an EmptyTagUnion in canonicalization
debug_assert!(!tags.is_empty() || !ext.is_empty_tag_union()); debug_assert!(!tags.is_empty() || !ext.is_closed());
let (union_tags, ext) = let (union_tags, ext) =
type_to_union_tags(subs, rank, pools, arena, tags, ext, &mut stack); type_to_union_tags(subs, rank, pools, arena, tags, ext, &mut stack);
@ -1155,7 +1158,10 @@ fn type_to_variable<'a>(
register_with_known_var(subs, destination, rank, pools, content) register_with_known_var(subs, destination, rank, pools, content)
} }
FunctionOrTagUnion(tag_name, symbol, ext) => { FunctionOrTagUnion(tag_name, symbol, ext) => {
let temp_ext_var = helper!(ext); let temp_ext_var = match ext {
TypeExtension::Open(ext) => helper!(ext),
TypeExtension::Closed => Variable::EMPTY_TAG_UNION,
};
let (it, ext) = roc_types::types::gather_tags_unsorted_iter( let (it, ext) = roc_types::types::gather_tags_unsorted_iter(
subs, subs,
@ -1177,7 +1183,7 @@ fn type_to_variable<'a>(
RecursiveTagUnion(rec_var, tags, ext) => { RecursiveTagUnion(rec_var, tags, ext) => {
// An empty tags is inefficient (but would be correct) // An empty tags is inefficient (but would be correct)
// If hit, try to turn the value into an EmptyTagUnion in canonicalization // If hit, try to turn the value into an EmptyTagUnion in canonicalization
debug_assert!(!tags.is_empty() || !ext.is_empty_tag_union()); debug_assert!(!tags.is_empty() || !ext.is_closed());
let (union_tags, ext) = let (union_tags, ext) =
type_to_union_tags(subs, rank, pools, arena, tags, ext, &mut stack); type_to_union_tags(subs, rank, pools, arena, tags, ext, &mut stack);
@ -1316,7 +1322,7 @@ fn roc_result_to_var<'a>(
) -> Variable { ) -> Variable {
match result_type { match result_type {
Type::TagUnion(tags, ext) => { Type::TagUnion(tags, ext) => {
debug_assert!(ext.is_empty_tag_union()); debug_assert!(ext.is_closed());
debug_assert!(tags.len() == 2); debug_assert!(tags.len() == 2);
if let [(err, err_args), (ok, ok_args)] = &tags[..] { if let [(err, err_args), (ok, ok_args)] = &tags[..] {
@ -1560,40 +1566,46 @@ fn type_to_union_tags<'a>(
pools: &mut Pools, pools: &mut Pools,
arena: &'_ bumpalo::Bump, arena: &'_ bumpalo::Bump,
tags: &'a [(TagName, Vec<Type>)], tags: &'a [(TagName, Vec<Type>)],
ext: &'a Type, ext: &'a TypeExtension,
stack: &mut bumpalo::collections::Vec<'_, TypeToVar<'a>>, stack: &mut bumpalo::collections::Vec<'_, TypeToVar<'a>>,
) -> (UnionTags, Variable) { ) -> (UnionTags, Variable) {
use bumpalo::collections::Vec; use bumpalo::collections::Vec;
let sorted = tags.len() == 1 || sorted_no_duplicates(tags); let sorted = tags.len() == 1 || sorted_no_duplicates(tags);
if ext.is_empty_tag_union() { match ext {
let ext = Variable::EMPTY_TAG_UNION; TypeExtension::Closed => {
let ext = Variable::EMPTY_TAG_UNION;
let union_tags = if sorted { let union_tags = if sorted {
insert_tags_fast_path(subs, rank, pools, arena, tags, stack) insert_tags_fast_path(subs, rank, pools, arena, tags, stack)
} else { } else {
let tag_vars = Vec::with_capacity_in(tags.len(), arena); let tag_vars = Vec::with_capacity_in(tags.len(), arena);
insert_tags_slow_path(subs, rank, pools, arena, tags, tag_vars, stack) insert_tags_slow_path(subs, rank, pools, arena, tags, tag_vars, stack)
}; };
(union_tags, ext) (union_tags, ext)
} else { }
let mut tag_vars = Vec::with_capacity_in(tags.len(), arena); TypeExtension::Open(ext) => {
let mut tag_vars = Vec::with_capacity_in(tags.len(), arena);
let temp_ext_var = RegisterVariable::with_stack(subs, rank, pools, arena, ext, stack); let temp_ext_var = RegisterVariable::with_stack(subs, rank, pools, arena, ext, stack);
let (it, ext) = let (it, ext) = roc_types::types::gather_tags_unsorted_iter(
roc_types::types::gather_tags_unsorted_iter(subs, UnionTags::default(), temp_ext_var); subs,
UnionTags::default(),
temp_ext_var,
);
tag_vars.extend(it.map(|(n, v)| (n.clone(), v))); tag_vars.extend(it.map(|(n, v)| (n.clone(), v)));
let union_tags = if tag_vars.is_empty() && sorted { let union_tags = if tag_vars.is_empty() && sorted {
insert_tags_fast_path(subs, rank, pools, arena, tags, stack) insert_tags_fast_path(subs, rank, pools, arena, tags, stack)
} else { } else {
insert_tags_slow_path(subs, rank, pools, arena, tags, tag_vars, stack) insert_tags_slow_path(subs, rank, pools, arena, tags, tag_vars, stack)
}; };
(union_tags, ext) (union_tags, ext)
}
} }
} }