joshvera
|
8180b37285
|
Use Protolude via the Prologue module and add NoImplicitPrelude
|
2016-05-26 12:58:04 -04:00 |
|
joshvera
|
adf82ee812
|
Add NoImplicitPrelude and protolude. Bump lts to 6.0
|
2016-05-26 11:46:20 -04:00 |
|
Rob Rix
|
567e47c5c9
|
The tests depend on mtl.
|
2016-05-21 00:07:35 -04:00 |
|
joshvera
|
3d7e6f833a
|
Add protolude package
|
2016-05-19 18:10:07 -04:00 |
|
joshvera
|
68948287f8
|
Add a summary renderer
|
2016-05-18 12:01:16 -04:00 |
|
joshvera
|
5a8aed6e51
|
map infos to DifInfos in diffSummary'
|
2016-05-17 17:34:27 -04:00 |
|
joshvera
|
927acafcbd
|
add DiffSummarySpec
|
2016-05-16 14:45:33 -04:00 |
|
joshvera
|
a5b838d458
|
Remove CofreeExtras
|
2016-05-10 17:50:37 -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
|
1914950bc1
|
Stub diffSummary'
|
2016-05-03 15:50:38 -04:00 |
|
joshvera
|
6c07d4dc55
|
WIP CofreeF
|
2016-05-03 12:17:38 -04:00 |
|
joshvera
|
658fd024ec
|
Add recursion-schemes and free
|
2016-04-26 17:31:05 -04:00 |
|
joshvera
|
33270bd65a
|
stub diffSummary
|
2016-04-25 11:46:10 -04:00 |
|
Rob Rix
|
82289984de
|
Revert "Depend on semigroupoids."
This reverts commit aee2715e87a9112ced62ef27ef74f7a1869f2456.
|
2016-04-22 11:39:21 -04:00 |
|
Rob Rix
|
f0dc234c85
|
Depend on semigroupoids.
|
2016-04-22 11:04:08 -04:00 |
|
Rob Rix
|
2ca1caaa98
|
Replace Data.Option with a dependency on semigroups.
|
2016-04-15 12:20:27 -04:00 |
|
Rob Rix
|
2f5f0ad55b
|
Revert "Add Alt and Plus instances over OrderedMap."
This reverts commit ac24ca8debc3674940532944d59ee4b390489cca.
|
2016-04-15 11:57:23 -04:00 |
|
Rob Rix
|
4515b03fc7
|
Add Alt and Plus instances over OrderedMap.
|
2016-04-15 11:26:51 -04:00 |
|
Rob Rix
|
025d91f6ad
|
🔥 Data.Copointed; use pointed instead.
|
2016-04-15 11:19:50 -04:00 |
|
Rob Rix
|
a61d847705
|
Replace Data.Bifunctor.These and Data.Align with the these package.
|
2016-04-14 22:00:00 -04:00 |
|
Rob Rix
|
b036fa27a3
|
🔥 Data.Coalescent.
|
2016-04-14 21:59:25 -04:00 |
|
Rob Rix
|
e4e3418a7a
|
🔥 Data.Adjoined.
|
2016-04-14 21:59:11 -04:00 |
|
Rob Rix
|
8fc7a094a5
|
🔥 Line.
|
2016-04-14 21:58:37 -04:00 |
|
Rob Rix
|
6829c6baab
|
🔥 Data.Adjoined.Spec.
|
2016-04-14 21:54:25 -04:00 |
|
Rob Rix
|
1972e20233
|
🔥 Data.Functor.Both.Spec.
|
2016-04-14 21:54:11 -04:00 |
|
Rob Rix
|
19cc23b51a
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# src/Diff.hs
|
2016-03-30 20:20:50 -04:00 |
|
Rob Rix
|
75677fa8aa
|
Add a module for Info.
|
2016-03-30 17:12:39 -04:00 |
|
Rob Rix
|
745b695dd9
|
The tests depend on bifunctors.
|
2016-03-21 18:53:57 -04:00 |
|
Rob Rix
|
cd2e07bcf3
|
🔥 Data.Aligned.
|
2016-03-21 13:27:20 -04:00 |
|
Rob Rix
|
ac247fa315
|
Stub in a Data.Aligned module.
|
2016-03-18 10:41:55 -04:00 |
|
Rob Rix
|
33ef0d13dc
|
Depend on bifunctors.
|
2016-03-17 20:07:28 -04:00 |
|
Rob Rix
|
0129bffe6e
|
Stub in a spec for Both.
|
2016-03-15 10:40:35 -04:00 |
|
Rob Rix
|
c61b90d2b9
|
Revert "Stub the Join module back in."
This reverts commit c927af544cdea5dda46904fa79cadff7e60ea52f.
|
2016-03-14 20:44:32 -04:00 |
|
Rob Rix
|
7f83e07fe9
|
Stub the Join module back in.
|
2016-03-14 19:48:37 -04:00 |
|
Rob Rix
|
c48bd242d7
|
Turn DeriveFunctor on for the tests.
|
2016-03-11 09:14:46 -05:00 |
|
Rob Rix
|
4e1d4706ee
|
Stub in a Data.Adjoined spec module.
|
2016-03-11 09:06:03 -05:00 |
|
Rob Rix
|
b6d422eb5b
|
Revert "Revert "Stub in a Data.Bifunctor.These module.""
This reverts commit 2b5c242f70e141e00fdeadd378c2d6eae49fce22.
|
2016-03-10 10:46:32 -05:00 |
|
Rob Rix
|
ddd0adf2aa
|
Revert "Revert "Stub in a Data.Align module.""
This reverts commit 91ab52cef2217ae1a92eebb4d7d90bbcc1626565.
|
2016-03-10 10:45:29 -05:00 |
|
Rob Rix
|
7c88d9ff38
|
Stub in a Data.Coalescent module.
|
2016-03-10 09:41:57 -05:00 |
|
Rob Rix
|
29064a6d9d
|
Revert "🔥 Data.Adjoined."
This reverts commit 68dd849071a17f58d4bfe83ebc05b55ffc011ba5.
|
2016-03-10 03:27:00 -05:00 |
|
Rob Rix
|
086a3d53cb
|
🔥 Row.
|
2016-03-09 01:39:18 -05:00 |
|
Rob Rix
|
1d99e4f548
|
🔥 Data.Adjoined.
|
2016-03-08 10:24:27 -05:00 |
|
Rob Rix
|
6bd58e3007
|
Revert "Stub in a Data.Bifunctor.These module."
This reverts commit 2cb0cce8304de64ebca4b8106dc453bd66fe1c36.
|
2016-03-07 12:57:12 -05:00 |
|
Rob Rix
|
705b0757ed
|
Revert "Stub in a Data.Align module."
This reverts commit 7e2a1740f7c585cc1ac277c1cd92b333c7c68e34.
|
2016-03-07 12:57:03 -05:00 |
|
Rob Rix
|
fb24cc7241
|
Stub in a Data.Align module.
|
2016-03-07 09:33:09 -05:00 |
|
Rob Rix
|
d78b5e7a7a
|
Stub in a Data.Bifunctor.These module.
|
2016-03-07 09:28:09 -05:00 |
|
Rob Rix
|
2dde65d46e
|
Stub in a Data.Adjoined module.
|
2016-03-04 21:56:41 -05:00 |
|
Rob Rix
|
a8ca94bd49
|
Stub in a Data.Copointed module.
|
2016-03-02 23:08:28 -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
|
adf7b24bc7
|
🔥 Text.JSON, just use the json package.
|
2016-02-29 18:06:06 -05:00 |
|
Rob Rix
|
bc2db99978
|
Stub in a Text.JSON module.
|
2016-02-29 16:32:31 -05:00 |
|
Rob Rix
|
46b85eea05
|
Merge branch 'master' into forward-compatible-rendering
|
2016-02-29 14:11:14 -05:00 |
|
Rob Rix
|
75b7f9d58c
|
Revert "Don’t warn about orphans."
This reverts commit 18205b45d7cce5985265248f6c69f9c1932b057d.
|
2016-02-29 13:43:38 -05:00 |
|
Rob Rix
|
52b23a8e5c
|
Don’t warn about orphans.
This is for the orphan ToMarkup instance in Renderer.Split.
|
2016-02-29 13:38:14 -05:00 |
|
Rob Rix
|
0626228917
|
Data.Bifunctor.Join is actually Data.Functor.Both.
|
2016-02-28 21:29:59 -05:00 |
|
Rob Rix
|
d6fb451ebd
|
Rename SplitSpec to AlignmentSpec.
|
2016-02-28 14:05:19 -05:00 |
|
Rob Rix
|
e55cb8e24d
|
Stub in an Alignment module.
|
2016-02-28 13:55:19 -05:00 |
|
Rob Rix
|
5dc42ddcf3
|
Stub in a SplitDiff module.
|
2016-02-28 13:37:40 -05:00 |
|
Rob Rix
|
46e66bf639
|
Sort the library’s exposed modules.
|
2016-02-28 13:36:32 -05:00 |
|
Rob Rix
|
145defd1b9
|
Sort the dependencies in each cabal file.
|
2016-02-28 13:34:07 -05:00 |
|
Rob Rix
|
1ba036b495
|
Merge branch 'master' into forward-compatible-rendering
# Conflicts:
# src/DiffOutput.hs
# test/CorpusSpec.hs
# tools/semantic-difftool/src/Main.hs
|
2016-02-28 13:26:50 -05:00 |
|
Rob Rix
|
bcbb762ccf
|
Remove the library’s dependency on c-storable-deriving.
|
2016-02-27 19:38:19 -05:00 |
|
Rob Rix
|
7b038f821d
|
Merge branch 'master' into factor-git-integration-into-a-separate-package
# Conflicts:
# semantic-diff.cabal
|
2016-02-26 22:37:44 -05:00 |
|
Josh Vera
|
ca92f08159
|
Merge pull request #471 from github/remove-semigroups
Remove semigroups
|
2016-02-26 19:07:04 -07:00 |
|
joshvera
|
7cbe330be5
|
Merge remote-tracking branch 'origin/master' into factor-out-packages
|
2016-02-26 18:36:57 -07:00 |
|
Rob Rix
|
686c94d69f
|
Move the semantic-diff executable to a semantic-git-diff package.
|
2016-02-26 20:34:30 -05:00 |
|
Rob Rix
|
f25d2754f7
|
Remove semigroups.
|
2016-02-26 19:55:18 -05:00 |
|
Rob Rix
|
431b8ff693
|
Build Data.Option.
|
2016-02-26 19:54:53 -05:00 |
|
Rob Rix
|
a415ae4d44
|
Goodbye, 🌈 Chunks.
|
2016-02-26 19:06:43 -05:00 |
|
Rob Rix
|
8c39ae3c87
|
Remove the Unified module.
|
2016-02-26 19:05:51 -05:00 |
|
Rob Rix
|
782b01932f
|
Replace the dependency on bifunctors with Data.Bifunctor.Join.
|
2016-02-26 18:57:54 -05:00 |
|
Rob Rix
|
bbf76ad1e6
|
Merge branch 'master' into factor-out-packages
# Conflicts:
# semantic-diff.cabal
|
2016-02-26 18:45:38 -05:00 |
|
Rob Rix
|
254d04774a
|
Merge pull request #467 from github/group-renderers
Group renderers
|
2016-02-26 18:43:13 -05:00 |
|
Rob Rix
|
f9bca5ec2d
|
Set up a semantic-difftool package.
|
2016-02-26 18:05:10 -05:00 |
|
Rob Rix
|
0892dfd49e
|
Move DiffOutput into the library.
|
2016-02-26 17:56:38 -05:00 |
|
Rob Rix
|
4b15f12735
|
Replace free with Control.Monad.Free & Control.Comonad.Cofree.
|
2016-02-26 12:20:55 -07:00 |
|
Rob Rix
|
bce5430697
|
Stub in a JSON renderer module.
|
2016-02-25 13:57:28 -07:00 |
|
Rob Rix
|
78f8704b13
|
Move Renderer up.
|
2016-02-25 13:55:28 -07:00 |
|
Rob Rix
|
fcd8571274
|
Move Unified under Renderer.
|
2016-02-25 13:50:35 -07:00 |
|
Rob Rix
|
f8214a9872
|
Move Split under Renderer.
|
2016-02-25 13:32:39 -07:00 |
|
Rob Rix
|
f44455c372
|
Rename Renderer.PatchOutput to Renderer.Patch.
|
2016-02-25 13:20:25 -07:00 |
|
Rob Rix
|
c710b3c713
|
Move PatchOutput into Renderer.
|
2016-02-25 13:14:56 -07:00 |
|
Rob Rix
|
7949048e13
|
Add a function to branches only.
|
2016-02-24 13:24:51 -07:00 |
|
Matt Diephouse
|
565c7b6ca8
|
Add todo tests
|
2016-02-17 17:42:27 -05:00 |
|
Rob Rix
|
adb9d009cb
|
Merge branch 'master' into hush-little-vector-don’t-you-cry
# Conflicts:
# semantic-diff.cabal
|
2016-02-17 11:43:29 -05:00 |
|
Matt Diephouse
|
8df993408d
|
Set the correct flags
|
2016-02-16 16:45:49 -05:00 |
|
Matt Diephouse
|
c8edf79abb
|
Add a spec for test files
|
2016-02-16 16:38:31 -05:00 |
|
Matt Diephouse
|
5127376e68
|
diffFiles :: Parser -> Renderer T.Text b -> (Source Char, Source Char) -> IO b
|
2016-02-16 16:09:58 -05:00 |
|
Matt Diephouse
|
ac053940fe
|
Add a spec for on-disk tests
|
2016-02-16 12:33:41 -05:00 |
|
Rob Rix
|
52875fdd99
|
Silence a warning for the DiffOutput module.
|
2016-02-13 15:09:13 -08:00 |
|
Rob Rix
|
bda4df6731
|
Build threadily.
|
2016-02-13 14:16:49 -08:00 |
|
Rob Rix
|
54cf53e639
|
Add DiffOutput to the cabal file.
|
2016-02-13 12:41:07 -08:00 |
|
Matt Diephouse
|
4a5c844f34
|
Move Language to a separate module
|
2016-02-10 14:30:14 -08:00 |
|
Matt Diephouse
|
170b7c6e1e
|
Rename Categorizable module to Category
|
2016-02-04 13:59:33 -05:00 |
|
joshvera
|
724910bf7a
|
Merge remote-tracking branch 'origin/master' into git-diff
|
2016-02-01 14:48:30 -05:00 |
|
Matt Diephouse
|
316a7827c3
|
Add Rainbow to semantic-diff-exe
|
2016-01-21 13:32:00 -05:00 |
|
joshvera
|
84d8494c3e
|
Add semantic-diff exe
|
2016-01-15 16:25:58 -05:00 |
|
joshvera
|
13b676f392
|
Merge origin/master into git-diff
|
2016-01-14 14:04:28 -05:00 |
|
Matt Diephouse
|
9c4ea153bc
|
Add a Renderer type for rendering diffs
|
2016-01-14 13:18:40 -05:00 |
|
Matt Diephouse
|
6a3f5c4c00
|
Use Option instead of creating a Union type
|
2016-01-13 13:34:56 -05:00 |
|
Rob Rix
|
c5059e94ee
|
Just include-dirs .
|
2016-01-13 13:34:56 -05:00 |
|
Rob Rix
|
6bffb323c2
|
Extra include dirs.
|
2016-01-13 13:34:56 -05:00 |
|
Rob Rix
|
7dbaddf8fa
|
Add the homebrew icu4c path to extra-lib-dirs on Darwin.
|
2016-01-13 13:34:56 -05:00 |
|
Matt Diephouse
|
473866cb6a
|
Use Option instead of creating a Union type
|
2016-01-13 10:04:26 -05:00 |
|
Rob Rix
|
bfbb1745dd
|
Just include-dirs .
|
2016-01-12 20:49:46 -05:00 |
|
Rob Rix
|
57cee8f754
|
Extra include dirs.
|
2016-01-12 20:47:50 -05:00 |
|
Rob Rix
|
47ed985a6a
|
Add the homebrew icu4c path to extra-lib-dirs on Darwin.
|
2016-01-12 20:39:04 -05:00 |
|
joshvera
|
8f069abbce
|
Merge master into git-diff
|
2016-01-12 12:53:09 -05:00 |
|
Rob Rix
|
662e14448e
|
Just link the libs on Darwin (I hope, oh god I hope)
|
2016-01-12 11:55:23 -05:00 |
|
Rob Rix
|
fe759bb6cd
|
Now with 100% more correct syntax!
|
2016-01-12 11:46:11 -05:00 |
|
Rob Rix
|
d37fcb287e
|
Don’t use script/g++ on Darwin.
|
2016-01-12 11:42:55 -05:00 |
|
Rob Rix
|
23ac8b749e
|
We don’t need these options any more.
-lstdc++ is handled by g++. The libraries are handled by our wrapper
script.
|
2016-01-11 19:23:53 -05:00 |
|
Rob Rix
|
5519a1dda0
|
Use the linker wrapper.
|
2016-01-11 19:18:34 -05:00 |
|
Rob Rix
|
b7030fe9bf
|
Pass the flags through as tho to g++ itself.
|
2016-01-11 19:10:57 -05:00 |
|
Rob Rix
|
0ceafb12ac
|
Pass icui18n first.
|
2016-01-11 19:09:36 -05:00 |
|
Rob Rix
|
dc1d017a40
|
-Bstatic/-Bdynamic exist and may actually differ.
|
2016-01-11 15:34:50 -05:00 |
|
Rob Rix
|
5978a57204
|
Link -lstdc++ via ld-options.
|
2016-01-11 13:08:41 -05:00 |
|
Rob Rix
|
3404008f5b
|
Don’t use extra-libraries.
|
2016-01-11 13:08:27 -05:00 |
|
Rob Rix
|
2dc2c94b79
|
Use ld-options again.
|
2016-01-11 13:08:23 -05:00 |
|
Rob Rix
|
ef3efba294
|
Revert "Don’t link ICU (to compare the errors)."
This reverts commit 2e6ce0b97b1ccf8f95c8086b5e75d8b6ed23cee0.
|
2016-01-11 13:07:47 -05:00 |
|
Rob Rix
|
b986780045
|
Don’t link ICU (to compare the errors).
|
2016-01-11 13:05:32 -05:00 |
|
Rob Rix
|
407e9bf8bc
|
extra-libs here maybe?
|
2016-01-11 12:55:48 -05:00 |
|
Rob Rix
|
d5d7997a19
|
Try to statically link the ICU libs but dynamically link everything else.
|
2016-01-11 12:52:29 -05:00 |
|
Rob Rix
|
5c18bb7715
|
Revert "Pass the static archives in as ld-options."
This reverts commit 6934d44e96e6d999b352e21bfc6446c99b80a387.
|
2016-01-11 12:50:04 -05:00 |
|
Rob Rix
|
a09449720a
|
Pass the static archives in as ld-options.
|
2016-01-11 12:46:05 -05:00 |
|
Rob Rix
|
e767f9858d
|
Revert "Pass the static archives in as c-sources."
This reverts commit ff1b6769186add595de0d3d521efacd5e54cfebb.
|
2016-01-11 12:45:30 -05:00 |
|
Rob Rix
|
39a4d00a99
|
Pass the static archives in as c-sources.
|
2016-01-11 12:44:31 -05:00 |
|
Rob Rix
|
a951895ebf
|
Try linking against ICU .a’s directly.
|
2016-01-11 12:41:43 -05:00 |
|
Rob Rix
|
861a6dfc88
|
Remove the semantic-diff-profile component.
|
2016-01-11 11:46:12 -05:00 |
|
Rob Rix
|
e931df2bd5
|
Remove ld-options.
|
2016-01-11 11:16:47 -05:00 |
|
Rob Rix
|
66fb848834
|
Revert "Revert "Remove -dynamic.""
This reverts commit 7dfd43f26ed0d880ff498f98f3544059c9d5ada6.
|
2016-01-11 11:14:16 -05:00 |
|
Rob Rix
|
597397b16e
|
Revert "Remove -dynamic."
This reverts commit a0c75e64bb5896ee336d2a9c38eba4b3a6f49f9a.
|
2016-01-11 11:13:04 -05:00 |
|
Rob Rix
|
e2d4b6bfea
|
Remove -dynamic.
|
2016-01-11 11:12:15 -05:00 |
|
Rob Rix
|
188d6025d7
|
Revert "Attempt to link the ICU libs statically."
This reverts commit 5961a362ac93ff2c28e59a3bb18900c7713d68e8.
|
2016-01-11 11:12:03 -05:00 |
|
Rob Rix
|
342d42f9d2
|
Attempt to link the ICU libs statically.
|
2016-01-11 11:10:05 -05:00 |
|
Rob Rix
|
6f56d9b59d
|
Move -dynamic to the end instead.
|
2016-01-11 11:09:43 -05:00 |
|
Rob Rix
|
842f943920
|
Try linking libstdc++ dynamically as well.
|
2016-01-11 11:02:23 -05:00 |
|
Rob Rix
|
42a69077b8
|
Try to link libc dynamically.
|
2016-01-11 10:53:20 -05:00 |
|
Rob Rix
|
7b27db926e
|
Move the static/pthread options to ld-options.
|
2016-01-11 10:48:18 -05:00 |
|
Rob Rix
|
e900220aa3
|
Pass -optl-pthread in the cabal file.
|
2016-01-11 10:37:51 -05:00 |
|
Rob Rix
|
8bec83cf84
|
Build the profile executable with -static -optl-static.
|
2016-01-11 10:11:17 -05:00 |
|
Rob Rix
|
bd50d1812a
|
Build the executable with -optl-static.
|
2016-01-11 10:10:50 -05:00 |
|
Rob Rix
|
1af0fbab68
|
Remove the second ghc-options entry from the cabal file.
|
2016-01-11 09:47:17 -05:00 |
|
Rob Rix
|
80ff4875b1
|
Indentation 💄
|
2016-01-11 09:46:50 -05:00 |
|
joshvera
|
61520c1351
|
remove optl-pthread
|
2016-01-08 20:29:01 -05:00 |
|
joshvera
|
48fd1a4b21
|
set optl-pthread and optl-static
|
2016-01-08 20:24:24 -05:00 |
|
Rob Rix
|
e75652b33b
|
Revert "Don’t set the static flag."
This reverts commit 0cc9f066eb0a1d8411d08666106291f978550b93.
|
2016-01-08 17:57:05 -05:00 |
|
Rob Rix
|
9b1bcd43ec
|
Don’t set the static flag.
|
2016-01-08 17:55:56 -05:00 |
|