3e6b727 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Use TokenParsing from Text.Parsers

commit3e6b727d875a94e2955fd0ffde09f57ffda29f23 authorJason Felice <jason.m.felice@gmail.com> dateMon 30 Oct 2017, 11:52 (9 years ago) parenta817add

2 files changed+3−2

unifiedsplit

src/Idris/Package/Parser.hs+2−1

@@ -21,6 +21,7 @@ import Data.List (union)

2121import System.Directory (doesFileExist)

2222import System.Exit

2323import System.FilePath (isValid, takeExtension, takeFileName)

24+import Text.Parser.Token (TokenParsing)

2425import qualified Text.PrettyPrint.ANSI.Leijen as PP

2526import Text.Trifecta ((<?>))

2627import qualified Text.Trifecta as P

@@ -41,7 +42,7 @@ instance {-# OVERLAPPING #-} P.DeltaParsing PParser where

4142 {-# INLINE restOfLine #-}

4243#endif

4344

44−instance {-# OVERLAPPING #-} P.TokenParsing PParser where

45+instance {-# OVERLAPPING #-} TokenParsing PParser where

4546 someSpace = someSpace'

4647

4748

src/Idris/Parser/Helpers.hs+1−1

@@ -59,7 +59,7 @@ instance {-# OVERLAPPING #-} P.DeltaParsing IdrisParser where

5959someSpace' :: MonadicParsing m => m ()

6060someSpace' = many (simpleWhiteSpace <|> singleLineComment <|> multiLineComment) *> pure ()

6161

62−instance {-# OVERLAPPING #-} P.TokenParsing IdrisParser where

62+instance {-# OVERLAPPING #-} Tok.TokenParsing IdrisParser where

6363 someSpace = someSpace'

6464 token p = do s <- get

6565 (FC fn (sl, sc) _) <- getFC --TODO: Update after fixing getFC