diff --git a/Control/Monad/Cont.hs b/Control/Monad/Cont.hs --- a/Control/Monad/Cont.hs +++ b/Control/Monad/Cont.hs @@ -3,9 +3,9 @@ Copyright : (c) The University of Glasgow 2001, (c) Jeff Newbern 2003-2007, (c) Andriy Palamarchuk 2007 -License : BSD-style (see the file libraries/base/LICENSE) +License : BSD-style (see the file LICENSE) -Maintainer : libraries@haskell.org +Maintainer : ross@soi.city.ac.uk Stability : experimental Portability : non-portable (type families) diff --git a/Control/Monad/Cont/Class.hs b/Control/Monad/Cont/Class.hs --- a/Control/Monad/Cont/Class.hs +++ b/Control/Monad/Cont/Class.hs @@ -3,9 +3,9 @@ Copyright : (c) The University of Glasgow 2001, (c) Jeff Newbern 2003-2007, (c) Andriy Palamarchuk 2007 -License : BSD-style (see the file libraries/base/LICENSE) +License : BSD-style (see the file LICENSE) -Maintainer : libraries@haskell.org +Maintainer : ross@soi.city.ac.uk Stability : experimental Portability : non-portable (type families) diff --git a/Control/Monad/Error.hs b/Control/Monad/Error.hs --- a/Control/Monad/Error.hs +++ b/Control/Monad/Error.hs @@ -3,9 +3,9 @@ Copyright : (c) Michael Weber 2001, (c) Jeff Newbern 2003-2006, (c) Andriy Palamarchuk 2006 -License : BSD-style (see the file libraries/base/LICENSE) +License : BSD-style (see the file LICENSE) -Maintainer : libraries@haskell.org +Maintainer : ross@soi.city.ac.uk Stability : experimental Portability : non-portable (type families) diff --git a/Control/Monad/Error/Class.hs b/Control/Monad/Error/Class.hs --- a/Control/Monad/Error/Class.hs +++ b/Control/Monad/Error/Class.hs @@ -3,9 +3,9 @@ Copyright : (c) Michael Weber 2001, (c) Jeff Newbern 2003-2006, (c) Andriy Palamarchuk 2006 -License : BSD-style (see the file libraries/base/LICENSE) +License : BSD-style (see the file LICENSE) -Maintainer : libraries@haskell.org +Maintainer : ross@soi.city.ac.uk Stability : experimental Portability : non-portable (type families) @@ -50,6 +50,7 @@ import Control.Monad.Trans.Writer.Strict as StrictWriter import Control.Monad.Trans +import qualified Control.Exception import Control.Monad import Control.Monad.Instances () import Data.Monoid @@ -91,7 +92,7 @@ instance MonadError IO where type ErrorType IO = IOError throwError = ioError - catchError = catch + catchError = Control.Exception.catch -- --------------------------------------------------------------------------- -- Our parameterizable error monad diff --git a/Control/Monad/Identity.hs b/Control/Monad/Identity.hs --- a/Control/Monad/Identity.hs +++ b/Control/Monad/Identity.hs @@ -4,9 +4,9 @@ (c) Oregon Graduate Institute of Science and Technology 2001, (c) Jeff Newbern 2003-2006, (c) Andriy Palamarchuk 2006 -License : BSD-style (see the file libraries/base/LICENSE) +License : BSD-style (see the file LICENSE) -Maintainer : libraries@haskell.org +Maintainer : ross@soi.city.ac.uk Stability : experimental Portability : portable diff --git a/Control/Monad/List.hs b/Control/Monad/List.hs --- a/Control/Monad/List.hs +++ b/Control/Monad/List.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.List -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : portable -- diff --git a/Control/Monad/RWS.hs b/Control/Monad/RWS.hs --- a/Control/Monad/RWS.hs +++ b/Control/Monad/RWS.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.RWS -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : non-portable (type families) -- diff --git a/Control/Monad/RWS/Class.hs b/Control/Monad/RWS/Class.hs --- a/Control/Monad/RWS/Class.hs +++ b/Control/Monad/RWS/Class.hs @@ -4,9 +4,9 @@ -- Module : Control.Monad.RWS.Class -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : non-portable (type families) -- diff --git a/Control/Monad/RWS/Lazy.hs b/Control/Monad/RWS/Lazy.hs --- a/Control/Monad/RWS/Lazy.hs +++ b/Control/Monad/RWS/Lazy.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.RWS.Lazy -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : non-portable (type families) -- diff --git a/Control/Monad/RWS/Strict.hs b/Control/Monad/RWS/Strict.hs --- a/Control/Monad/RWS/Strict.hs +++ b/Control/Monad/RWS/Strict.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.RWS.Strict -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : non-portable (type families) -- diff --git a/Control/Monad/Reader.hs b/Control/Monad/Reader.hs --- a/Control/Monad/Reader.hs +++ b/Control/Monad/Reader.hs @@ -4,9 +4,9 @@ (c) Oregon Graduate Institute of Science and Technology 2001, (c) Jeff Newbern 2003-2007, (c) Andriy Palamarchuk 2007 -License : BSD-style (see the file libraries/base/LICENSE) +License : BSD-style (see the file LICENSE) -Maintainer : libraries@haskell.org +Maintainer : ross@soi.city.ac.uk Stability : experimental Portability : non-portable (type families) diff --git a/Control/Monad/Reader/Class.hs b/Control/Monad/Reader/Class.hs --- a/Control/Monad/Reader/Class.hs +++ b/Control/Monad/Reader/Class.hs @@ -4,9 +4,9 @@ (c) Oregon Graduate Institute of Science and Technology 2001, (c) Jeff Newbern 2003-2007, (c) Andriy Palamarchuk 2007 -License : BSD-style (see the file libraries/base/LICENSE) +License : BSD-style (see the file LICENSE) -Maintainer : libraries@haskell.org +Maintainer : ross@soi.city.ac.uk Stability : experimental Portability : non-portable (type families) diff --git a/Control/Monad/State.hs b/Control/Monad/State.hs --- a/Control/Monad/State.hs +++ b/Control/Monad/State.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.State -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : non-portable (type families) -- diff --git a/Control/Monad/State/Class.hs b/Control/Monad/State/Class.hs --- a/Control/Monad/State/Class.hs +++ b/Control/Monad/State/Class.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.State.Class -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : non-portable (type families) -- diff --git a/Control/Monad/State/Lazy.hs b/Control/Monad/State/Lazy.hs --- a/Control/Monad/State/Lazy.hs +++ b/Control/Monad/State/Lazy.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.State.Lazy -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : non-portable (type families) -- diff --git a/Control/Monad/State/Strict.hs b/Control/Monad/State/Strict.hs --- a/Control/Monad/State/Strict.hs +++ b/Control/Monad/State/Strict.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.State.Strict -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : non-portable (type families) -- diff --git a/Control/Monad/Trans.hs b/Control/Monad/Trans.hs --- a/Control/Monad/Trans.hs +++ b/Control/Monad/Trans.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.Trans -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : portable -- diff --git a/Control/Monad/Writer.hs b/Control/Monad/Writer.hs --- a/Control/Monad/Writer.hs +++ b/Control/Monad/Writer.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.Writer -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : non-portable (type families) -- diff --git a/Control/Monad/Writer/Class.hs b/Control/Monad/Writer/Class.hs --- a/Control/Monad/Writer/Class.hs +++ b/Control/Monad/Writer/Class.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.Writer.Class -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : non-portable (type families) -- diff --git a/Control/Monad/Writer/Lazy.hs b/Control/Monad/Writer/Lazy.hs --- a/Control/Monad/Writer/Lazy.hs +++ b/Control/Monad/Writer/Lazy.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.Writer.Lazy -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : non-portable (type families) -- diff --git a/Control/Monad/Writer/Strict.hs b/Control/Monad/Writer/Strict.hs --- a/Control/Monad/Writer/Strict.hs +++ b/Control/Monad/Writer/Strict.hs @@ -3,9 +3,9 @@ -- Module : Control.Monad.Writer.Strict -- Copyright : (c) Andy Gill 2001, -- (c) Oregon Graduate Institute of Science and Technology, 2001 --- License : BSD-style (see the file libraries/base/LICENSE) +-- License : BSD-style (see the file LICENSE) -- --- Maintainer : libraries@haskell.org +-- Maintainer : ross@soi.city.ac.uk -- Stability : experimental -- Portability : non-portable (type families) -- diff --git a/monads-tf.cabal b/monads-tf.cabal --- a/monads-tf.cabal +++ b/monads-tf.cabal @@ -1,5 +1,5 @@ name: monads-tf -version: 0.1.0.0 +version: 0.1.0.1 license: BSD3 license-file: LICENSE author: Andy Gill @@ -16,7 +16,9 @@ This package is almost a compatible replacement for the @mtl-tf@ package. build-type: Simple cabal-version: >= 1.2.3 -exposed-modules: + +library + exposed-modules: Control.Monad.Cont Control.Monad.Cont.Class Control.Monad.Error @@ -38,7 +40,7 @@ Control.Monad.Writer.Class Control.Monad.Writer.Lazy Control.Monad.Writer.Strict -build-depends: base < 6, transformers >= 0.2 -extensions: + build-depends: base < 6, transformers >= 0.2.0.0 && < 0.4 + extensions: FlexibleContexts TypeFamilies