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

Redefine diffFPatch as a diffF function characterizing diffs.

Browse Source
This commit is contained in:
Rob Rix 2017-09-12 08:43:55 -04:00
parent 17ebab9803
commit fa3a0e08dc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Diff.hs
View File

@ -68,15 +68,15 @@ diffCost = diffSum (const 1)
diffPatch :: Diff syntax ann -> Maybe (Patch (TermF syntax ann (Diff syntax ann)))
diffPatch diff = case unDiff diff of
Let _ body -> diffFPatch body
Let _ body -> either Just (const Nothing) (diffF body)
_ -> Nothing
diffFPatch :: DiffF syntax ann a -> Maybe (Patch (TermF syntax ann a))
diffFPatch diff = case diff of
Either (In ann (InL syntax)) -> Just (Delete (In ann syntax))
Either (In ann (InR syntax)) -> Just (Insert (In ann syntax))
Both (In (ann1, ann2) (Product.Pair syntax1 syntax2)) -> Just (Replace (In ann1 syntax1) (In ann2 syntax2))
_ -> Nothing
diffF :: DiffF syntax ann a -> Either (Patch (TermF syntax ann a)) (TermF syntax (ann, ann) a)
diffF diff = case diff of
Either (In ann (InL syntax)) -> Left (Delete (In ann syntax))
Either (In ann (InR syntax)) -> Left (Insert (In ann syntax))
Both (In (ann1, ann2) (Product.Pair syntax1 syntax2)) -> Left (Replace (In ann1 syntax1) (In ann2 syntax2))
Merge (In anns syntax) -> Right (In anns syntax)
-- | Merge a diff using a function to provide the Term (in Maybe, to simplify recovery of the before/after state) for every Patch.