From 8c9a9c75868c69ba5aa5507580902cfbabadfc32 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Thu, 14 Apr 2016 12:46:25 -0400 Subject: [PATCH] :fire: mask. --- src/Alignment.hs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/Alignment.hs b/src/Alignment.hs index 9a1ef6d42..089a673da 100644 --- a/src/Alignment.hs +++ b/src/Alignment.hs @@ -167,16 +167,6 @@ catThese as = maybe (Join (These [] [])) Join $ getUnion $ mconcat $ Union . Jus pairRangesWithLine :: Monoid b => Join These a -> Join These b -> Join These (a, b) pairRangesWithLine headRanges childLine = fromMaybe (flip (,) mempty <$> headRanges) $ (,) <$> headRanges `applyThese` childLine -mask :: Join These a -> Join These b -> Join These b -mask (Join (This _)) (Join (This b1)) = Join $ This b1 -mask (Join (This _)) (Join (These b1 _)) = Join $ This b1 -mask (Join (That _)) (Join (That b2)) = Join $ That b2 -mask (Join (That _)) (Join (These _ b2)) = Join $ That b2 -mask (Join (These _ _)) (Join (This b1)) = Join $ This b1 -mask (Join (These _ _)) (Join (That b2)) = Join $ That b2 -mask (Join (These _ _)) (Join (These b1 b2)) = Join $ These b1 b2 -mask _ b = b - getRange :: SplitDiff leaf Info -> Range getRange (Free (Annotated (Info range _) _)) = range getRange (Pure patch) | Info range _ :< _ <- getSplitTerm patch = range