github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-23 14:54:16 +03:00
Code Issues Projects Releases Wiki Activity

Pass the sources to alignTermBy.

Browse Source
This commit is contained in:
Rob Rix 2016-03-18 14:18:19 -04:00
parent 2900eb1f71
commit bad7878953
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Alignment.hs
View File

@ -113,11 +113,11 @@ newtype Fix f = Fix { unFix :: f (Fix f) }
type AlignedDiff leaf = Cofree (Aligned (Syntax leaf)) (These Info Info) type AlignedDiff leaf = Cofree (Aligned (Syntax leaf)) (These Info Info)
alignPatch :: Both (Source Char) -> Patch (Term leaf Info) -> AlignedDiff leaf alignPatch :: Both (Source Char) -> Patch (Term leaf Info) -> AlignedDiff leaf
alignPatch sources (Insert term) = hylo (alignTermBy AlignThis) unCofree (This <$> term) alignPatch sources (Insert term) = hylo (alignTermBy sources AlignThis) unCofree (This <$> term)
alignPatch sources (Delete term) = hylo (alignTermBy AlignThat) unCofree (That <$> term) alignPatch sources (Delete term) = hylo (alignTermBy sources AlignThat) unCofree (That <$> term)
alignPatch sources (Replace term1 term2) = let This info1 :< AlignThis a = hylo (alignTermBy AlignThis) unCofree (This <$> term1) alignPatch sources (Replace term1 term2) = let This info1 :< AlignThis a = hylo (alignTermBy sources AlignThis) unCofree (This <$> term1)
That info2 :< AlignThat b = hylo (alignTermBy AlignThat) unCofree (That <$> term2) in That info2 :< AlignThat b = hylo (alignTermBy sources AlignThat) unCofree (That <$> term2) in
These info1 info2 :< AlignThese a b These info1 info2 :< AlignThese a b
alignTermBy :: (forall r. [Syntax leaf r] -> Aligned (Syntax leaf) r) -> These Info Info -> Syntax leaf (AlignedDiff leaf) -> AlignedDiff leaf alignTermBy :: Both (Source Char) -> (forall r. [Syntax leaf r] -> Aligned (Syntax leaf) r) -> These Info Info -> Syntax leaf (AlignedDiff leaf) -> AlignedDiff leaf
alignTermBy constructor infos syntax = infos :< constructor [syntax] alignTermBy sources constructor infos syntax = infos :< constructor [syntax]