Rob Rix
|
59bc42b731
|
Don’t attempt to align non-overlapping terms.
|
2016-07-08 14:00:07 -04:00 |
|
Rob Rix
|
032dcb047b
|
Pass both the syntaxes to the helper function directly.
|
2016-07-08 13:57:25 -04:00 |
|
Rob Rix
|
9242d2fe7c
|
Add an alignment function over Cofree f a.
|
2016-07-08 13:44:29 -04:00 |
|
joshvera
|
772575dffd
|
Add zipUnwrap cases for Comment and Commented
|
2016-07-08 13:27:41 -04:00 |
|
joshvera
|
73afe7d1e9
|
Add zipTerms to Pairs
|
2016-07-08 13:16:06 -04:00 |
|
joshvera
|
99b05ebdc1
|
Object takes a list of f now
|
2016-07-08 11:17:46 -04:00 |
|
joshvera
|
1efd68d122
|
Merge remote-tracking branch 'origin/master' into syntax-redux
|
2016-07-06 16:22:25 -04:00 |
|
Rob Rix
|
e914685790
|
Don’t warn of orphans so much.
|
2016-06-30 12:59:26 -04:00 |
|
joshvera
|
9973343364
|
Map dictionary literals to objects
|
2016-06-28 16:38:06 -04:00 |
|
joshvera
|
af8e7a4d81
|
Add a Switch case to zipUnwrap
|
2016-06-16 16:35:52 -07:00 |
|
joshvera
|
7c8ac45c83
|
Zip Case statements in zipTerms
|
2016-06-16 10:39:57 -07:00 |
|
joshvera
|
ef6b174c7d
|
Merge remote-tracking branch 'origin/master' into ghc8
|
2016-06-15 10:10:07 -07:00 |
|
joshvera
|
41de1b69a3
|
Add zipUnwrap cases for FunctionCall and Function
|
2016-06-10 18:56:04 -04:00 |
|
Rob Rix
|
7802d4916c
|
🔥 FlexibleInstances & RecordWildCards pragmas.
|
2016-06-03 16:02:06 -04:00 |
|
joshvera
|
fbf368b659
|
Merge remote-tracking branch 'origin/master' into ghc8
|
2016-05-31 13:49:17 -04:00 |
|
joshvera
|
dcd8b0de32
|
Bump to lts nightly for ghc-8.0
|
2016-05-27 13:10:04 -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
|
9d9fbe3c37
|
🔥 annotate and unfix
|
2016-05-26 14:46:13 -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
|
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 |
|
joshvera
|
48c7498ce2
|
Define Term in terms of Cofree
|
2016-05-04 14:37:24 -04:00 |
|
joshvera
|
6c07d4dc55
|
WIP CofreeF
|
2016-05-03 12:17:38 -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
|
97b588d5e3
|
Correct the docs of termSize.
|
2016-04-11 15:06:53 -04:00 |
|
Rob Rix
|
0b4696062d
|
Compute term sizes as node counts.
|
2016-04-11 13:54:46 -04:00 |
|
Rob Rix
|
60d6cfeb90
|
Use the curried both constructor.
|
2016-04-04 14:53:09 -04:00 |
|
Rob Rix
|
619c16e72d
|
These definitions of cata and ana admit the usual definition of hylo.
|
2016-03-18 13:08:59 -04:00 |
|
Rob Rix
|
dfb02c877b
|
Rename the type variable to something more sensible.
|
2016-03-18 13:06:53 -04:00 |
|
Rob Rix
|
f45796ab4a
|
Use the obvious type variable.
|
2016-03-18 12:59:49 -04:00 |
|
Rob Rix
|
4c6be8d2bb
|
Implement cata pointfree.
|
2016-03-18 12:59:06 -04:00 |
|
Rob Rix
|
53de236860
|
Generalize cata over Cofree .
|
2016-03-18 12:51:32 -04:00 |
|
Rob Rix
|
82e29e2df7
|
Define anamorphisms over Cofree.
|
2016-03-18 12:50:16 -04:00 |
|
Rob Rix
|
bf87e931b7
|
Move the annotated hylo from Interpreter into Term.
|
2016-03-18 12:43:29 -04:00 |
|
Rob Rix
|
379208b3a3
|
🔥 qualifications of zip & zipWith.
|
2016-03-11 14:21:42 -05:00 |
|
Rob Rix
|
ace7616899
|
The Foldable instance for OrderedMap takes care of this for us.
|
2016-02-29 19:38:22 -05:00 |
|
Rob Rix
|
c889174aee
|
Use Both to represent Diff annotations.
|
2016-02-29 10:12:34 -05:00 |
|
Rob Rix
|
065c21c013
|
Sort more imports.
|
2016-02-29 10:07:44 -05:00 |
|
Matt Diephouse
|
fde0749cf0
|
Correct the directionality
|
2016-01-13 16:19:48 -05:00 |
|
Matt Diephouse
|
c0c3a69bcf
|
Document the declarations in Term.hs
|
2016-01-13 15:35:40 -05:00 |
|
Matt Diephouse
|
a2643cef82
|
eta reduction
|
2016-01-13 15:32:03 -05:00 |
|
Rob Rix
|
7af5a4876a
|
Move OrderedMap into Data.
|
2016-01-06 11:56:58 -05:00 |
|
Rob Rix
|
62815448c1
|
Use OrderedMap everywhere.
|
2015-12-14 17:12:47 -05:00 |
|
Rob Rix
|
5069014381
|
Compute the size of terms.
|
2015-11-30 19:13:20 -05:00 |
|
Rob Rix
|
4467b4444e
|
Don’t shadow.
|
2015-11-27 12:02:28 -05:00 |
|
Rob Rix
|
2c241e8ad8
|
Move the Categorizable instance.
|
2015-11-27 12:02:15 -05:00 |
|
Rob Rix
|
f89e05b702
|
We don’t use this.
|
2015-11-27 11:58:20 -05:00 |
|
Rob Rix
|
df7d79bc62
|
This is also a Term.
|
2015-11-27 09:31:56 -05:00 |
|
Rob Rix
|
f40fc7e117
|
cata over Term .
|
2015-11-19 17:17:17 -08:00 |
|
Rob Rix
|
2a081c5aa0
|
Keyed nodes.
|
2015-11-18 18:00:10 -08:00 |
|
Rob Rix
|
21d9bb3670
|
Compose some more functions.
|
2015-11-18 17:38:48 -08:00 |
|
Rob Rix
|
e91bdbd981
|
Factor out the operator section.
|
2015-11-18 17:35:03 -08:00 |
|
Rob Rix
|
63dfb9d08b
|
Zip Fixed terms.
|
2015-11-18 17:35:03 -08:00 |
|
Rob Rix
|
d317e32284
|
Zip Indexed terms.
|
2015-11-18 17:35:03 -08:00 |
|
Rob Rix
|
0b3c04fe1b
|
Zip leaf terms.
|
2015-11-18 17:35:03 -08:00 |
|
Rob Rix
|
e8274ed379
|
Zip terms.
|
2015-11-18 17:35:03 -08:00 |
|
Rob Rix
|
1e3ae866c2
|
Terms with Categorizable annotations are themselves Categorizable.
|
2015-11-18 11:39:08 -08:00 |
|
Rob Rix
|
a47ad36d98
|
Move the definition of Term into the Term module.
|
2015-11-18 11:28:16 -08:00 |
|
Rob Rix
|
e989216361
|
Add a Term module.
|
2015-11-18 11:27:09 -08:00 |
|