Reuse Parser type in PDF.Body (and generalize the type of the comment parser)

src/PDF/Body.hs

@@ -1,16 +1,13 @@
 {-# LANGUAGE NamedFieldPuns #-}
-module PDF.Body (
-    populate
-  ) where
+module PDF.Body  where
 
 import Data.ByteString.Lazy.Char8 (ByteString)
 import qualified Data.ByteString.Lazy.Char8 as BS (drop, pack)
-import Data.Functor.Identity (Identity)
 import Data.Int (Int64)
 import qualified Data.Map as Map (insert, lookup)
 import PDF.Object (
       Content(..), DirectObject(..), IndirectObjCoordinates(..), Object(..)
-    , Occurrence(..), XRefEntry(..), XRefSection, XRefSubSection(..)
+    , Occurrence(..), Parser, XRefEntry(..), XRefSection, XRefSubSection(..)
     , eol, eolCharset, dictionary, directObject, integer, line
   )
 import Text.Parsec
@@ -20,7 +17,7 @@ data UserState = UserState {
     , content :: Content
   }
 
-type SParser = ParsecT ByteString UserState Identity
+type SParser = Parser UserState
 
 modifyContent :: (Content -> Content) -> SParser ()
 modifyContent f = modifyState $ \state -> state {content = f $ content state}
@@ -35,7 +32,7 @@ pushOccurrence newOccurrence = modifyContent $ \content -> content {
     body = newOccurrence : (body content)
   }
 
-comment :: SParser String
+comment :: Parser u String
 comment = char '%' *> many (noneOf eolCharset) <* eol
 
 lookupOffset :: Int -> XRefSection -> Maybe Int64

src/PDF/Object.hs

@@ -6,6 +6,7 @@ module PDF.Object (
     , IndirectObjCoordinates(..)
     , Object(..)
     , Occurrence(..)
+    , Parser
     , XRefEntry(..)
     , XRefSection
     , XRefSubSection(..)