Rob Rix
8ee284866b
Merge branch 'master' into recover-before-and-after-states
2015-10-09 08:48:50 -05:00
Rob Rix
aba998e485
Merge branch 'master' into recover-before-and-after-states
2015-10-09 08:06:31 -05:00
Rob Rix
26f8e63ee3
Merge pull request #62 from github/update-swift-target
...
Update Swift target
2015-10-09 08:03:56 -05:00
Matt Diephouse
4a1ec7957b
Merge pull request #58 from github/shortest-edit-script-in-algorithm
...
Shortest edit script in Algorithm
2015-10-07 22:05:10 -05:00
Rob Rix
5d047d5027
Merge branch 'update-swift-target' into recover-before-and-after-states
2015-10-07 19:48:36 -04:00
Rob Rix
2a8a444dbe
Merge branch 'shortest-edit-script-in-algorithm' into update-swift-target
2015-10-07 19:45:56 -04:00
Rob Rix
0ad285fb26
Document the Recursive operation a little.
2015-10-07 13:28:16 -04:00
Rob Rix
06c456f1cd
Document dictionary diffing as an approach stemming from set reconciliation.
2015-10-07 13:25:02 -04:00
Rob Rix
21ac5822a0
Sort categories alphabetically.
2015-10-07 13:20:41 -04:00
Rob Rix
f8b89bd93b
Category is Comparable.
2015-10-07 13:20:22 -04:00
Rob Rix
aef4c32754
Don’t bother destructuring tags.
2015-10-07 13:20:09 -04:00
Rob Rix
ba650f8080
Handle the zero-category case with a where clause.
2015-10-07 13:19:49 -04:00
Rob Rix
4bcc773fc6
🔥 chaff.
2015-10-07 13:13:51 -04:00
Rob Rix
c2b00c2230
Nominate the best interior edge using compare-parametric min.
2015-10-07 13:13:32 -04:00
Rob Rix
47dec5546d
Restore the compare-parametric min
function.
2015-10-07 13:09:22 -04:00
Rob Rix
10ddaab0ed
Use values
instead of mapping.
2015-10-07 13:04:03 -04:00
Rob Rix
ecef6f8370
Rename FreeAlgorithm
to Algorithm
.
2015-10-07 13:00:54 -04:00
Rob Rix
b8b5a26b46
Update doc comments.
2015-10-07 13:00:17 -04:00
Rob Rix
fa7a89c247
Rename Algorithm to Operation.
2015-10-07 12:59:22 -04:00
Rob Rix
0b920df272
Diffing by key handles equal terms correctly.
2015-10-07 08:47:37 -04:00
Rob Rix
8a9f74a0ff
Use discardNullTerms to compute both states.
2015-10-06 21:39:11 -04:00
Rob Rix
321622d553
Extract the discarding of null terms into a private helper function.
2015-10-06 21:38:44 -04:00
Rob Rix
e1dd859db9
Implicit parameters.
2015-10-06 21:36:22 -04:00
Rob Rix
ee969a75fa
Compute the after state of diffs.
2015-10-06 21:35:47 -04:00
Rob Rix
b04d71ede3
Compute the before-state of diffs.
...
This is `Optional`, as some diffs have unrecoverable before states. For
example, the insertion of a term has no before state, but can still
produce a valid before state if it occurs within the context of an
`Indexed` or `Keyed` node.
However, certain malformed diffs (such as `.Pure(.Insert(…))` in
isolation) may lack a valid before state, and thus the public API has
to reflect this.
2015-10-06 21:35:19 -04:00
Rob Rix
75aaebe834
Free
has a Term
typealias when appropriate.
2015-10-06 21:32:38 -04:00
Rob Rix
85ac68d232
Document why PatchConvertible.
2015-10-06 21:25:21 -04:00
Rob Rix
6b3c66d801
Patch is trivially PatchConvertible.
2015-10-06 21:24:43 -04:00
Rob Rix
46f3f9431b
Add a PatchConvertible protocol to enable constrained extensions.
2015-10-06 21:24:01 -04:00
Rob Rix
eec173c560
Pass fixtures to the tool.
2015-10-06 21:17:17 -04:00
Rob Rix
6f7552bae0
Add a couple of fixtures.
2015-10-06 21:17:09 -04:00
Rob Rix
e736116211
Evaluate the algorithm.
2015-10-06 21:02:00 -04:00
Rob Rix
2b9993c5f4
Treat protocols as groups.
2015-10-06 21:01:53 -04:00
Rob Rix
38c50d4e4a
Term is not a proper noun any more.
2015-10-06 20:53:35 -04:00
Rob Rix
e152d8702a
/dev/null -> nil
...
`git difftool` will invoke us with /dev/null when a file has been
deleted.
2015-10-06 20:48:53 -04:00
Rob Rix
b3324a6c5f
Drop null JSON.
2015-10-06 20:46:24 -04:00
Rob Rix
7e4ca06cbc
Indexed, not Branch.
2015-10-06 20:45:50 -04:00
Rob Rix
706654552f
In, not Roll.
2015-10-06 20:45:37 -04:00
Rob Rix
771f03f1fa
Indentation.
2015-10-06 20:43:27 -04:00
Rob Rix
8a6a39f06a
Construct terms for section headings.
2015-10-06 20:43:23 -04:00
Rob Rix
87d547a670
Wrap constructors in .In.
2015-10-06 20:43:02 -04:00
Rob Rix
40ecf24c9e
Fix, not Term.
2015-10-06 20:39:57 -04:00
Rob Rix
f131f40752
Construct the terms in Fix
.
2015-10-06 20:39:51 -04:00
Rob Rix
ee151d0edc
Compute the diff in FreeAlgorithm
.
2015-10-06 20:39:37 -04:00
Rob Rix
c7d9216433
Info is StringConvertible.
2015-10-06 20:38:00 -04:00
Rob Rix
c16a8b3af2
Combine the extensions.
2015-10-06 20:35:52 -04:00
Rob Rix
1059a00db0
🔥 AnyEquatable.
2015-10-06 19:20:16 -04:00
Rob Rix
939a714807
🔥 AnyHashable.
2015-10-06 19:20:06 -04:00
Rob Rix
fb41713906
Replace roll()
with Diff()
.
2015-10-06 17:48:17 -04:00
Rob Rix
47dd0b4849
Construct with Diff(), not copy().
2015-10-06 17:47:10 -04:00