github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2025-01-03 13:02:37 +03:00
Code Issues Projects Releases Wiki Activity

Rename x to pairRangeWithLine.

Browse Source
This commit is contained in:
Rob Rix 2016-03-31 15:38:27 -04:00
parent 86cd2742c4
commit dea54b6790
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Alignment.hs
View File

@ -143,11 +143,11 @@ group2 ranges child | Just (headRanges, tailRanges) <- unconsThese ranges
, (first:rest) <- child
= case fromThese False False . runJoin $ intersects headRanges child of
(True, True) -> let (moreRanges, restOfChild) = group2 tailRanges rest in
(moreRanges, (x headRanges first) : restOfChild)
(moreRanges, (pairRangeWithLine headRanges first) : restOfChild)
(True, False) -> let (moreRanges, restOfChild) = group2 (atLeft ranges) rest in
(moreRanges, (x headRanges first) : restOfChild)
(moreRanges, (pairRangeWithLine headRanges first) : restOfChild)
(False, True) -> let (moreRanges, restOfChild) = group2 (atRight ranges) rest in
(moreRanges, (x headRanges first) : restOfChild)
(moreRanges, (pairRangeWithLine headRanges first) : restOfChild)
_ -> (tailRanges, [ flip (,) [] <$> headRanges ])
| otherwise = (ranges, [])
where atLeft (Join (These (_:as) bs)) = Join (These as bs)
@ -156,7 +156,7 @@ group2 ranges child | Just (headRanges, tailRanges) <- unconsThese ranges
atRight (Join (These as (_:bs))) = Join (These as bs)
atRight (Join (That (_:bs))) = Join (That bs)
atRight other = other
x headRanges childLine = case (,) <$> headRanges `applyThese` (pure <$> childLine) of
pairRangeWithLine headRanges childLine = case (,) <$> headRanges `applyThese` (pure <$> childLine) of
Just v -> v
Nothing -> error "oh god no"