git.iko.soy/elk
on master help sign in
handle overlapping imports again
8dfdde7Evan Czaplicki
compiler/src/Canonicalize/Environment.hs+1−1
compare with master
unifiedsplit
@@ -81,7 +81,7 @@ mergeInfo info1 info2 =
81 case info1 of
81 case info1 of
82 Specific h1 _ ->
82 Specific h1 _ ->
83 case info2 of
83 case info2 of
84− Specific h2 _ -> Ambiguous h1 (OneOrMore.one h2)
84+ Specific h2 _ -> if h1 == h2 then info1 else Ambiguous h1 (OneOrMore.one h2)
85 Ambiguous h2 hs2 -> Ambiguous h1 (OneOrMore.more (OneOrMore.one h2) hs2)
85 Ambiguous h2 hs2 -> Ambiguous h1 (OneOrMore.more (OneOrMore.one h2) hs2)
86
86
87 Ambiguous h1 hs1 ->
87 Ambiguous h1 hs1 ->