joshvera
|
21cb7f71d7
|
Merge 'origin/master' into one-json-to-rule-them-all
|
2016-08-10 17:33:11 -04:00 |
|
joshvera
|
59932277f9
|
Merge remote-tracking branch 'origin/master' into one-json-to-rule-them-all
|
2016-08-10 13:49:26 -04:00 |
|
joshvera
|
ae0f18593b
|
Remove redundant imports
|
2016-08-10 12:18:53 -04:00 |
|
joshvera
|
347f4fbb4b
|
Concat outputs in CorpusSpec
|
2016-08-10 12:17:33 -04:00 |
|
joshvera
|
1c1938080c
|
Use either path in output
|
2016-08-10 11:00:40 -04:00 |
|
joshvera
|
dfbc5e1867
|
infix
|
2016-08-10 10:58:41 -04:00 |
|
joshvera
|
d09c1314a4
|
infix
|
2016-08-10 10:56:28 -04:00 |
|
joshvera
|
1574e74bcb
|
Normalize names before unioning
|
2016-08-10 10:55:48 -04:00 |
|
joshvera
|
07dfb0f5d8
|
handle missing files in CorpusSpec
|
2016-08-09 16:14:46 -04:00 |
|
joshvera
|
485fc884a4
|
Merge branch 'syntax-redux' into property-tests
|
2016-07-22 14:39:54 -04:00 |
|
Rob Rix
|
5bc2cd93f1
|
Only annotate terms & diffs with costs, not sizes.
|
2016-07-15 11:17:53 -04:00 |
|
Rob Rix
|
300bd2b84c
|
Renderer takes an annotation type parameter.
|
2016-07-14 16:36:47 -04:00 |
|
joshvera
|
59426b86f6
|
Add megaparsec to pretty print summaries
|
2016-07-13 14:32:53 -04:00 |
|
Rob Rix
|
49f477f5b0
|
📝 Verbatim .
|
2016-05-30 12:46:25 -04:00 |
|
Rob Rix
|
3fbfe43935
|
Prepend a newline to avoid being indented by expected: /but got: .
|
2016-05-30 12:44:09 -04:00 |
|
Rob Rix
|
89733ccdef
|
Test the fixtures in Verbatim.
|
2016-05-30 12:42:43 -04:00 |
|
Rob Rix
|
643e37477f
|
Derive an NFData instance for Verbatim.
|
2016-05-30 12:42:19 -04:00 |
|
Rob Rix
|
f10c0b305d
|
Enable GeneralizedNewtypeDeriving.
|
2016-05-30 12:42:11 -04:00 |
|
Rob Rix
|
46b43c63e9
|
This is Text, now.
|
2016-05-30 12:40:41 -04:00 |
|
Rob Rix
|
7fe5be7fe2
|
Verbatim wraps Text.
|
2016-05-30 12:39:43 -04:00 |
|
Rob Rix
|
7a52507e94
|
Derive an Eq instance for Verbatim.
|
2016-05-30 12:39:39 -04:00 |
|
Rob Rix
|
3774bfb816
|
We treat this argument as a FilePath.
|
2016-05-30 12:38:21 -04:00 |
|
Rob Rix
|
d584832b6b
|
We treat this argument as a FilePath.
|
2016-05-30 12:37:45 -04:00 |
|
Rob Rix
|
93b36a852f
|
Add a Show instance for Verbatim which emits the unquoted string.
|
2016-05-30 12:37:05 -04:00 |
|
Rob Rix
|
58883000b1
|
Add a Verbatim newtype wrapping a String.
|
2016-05-30 12:36:52 -04:00 |
|
Rob Rix
|
610d6e05da
|
🔥 some redundant imports.
|
2016-05-27 15:10:54 -04:00 |
|
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
|
473ec980b1
|
Merge remote-tracking branch 'origin/master' into diff-summaries
|
2016-05-26 13:40:54 -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
|
68948287f8
|
Add a summary renderer
|
2016-05-18 12:01:16 -04:00 |
|
Rob Rix
|
8b2a9fb6d0
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# src/Renderer/JSON.hs
# src/Renderer/Patch.hs
# test/CorpusSpec.hs
|
2016-04-04 18:00:25 -04:00 |
|
joshvera
|
928087e1f5
|
🔥
|
2016-04-04 17:38:58 -04:00 |
|
joshvera
|
a553709112
|
Specialize Renderer to Text
|
2016-04-04 17:20:26 -04:00 |
|
Rob Rix
|
60d6cfeb90
|
Use the curried both constructor.
|
2016-04-04 14:53:09 -04:00 |
|
joshvera
|
ba8fef376a
|
move to where clause
|
2016-04-02 13:28:17 -04:00 |
|
joshvera
|
4a7004394b
|
fix tests
|
2016-04-01 15:53:16 -04:00 |
|
Rob Rix
|
379208b3a3
|
🔥 qualifications of zip & zipWith.
|
2016-03-11 14:21:42 -05:00 |
|
joshvera
|
146632c2c7
|
parens
|
2016-03-08 16:20:17 -05:00 |
|
joshvera
|
8ddc5eb000
|
Add defaultPlainBlob
|
2016-03-08 16:05:01 -05:00 |
|
joshvera
|
54c86748ad
|
we just say pure
|
2016-03-08 16:05:01 -05:00 |
|
joshvera
|
c5fc04904e
|
Store modes as Word32
|
2016-03-07 19:20:28 -05:00 |
|
joshvera
|
a2dcdcab6e
|
Fix tests
|
2016-03-03 17:41:15 -05:00 |
|
Josh Vera
|
2c0014f26e
|
Merge branch 'master' into crashers-gonna-crash
|
2016-03-02 12:24:40 -05:00 |
|
Rob Rix
|
440f741658
|
Restore the crashers crash test to working.
cc @mdiep
|
2016-03-02 12:09:58 -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
|
d92bab31fd
|
Generate the JSON with aeson instead.
|
2016-02-29 20:52:30 -05:00 |
|
Rob Rix
|
7548e148dc
|
Rename runLeft/runRight to fst/snd.
|
2016-02-29 19:39:04 -05:00 |
|
joshvera
|
2c4acfb14f
|
Disambiguate the tests.
|
2016-02-29 07:45:24 -05:00 |
|