Rob Rix
|
de6d7edec2
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# semantic-diff.cabal
# src/Alignment.hs
# src/Control/Comonad/Cofree.hs
# src/Data/Adjoined.hs
# src/Diffing.hs
# src/Interpreter.hs
# src/Prologue.hs
# src/Renderer/JSON.hs
# src/Renderer/Patch.hs
# src/Renderer/Split.hs
# src/SplitDiff.hs
# src/Term.hs
# test/AlignmentSpec.hs
# test/ArbitraryTerm.hs
# test/PatchOutputSpec.hs
|
2016-05-27 09:35:26 -04:00 |
|
Rob Rix
|
cfe15a5afa
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# src/Alignment.hs
# src/Control/Comonad/Cofree.hs
# src/Data/Adjoined.hs
# src/Data/Align.hs
# src/Data/Bifunctor/These.hs
# src/Data/Coalescent.hs
# src/Data/Copointed.hs
# src/Data/Functor/Both.hs
# src/Data/Option.hs
# src/Line.hs
# src/Patch.hs
# src/Range.hs
# src/Renderer/JSON.hs
# src/Renderer/Patch.hs
# src/Renderer/Split.hs
# src/SplitDiff.hs
# stack.yaml
# test/AlignmentSpec.hs
# test/CorpusSpec.hs
# test/Data/Adjoined/Spec.hs
# test/Data/Functor/Both/Spec.hs
|
2016-05-26 15:25:45 -04:00 |
|
joshvera
|
ebd5d20171
|
Remove duplicate imports
|
2016-05-26 14:04:27 -04:00 |
|
joshvera
|
473ec980b1
|
Merge remote-tracking branch 'origin/master' into diff-summaries
|
2016-05-26 13:40:54 -04:00 |
|
joshvera
|
85553f281c
|
Remove duplicate Prologue import
|
2016-05-26 13:13:30 -04:00 |
|
joshvera
|
ed144bbb1f
|
Fix tests
|
2016-05-26 13:11:34 -04:00 |
|
joshvera
|
8180b37285
|
Use Protolude via the Prologue module and add NoImplicitPrelude
|
2016-05-26 12:58:04 -04:00 |
|
joshvera
|
170110ee8e
|
Fix up tests
|
2016-05-04 15:15:25 -04:00 |
|
Rob Rix
|
28aeb9f4fa
|
Operator section.
|
2016-04-26 14:20:02 -04:00 |
|
Rob Rix
|
d58123d208
|
fmap, not liftM.
|
2016-04-26 14:18:59 -04:00 |
|
Rob Rix
|
5a2925b016
|
Add an Arbitrary instance over Join These.
|
2016-04-26 14:17:43 -04:00 |
|
Rob Rix
|
ea8626b9db
|
Shrink These.
|
2016-04-26 14:17:36 -04:00 |
|
Rob Rix
|
b64a67128c
|
Add an Arbitrary instance over These.
|
2016-04-26 14:14:31 -04:00 |
|
Rob Rix
|
c6be56f7d3
|
Disable warnings about orphans.
This is primarily for the benefit of ghc-mod while editing.
|
2016-04-22 12:54:50 -04:00 |
|
Rob Rix
|
a98876bf18
|
🔥 a redundant import.
|
2016-04-22 12:54:26 -04:00 |
|
Rob Rix
|
10de1a72ba
|
🔥 the Arbitrary instance over Line.
|
2016-04-14 21:57:33 -04:00 |
|
Rob Rix
|
19ccf9fd54
|
🔥 some redundant parens.
|
2016-04-14 21:56:07 -04:00 |
|
Rob Rix
|
e3ace6408c
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# test/AlignmentSpec.hs
# test/PatchOutputSpec.hs
|
2016-04-14 12:57:45 -04:00 |
|
Rob Rix
|
1a22eaebf6
|
Correct the tests.
|
2016-04-12 04:54:32 -04:00 |
|
Rob Rix
|
06c4759aed
|
Represent Both as Join (,).
|
2016-04-04 15:01:47 -04:00 |
|
Rob Rix
|
60d6cfeb90
|
Use the curried both constructor.
|
2016-04-04 14:53:09 -04:00 |
|
Rob Rix
|
20bb94bf5e
|
Also, tests.
|
2016-03-30 17:33:07 -04:00 |
|
Rob Rix
|
493f55aa65
|
Shrink Both.
|
2016-03-15 11:46:09 -04:00 |
|
Rob Rix
|
943e0b7a40
|
Shrink Lines.
|
2016-03-15 11:46:05 -04:00 |
|
Rob Rix
|
01f817a77e
|
Move the other arbitrary instances into ArbitraryTerm.
|
2016-03-15 11:17:47 -04:00 |
|
Rob Rix
|
07e9e192e9
|
Scale the arbitrary term sizes down.
|
2016-03-11 09:32:03 -05:00 |
|
Matt Diephouse
|
110149673a
|
Add staticgories to ArbitraryTerm.hs
|
2016-02-09 11:43:13 -08:00 |
|
Matt Diephouse
|
170b7c6e1e
|
Rename Categorizable module to Category
|
2016-02-04 13:59:33 -05:00 |
|
Rob Rix
|
7af5a4876a
|
Move OrderedMap into Data.
|
2016-01-06 11:56:58 -05:00 |
|
joshvera
|
28e5b60bbc
|
fix tests
|
2015-12-29 15:24:13 -05:00 |
|
Rob Rix
|
690966086e
|
Remove some redundant parentheses.
|
2015-12-22 12:54:01 -05:00 |
|
Rob Rix
|
38a317156b
|
Move arbitrary term generation into its own module.
|
2015-12-22 12:53:31 -05:00 |
|