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

Implement recur using galign.

Browse Source
This commit is contained in:
Rob Rix 2016-07-11 15:35:13 -04:00
parent ce500a822f
commit cf3690f28a
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Interpreter.hs
View File

@ -2,7 +2,7 @@ module Interpreter (Comparable, DiffConstructor, diffTerms) where
import Algorithm import Algorithm
import Category import Category
import Data.Align import Data.Align.Generic
import Data.Functor.Foldable import Data.Functor.Foldable
import Data.Functor.Both import Data.Functor.Both
import Data.Hashable import Data.Hashable
@ -54,13 +54,7 @@ run construct comparable cost algorithm = case runFree algorithm of
(annotation1 :< a, annotation2 :< b) = (runCofree t1, runCofree t2) (annotation1 :< a, annotation2 :< b) = (runCofree t1, runCofree t2)
annotate = construct . (both annotation1 annotation2 :<) annotate = construct . (both annotation1 annotation2 :<)
recur (Indexed a') (Indexed b') = annotate . Indexed $ alignWith diffThese a' b' recur a b = maybe (pure (Replace t1 t2)) (annotate . fmap diffThese) (galign a b)
recur (Fixed a') (Fixed b') = annotate . Fixed $ alignWith diffThese a' b'
recur (Keyed a') (Keyed b') | Map.keys a' == bKeys = annotate . Keyed . Map.fromList . fmap repack $ bKeys where
bKeys = Map.keys b'
repack key = (key, interpretInBoth key a' b')
interpretInBoth key x y = diffTerms construct comparable cost (x ! key) (y ! key)
recur _ _ = pure $ Replace (cofree (annotation1 :< a)) (cofree (annotation2 :< b))
diffThese = these (pure . Delete) (pure . Insert) (diffTerms construct comparable cost) diffThese = these (pure . Delete) (pure . Insert) (diffTerms construct comparable cost)