universe-reverse-instances to not depend on universe-instances-base

dmwit · Jun 29, 2016 · 58e176d · 58e176d
1 parent 4cb25e2
commit 58e176d
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 20 deletions.
diff --git a/base/Data/Universe/Class.hs b/base/Data/Universe/Class.hs
@@ -2,11 +2,17 @@
 #ifdef DEFAULT_SIGNATURES
 {-# LANGUAGE DefaultSignatures #-}
 #endif
+-- | Bottoms are ignored for this entire module: only fully-defined inhabitants
+-- are considered inhabitants.
 module Data.Universe.Class
-    ( -- | Bottoms are ignored for this entire module: only fully-defined inhabitants are considered inhabitants.
+    (
+    -- * Classes
       Universe(..)
     , Finite(..)
-    , Univ(..)
+    , Univ
+    -- * Lists
+    , universe
+    , universeF
     ) where
 
 import Data.Universe.Helpers
@@ -26,19 +32,15 @@ import Data.Universe.Helpers
 -- in 'length' pfx = 'length' (nub pfx)
 -- @
 class Universe a where
-    -- | Memoised CAF. Use with care as the expanded value will live forever.
-    --
-    -- See <http://stackoverflow.com/questions/6090932/how-to-make-a-caf-not-a-caf-in-haskell>
-    universe :: [a]
-    universe = getUniv universeUniv
-
-    -- | 'Univ' containing all values of @a@.
     universeUniv :: Univ a
 #ifdef DEFAULT_SIGNATURES
     default universeUniv :: (Enum a, Bounded a) => Univ a
     universeUniv = universeDef
 #endif
 
+universe :: Universe a => [a]
+universe = getUniv universeUniv
+
 -- | Creating an instance of this class is a declaration that your 'universe'
 -- eventually ends. Minimal definition: no methods defined. By default,
 -- @universeF = universe@, but for some types (like 'Either') the 'universeF'
@@ -62,8 +64,8 @@ class Universe a where
 -- Just 1
 -- @
 class Universe a => Finite a where
-    universeF :: [a]
-    universeF = getUniv universeUnivF
-
     universeUnivF :: Univ a
     universeUnivF = universeUniv
+
+universeF :: Finite a => [a]
+universeF = getUniv universeUnivF
diff --git a/instances/base/tests/Tests.hs b/instances/base/tests/Tests.hs
@@ -4,7 +4,8 @@ module Main (main) where
 import Data.List (elemIndex, nub)
 import Data.Int (Int8)
 import Test.QuickCheck
-import Data.Universe.Instances.Base (Universe(..), Finite(..))
+import Data.Universe.Class
+import Data.Universe.Instances.Base ()
 
 import qualified Data.Set as Set
 

diff --git a/instances/containers/tests/Tests.hs b/instances/containers/tests/Tests.hs
@@ -3,8 +3,9 @@ module Main (main) where
 
 import Data.Set (Set)
 import Test.QuickCheck
+import Data.Universe.Class
 import Data.Universe.Instances.Base ()
-import Data.Universe.Instances.Containers (Universe(..), Finite(..))
+import Data.Universe.Instances.Containers ()
 
 import qualified Data.Set as Set
 

diff --git a/instances/reverse/Data/Universe/Instances/Eq.hs b/instances/reverse/Data/Universe/Instances/Eq.hs
@@ -5,7 +5,7 @@ module Data.Universe.Instances.Eq (
     Eq(..)
     ) where
 
-import Data.Universe.Instances.Base
+import Data.Universe.Class
 
 instance (Finite a, Eq b) => Eq (a -> b) where
     f == g = and [f x == g x | x <- universeF]
diff --git a/instances/reverse/Data/Universe/Instances/Ord.hs b/instances/reverse/Data/Universe/Instances/Ord.hs
@@ -6,8 +6,10 @@ module Data.Universe.Instances.Ord (
     Ord(..)
     ) where
 
-import Data.Universe.Instances.Base
+import Data.Monoid
+import Data.Universe.Class
 import Data.Universe.Instances.Eq ()
+import Prelude
 
 instance (Finite a, Ord b) => Ord (a -> b) where
     f `compare` g = mconcat [f x `compare` g x | x <- universeF]
diff --git a/instances/reverse/Data/Universe/Instances/Read.hs b/instances/reverse/Data/Universe/Instances/Read.hs
@@ -6,7 +6,7 @@ module Data.Universe.Instances.Read (
     ) where
 
 import Data.Map (fromList, (!))
-import Data.Universe.Instances.Base
+import Data.Universe.Class
 
 -- actually, the "Finite a" part of the context wouldn't be inferred if you
 -- asked GHC -- but it's kind of hopeless otherwise!

diff --git a/instances/reverse/Data/Universe/Instances/Show.hs b/instances/reverse/Data/Universe/Instances/Show.hs
@@ -5,7 +5,7 @@ module Data.Universe.Instances.Show (
     Show(..)
     ) where
 
-import Data.Universe.Instances.Base
+import Data.Universe.Class
 
 instance (Finite a, Show a, Show b) => Show (a -> b) where
     showsPrec n f = showsPrec n [(a, f a) | a <- universeF]
diff --git a/instances/reverse/Data/Universe/Instances/Traversable.hs b/instances/reverse/Data/Universe/Instances/Traversable.hs
@@ -11,7 +11,7 @@ import Data.Foldable
 import Data.Map ((!), fromList)
 import Data.Monoid
 import Data.Traversable
-import Data.Universe.Instances.Base
+import Data.Universe.Class
 import Prelude
 
 instance Finite e => Foldable ((->) e) where

diff --git a/instances/reverse/universe-reverse-instances.cabal b/instances/reverse/universe-reverse-instances.cabal
@@ -26,6 +26,6 @@ library
                        Data.Universe.Instances.Traversable
   build-depends:       base                    >=4   && <5  ,
                        containers              >=0.4 && <0.6,
-                       universe-instances-base >=2   && <3
+                       universe-base           >=2   && <3
   default-language:    Haskell2010
   ghc-options:         -Wall