Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

starting to bring to new version of ghc #30

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hs-conllu.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ library
containers >0.5.8 && <0.6,
directory ==1.3.*,
filepath ==1.4.*,
megaparsec ==6.*,
megaparsec <0.8,
void <1
hs-source-dirs: src
default-language: Haskell2010
Expand Down
8 changes: 4 additions & 4 deletions src/Conllu/Parse.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-- |
-- Module : Conllu.Parse
-- Copyright : © 2018 bruno cuconato
-- License : LPGL-3
Expand Down Expand Up @@ -61,7 +60,8 @@ import Data.Maybe
import Data.Void (Void)

import Text.Megaparsec
(ParseError, Parsec, (<?>), (<|>), between, choice, eitherP, endBy1, eof,
(ParseError, Parsec, (<?>), (<|>), anySingle, between, choice,
eitherP, endBy1, eof, errorBundlePretty,
lookAhead, many, option, optional, parse, parseErrorPretty, sepBy,
sepBy1, skipManyTill, some, takeWhile1P, takeWhileP, try,
withRecovery)
Expand Down Expand Up @@ -91,7 +91,7 @@ rawSentsC sent = between ws eof (e `endBy1` lineFeed)
e = withRecovery recover (Right <$> sent)
recover err =
Left err <$
skipManyTill anyChar
skipManyTill anySingle
-- if parser consumes the first newline but can't parse the
-- second, it breaks; it can't consume the second one, because
-- that one has to be consumed by the endBy1
Expand Down Expand Up @@ -393,7 +393,7 @@ parseConlluWith
-- | parse a CoNLL-U document using a customized parser.
parseConlluWith p fp s =
case parse doc fp s of
Left err -> Left $ parseErrorPretty err
Left err -> Left $ errorBundlePretty err
Right d ->
let (ls, rs) = partitionEithers d
in if null ls
Expand Down
4 changes: 2 additions & 2 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# resolver:
# name: custom-snapshot
# location: "./custom-snapshot.yaml"
resolver: lts-10.3
resolver: lts-13.12

# User packages to be built.
# Various formats can be used as shown in the example below.
Expand Down Expand Up @@ -63,4 +63,4 @@ packages:
# extra-lib-dirs: [/path/to/dir]
#
# Allow a newer minor version of GHC than the snapshot specifies
# compiler-check: newer-minor
# compiler-check: newer-minor