1
1
mirror of https://github.com/github/semantic.git synced 2024-12-23 06:41:45 +03:00
Commit Graph

302 Commits

Author SHA1 Message Date
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