github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-22 22:31:36 +03:00
Code Issues Projects Releases Wiki Activity

The annotations are in Join.

Browse Source
This commit is contained in:
Rob Rix 2016-03-18 14:30:22 -04:00
parent bad7878953
commit cceeffe360
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Alignment.hs
View File

@ -15,6 +15,7 @@ import Control.Monad.Free
import Data.Adjoined
import Data.Align
import Data.Aligned
import Data.Bifunctor.Join
import Data.Bifunctor.These
import Data.Coalescent
import Data.Copointed
@ -110,14 +111,14 @@ type Row a = Both (Line a)
-- | A fixpoint over a functor.
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)) (Join These Info)
alignPatch :: Both (Source Char) -> Patch (Term leaf Info) -> AlignedDiff leaf
alignPatch sources (Insert term) = hylo (alignTermBy sources AlignThis) unCofree (This <$> term)
alignPatch sources (Delete term) = hylo (alignTermBy sources AlignThat) unCofree (That <$> term)
alignPatch sources (Replace term1 term2) = let This info1 :< AlignThis a = hylo (alignTermBy sources AlignThis) unCofree (This <$> term1)
That info2 :< AlignThat b = hylo (alignTermBy sources AlignThat) unCofree (That <$> term2) in
These info1 info2 :< AlignThese a b
alignPatch sources (Insert term) = hylo (alignTermBy sources AlignThis) unCofree (Join . This <$> term)
alignPatch sources (Delete term) = hylo (alignTermBy sources AlignThat) unCofree (Join . That <$> term)
alignPatch sources (Replace term1 term2) = let Join (This info1) :< AlignThis a = hylo (alignTermBy sources AlignThis) unCofree (Join . This <$> term1)
Join (That info2) :< AlignThat b = hylo (alignTermBy sources AlignThat) unCofree (Join . That <$> term2) in
Join (These info1 info2) :< AlignThese a b
alignTermBy :: Both (Source Char) -> (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) -> Join These Info -> Syntax leaf (AlignedDiff leaf) -> AlignedDiff leaf
alignTermBy sources constructor infos syntax = infos :< constructor [syntax]