file-location 0.3.0 → 0.4.0

raw patch · 4 files changed

+29/−25 lines, 4 filesdep +transformersdep −monad-control

Dependencies added: transformers

Dependencies removed: monad-control

Files

• Control/Exception/Control/FileLocation.hs +0/−21
• Control/Exception/FileLocation.hs +25/−0
• FileLocation.hs +1/−1
• file-location.cabal +3/−3

@@ -1,21 +0,0 @@-{-# LANGUAGE TemplateHaskell #-}-module Control.Exception.Control.FileLocation (thrwIO, thrwsIO) where--import Language.Haskell.TH.Syntax--import FileLocation.LocationString (locationToString)--import Control.Exception.Base hiding (throwIO)-import Control.Exception.Control (throwIO)--thrwIO :: Q Exp-thrwIO = do-  loc <- qLocation-  let locStr = locationToString loc-  [|(\mkEx -> throwIO (mkEx locStr))|]--thrwsIO :: String -> Q Exp-thrwsIO errMsg = do-  loc <- qLocation-  let locStr = locationToString loc-  [|(\mkEx -> throwIO (mkEx (locStr ++ " " ++ errMsg)))|]

@@ -0,0 +1,25 @@+{-# LANGUAGE TemplateHaskell #-}+module Control.Exception.FileLocation (thrwIO, thrwsIO) where++import Language.Haskell.TH.Syntax++import FileLocation.LocationString (locationToString)++import Control.Exception.Base hiding (throwIO)+import qualified Control.Exception as E+import Control.Monad.IO.Class (MonadIO (liftIO))++throwIO :: (Exception e, MonadIO m) => e -> m a+throwIO = liftIO . E.throwIO++thrwIO :: Q Exp+thrwIO = do+  loc <- qLocation+  let locStr = locationToString loc+  [|(\mkEx -> throwIO (mkEx locStr))|]++thrwsIO :: String -> Q Exp+thrwsIO errMsg = do+  loc <- qLocation+  let locStr = locationToString loc+  [|(\mkEx -> throwIO (mkEx (locStr ++ " " ++ errMsg)))|]

@@ -10,7 +10,7 @@  import FileLocation.LocationString (locationToString) import Debug.FileLocation (debug, debugM, debugMsg, dbg, dbgMsg, trc, ltrace, ltraceM, strace)-import Control.Exception.Control.FileLocation (thrwIO, thrwsIO)+import Control.Exception.FileLocation (thrwIO, thrwsIO) import Debug.Trace (trace) -- future plans -- import Control.Exception.FileLocation (thrw, thrwIO)

@@ -1,5 +1,5 @@ Name:                file-location-Version:             0.3.0+Version:             0.4.0 Synopsis:            common functions that show file location information Homepage:            https://github.com/gregwebs/FileLocation.hs License:             BSD3@@ -47,12 +47,12 @@ Library   Exposed-modules: FileLocation,                    Debug.FileLocation,-                   Control.Exception.Control.FileLocation,+                   Control.Exception.FileLocation,                    Debug.Util,                    FileLocation.LocationString      -- Packages needed in order to build this package.   Build-depends:  base >= 4 && < 5                 , template-haskell-                , monad-control    >= 0.2 && < 0.3+                , transformers     >= 0.2 && < 0.3