From 27ce2f2c70d02554bb477a23ef9f405a14d6650f Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Thu, 5 Jan 2012 17:10:43 -0500 Subject: Prevent unifications of 'others' pieces in record summaries, when both pieces contain unification variables (to prevent undesired unifications) --- src/elaborate.sml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/elaborate.sml') diff --git a/src/elaborate.sml b/src/elaborate.sml index b15ef1c4..89c077e5 100644 --- a/src/elaborate.sml +++ b/src/elaborate.sml @@ -865,7 +865,13 @@ val (unifs1, unifs2) = eatMatching (fn ((_, r1), (_, r2)) => r1 = r2) (#unifs s1, #unifs s2) - val (others1, others2) = eatMatching (consEq env loc) (#others s1, #others s2) + val hasUnifs = U.Con.exists {kind = fn _ => false, + con = fn L'.CUnif _ => true + | _ => false} + + val (others1, others2) = eatMatching (fn (c1, c2) => + not (hasUnifs c1 andalso hasUnifs c2) + andalso consEq env loc (c1, c2)) (#others s1, #others s2) (*val () = eprefaces "Summaries3" [("#1", p_summary env {fields = fs1, unifs = unifs1, others = others1}), ("#2", p_summary env {fields = fs2, unifs = unifs2, others = others2})]*) -- cgit v1.2.3