Merge pull request #96 from haskell-works/use-FilePath-type-in-place-of-String

Use FilePath type in place of String

Author: newhoggy

app/App/Naive.hs

@@ -23,15 +23,15 @@ import qualified Data.ByteString as BS
 
 -- | Load an XML file into memory and return a raw cursor initialised to the
 -- start of the XML document.
-loadSlowCursor :: String -> IO SlowCursor
+loadSlowCursor :: FilePath -> IO SlowCursor
 loadSlowCursor path = do
   !bs <- BS.readFile path
   let !cursor = fromByteString bs :: SlowCursor
   return cursor
 
 -- | Load an XML file into memory and return a query-optimised cursor initialised
 -- to the start of the XML document.
-loadFastCursor :: String -> IO FastCursor
+loadFastCursor :: FilePath -> IO FastCursor
 loadFastCursor filename = do
   -- Load the XML file into memory as a raw cursor.
   -- The raw XML data is `text`, and `ib` and `bp` are the indexes.

src/HaskellWorks/Data/Xml/Succinct/Cursor/Load.hs

@@ -12,10 +12,10 @@ import qualified Data.ByteString as BS
 
 -- | Load an XML file into memory and return a raw cursor initialised to the
 -- start of the XML document.
-loadSlowCursor :: String -> IO SlowCursor
+loadSlowCursor :: FilePath -> IO SlowCursor
 loadSlowCursor = fmap byteStringAsSlowCursor . BS.readFile
 
 -- | Load an XML file into memory and return a query-optimised cursor initialised
 -- to the start of the XML document.
-loadFastCursor :: String -> IO FastCursor
+loadFastCursor :: FilePath -> IO FastCursor
 loadFastCursor = fmap byteStringAsFastCursor . BS.readFile

src/HaskellWorks/Data/Xml/Succinct/Cursor/MMap.hs

@@ -23,7 +23,7 @@ import qualified Data.ByteString.Internal                as BSI
 import qualified HaskellWorks.Data.Xml.Internal.ToIbBp64 as I
 import qualified System.IO.MMap                          as IO
 
-mmapSlowCursor :: String -> IO SlowCursor
+mmapSlowCursor :: FilePath -> IO SlowCursor
 mmapSlowCursor filePath = do
   (fptr :: ForeignPtr Word8, offset, size) <- IO.mmapFileForeignPtr filePath IO.ReadOnly Nothing
   let !bs = BSI.fromForeignPtr (castForeignPtr fptr) offset size
@@ -38,7 +38,7 @@ mmapSlowCursor filePath = do
 
   return cursor
 
-mmapFastCursor :: String -> IO FastCursor
+mmapFastCursor :: FilePath -> IO FastCursor
 mmapFastCursor filename = do
   -- Load the XML file into memory as a raw cursor.
   -- The raw XML data is `text`, and `ib` and `bp` are the indexes.

src/HaskellWorks/Data/Xml/Succinct/Index.hs

@@ -65,20 +65,20 @@ instance (BP.BalancedParens w, Rank0 w, Rank1 w, Select1 v, TestBit w) => XmlInd
 
 getIndexAt :: (BP.BalancedParens w, Rank0 w, Rank1 w, Select1 v, TestBit w) => XmlIndexState -> XmlCursor BS.ByteString v w -> XmlIndex
 getIndexAt state k = case uncons remainder of
-  Just (!c, cs) | isElementStart c          -> parseElem cs
-  Just (!c, _ ) | isSpace c                 -> XmlIndexAttrList $ mapValuesFrom InAttrList (firstChild k)
-  Just (!c, _ ) | isAttribute && isQuote c  -> XmlIndexAttrValue remainder
-  Just _        | isAttribute               -> XmlIndexAttrName remainder
-  Just _        -> XmlIndexValue remainder
-  Nothing       -> XmlIndexError "End of data"
+  Just (!c, cs) | isElementStart c         -> parseElem cs
+  Just (!c, _ ) | isSpace c                -> XmlIndexAttrList $ mapValuesFrom InAttrList (firstChild k)
+  Just (!c, _ ) | isAttribute && isQuote c -> XmlIndexAttrValue remainder
+  Just _        | isAttribute              -> XmlIndexAttrName remainder
+  Just _                                   -> XmlIndexValue remainder
+  Nothing                                  -> XmlIndexError "End of data"
   where remainder         = remText k
         mapValuesFrom s   = L.unfoldr (fmap (getIndexAt s &&& nextSibling))
         isAttribute = case state of
           InAttrList -> True
           InElement  -> False
           Unknown    -> case remText <$> parent k >>= uncons of
             Just (!c, _) | isSpace c -> True
-            _            -> False
+            _                        -> False
 
         parseElem bs =
           case ABC.parse parseXmlElement bs of