github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-28 17:32:05 +03:00
Code Issues Projects Releases Wiki Activity
16,794 Commits 19 Branches 16 Tags 46 MiB
088c58f405
Commit Graph

723 Commits

Author SHA1 Message Date
Timothy Clem
6cbfa91475 Try out moving project around 2016-10-05 16:17:46 -07:00
Rob Rix
8cec95aad4 Merge branch 'master' into pretty-print-expectations 
# Conflicts:
#	script/cibuild-semantic-diff
#	script/cibuild-semantic-diff-linux
#	test/RangeSpec.hs
#	test/Spec.hs
 2016-09-20 05:56:12 +09:00
Rob Rix
38d6bbe644 Merge branch 'master' into ghc8 2016-09-17 20:45:58 -04:00
Rob Rix
7a0534eaaf 🔥 -threaded & -fprof-auto on the lib. 
Because:

```
Warning: 'ghc-options: -threaded' has no effect for libraries. It
should only
be used for executables.
Warning: 'ghc-options: -with-rtsopts' has no effect for libraries. It
should
only be used for executables.
```
 2016-09-14 19:15:52 -04:00
Rick Winfrey
2f2dd26fbc Add hspec-expectations-pretty-diff to semantic-diff 2016-09-14 16:44:46 -05:00
Rick Winfrey
91b12b71d0 Change semantic-diff-test -> test 2016-09-14 16:12:06 -05:00
Rob Rix
2e28d0d582 Data.These has its own Arbitrary instance these days. 2016-09-14 16:42:01 -04:00
Rob Rix
4a06d76054 Move cmarkParser to its own module. 2016-09-14 02:08:27 -04:00
Rob Rix
dcc164d09f Add a spec for Source. 2016-09-13 11:35:10 -04:00
Rob Rix
2b34916554 Build and run RangeSpec 😔 2016-09-13 11:18:38 -04:00
Rob Rix
b4e6e1dbb8 Merge branch 'master' into markdown 2016-09-13 10:35:28 -04:00
Timothy Clem
e862ffe86e Move to semver MAJOR.MINOR.PATCH 2016-09-08 13:28:43 -07:00
Timothy Clem
81651283ea Version change to validate --version output 2016-09-08 11:11:16 -07:00
Timothy Clem
ed08914d18 Show version for both tool and library 2016-09-08 11:09:24 -07:00
Rob Rix
38abf6b339 Merge branch 'master' into abstract-term-construction-out-of-parsing 
# Conflicts:
#	src/Parser.hs
#
tools/semantic-git-diff/test/corpus/diff-summaries/javascript/switch-sta
tement.json
#
tools/semantic-git-diff/test/corpus/diff-summaries/javascript/throw-stat
ement.json
 2016-09-08 09:52:01 -04:00
Rob Rix
cccd9e9cc6 Stub in a term constructor for C. 2016-09-07 15:10:49 -04:00
Rob Rix
64edd14b1d Stub in a module for JS-specific stuff. 2016-09-07 11:50:41 -04:00
Rick Winfrey
b07d4d2cdf Extract Arguments to its own module 2016-08-31 13:09:41 -05:00
Rob Rix
0ebb18da7e Add cmark to our dependencies. 2016-08-29 12:51:44 -04:00
Timothy Clem
24cb9f8d94 No more os(darwin) specific options 2016-08-25 15:54:55 -07:00
joshvera
39757eca55 Add pgml=script/g++ to bench targets and -O2 on semantic-git-diff target 2016-08-19 16:31:19 -04:00
Rob Rix
2477a40b6c Enable FlexibleContexts for the tests. 2016-08-11 12:29:17 -04:00
Rob Rix
47ea24e90a Merge branch 'master' into precompute-p,q-grams 
# Conflicts:
#	test/CorpusSpec.hs
 2016-08-10 10:24:07 -04:00
Rob Rix
b97b422cfb Revert "Enable FlexibleContexts for the tests." 
This reverts commit 1c0007137862d4c263d75225c7ff579c574c48b1.
 2016-08-10 09:44:55 -04:00
Rob Rix
959f15198c 🔥 Data.Vector.Arbitrary. 2016-08-10 09:44:02 -04:00
Rob Rix
f0466c0c43 Enable FlexibleContexts for the tests. 2016-08-10 09:15:42 -04:00
joshvera
46b1a7385e Include protolude for Unsafe in tests 2016-08-09 16:14:46 -04:00
Rob Rix
25f4d2e751 Merge branch 'master' into precompute-p,q-grams 
# Conflicts:
#	src/Diffing.hs
#	src/Parser.hs
#	src/TreeSitter.hs
 2016-08-05 13:13:36 -04:00
Rob Rix
a06dd1dc1e Move the Arbitrary instance over Vector into its own module. 2016-08-05 10:14:53 -04:00
Rob Rix
60c4effabe Diffing annotates terms with their feature vectors. 2016-08-04 20:43:10 -04:00
Rob Rix
ec548b56d4 Sort the test dependencies alphabetically. 2016-08-04 20:42:39 -04:00
Rob Rix
9a14248c08 🔥 Operation. 2016-08-03 18:12:58 -04:00
joshvera
8b0f496b90 Merge remote-tracking branch 'origin/master' into error-syntax 2016-07-27 19:00:27 -04:00
joshvera
ae4142ad7c Add SourceSpan module 2016-07-27 17:15:09 -04:00
Rob Rix
cfddd9ca75 Merge branch 'master' into sequenceable 2016-07-26 15:43:02 -04:00
Rob Rix
8f15a59282 Stub in a spec for the Mergeable stuff. 2016-07-26 03:56:52 -04:00
joshvera
1197d46d31 Remove megaparsec 2016-07-25 13:34:38 -04:00
Rob Rix
77969d5366 Merge branch 'master' into sequenceable 
# Conflicts:
#	src/Diff.hs
#	src/Syntax.hs
 2016-07-22 18:40:11 -04:00
Rob Rix
9ae7f52e8f Rename Sequenceable to Mergeable. 2016-07-22 17:38:10 -04:00
Rob Rix
808f15d40e Stub in a generic Sequenceable module. 2016-07-22 15:33:01 -04:00
Rob Rix
f53cf8f05e Stub in a Sequenceable typeclass. 2016-07-22 15:28:47 -04:00
joshvera
485fc884a4 Merge branch 'syntax-redux' into property-tests 2016-07-22 14:39:54 -04:00
joshvera
70f9329f1a Merge remote-tracking branch 'origin/master' into syntax-redux 2016-07-22 12:36:03 -04:00
joshvera
ad4d36f7fd Add a CoArbitrary instance to Category 2016-07-17 11:18:31 -04:00
Rob Rix
631b557823 🔥 DiffOutput.hs. 2016-07-15 16:01:43 -04:00
joshvera
27c338331f Merge remote-tracking branch 'origin/master' into syntax-redux 2016-07-14 15:22:46 -04:00
joshvera
453334d966 Use wl-pprint-text to pretty print diff summaries 2016-07-14 14:44:18 -04:00
joshvera
58ff433dd0 Merge remote-tracking branch 'origin/master' into pretty-print-summaries 2016-07-14 14:38:46 -04:00
joshvera
59426b86f6 Add megaparsec to pretty print summaries 2016-07-13 14:32:53 -04:00
joshvera
7169a51265 Use wl-pprint-text to pretty print diff summaries 2016-07-13 11:58:43 -04:00
Rob Rix
4f967e0e1a 🔥 Data.OrderedMap. 2016-07-12 23:27:20 -04:00
Rick Winfrey
177af03bd3 Merge branch 'master' into syntax-redux 2016-07-12 17:03:35 -05:00
Rob Rix
6c16a071bb Stub in a generic align module. 2016-07-11 13:55:27 -04:00
Rob Rix
f97169b064 We no longer need syb. 2016-07-11 11:46:58 -04:00
Rob Rix
6c2948e317 Try to implement alignment over functors. Try, and fail miserably. 2016-07-08 17:59:54 -04:00
joshvera
1efd68d122 Merge remote-tracking branch 'origin/master' into syntax-redux 2016-07-06 16:22:25 -04:00
Rob Rix
4cfa993239 Move the Arbitrary gram functions into Data.RandomWalkSimilarity. 2016-07-05 09:18:53 -04:00
Rob Rix
28abcd1b38 Move Record’s Arbitrary instance into Data.Record. 2016-06-30 12:49:50 -04:00
Rob Rix
9611a27887 🔥 test/ArbitraryTerm.hs. 2016-06-27 15:03:04 -04:00
Rob Rix
b4107426de Stub in a spec for Diff. 2016-06-27 13:12:06 -04:00
Rob Rix
5724d2cbb3 Use k-d trees to look up the nearest neighbour. 2016-06-24 11:10:18 -04:00
Rob Rix
b604ddd446 FlexibleContexts all the things. 2016-06-23 16:19:51 -04:00
Rob Rix
011623e028 Correct the spec module import. 2016-06-23 09:51:47 -04:00
Rob Rix
4a8b7631bb Stub in a Data.Record.Arbitrary module. 2016-06-23 09:42:43 -04:00
Rob Rix
1170bfdcb2 Rename Data.Gram to Data.RandomWalkSimilarity. 2016-06-22 17:59:28 -04:00
Rob Rix
0bef12d722 Test that featureVector produces d-vectors. 2016-06-22 11:04:27 -04:00
Rob Rix
9a976869b2 Stub in a module for arbitrary grams. 2016-06-22 10:53:29 -04:00
Rob Rix
51392382ef Stub in a spec for Data.Gram. 2016-06-22 10:41:13 -04:00
Rob Rix
226be486c8 Add a Random instance over Ratios. 2016-06-21 18:48:44 -04:00
Rob Rix
ce838de9b4 Bags are DLists. 2016-06-21 17:49:34 -04:00
Rob Rix
2c9ef943b8 Depend on hashable. 2016-06-21 17:24:18 -04:00
joshvera
0a574871c9 Merge remote-tracking branch 'origin/master' into syntax-redux 2016-06-21 17:08:40 -04:00
Rob Rix
f8988adf3b Stub in a module for Grams. 2016-06-21 15:19:44 -04:00
Rob Rix
ba1fc277eb Rework the constructors and eliminators a bit to not use tagged. 2016-06-16 16:41:43 -04:00
Rob Rix
d596c02e74 :=> and field are shorthand for Tagged. 2016-06-16 11:40:43 -04:00
Rob Rix
3809f3ee43 Stub in a Data.Record module. 2016-06-16 11:30:11 -04:00
Rick Winfrey
a79d5c5bd0 Merge remote-tracking branch 'origin/master' into syntax-redux 2016-06-07 16:50:11 -05:00
joshvera
f61f9675ae Convert to function call 2016-06-06 14:56:28 -04:00
Rob Rix
29a725b125 Move ArbitraryDiff into semantic-diff proper. 2016-06-06 12:07:07 -04:00
Rob Rix
8780ea3f26 Move the Arbitrary instances for Join (,) and Join These into semantic-diff proper. 2016-06-06 11:50:45 -04:00
Rob Rix
4eb76ff3a3 Move the Arbitrary instance for Data.These into semantic-diff proper. 2016-06-06 11:46:30 -04:00
Rob Rix
378b577175 Move the Arbitrary instance for Patch into semantic-diff proper. 2016-06-06 11:43:38 -04:00
Rob Rix
a613fa0369 Merge branch 'push-benchmarks-to-graphite' into benchmark-alignment 2016-06-06 11:36:48 -04:00
Rob Rix
a571d9746d Add RecordWildCards and FlexibleInstances to our default extensions. 2016-06-03 15:59:58 -04:00
Rob Rix
69fbaf8337 semantic-diff depends on QuickCheck. 2016-06-01 09:18:31 -04:00
Rob Rix
3ada142796 Stub in a module for arbitrary Terms. 2016-06-01 09:03:15 -04:00
Rob Rix
dadaa6b420 Add an Arbitrary instance for ArbitraryDiff. 2016-05-31 20:24:49 -04:00
Rob Rix
444bdb8c50 Depend on bifunctors & these. 2016-05-31 10:58:39 -04:00
Rob Rix
7a3cfd3425 Add a function to produce generative benchmarks. 2016-05-31 10:37:34 -04:00
Rob Rix
275751b0c5 Specify the default language. 2016-05-31 10:37:14 -04:00
Rob Rix
a7bdcaa7c2 Stub in a benchmark component. 2016-05-31 09:25:00 -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
2f761fc38b Remove split dependency 2016-05-26 13:44:17 -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
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
Rob Rix
2e5064fe99 Revert "Comment out static implementations for now." 
This reverts commit 62319718cbf86c3cd0b70496d569e80aca7b96c0.
 2016-01-08 17:06:36 -05:00
Rob Rix
c7a9ae66b6 Revert "🔥 the static implementation flags." 
This reverts commit 9e8c2c22bee3c57e4e8b063ef6c7eb628674368a.
 2016-01-08 17:06:32 -05:00
Rob Rix
1173677d0d 🔥 the static implementation flags. 2016-01-08 17:04:27 -05:00
Rob Rix
256a34b7d0 Comment out static implementations for now. 2016-01-08 16:58:17 -05:00
Rob Rix
3e0a4dfcd9 Try to build against the static lib. 2016-01-08 16:38:12 -05:00
Rob Rix
651390e884 Revert "Link icui18n explicitly." 
This reverts commit 25eed4139a0c2acb01e618ef2d545a68d6bba0de.
 2016-01-08 16:03:45 -05:00
Rob Rix
87b4434f96 Revert "Link all the ICUs!" 
This reverts commit e5a67590fe654ab86a96dc18260e36a4532dd7bd.
 2016-01-08 16:03:40 -05:00
Rob Rix
29a13900ef Link all the ICUs! 2016-01-08 16:00:49 -05:00
Rob Rix
6c75393669 Link icui18n explicitly. 2016-01-08 15:59:17 -05:00
Rob Rix
a1a69a8def Revert "Extra static linkage." 
This reverts commit 3940a4c675985ddbb40a1c0f449621bcc05b434c.
 2016-01-08 15:55:39 -05:00
Rob Rix
804766ec3c Revert "Link statically via ld-options." 
This reverts commit f1c3591fed908b7d5a399dd938e3086202fe0db0.
 2016-01-08 15:55:33 -05:00
Rob Rix
98d6c1a57e Revert "More staticity." 
This reverts commit 1952d27e3e55b781a3e55203315dd4c1205e6562.
 2016-01-08 15:55:28 -05:00
Rob Rix
2b755741d0 More staticity. 2016-01-08 15:50:00 -05:00
Rob Rix
45c7e3177f Link statically via ld-options. 2016-01-08 15:44:56 -05:00
Rob Rix
0bad34c1c3 Extra static linkage. 2016-01-08 15:30:13 -05:00
Rob Rix
a6fffe1be3 Spacing. 2016-01-08 15:30:04 -05:00
Rob Rix
b91dfa18a3 Revert "Try linking icuuc directly." 
This reverts commit ffc4e40bc11f35b9b2cc5c54b040f940acf0ae79.
 2016-01-08 15:23:12 -05:00
Rob Rix
376d53b212 Revert "Can we build without the exe?" 
This reverts commit f44db6cfa2bb68ab37a13081a6a5423483aeabf4.
 2016-01-08 15:21:19 -05:00
Rob Rix
dc2e034ef0 Can we build without the exe? 2016-01-08 15:20:23 -05:00
Rob Rix
f2a8872546 Try linking icuuc directly. 2016-01-08 15:10:48 -05:00
Rob Rix
0a92cd73a1 Revert "Compile any C as C99." 
This reverts commit 8809217a57fd926d8f9a153bab37e36ac5da5d03.
 2016-01-08 14:03:30 -05:00
Rob Rix
06eb07ba02 Compile any C as C99. 2016-01-08 13:49:41 -05:00
Rob Rix
0ee6a6738a Custom build setup to set the paths. 2016-01-08 13:24:25 -05:00
Rob Rix
8da1fcf991 Merge branch 'master' into d-e-p-l-o-y-m-e-n-t 2016-01-08 12:33:57 -05:00
joshvera
fc13585bcf depend on stdc++ 2016-01-08 12:09:19 -05:00
Rob Rix
db6cdca7cb Pass -static to ghc, and let it figure out the call to the linker. 2016-01-08 10:46:31 -05:00
Rob Rix
cd12d1fbc1 Remove the pthread option. 2016-01-08 10:45:15 -05:00
Rob Rix
6a7908c769 Ensure static linking of the exe. 2016-01-08 10:42:24 -05:00
joshvera
9975bd0e57 Add mtl, tagged, and gitlib-libgit2 dependencies 2016-01-06 16:15:40 -05:00
Josh Vera
768ca30a7b Merge pull request #385 from github/data-dot-ordered-map 
Move OrderedMap into Data.
 2016-01-06 13:09:22 -05:00
Rob Rix
7af5a4876a Move OrderedMap into Data. 2016-01-06 11:56:58 -05:00
joshvera
8b4904c209 Add gitlib to semantic diff exe 2016-01-06 11:34:04 -05:00
Rob Rix
7dedd39cab Manually include all of the other specs. 2016-01-05 11:27:14 -05:00
Rob Rix
34ecaf16af It’s a brand new year 🎉 2016-01-05 11:26:58 -05:00
joshvera
c61b16d993 move these 2016-01-04 16:04:04 -05:00
joshvera
2438de3040 Remove conduit dependency 2016-01-04 15:50:31 -05:00
joshvera
44e9f50434 remove uses of lens 2016-01-04 14:48:55 -05:00
joshvera
15724218b8 Merge remote-tracking branch 'origin/master' into use-conduit 2016-01-04 14:26:18 -05:00
Josh Vera
2bffbe9537 Merge pull request #353 from github/patch 
Patch output
 2016-01-04 12:13:09 -05:00
Rob Rix
d79c6084b1 Revert "Remove the deriving extensions from the cabal file." 
This reverts commit e9f5bd112d55aff2523d8f1b1436bd1e4c70f01a.
 2016-01-04 12:04:12 -05:00
Rob Rix
5a10bbb374 Revert "Remove OverloadedStrings from the default extensions." 
This reverts commit 6904929f082dd8b2c048884a9f62415ee37c3be5.
 2016-01-04 12:03:05 -05:00
Rob Rix
dc9113aa6d Remove OverloadedStrings from the default extensions. 2016-01-04 09:28:16 -05:00
Rob Rix
b227546e29 Remove FlexibleInstances from the default extensions. 2016-01-04 09:25:44 -05:00
Rob Rix
089752f101 Remove the deriving extensions from the cabal file. 2016-01-04 09:22:45 -05:00
Rob Rix
09459a3421 Merge branch 'master' into patch 2015-12-30 18:55:42 -05:00
joshvera
24015141b7 Add conduit 2015-12-30 18:00:57 -05:00
joshvera
8852f81023 Remove unused modules 2015-12-30 17:53:35 -05:00
joshvera
e7da8b64c5 Add text-icu package 2015-12-29 17:34:35 -05:00
joshvera
414f275639 build text-icu 2015-12-29 15:18:22 -05:00
joshvera
a3051c531d Merge remote-tracking branch 'origin/master' into use-text 2015-12-29 15:13:57 -05:00
Rob Rix
0866ef52bd Merge branch 'diff-performance' into patch 2015-12-24 16:33:24 -05:00
Rob Rix
cc9dee5704 Stub in a Source module. 2015-12-23 22:38:02 -05:00
Rob Rix
61eccbcd80 Link against vector instead. 2015-12-23 22:35:55 -05:00
Rob Rix
c23833485e Depend on array. 2015-12-23 20:33:24 -05:00
Rob Rix
46635ccb60 Merge branch 'profiling-improvements' into split-performance 
# Conflicts:
#	src/Range.hs
 2015-12-23 19:50:27 -05:00
Rob Rix
1d5114318d Enable profiling on the library as well. 2015-12-23 19:42:55 -05:00
Rob Rix
0136305f34 Merge branch 'ffi-ffs' into patch 
# Conflicts:
#	src/Range.hs
 2015-12-23 18:06:38 -05:00
Rob Rix
21ac483558 DeriveGeneric. 2015-12-23 09:58:46 -05:00
Rob Rix
6edd7453e4 Attempt to depend on c-storable-deriving again. 2015-12-23 09:57:15 -05:00
Rob Rix
6049a99ed7 Merge branch 'split-refactoring' into patch 2015-12-22 19:01:50 -05:00
Rob Rix
b256d46f83 Stub in a Row module. 2015-12-22 17:24:08 -05:00
Rob Rix
8f469a07c4 Stub in a Line module. 2015-12-22 17:20:08 -05:00
Rob Rix
6e20ad6a9c Revert "Enable RankNTypes." 
This reverts commit 8fce071dc9a45ff1ecb9d683980fc584a358eece.
 2015-12-22 15:17:55 -05:00
Rob Rix
c41a2cfccc Enable RankNTypes. 2015-12-22 14:53:29 -05:00
Rob Rix
38a317156b Move arbitrary term generation into its own module. 2015-12-22 12:53:31 -05:00
joshvera
0121a44432 Don't depend on text-icu 2015-12-18 14:57:30 -05:00
joshvera
cfc4a97f9d Merge remote-tracking branch 'origin/master' into use-bytestrings 2015-12-18 14:43:25 -05:00
Rob Rix
70c5179a6b Merge branch 'master' into patch 2015-12-17 17:34:45 -05:00
Rob Rix
f41c154b76 Stub in a PatchOutput module. 2015-12-17 17:22:09 -05:00
Rob Rix
71d55d177e Revert "Figure out our extra lib dirs correctly." 
This reverts commit fe4dcf2ae2f5f4118e3df6ae28d63b304482683c.
 2015-12-17 16:34:28 -05:00
Rob Rix
f37c51b8b8 Depend on tree-sitter-parsers. 2015-12-17 14:49:28 -05:00
Rob Rix
5e1bf1377b Don’t try to build the bridge. 2015-12-17 14:43:09 -05:00
Rob Rix
86fc332cff Merge branch 'master' into self-contained-binary 2015-12-17 13:43:00 -05:00
Rob Rix
ae14851129 Revert "Declare the interpreter spec in the cabal file." 
This reverts commit 55f0f2eeef07a7b9719de94bdb0d191c31e205e1.
 2015-12-17 13:42:52 -05:00
Rob Rix
f4248aaa64 Figure out our extra lib dirs correctly. 2015-12-17 13:37:24 -05:00
joshvera
802ed919f5 Don't need OrderedMapSpec in other-modules 2015-12-17 13:10:41 -05:00
Rob Rix
2d0e030c23 Compile the parsers into the library. 2015-12-17 13:10:14 -05:00
Rob Rix
09b9defa2d Build the bridge directly. 2015-12-17 13:09:08 -05:00
Rob Rix
d05e622768 Look for headers in tree-sitter’s include dir. 2015-12-17 13:09:05 -05:00
Rob Rix
e3abd5feea Don’t link the executables against libbridge. 2015-12-17 12:57:31 -05:00
Rob Rix
12e964884d Declare the interpreter spec in the cabal file. 2015-12-17 12:54:34 -05:00
Rob Rix
96f189719a Move TreeSitter into the library. 2015-12-17 12:54:27 -05:00
Rob Rix
e47d3d4d3c Move the Parser type back into the library. 2015-12-16 16:24:23 -05:00
Rob Rix
1504a985de Rename Parser to Parsers. 2015-12-16 16:21:49 -05:00
Rob Rix
c034942a4c Don’t depend on trifecta. 2015-12-16 15:36:11 -05:00
Rob Rix
6270b4aa7e Remove the Haskell module. 2015-12-16 15:36:08 -05:00
Rob Rix
51098e2023 Pretend like we know what we’re doing & parse with Trifecta instead. 2015-12-16 11:48:09 -05:00
Rob Rix
6ea78f4318 Merge branch 'output-directory' into haskell-parser 2015-12-16 01:58:18 -05:00
Rob Rix
c451506ecd Add directory to the dependencies. 2015-12-16 01:18:43 -05:00
joshvera
5fe694d2b8 nope gotta normalize sources in main 2015-12-15 17:42:37 -05:00
joshvera
566205254c normalize sources 2015-12-15 16:39:32 -05:00
joshvera
e80bc4590d add text-icu 2015-12-15 16:34:47 -05:00
joshvera
9d10f8ba4f Add quickcheck-text to generate arbitrary utf-8 2015-12-15 15:03:10 -05:00
Rob Rix
39593d0ee3 The profile component depends on parsec. 2015-12-15 14:55:28 -05:00
joshvera
30132a94de pin QuickCheck and hspec 2015-12-15 14:53:03 -05:00
Rob Rix
96d604092e Add the Haskell module to the profile component. 2015-12-15 14:36:42 -05:00
Rob Rix
ad68d7beab Move Parser into the executable(s). 2015-12-15 14:35:11 -05:00
Rob Rix
706da9e13e Stub in a Haskell parser module. 2015-12-15 14:22:06 -05:00
Rob Rix
c9ad5f3941 Depend on parsec. 2015-12-15 14:22:00 -05:00
joshvera
6eb8172fe4 output split diffs as Text 2015-12-15 13:29:58 -05:00
joshvera
6ea23b813b add TextShow so we don't have to text . show 2015-12-15 12:11:05 -05:00
joshvera
85c7b8f92d Add text package to cabal 2015-12-15 11:47:52 -05:00
Rob Rix
205a885305 Stub in an OrderedMapSpec module. 2015-12-14 17:42:57 -05:00
Rob Rix
5ecb5a6d1d Merge branch 'master' into ordered-map 2015-12-14 17:13:58 -05:00
Rob Rix
187cecefdb Stub in an OrderedMap type. 2015-12-11 17:07:34 -05:00