Merge pull request #743 from emmabastas/new-parser-2021-refactor

Parsec API refactor

elm-format-lib/elm-format-lib.cabal

@@ -59,20 +59,12 @@ common common-options
         Parse.Literal
         Parse.Module
         Parse.Parse
+        Parse.ParsecAdapter
         Parse.Pattern
         Parse.Primitives
         Parse.State
         Parse.Type
         Parse.Whitespace
-        Text.Parsec
-        Text.Parsec.Char
-        Text.Parsec.Combinator
-        Text.Parsec.Error
-        Text.Parsec.Indent
-        Text.Parsec.Pos
-        Text.Parsec.Prim
-        Text.ParserCombinators.Parsec.Char
-        Text.ParserCombinators.Parsec.Combinator
 
     build-depends:
         aeson >= 1.5.5.1 && < 1.6,

elm-format-lib/src/Parse/Binop.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE DataKinds #-}
 module Parse.Binop (binops) where
 
-import Text.Parsec ((<|>), choice, try)
+import Parse.ParsecAdapter ((<|>), choice, try)
 
 import AST.V0_16
 import AST.Structure (FixAST)

elm-format-lib/src/Parse/Common.hs

@@ -5,7 +5,7 @@ module Parse.Common
     ) where
 
 import AST.V0_16
-import Text.Parsec
+import Parse.ParsecAdapter
 import Parse.Helpers
 import Parse.Whitespace
 import Parse.IParser

elm-format-lib/src/Parse/Declaration.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE DataKinds #-}
 module Parse.Declaration where
 
-import Text.Parsec ( (<|>), (<?>), choice, digit, optionMaybe, string, try )
+import Parse.ParsecAdapter ( (<|>), (<?>), choice, digit, optionMaybe, string, try )
 
 import AST.Structure
 import qualified Data.Indexed as I

elm-format-lib/src/Parse/Expression.hs

@@ -6,9 +6,8 @@ module Parse.Expression (term, typeAnnotation, definition, expr) where
 import Data.Coapplicative
 import qualified Data.Indexed as I
 import Data.Maybe (fromMaybe)
-import Text.Parsec hiding (newline, spaces)
-import Text.Parsec.Indent (block, withPos, checkIndent)
 
+import Parse.ParsecAdapter hiding (newline, spaces)
 import qualified Parse.Binop as Binop
 import Parse.Helpers
 import Parse.Common

elm-format-lib/src/Parse/Helpers.hs

@@ -6,8 +6,7 @@ import Prelude hiding (until)
 import Control.Monad (guard)
 import qualified Data.Indexed as I
 import Data.Map.Strict hiding (foldl)
-import Text.Parsec hiding (newline, spaces, State)
-import Text.Parsec.Indent (indented, runIndent)
+import Parse.ParsecAdapter hiding (newline, spaces, State)
 
 import AST.V0_16
 import qualified AST.Helpers as Help
@@ -17,6 +16,7 @@ import qualified Parse.State as State
 import Parse.Comments
 import Parse.IParser
 import Parse.Whitespace
+import qualified Parse.Primitives as EP
 import qualified Reporting.Annotation as A
 import qualified Reporting.Error.Syntax as Syntax
 import qualified Reporting.Region as R
@@ -512,12 +512,18 @@ commentedKeyword elmVersion word parser =
 
 -- ODD COMBINATORS
 
+-- Behaves the same as `Parse.ParsecAdapter.fail` except that the consumed
+-- continuation is called instead of the empty continuation.
 failure :: String -> IParser String
-failure msg = do
-  inp <- getInput
-  setInput ('x':inp)
-  _ <- anyToken
-  fail msg
+failure msg =
+  EP.Parser $ \s _ _ cerr _ ->
+    let
+      (EP.Parser p) = fail msg
+    in
+    -- This looks really unsound, but `p` which was created with `fail` will
+    -- only ever call the empty error continuation (which in this case
+    -- re-routes to the consumed error continuation)
+    p s undefined undefined undefined cerr
 
 
 until :: IParser a -> IParser b -> IParser b

elm-format-lib/src/Parse/IParser.hs

@@ -1,6 +1,7 @@
 module Parse.IParser where
 
-import Text.Parsec.Prim (Parser)
+import Parse.Primitives (Parser)
+import Parse.ParsecAdapter (ParseError)
 
 
-type IParser a = Parser a
+type IParser a = Parser ParseError a

elm-format-lib/src/Parse/Literal.hs

@@ -2,8 +2,7 @@ module Parse.Literal (literal) where
 
 import Prelude hiding (exponent)
 import Data.Char (digitToInt, isSpace)
-import Text.Parsec ((<|>), (<?>), digit, hexDigit, lookAhead, many1, option, string, try, char, notFollowedBy, choice, anyChar, satisfy, manyTill, many, between, skipMany, skipMany1)
-import Text.Parsec.Char (octDigit, space, upper)
+import Parse.ParsecAdapter
 import Parse.Helpers (processAs, escaped, expecting, sandwich, betwixt)
 import Parse.IParser
 

elm-format-lib/src/Parse/Module.hs

@@ -4,7 +4,7 @@ module Parse.Module (moduleDecl, elmModule, topLevel, import') where
 import qualified Control.Applicative
 import Data.Map.Strict ( Map, empty, insert, insertWith )
 import Elm.Utils ((|>))
-import Text.Parsec ( char, letter, string, choice, eof, option, optionMaybe, (<?>), (<|>), many, try )
+import Parse.ParsecAdapter ( char, letter, string, choice, eof, option, optionMaybe, (<?>), (<|>), many, try )
 import Parse.Helpers
 import qualified Parse.Declaration as Decl
 import AST.Listing (Listing(..), mergeCommentedMap, mergeListing)

elm-format-lib/src/Parse/Parse.hs

@@ -1,7 +1,8 @@
 {-# LANGUAGE DataKinds #-}
 module Parse.Parse (parse, parseModule, parseDeclarations, parseExpressions) where
 
-import qualified Text.Parsec.Error as Parsec
+import Parse.ParsecAdapter (eof)
+import qualified Parse.ParsecAdapter as Parsec
 
 import AST.V0_16
 import AST.Module (Module)
@@ -17,7 +18,6 @@ import qualified Reporting.Region as R
 import qualified Reporting.Error.Syntax as Error
 import qualified Reporting.Result as Result
 import Parse.IParser
-import Text.Parsec (eof)
 
 
 parseModule :: ElmVersion -> String -> Result.Result () Error.Error (Module [UppercaseIdentifier] (ASTNS Located [UppercaseIdentifier] 'TopLevelNK))