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

Run alignPatch in Cofree instead of Fix.

Browse Source
This commit is contained in:
Rob Rix 2016-03-18 13:46:56 -04:00
parent 619c16e72d
commit 77fd84f831
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Alignment.hs
View File

@ -109,23 +109,14 @@ type Row a = Both (Line a)
-- | A fixpoint over a functor. -- | A fixpoint over a functor.
newtype Fix f = Fix { unFix :: f (Fix f) } newtype Fix f = Fix { unFix :: f (Fix f) }
type AlignedDiff leaf = Cofree (Aligned (Syntax leaf)) Info type AlignedDiff leaf = Cofree (Aligned (Syntax leaf)) ()
alignPatch :: Patch (Term leaf Info) -> Fix (Aligned (Syntax leaf)) alignPatch :: Patch (Term leaf Info) -> AlignedDiff leaf
alignPatch (Insert term) = Alignment.hylo (Fix . AlignThis . pure) alignTerm term alignPatch (Insert term) = hylo (alignTermBy AlignThis) unCofree (() <$ term)
alignPatch (Delete term) = Alignment.hylo (Fix . AlignThat . pure) alignTerm term alignPatch (Delete term) = hylo (alignTermBy AlignThat) unCofree (() <$ term)
alignPatch (Replace term1 term2) = let Fix (AlignThis a) = alignPatch $ Delete term1 alignPatch (Replace term1 term2) = let _ :< AlignThis a = hylo (alignTermBy AlignThis) unCofree (() <$ term1)
Fix (AlignThat b) = alignPatch $ Insert term2 in _ :< AlignThat b = hylo (alignTermBy AlignThat) unCofree (() <$ term2) in
Fix (AlignThese a b) () :< AlignThese a b
alignTerm :: Term leaf Info -> Syntax leaf (Term leaf Info) alignTermBy :: (forall r. [Syntax leaf r] -> Aligned (Syntax leaf) r) -> () -> Syntax leaf (AlignedDiff leaf) -> AlignedDiff leaf
alignTerm = unwrap alignTermBy constructor _ syntax = () :< constructor [syntax]
hylo :: Functor f => (f b -> b) -> (a -> f a) -> a -> b
hylo phi psi = Alignment.cata phi . Alignment.ana psi
cata :: Functor f => (f a -> a) -> Fix f -> a
cata f = f . fmap (Alignment.cata f) . unFix
ana :: Functor f => (a -> f a) -> a -> Fix f
ana f = Fix . fmap (Alignment.ana f) . f