@@ -26,17 +26,15 @@ import Control.Monad.State.Strict
26import Data.Char
26import Data.Char
27import qualified Data.HashSet as HS
27import qualified Data.HashSet as HS
28import Data.List
28import Data.List
29−import Data.List.NonEmpty (NonEmpty(..))
30import qualified Data.List.NonEmpty as NonEmpty
29import qualified Data.List.NonEmpty as NonEmpty
31import qualified Data.Map as M
30import qualified Data.Map as M
32import Data.Maybe
31import Data.Maybe
33−import qualified Data.Set as Set
34import qualified Data.Text as T
32import qualified Data.Text as T
33+import Data.Void (Void(..))
35import System.FilePath
34import System.FilePath
36import qualified Text.Parser.Char
35import qualified Text.Parser.Char
37import qualified Text.Parser.Combinators
36import qualified Text.Parser.Combinators
38import qualified Text.Parser.Token as Tok
37import qualified Text.Parser.Token as Tok
39−import Text.PrettyPrint.ANSI.Leijen ((<>), (<+>))
40import qualified Text.PrettyPrint.ANSI.Leijen as PP
38import qualified Text.PrettyPrint.ANSI.Leijen as PP
41import Text.Megaparsec ((<?>))
39import Text.Megaparsec ((<?>))
42import qualified Text.Megaparsec as P
40import qualified Text.Megaparsec as P
@@ -46,46 +44,15 @@ import qualified Text.Megaparsec.Char.Lexer as P hiding (space)
47-- | Idris parser with state used during parsing
45-- | Idris parser with state used during parsing
48type IdrisParser = StateT IState IdrisInnerParser
46type IdrisParser = StateT IState IdrisInnerParser
49−type IdrisInnerParser = P.Parsec () String
47+type IdrisInnerParser = P.Parsec Void String
50type ParseState = P.State String
48type ParseState = P.State String
51−type ParseError = P.ParseError (P.Token String) ()
49+type ParseError = P.ParseError (P.Token String) Void
53parseErrorDoc :: ParseError -> PP.Doc
51parseErrorDoc :: ParseError -> PP.Doc
54−parseErrorDoc (P.TrivialError (pos :| _) un ex)
52+parseErrorDoc = PP.string . P.parseErrorPretty
55− = ppLocation pos <> PP.text ": error:" <+> ppCommas (ppUnexpected un ++ ppExpected ex)
57− ppCommas :: [PP.Doc] -> PP.Doc
58− ppCommas = PP.sep . PP.punctuate (PP.char ',')
60− ppUnexpected :: Maybe (P.ErrorItem (P.Token String)) -> [PP.Doc]
61− ppUnexpected Nothing = []
62− ppUnexpected (Just item) = [PP.text "unexpected" <+> ppCommas (ppItem item)]
64− ppExpected :: Set.Set (P.ErrorItem (P.Token String)) -> [PP.Doc]
66− | Set.null items = []
67− | otherwise = [PP.text "expected" <+> ppCommas (join . map ppItem . Set.toList $ items)]
69− ppItem :: P.ErrorItem (P.Token String) -> [PP.Doc]
70− ppItem (P.Tokens ts) = (PP.char '"' <>) . (<> PP.char '"') . PP.char <$> NonEmpty.toList ts
71− ppItem (P.Label lbl) = [PP.text $ NonEmpty.toList lbl]
72− ppItem P.EndOfInput = [PP.text "end of input"]
73−parseErrorDoc (P.FancyError (pos :| _) errs) = PP.vcat $ (ppError pos <+>) . ppErrorFancy <$> Set.toList errs
75− ppErrorFancy :: P.ErrorFancy e -> PP.Doc
76− ppErrorFancy (P.ErrorFail msg) = PP.text msg
77− ppErrorFancy (P.ErrorIndentation ord ref act) = undefined -- Not using megaparsec's indentation yet
78− ppErrorFancy (P.ErrorCustom _) = undefined -- Not using custom errors yet
80−ppLocation :: P.SourcePos -> PP.Doc
81−ppLocation (P.SourcePos name line col) =
82− PP.text name <> PP.char ':' <> PP.int (P.unPos line) <> PP.char ':' <> PP.int (P.unPos col)
84−ppError :: P.SourcePos -> PP.Doc
85−ppError pos = ppLocation pos <> PP.char ':' <+> PP.text "error:"
87-- | Generalized monadic parsing constraint type
54-- | Generalized monadic parsing constraint type
88−type MonadicParsing m = (P.MonadParsec () String m, Tok.TokenParsing m)
55+type MonadicParsing m = (P.MonadParsec Void String m, Tok.TokenParsing m)
90someSpace' :: MonadicParsing m => m ()
57someSpace' :: MonadicParsing m => m ()
91someSpace' = many (simpleWhiteSpace <|> singleLineComment <|> multiLineComment) *> pure ()
58someSpace' = many (simpleWhiteSpace <|> singleLineComment <|> multiLineComment) *> pure ()