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

git.iko.soy/Idris-dev

on master help sign in

Use TokenParsing from Text.Parsers

3e6b727Jason Felice9 years ago

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

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

21import System.Directory (doesFileExist)

22import System.Exit

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

24+import Text.Parser.Token (TokenParsing)

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

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

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

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

26import qualified Text.Trifecta as P

27import qualified Text.Trifecta as P

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

41 {-# INLINE restOfLine #-}

42 {-# INLINE restOfLine #-}

42#endif

43#endif

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

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

45 someSpace = someSpace'

46 someSpace = someSpace'

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

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

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

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

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

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

63 someSpace = someSpace'

64 token p = do s <- get

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