git.iko.soy/elk
on master help sign in
Fix little typos in new record unification code
70c7edfEvan Czaplicki
src/Type/Unify.hs+4−4
compare with master
unifiedsplit
@@ -642,17 +642,17 @@ unifyRecord context (RecordStructure fields1 ext1) (RecordStructure fields2 ext2
642 (unifySharedFields context sharedFields Map.empty ext1)
642 (unifySharedFields context sharedFields Map.empty ext1)
643
643
644 else
644 else
645− do subRecord <- fresh context (Structure (Record1 uniqueFields1 ext1))
645+ do subRecord <- fresh context (Structure (Record1 uniqueFields2 ext2))
646 try2
646 try2
647− (subUnify subRecord ext2)
647+ (subUnify ext1 subRecord)
648 (unifySharedFields context sharedFields Map.empty subRecord)
648 (unifySharedFields context sharedFields Map.empty subRecord)
649
649
650 else
650 else
651
651
652 if Map.null uniqueFields2 then
652 if Map.null uniqueFields2 then
653− do subRecord <- fresh context (Structure (Record1 uniqueFields2 ext2))
653+ do subRecord <- fresh context (Structure (Record1 uniqueFields1 ext1))
654 try2
654 try2
655− (subUnify ext1 subRecord)
655+ (subUnify subRecord ext2)
656 (unifySharedFields context sharedFields Map.empty subRecord)
656 (unifySharedFields context sharedFields Map.empty subRecord)
657
657
658 else
658 else