ES: API changes of Megaparsec and QC

Author: Anabra

grin/src/Grin/ExtendedSyntax/Parse.hs

@@ -14,5 +14,5 @@ import Grin.ExtendedSyntax.TypeEnvDefs
 import Grin.ExtendedSyntax.Parse.AST
 import Grin.ExtendedSyntax.Parse.TypeEnv
 
-parseGrinWithTypes :: String -> Text -> Either (ParseError Char Void) (TypeEnv, Exp)
+parseGrinWithTypes :: String -> Text -> Either (ParseErrorBundle Text Void) (TypeEnv, Exp)
 parseGrinWithTypes filename content = (,) <$> parseMarkedTypeEnv filename content <*> parseGrin filename content

grin/src/Grin/ExtendedSyntax/Parse/AST.hs

@@ -78,7 +78,7 @@ literal = (try $ LFloat . realToFrac <$> signedFloat) <|>
           (try $ LInt64 . fromIntegral <$> signedInteger) <|>
           (try $ LBool <$> (True <$ kw "#True" <|> False <$ kw "#False")) <|>
           (try $ LString <$> lexeme (C.char '#' *> quotedString)) <|>
-          (try $ LChar <$> lexeme (C.string "#'" *> (escaped <|> anyChar) <* C.char '\''))
+          (try $ LChar <$> lexeme (C.string "#'" *> (escaped <|> anySingle) <* C.char '\''))
 
 satisfyM :: (a -> Bool) -> Parser a -> Parser a
 satisfyM pred parser = do
@@ -122,17 +122,17 @@ tyP =
 grinModule :: Parser Exp
 grinModule = Program <$> (concat <$> many (try externalBlock)) <*> many def <* sc <* eof
 
-parseGrin :: String -> Text -> Either (ParseError Char Void) Exp
+parseGrin :: String -> Text -> Either (ParseErrorBundle Text Void) Exp
 parseGrin filename content = runParser grinModule filename (withoutTypeAnnots content)
 
 parseProg :: Text -> Exp
-parseProg src = either (error . parseErrorPretty' src) id . parseGrin "" $ withoutTypeAnnots src
+parseProg src = either (error . errorBundlePretty) id . parseGrin "" $ withoutTypeAnnots src
 
 parseDef :: Text -> Exp
-parseDef src = either (error . parseErrorPretty' src) id . runParser (def <* sc <* eof) "" $ withoutTypeAnnots src
+parseDef src = either (error . errorBundlePretty) id . runParser (def <* sc <* eof) "" $ withoutTypeAnnots src
 
 parseExpr :: Text -> Exp
-parseExpr src = either (error . parseErrorPretty' src) id . runParser (expr pos1 <* sc <* eof) "" $ withoutTypeAnnots src
+parseExpr src = either (error . errorBundlePretty) id . runParser (expr pos1 <* sc <* eof) "" $ withoutTypeAnnots src
 
 
 withoutTypeAnnots :: Text -> Text

grin/src/Grin/ExtendedSyntax/Parse/Basic.hs

@@ -95,9 +95,6 @@ set p = Set.fromList <$> bracedList p
 set1 :: Ord a => Parser a -> Parser (Set a)
 set1 p = Set.fromList <$> bracedList p
 
-anySingle :: MonadParsec e s m => m (Token s)
-anySingle = satisfy (const True)
-
 anySingleBut :: MonadParsec e s m => Token s -> m (Token s)
 anySingleBut t = satisfy (/= t)
 
@@ -108,7 +105,7 @@ escaped :: Parser Char
 escaped = string "\\\"" >> pure '"'
 
 quotedVar :: Parser Name
-quotedVar = packName <$ char '"' <*> someTill (escaped <|> anyChar) (char '"')
+quotedVar = packName <$ char '"' <*> someTill (escaped <|> anySingle) (char '"')
 
 escapedStringChar :: Parser Char
 escapedStringChar =
@@ -123,7 +120,7 @@ escapedStringChar =
   (string "\\v" >> pure '\v')
 
 quotedString :: Parser Text
-quotedString = fromString <$> (char '"' *> manyTill (escapedStringChar <|> anyChar) (char '"'))
+quotedString = fromString <$> (char '"' *> manyTill (escapedStringChar <|> anySingle) (char '"'))
 
 simpleVar :: Parser Name
 simpleVar = (\c s -> packName $ c : s) <$> oneOf allowedInitial <*> many (alphaNumChar <|> oneOf allowedSpecial)

grin/src/Grin/ExtendedSyntax/Parse/TypeEnv.hs

@@ -113,15 +113,15 @@ entriesToTypeEnv xs = flip execState emptyTypeEnv $ do
 
 -- parses a type environment (without code)
 parseTypeEnv :: Text -> TypeEnv
-parseTypeEnv src = either (error . parseErrorPretty' src) id
+parseTypeEnv src = either (error . errorBundlePretty) id
                  . runParser typeEnv ""
                  $ src
 
 -- parses type marked type annotations (even interleaved with code)
 parseMarkedTypeEnv' :: Text -> TypeEnv
-parseMarkedTypeEnv' src = either (error . parseErrorPretty' src) id $ parseMarkedTypeEnv "" src
+parseMarkedTypeEnv' src = either (error . errorBundlePretty) id $ parseMarkedTypeEnv "" src
 
-parseMarkedTypeEnv :: String -> Text -> Either (ParseError Char Void) TypeEnv
+parseMarkedTypeEnv :: String -> Text -> Either (ParseErrorBundle Text Void) TypeEnv
 parseMarkedTypeEnv filename src = runParser markedTypeEnv filename (withoutCodeLines src)
 
 withoutCodeLines :: Text -> Text

grin/src/Grin/ExtendedSyntax/TH.hs

@@ -51,7 +51,7 @@ progConst = QuasiQuoter
   { quoteExp = \input -> do
       let src = T.pack $ normalizeQQInput input
       case P.parseGrin "" src of
-        Left  e -> fail $ parseErrorPretty' src e
+        Left  e -> fail $ errorBundlePretty e
         Right p -> liftDataWithText p
   , quotePat  = undefined
   , quoteType = undefined

grin/src/Test/ExtendedSyntax/Old/Test.hs

@@ -941,7 +941,7 @@ instance Solve G.Prog where
     _    -> mzero
 
 changed :: (Testable prop) => Exp -> Exp -> prop -> Property
-changed old new = cover (old /= new) 1 "Transformation has effect"
+changed old new = cover 1 (old /= new) "Transformation has effect"
 
 
 newtype SemanticallyCorrectProgram = SC { correctProg :: Exp }