Remove CabalParsing class, specialize to ParsecParser

Author: FinleyMcIlwaine

Cabal-syntax/src/Distribution/Backpack.hs

@@ -228,7 +228,7 @@ dispOpenModuleSubstEntry (k, v) = pretty k <<>> Disp.char '=' <<>> pretty v
 -- | Inverse to 'dispModSubst'.
 --
 -- @since 2.2
-parsecOpenModuleSubst :: CabalParsing m => m OpenModuleSubst
+parsecOpenModuleSubst :: ParsecParser OpenModuleSubst
 parsecOpenModuleSubst =
   fmap Map.fromList
     . flip P.sepBy (P.char ',')
@@ -237,7 +237,7 @@ parsecOpenModuleSubst =
 -- | Inverse to 'dispModSubstEntry'.
 --
 -- @since 2.2
-parsecOpenModuleSubstEntry :: CabalParsing m => m (ModuleName, OpenModule)
+parsecOpenModuleSubstEntry :: ParsecParser (ModuleName, OpenModule)
 parsecOpenModuleSubstEntry =
   do
     k <- parsec

Cabal-syntax/src/Distribution/FieldGrammar/FieldDescrs.hs

@@ -29,7 +29,7 @@ import qualified Text.PrettyPrint as Disp
 -- strict pair
 data SP s = SP
   { pPretty :: !(s -> Disp.Doc)
-  , pParse :: !(forall m. P.CabalParsing m => s -> m s)
+  , pParse :: !(s -> P.ParsecParser s)
   }
 
 -- | A collection of field parsers and pretty-printers.
@@ -40,21 +40,20 @@ instance Applicative (FieldDescrs s) where
   pure _ = F mempty
   f <*> x = F (mappend (runF f) (runF x))
 
-singletonF :: P.FieldName -> (s -> Disp.Doc) -> (forall m. P.CabalParsing m => s -> m s) -> FieldDescrs s a
+singletonF :: P.FieldName -> (s -> Disp.Doc) -> (s -> P.ParsecParser s) -> FieldDescrs s a
 singletonF fn f g = F $ Map.singleton fn (SP f g)
 
 -- | Lookup a field value pretty-printer.
 fieldDescrPretty :: FieldDescrs s a -> P.FieldName -> Maybe (s -> Disp.Doc)
 fieldDescrPretty (F m) fn = pPretty <$> Map.lookup fn m
 
 -- | Lookup a field value parser.
-fieldDescrParse :: P.CabalParsing m => FieldDescrs s a -> P.FieldName -> Maybe (s -> m s)
+fieldDescrParse :: FieldDescrs s a -> P.FieldName -> Maybe (s -> P.ParsecParser s)
 fieldDescrParse (F m) fn = (\f -> pParse f) <$> Map.lookup fn m
 
 fieldDescrsToList
-  :: P.CabalParsing m
-  => FieldDescrs s a
-  -> [(P.FieldName, s -> Disp.Doc, s -> m s)]
+  :: FieldDescrs s a
+  -> [(P.FieldName, s -> Disp.Doc, s -> P.ParsecParser s)]
 fieldDescrsToList = map mk . Map.toList . runF
   where
     mk (name, SP ppr parse) = (name, ppr, parse)
@@ -111,7 +110,7 @@ instance FieldGrammar ParsecPretty FieldDescrs where
   availableSince _ _ = id
   hiddenField _ = F mempty
 
-parsecFreeText :: P.CabalParsing m => m String
+parsecFreeText :: P.ParsecParser String
 parsecFreeText = dropDotLines <$ C.spaces <*> many C.anyChar
   where
     -- Example package with dot lines

Cabal-syntax/src/Distribution/FieldGrammar/Newtypes.hs

@@ -96,8 +96,8 @@ data NoCommaFSep = NoCommaFSep
 class Sep sep where
   prettySep :: Proxy sep -> [Doc] -> Doc
 
-  parseSep :: CabalParsing m => Proxy sep -> m a -> m [a]
-  parseSepNE :: CabalParsing m => Proxy sep -> m a -> m (NonEmpty a)
+  parseSep :: Proxy sep -> ParsecParser a -> ParsecParser [a]
+  parseSepNE :: Proxy sep -> ParsecParser a -> ParsecParser (NonEmpty a)
 
 instance Sep CommaVCat where
   prettySep _ = vcat . punctuate comma
@@ -449,7 +449,7 @@ instance Pretty TestedWith where
   pretty x = case unpack x of
     (compiler, vr) -> pretty compiler <+> pretty vr
 
-parsecTestedWith :: CabalParsing m => m (CompilerFlavor, VersionRange)
+parsecTestedWith :: ParsecParser (CompilerFlavor, VersionRange)
 parsecTestedWith = do
   name <- lexemeParsec
   ver <- parsec <|> pure anyVersion

Cabal-syntax/src/Distribution/ModuleName.hs

@@ -57,27 +57,27 @@ instance Pretty ModuleName where
 instance Parsec ModuleName where
   parsec = parsecModuleName
 
-parsecModuleName :: forall m. CabalParsing m => m ModuleName
+parsecModuleName :: ParsecParser ModuleName
 parsecModuleName = state0 DList.empty
   where
-    upper :: m Char
+    upper :: ParsecParser Char
     !upper = P.satisfy isUpper
 
-    ch :: m Char
+    ch :: ParsecParser Char
     !ch = P.satisfy (\c -> validModuleChar c || c == '.')
 
-    alt :: m ModuleName -> m ModuleName -> m ModuleName
+    alt :: ParsecParser ModuleName -> ParsecParser ModuleName -> ParsecParser ModuleName
     !alt = (<|>)
 
-    state0 :: DList.DList Char -> m ModuleName
+    state0 :: DList.DList Char -> ParsecParser ModuleName
     state0 acc = do
       c <- upper
       state1 (DList.snoc acc c)
 
-    state1 :: DList.DList Char -> m ModuleName
+    state1 :: DList.DList Char -> ParsecParser ModuleName
     state1 acc = state1' acc `alt` return (fromString (DList.toList acc))
 
-    state1' :: DList.DList Char -> m ModuleName
+    state1' :: DList.DList Char -> ParsecParser ModuleName
     state1' acc = do
       c <- ch
       case c of

Cabal-syntax/src/Distribution/PackageDescription/Configuration.hs

@@ -108,7 +108,7 @@ simplifyWithSysParams os arch cinfo cond = (cond', flags)
 --
 
 -- | Parse a configuration condition from a string.
-parseCondition :: CabalParsing m => m (Condition ConfVar)
+parseCondition :: ParsecParser (Condition ConfVar)
 parseCondition = condOr
   where
     condOr = sepByNonEmpty condAnd (oper "||") >>= return . foldl1 COr