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

Presence constraint flag -> Enum

Browse source
This commit is contained in:
ayazhafiz 2021-12-23 14:48:41 -06:00
parent 9a813b6c49
commit 1f81a598f7
4 changed files with 83 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@ use roc_types::subs::{
};
use roc_types::types::Type::{self, *};
use roc_types::types::{gather_fields_unsorted_iter, Alias, Category, ErrorType, PatternCategory};
use roc_unify::unify::{unify, Unified::*};
use roc_unify::unify::{unify, Mode, Unified::*};
use std::collections::hash_map::Entry;
// Type checking system adapted from Elm by Evan Czaplicki, BSD-3-Clause Licensed
@ -206,7 +206,7 @@ fn solve(
expectation.get_type_ref(),
);
match unify(subs, actual, expected, false) {
match unify(subs, actual, expected, Mode::Eq) {
Success(vars) => {
introduce(subs, rank, pools, &vars);
@ -241,7 +241,7 @@ fn solve(
let actual = type_to_var(subs, rank, pools, cached_aliases, source);
let target = *target;
match unify(subs, actual, target, false) {
match unify(subs, actual, target, Mode::Eq) {
Success(vars) => {
introduce(subs, rank, pools, &vars);
@ -295,7 +295,7 @@ fn solve(
cached_aliases,
expectation.get_type_ref(),
);
match unify(subs, actual, expected, false) {
match unify(subs, actual, expected, Mode::Eq) {
Success(vars) => {
introduce(subs, rank, pools, &vars);
@ -361,9 +361,12 @@ fn solve(
expectation.get_type_ref(),
);
let presence_con = matches!(constraint, Present(_, _));
let mode = match constraint {
Present(_, _) => Mode::Present,
_ => Mode::Eq,
};
match unify(subs, actual, expected, presence_con) {
match unify(subs, actual, expected, mode) {
Success(vars) => {
introduce(subs, rank, pools, &vars);
@ -657,7 +660,7 @@ fn solve(
);
let includes = type_to_var(subs, rank, pools, cached_aliases, &tag_ty);
match unify(subs, actual, includes, true) {
match unify(subs, actual, includes, Mode::Present) {
Success(vars) => {
introduce(subs, rank, pools, &vars);