Merge pull request #21 from purescript/class-updates

Update for new class hierarchies

Author: garyb

bower.json

@@ -17,6 +17,6 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-monoid": "^1.0.0-rc.1"
+    "purescript-monoid": "^1.0.0-rc.2"
   }
 }

src/Data/Maybe.purs

@@ -3,19 +3,17 @@ module Data.Maybe where
 import Control.Alt (class Alt)
 import Control.Alternative (class Alternative)
 import Control.Applicative (class Applicative)
-import Control.Apply (class Apply, (<*>))
+import Control.Apply (class Apply)
 import Control.Bind (class Bind)
 import Control.Extend (class Extend)
 import Control.Monad (class Monad)
 import Control.MonadZero (class MonadZero)
 import Control.Plus (class Plus)
 
-import Data.BooleanAlgebra (class BooleanAlgebra, conj, disj, not)
 import Data.Bounded (class Bounded, top)
-import Data.BoundedOrd (class BoundedOrd)
 import Data.Eq (class Eq, (==))
 import Data.Function (const, id)
-import Data.Functor (class Functor, map, (<$>))
+import Data.Functor (class Functor, (<$>))
 import Data.Functor.Invariant (class Invariant, imapF)
 import Data.Monoid (class Monoid)
 import Data.Ord (class Ord, compare)
@@ -215,13 +213,6 @@ instance boundedMaybe :: Bounded a => Bounded (Maybe a) where
   top = Just top
   bottom = Nothing
 
-instance boundedOrdMaybe :: BoundedOrd a => BoundedOrd (Maybe a)
-
-instance booleanAlgebraMaybe :: BooleanAlgebra a => BooleanAlgebra (Maybe a) where
-  conj x y = conj <$> x <*> y
-  disj x y = disj <$> x <*> y
-  not = map not
-
 -- | The `Show` instance allows `Maybe` values to be rendered as a string with
 -- | `show` whenever there is an `Show` instance for the type the `Maybe`
 -- | contains.

src/Data/Maybe/First.purs

@@ -7,7 +7,6 @@ import Control.Extend (class Extend, extend)
 import Control.Monad (class Monad)
 
 import Data.Bounded (class Bounded, top, bottom)
-import Data.BoundedOrd (class BoundedOrd)
 import Data.Eq (class Eq, (==))
 import Data.Function ((<<<))
 import Data.Functor (class Functor, (<$>))
@@ -41,8 +40,6 @@ instance boundedFirst :: (Bounded a) => Bounded (First a) where
   top = First top
   bottom = First bottom
 
-instance boundedOrdFirst :: BoundedOrd a => BoundedOrd (First a) where
-
 instance functorFirst :: Functor First where
   map f (First x) = First (f <$> x)
 

src/Data/Maybe/Last.purs

@@ -7,7 +7,6 @@ import Control.Extend (class Extend, extend)
 import Control.Monad (class Monad)
 
 import Data.Bounded (class Bounded, top, bottom)
-import Data.BoundedOrd (class BoundedOrd)
 import Data.Eq (class Eq, (==))
 import Data.Function ((<<<))
 import Data.Functor (class Functor, (<$>))
@@ -41,8 +40,6 @@ instance boundedLast :: Bounded a => Bounded (Last a) where
   top = Last top
   bottom = Last bottom
 
-instance boundedOrdLast :: BoundedOrd a => BoundedOrd (Last a) where
-
 instance functorLast :: Functor Last where
   map f (Last x) = Last (f <$> x)