github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-11-29 11:02:26 +03:00
Code Issues Projects Releases Wiki Activity

Diffing by key handles equal terms correctly.

Browse Source
This commit is contained in:
Rob Rix 2015-10-07 08:47:37 -04:00
parent 1059a00db0
commit 0b920df272
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
prototype/Doubt/Algorithm.swift
View File

@ -90,6 +90,11 @@ public enum FreeAlgorithm<A, B> {
: Diff.Pure(.Replace(a, b))).evaluate(equals, recur: recur) : Diff.Pure(.Replace(a, b))).evaluate(equals, recur: recur)
case let .Roll(.ByKey(a, b, f)): case let .Roll(.ByKey(a, b, f)):
let recur = {
Term.equals(equals)($0, $1)
? Diff($1)
: recur($0, $1)
}
let deleted = Set(a.keys).subtract(b.keys).map { ($0, Diff.Pure(Patch.Delete(a[$0]!))) } let deleted = Set(a.keys).subtract(b.keys).map { ($0, Diff.Pure(Patch.Delete(a[$0]!))) }
let inserted = Set(b.keys).subtract(a.keys).map { ($0, Diff.Pure(Patch.Insert(b[$0]!))) } let inserted = Set(b.keys).subtract(a.keys).map { ($0, Diff.Pure(Patch.Insert(b[$0]!))) }
let patched = Set(a.keys).intersect(b.keys).map { ($0, recur(a[$0]!, b[$0]!)) } let patched = Set(a.keys).intersect(b.keys).map { ($0, recur(a[$0]!, b[$0]!)) }