summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdwardKmett <>2015-07-10 04:12:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2015-07-10 04:12:00 (GMT)
commit5681d96c0cd99798036a50001d41b8cdf94a2306 (patch)
tree088209318c557b67cebf989bea3e631e3aed92e4
parentd4f4a0c144aaf8b9c12d0936952a7404b885f7bf (diff)
version 1.0.61.0.6
-rw-r--r--CHANGELOG.markdown4
-rw-r--r--README.markdown2
-rw-r--r--bound.cabal6
-rw-r--r--src/Bound/Class.hs7
-rw-r--r--src/Bound/Name.hs6
-rw-r--r--src/Bound/Scope.hs2
-rw-r--r--src/Bound/Var.hs6
7 files changed, 23 insertions, 10 deletions
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 7bd3fc8..7f77085 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,3 +1,7 @@
+1.0.6
+-----
+* Compiles warning-free on GHC 7.10
+
1.0.5
-----
* Widened version bound on `bifunctors`.
diff --git a/README.markdown b/README.markdown
index 64718bc..dbd32a1 100644
--- a/README.markdown
+++ b/README.markdown
@@ -7,7 +7,7 @@ Goals
-----
This library provides convenient combinators for working with "locally-nameless" terms. These can be useful
-when writing a type checker, evalator, parser, or pretty printer for terms that contain binders like forall
+when writing a type checker, evaluator, parser, or pretty printer for terms that contain binders like forall
or lambda, as they ease the task of avoiding variable capture and testing for alpha-equivalence.
See [the documentation](http://hackage.haskell.org/package/bound) on hackage for more information, but here is an example:
diff --git a/bound.cabal b/bound.cabal
index e68106e..ec18f2f 100644
--- a/bound.cabal
+++ b/bound.cabal
@@ -1,6 +1,6 @@
name: bound
category: Language, Compilers/Interpreters
-version: 1.0.5
+version: 1.0.6
license: BSD3
cabal-version: >= 1.9.2
license-file: LICENSE
@@ -87,8 +87,6 @@ test-suite Simple
main-is: Simple.hs
hs-source-dirs: examples
ghc-options: -Wall -threaded
- if impl(ghc<7.6.1)
- ghc-options: -Werror
build-depends:
base,
bound,
@@ -100,8 +98,6 @@ test-suite doctests
main-is: doctests.hs
hs-source-dirs: tests
ghc-options: -Wall -threaded
- if impl(ghc<7.6.1)
- ghc-options: -Werror
build-depends:
base,
directory >= 1.0 && < 1.3,
diff --git a/src/Bound/Class.hs b/src/Bound/Class.hs
index ff726cb..8728cb2 100644
--- a/src/Bound/Class.hs
+++ b/src/Bound/Class.hs
@@ -2,9 +2,10 @@
#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 704
{-# LANGUAGE DefaultSignatures #-}
#endif
+{-# OPTIONS -fno-warn-deprecations #-}
-----------------------------------------------------------------------------
-- |
--- Copyright : (C) 2012 Edward Kmett
+-- Copyright : (C) 2012-2015 Edward Kmett
-- License : BSD-style (see the file LICENSE)
--
-- Maintainer : Edward Kmett <ekmett@gmail.com>
@@ -19,10 +20,12 @@ module Bound.Class
, (=<<<)
) where
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 704
+#if __GLASGOW_HASKELL__ >= 704
import Control.Monad.Trans.Class
#endif
+#if __GLASGOW_HASKELL__ < 710
import Data.Monoid
+#endif
import Control.Monad.Trans.Cont
import Control.Monad.Trans.Error
import Control.Monad.Trans.Identity
diff --git a/src/Bound/Name.hs b/src/Bound/Name.hs
index 80664d6..77eb1ce 100644
--- a/src/Bound/Name.hs
+++ b/src/Bound/Name.hs
@@ -43,12 +43,16 @@ module Bound.Name
import Bound.Scope
import Bound.Var
+#if __GLASGOW_HASKELL__ < 710
import Control.Applicative
+#endif
import Control.Comonad
import Control.Monad (liftM, liftM2)
+#if __GLASGOW_HASKELL__ < 710
import Data.Foldable
-import Data.Traversable
import Data.Monoid
+import Data.Traversable
+#endif
import Data.Bifunctor
import Data.Bifoldable
import qualified Data.Binary as Binary
diff --git a/src/Bound/Scope.hs b/src/Bound/Scope.hs
index 870ade8..b60bc80 100644
--- a/src/Bound/Scope.hs
+++ b/src/Bound/Scope.hs
@@ -409,7 +409,7 @@ transverseScope :: (Applicative f, Monad f, Traversable g)
-> Scope b g a -> f (Scope b h a)
transverseScope tau (Scope e) = Scope <$> (tau =<< traverse (traverse tau) e)
-bitransverseScope :: Applicative f => (forall a a'. (a -> f a') -> t a -> f (u a')) -> (a -> f a') -> Scope b t a -> f (Scope b u a')
+bitransverseScope :: Applicative f => (forall a a'. (a -> f a') -> t a -> f (u a')) -> (c -> f c') -> Scope b t c -> f (Scope b u c')
bitransverseScope tau f = fmap Scope . tau (_F (tau f)) . unscope
{-# INLINE bitransverseScope #-}
diff --git a/src/Bound/Var.hs b/src/Bound/Var.hs
index bc7fe0a..5f97055 100644
--- a/src/Bound/Var.hs
+++ b/src/Bound/Var.hs
@@ -29,11 +29,15 @@ module Bound.Var
, _F
) where
+#if __GLASGOW_HASKELL__ < 710
import Control.Applicative
+#endif
import Control.Monad (liftM, ap)
+#if __GLASGOW_HASKELL__ < 710
import Data.Foldable
import Data.Traversable
import Data.Monoid (mempty)
+#endif
import Data.Hashable
import Data.Hashable.Extras
import Data.Bifunctor
@@ -53,7 +57,9 @@ import GHC.Generics
import Data.Profunctor
import qualified Data.Serialize as Serialize
import Data.Serialize (Serialize)
+#if __GLASGOW_HASKELL__ < 710
import Data.Word
+#endif
import Prelude.Extras
----------------------------------------------------------------------------