Skip to content

Minimal fix for issue #2241 #2330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Minimal fix for issue #2241 #2330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions compiler/src/Type/Unify.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,20 @@ fresh (Context _ (Descriptor _ rank1 _ _) _ (Descriptor _ rank2 _ _)) content =
guardedUnify :: Variable -> Variable -> Unify ()
guardedUnify left right =
Unify $ \vars ok err ->
do equivalent <- UF.equivalent left right
if equivalent
then ok vars ()
do occursLeft <- Occurs.occurs left
occursRight <- Occurs.occurs right
if occursLeft || occursRight
then err vars ()
else
do leftDesc <- UF.get left
rightDesc <- UF.get right
case actuallyUnify (Context left leftDesc right rightDesc) of
Unify k ->
k vars ok err
equivalent <- UF.equivalent left right
if equivalent
then ok vars ()
else
do leftDesc <- UF.get left
rightDesc <- UF.get right
case actuallyUnify (Context left leftDesc right rightDesc) of
Unify k ->
k vars ok err


subUnify :: Variable -> Variable -> Unify ()
Expand Down
Loading