megaparsec 6.3 compat

3 files changed, 9 insertions, 6 deletions

diff --git a/src/LambdaCube/Compiler/Lexer.hs b/src/LambdaCube/Compiler/Lexer.hs
index ac7f7f71..c3f4e285 100644
--- a/src/LambdaCube/Compiler/Lexer.hs
+++ b/src/LambdaCube/Compiler/Lexer.hs
@@ -17,15 +17,17 @@ import Data.List
 import Data.List.NonEmpty (fromList)
 import Data.Char
 import qualified Data.Set as Set
+import Data.Void
 import Control.Monad.Except
 import Control.Monad.RWS
 import Control.Applicative
 import Control.Arrow
 
 import Text.Megaparsec hiding (State, ParseError)
+import Text.Megaparsec.Char
+import Text.Megaparsec.Char.Lexer hiding (lexeme, symbol)
 import qualified Text.Megaparsec as P
-import Text.Megaparsec as ParseUtils hiding (try, Message, State, ParseError)
-import Text.Megaparsec.Lexer hiding (lexeme, symbol, negate)
+import Text.Megaparsec as ParseUtils hiding (try, Message, State, ParseError, lexeme, symbol)
 
 import LambdaCube.Compiler.Pretty hiding (parens)
 import LambdaCube.Compiler.DesugaredSource
@@ -114,12 +116,12 @@ data ParseEnv r = ParseEnv
 type ParseState r = (ParseEnv r, P.State String)
 
 parseState :: FileInfo -> r -> ParseState r
-parseState fi di = (ParseEnv fi di ExpNS (SPos 0 0), either (error "impossible") id $ runParser (getParserState :: Parsec Dec String (P.State String)) (filePath fi) (fileContent fi))
+parseState fi di = (ParseEnv fi di ExpNS (SPos 0 0), either (error "impossible") id $ runParser (getParserState :: Parsec (ErrorFancy Void) String (P.State String)) (filePath fi) (fileContent fi))
 
 --type Parse r w = ReaderT (ParseEnv r) (WriterT [w] (StateT SPos (Parsec String)))
-type Parse r w = RWST (ParseEnv r) [w] SPos (Parsec Dec String)
+type Parse r w = RWST (ParseEnv r) [w] SPos (Parsec (ErrorFancy Void) String)
 
-newtype ParseError = ParseErr (P.ParseError (Token String) Dec)
+newtype ParseError = ParseErr (P.ParseError (Token String) (ErrorFancy Void))
 
 instance Show ParseError where
     show (ParseErr e) = parseErrorPretty e
diff --git a/src/LambdaCube/Compiler/Parser.hs b/src/LambdaCube/Compiler/Parser.hs
index 70e7b98c..752d7957 100644
--- a/src/LambdaCube/Compiler/Parser.hs
+++ b/src/LambdaCube/Compiler/Parser.hs
@@ -38,6 +38,8 @@ import LambdaCube.Compiler.DesugaredSource
 import LambdaCube.Compiler.Patterns
 import LambdaCube.Compiler.Statements
 
+import Text.Megaparsec.Char
+
 -------------------------------------------------------------------------------- parser type
 
 type BodyParser = Parse DesugarInfo PostponedCheck
diff --git a/src/LambdaCube/Compiler/Utils.hs b/src/LambdaCube/Compiler/Utils.hs
index 4e9eab27..42a63843 100644
--- a/src/LambdaCube/Compiler/Utils.hs
+++ b/src/LambdaCube/Compiler/Utils.hs
@@ -24,7 +24,6 @@ import Control.Monad.RWS
 import System.Directory
 import qualified Data.Text.IO as TIO
 import qualified Text.Megaparsec as P
-import qualified Text.Megaparsec.Prim as P
 
 ------------------------------------------------------- general functions