Commit Graph

6331 Commits

Author SHA1 Message Date
Alex Chen
846a38139d lib: add license to the code copied from megaparsec 2018-06-11 13:58:56 -06:00
Alex Chen
2b22f857ac lib: make the parse errors module backwards compatible 2018-06-11 13:58:56 -06:00
Alex Chen
ff2b042c7e lib: remove the ErroringJournalParser type 2018-06-11 13:58:56 -06:00
Alex Chen
39e7ef0311 lib: refine date parser error messages 2018-06-11 13:58:55 -06:00
Alex Chen
132f8706d7 lib: edit comments to satisfy doctest 2018-06-11 13:57:30 -06:00
Alex Chen
5f87e7cd5d lib: enable the custom parse errors 2018-06-11 13:57:30 -06:00
Alex Chen
2d21ec0174 lib: weaken parser types 2018-06-11 13:57:30 -06:00
Alex Chen
4a9e418b7a lib: refactor includedirectivep to avoid "re-parsing" 2018-06-11 13:57:30 -06:00
Alex Chen
b034fa7ca9 lib: weaken parser types 2018-06-11 13:57:30 -06:00
Alex Chen
9b6558401f lib: rewrite comment parsers [API]
- avoid the "re-parsing" of comments using the `match` parser combinator
2018-06-11 13:57:30 -06:00
Alex Chen
d707b351cc lib: switch to custom parse errors for parserErrorAt
Also weaken the types of the parsers that use it
2018-06-11 13:57:30 -06:00
Alex Chen
c5561f25f1 lib: switch parsers to the custom error type
Also add an explicit export list to `hledger-lib/Hledger/Utils/Parse.hs`
in order to re-export the custom error type (for convenience).
2018-06-11 13:57:30 -06:00
Alex Chen
ca201e4618 lib: add a module for custom parse errors
... for displaying the source line on which parse errors occured

Over the following set of commits, I will to refactor the parsers to
obviate the `ExceptT String` layer of the `ErroringJournalParser` type
so that all parse errors go through Megaparsec's parse error machinery.
2018-06-11 13:57:22 -06:00
Simon Michael
1624206b5d lib: more parse error test cleanup (#804)
[ci skip]
2018-06-10 08:04:45 -07:00
Simon Michael
e83d9a1e34 lib: test cleanups (#804) 2018-06-10 07:54:47 -07:00
Simon Michael
9d33342ff3 lib: start some parse error tests (#804)
[ci skip]
2018-06-10 07:54:40 -07:00
Simon Michael
42f47e2b6b update embedded manuals
[ci skip]
2018-06-08 17:27:04 -07:00
Simon Michael
312bf2fcb5 tools: make ghcid-test: ghcid plus the test command
[ci skip]
2018-06-08 06:01:36 -07:00
Simon Michael
ee68fed951 tools: make: rename rules to ghci[d]-doctest
[ci skip]
2018-06-07 18:20:14 -07:00
Simon Michael
305f208862 stack: remove obsolete extra deps
[ci skip]
2018-06-07 13:19:08 -07:00
Simon Michael
5af502b2bb site: download: C deps tweak
[ci skip]
2018-06-07 13:19:08 -07:00
Simon Michael
79d3da0b2d
Merge pull request #803 from trevorriles/doctests-fast-flag
Add fast flag to doctests.
2018-06-07 11:28:33 -07:00
trevorriles
9b1343d0b9 Add fast flag to doctests.
Fixes #802
2018-06-07 10:41:09 -05:00
Simon Michael
8226335c4e
Merge pull request #789 from ocdtrekkie/upstream-sandstorm
Upstream Sandstorm build files
2018-06-06 07:57:48 -07:00
Simon Michael
e86b15f2b5
Merge branch 'master' into upstream-sandstorm 2018-06-05 11:03:40 -07:00
Simon Michael
236101e31a ui: support/require fsnotify 0.3.0.1+
The api has changed, it supports directory events, and might be more robust.
2018-06-05 06:41:13 -07:00
Simon Michael
bcbf0489c7 tools: make buildplantest* to check install plans without building
[ci skip]
2018-06-05 06:21:52 -07:00
Jacob Weisz
c7cb8aa253 Update Sandstorm metadata 2018-06-05 01:37:29 -05:00
Jacob Weisz
0a4fbef175 Update Sandstorm build files 2018-06-05 00:23:59 -05:00
Simon Michael
061aad0431 remove some CPP that's obsolete since we require base 4.8+ 2018-06-04 17:33:21 -07:00
Simon Michael
7ebecb1ab8 use newer hashtables to fix an instance warning with doctests/ghc 7 (#794) 2018-06-04 17:33:17 -07:00
Simon Michael
ec39c87ca8 disambiguate the base-compat imports in hledger package too (#794) 2018-06-04 17:32:45 -07:00
Simon Michael
0ce9c5728a switch to base-compat-batteries to fix ghc 7.10 support (#794)
base-compat-batteries provides the same API across more ghc versions
than base-compat does, at the cost of more dependencies. Eg it exports
Prelude.Compat ((<>)) with ghc 7.10/base 4.8, which we expect.
My belief is that several of our deps already require it so the added
cost is not too great. We should probably go back to base-compat when
possible though, eg when we stop supporting ghc 7.10.
2018-06-04 17:32:42 -07:00
Simon Michael
08f8be3cb4 make older ghcs mostly work with new base-compat (#794)
Using the same base-compat version across all ghc versions is kind of
the point of base-compat; now we can rely on whatever base-compat
0.10.1 provides.

hledger-api has been commented with ghc 7.10, way too much hassle.
2018-06-04 17:32:39 -07:00
Simon Michael
9b801f5746 cabal: consistent indentation 2018-06-04 17:32:39 -07:00
Simon Michael
328b2dabfe require latest base-compat, might as well (#794) 2018-06-04 17:32:32 -07:00
Peter Simons
6db7f800ee hledger-lib: fix doctest suite after recent package updates
The new version of our package set apparently contains both base-compat and
base-compat-batteries in its transitive closure. This breaks the doctest suite,
which just imports everything into scope when the tests are run, thereby making
module names like Prelude.Compat ambiguous.
2018-06-04 21:41:15 +02:00
Peter Simons
7876d3a4ef stack.yaml: update nightly to latest snapshot
- We need base-compat 0.10.x.
 - The new snapshot includes the servant packages we require.
2018-06-04 21:00:57 +02:00
Peter Simons
8c0c168cd6 Fix the build of hledger-lib with ghc 8.0.x and base-compat 0.10.x.
We don't need to import Data.Monoid because Prelude.Compat exports "<>"
already. In fact, importing that module causes build failures:

    Hledger/Read/Common.hs:725:62: error:
        Ambiguous occurrence ‘<>’
        It could refer to either ‘Sem.<>’,
                                 imported from ‘Prelude.Compat’ at Hledger/Read/Common.hs:97:1-39
                                 (and originally defined in ‘Data.Semigroup’)
                              or ‘Data.Monoid.<>’,
                                 imported from ‘Data.Monoid’ at Hledger/Read/Common.hs:110:1-18

Fixes https://github.com/simonmichael/hledger/issues/794.
2018-06-04 20:58:58 +02:00
Léo Gaspard
0808307af1 travis: use STACK variable 2018-06-03 17:14:37 -07:00
Aerex
5808e289e6 feat(hledger-ui): added neovim as a supported editor
when neovim is set as EDITOR hleger will jump to the correct line number of the transaction; before
hledger will open journal at top of the file
2018-06-03 17:11:43 -07:00
Simon Michael
65f2dd6013 tools: make incr-buildtest*: like buildtest* but dont rebuild all
[ci skip]
2018-06-03 17:04:02 -07:00
Simon Michael
f68caf529c tools: make buildtest-all: include latest stack.yaml also
[ci skip]
2018-06-03 12:31:52 -07:00
Simon Michael
66fbdc5d61 lib: enable doctests on mac again, note workaround, fix link
[ci skip]
2018-06-01 07:18:12 -07:00
Simon Michael
0d989a8b48 site: download: windows: mention #791
[ci skip]
2018-05-30 14:31:31 -07:00
Simon Michael
3e470a999f appveyor: belay that happy fix attempt; check stack version 2018-05-30 12:51:12 -07:00
Simon Michael
93e61ec0c3 windows: note issue url (#791) 2018-05-30 11:52:10 -07:00
Simon Michael
e75b2b539e appveyor: add stack local bin dir to PATH, try to get happy seen 2018-05-30 11:39:43 -07:00
Simon Michael
10ae56aea8 appveyor: expand network issue note 2018-05-30 11:10:33 -07:00
Simon Michael
840a404b16 appveyor: always install happy, avoiding today's haskell tooling fail 2018-05-30 11:10:33 -07:00