Rob Rix
051916082a
Correct a misleading comment.
2017-02-08 12:03:50 -05:00
Rob Rix
f19a1fdfbf
Add a function to modify the annotation of a top-level diff node.
2017-02-08 12:03:10 -05:00
Rob Rix
9a39762d91
📝 the generalization.
2017-02-07 15:27:13 -05:00
Rob Rix
7263b683e5
Generalize the type of mapAnnotations slightly.
2017-02-07 15:27:13 -05:00
Rob Rix
bb46960dd8
📝 mapAnnotations.
2017-02-07 15:27:13 -05:00
Rob Rix
4a3dd9afd8
Define a function for mapping over the annotations in a diff.
2017-02-07 15:27:13 -05:00
joshvera
580fa11bd6
Clean up diffFiles
2016-10-21 18:00:04 -04:00
Rick Winfrey
bd9fb81037
Consolidate back to single functions, passing in a function to extract the correct Annotation
2016-10-20 17:19:42 -05:00
Rick Winfrey
85a3864a96
Remove unused function
2016-10-20 16:34:54 -05:00
Rick Winfrey
c91fd3270d
Use new afterTerm behavior for all semantic-diff
2016-10-20 16:33:47 -05:00
Rick Winfrey
e68be8e3b8
Take the after annotation when we take the afterTerm
2016-10-20 16:22:45 -05:00
joshvera
bfe57829d6
Merge remote-tracking branch 'origin/master' into rws-large-diffs
2016-09-27 10:34:19 -04:00
joshvera
0535744ebc
more imports
2016-09-16 11:48:58 -04:00
Rob Rix
25f4fa4bcb
Mergeable implies Functor.
2016-09-14 17:13:10 -04:00
Rob Rix
62196878fa
Merge branch 'master' into ghc8
...
# Conflicts:
# semantic-diff.cabal
# src/Diff.hs
# src/Term.hs
# src/Term/Arbitrary.hs
# stack.yaml
# tools/semantic-git-diff/src/SemanticDiff.hs
2016-09-14 16:12:47 -04:00
Rob Rix
2b933904c9
Add specializations of Term/TermF/Diff/DiffF/SplitDiff over Syntax/Record.
2016-09-12 13:40:22 -04:00
Rob Rix
98637ad656
Generalize Term/TermF & Diff/DiffF over the functor.
2016-09-09 14:46:50 -04:00
joshvera
2df90eada7
Account for false positive close terms
...
Improve nearestUnmapped by looking up the nearest unmapped term which is not a false positive. We look up the nearest unmapped terms closest to the query term, then sort by the constant time edit distance between the query term and the intersecting terms. Finally, we select the first term that has the lowest edit distance.
2016-08-17 16:34:58 -04:00
Rob Rix
9ae7f52e8f
Rename Sequenceable to Mergeable.
2016-07-22 17:38:10 -04:00
Rob Rix
dd0e4d890f
Define mergeMaybe’s algebra using sequenceAlt.
2016-07-22 15:32:11 -04:00
Rob Rix
22476895c6
Define mergeMaybe’s algebra by iteration.
...
This is a restricted class of catamorphism which happens to line up
exactly with what we’re doing here.
2016-07-22 15:31:10 -04:00
Rob Rix
bc05e694a3
🔥 Keyed
syntax nodes.
2016-07-12 23:27:09 -04:00
Rob Rix
baafd5f7a8
📝 mergeMaybe, beforeTerm, and afterTerm.
2016-07-05 09:45:28 -04:00
Rob Rix
5ea93ba8de
🔥 merge.
2016-07-05 09:43:03 -04:00
Rob Rix
e914685790
Don’t warn of orphans so much.
2016-06-30 12:59:26 -04:00
Rob Rix
41902045b4
Define an afterTerm function over diffs.
2016-06-27 12:50:25 -04:00
Rob Rix
8fcbaa3a7e
Define beforeTerm via mergeMaybe.
2016-06-27 12:50:10 -04:00
Rob Rix
8f7307c989
Add a partial merge function.
2016-06-27 12:49:44 -04:00
Rob Rix
9829d2df84
Add a merge function to compute a Term from a Diff.
2016-06-27 12:37:27 -04:00
Rob Rix
3f6cab2abc
Add a function to compute the before state of a diff.
2016-06-27 12:02:25 -04:00
joshvera
ef6b174c7d
Merge remote-tracking branch 'origin/master' into ghc8
2016-06-15 10:10:07 -07:00
Rob Rix
a613fa0369
Merge branch 'push-benchmarks-to-graphite' into benchmark-alignment
2016-06-06 11:36:48 -04:00
Rob Rix
7802d4916c
🔥 FlexibleInstances & RecordWildCards pragmas.
2016-06-03 16:02:06 -04:00
Rob Rix
39ddbfc60f
Add the DiffF type synonym back in.
2016-05-31 20:16:19 -04:00
joshvera
dcd8b0de32
Bump to lts nightly for ghc-8.0
2016-05-27 13:10:04 -04:00
joshvera
9d9fbe3c37
🔥 annotate and unfix
2016-05-26 14:46:13 -04:00
joshvera
aeb747179f
Remove Annotated
2016-05-26 14:05:25 -04:00
joshvera
b1f9cc4a4a
Remove DiffF type synonym
2016-05-26 13:46:33 -04:00
joshvera
473ec980b1
Merge remote-tracking branch 'origin/master' into diff-summaries
2016-05-26 13:40:54 -04:00
joshvera
8180b37285
Use Protolude via the Prologue module and add NoImplicitPrelude
2016-05-26 12:58:04 -04:00
joshvera
8be702f5e6
stub futu
2016-05-13 11:44:03 -04:00
joshvera
48c7498ce2
Define Term in terms of Cofree
2016-05-04 14:37:24 -04:00
joshvera
1914950bc1
Stub diffSummary'
2016-05-03 15:50:38 -04:00
joshvera
9f8fc439b3
typealias Annotated to CofreeF
2016-05-03 14:19:10 -04:00
joshvera
a789af8f31
Define Annotated in terms of CofreeF
2016-05-03 14:10:25 -04:00
Rob Rix
b3eb86a9e4
Correct the docs of diffCost.
2016-04-11 15:06:59 -04:00
Rob Rix
e8fbe8c789
Move Info into its own module.
2016-03-30 17:26:52 -04:00
Rob Rix
ff57f0db46
Rename the Annotated field accessors.
2016-03-02 11:52:20 -05:00
Rob Rix
e894d63a6c
Merge branch 'master' into forward-compatible-rendering
...
# Conflicts:
# src/DiffOutput.hs
# src/Renderer/Split.hs
# test/CorpusSpec.hs
2016-03-01 12:34:40 -05:00
Rob Rix
897e8255b4
Revert "Generic instances everywhere, why not."
...
This reverts commit 82105fde6f9ccd06042d0f7ada88b2d0ee072069.
2016-02-29 21:48:58 -05:00