Merge pull request purescript#18 from purescript/bump

Prepare for 2.0 release

bower.json

@@ -18,12 +18,12 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-either": "^1.0.0",
-    "purescript-strings": "^1.0.0",
-    "purescript-unfoldable": "^1.0.0"
+    "purescript-either": "^2.0.0",
+    "purescript-strings": "^2.0.0",
+    "purescript-unfoldable": "^2.0.0"
   },
   "devDependencies": {
-    "purescript-assert": "^1.0.0",
-    "purescript-console": "^1.0.0"
+    "purescript-assert": "^2.0.0",
+    "purescript-console": "^2.0.0"
   }
 }

src/Data/Enum.purs

@@ -6,7 +6,7 @@ module Data.Enum
   , enumFromThenTo
   , upFrom
   , downFrom
-  , Cardinality(..), runCardinality
+  , Cardinality(..)
   , class BoundedEnum, cardinality, toEnum, fromEnum, toEnumWithDefaults
   , defaultCardinality
   , defaultToEnum
@@ -20,15 +20,19 @@ import Control.MonadPlus (guard)
 import Data.Char (fromCharCode, toCharCode)
 import Data.Either (Either(..))
 import Data.Maybe (Maybe(..), maybe, fromJust)
+import Data.Newtype (class Newtype, unwrap)
 import Data.Tuple (Tuple(..))
 import Data.Unfoldable (class Unfoldable, unfoldr)
 
 import Partial.Unsafe (unsafePartial)
 
 newtype Cardinality a = Cardinality Int
 
-runCardinality :: forall a. Cardinality a -> Int
-runCardinality (Cardinality a) = a
+derive instance newtypeCardinality :: Newtype (Cardinality a) _
+
+derive newtype instance eqCardinality :: Eq (Cardinality a)
+
+derive newtype instance ordCardinality :: Ord (Cardinality a)
 
 -- | Type class for enumerations.
 -- |
@@ -188,7 +192,7 @@ instance boundedEnumOrdering :: BoundedEnum Ordering where
   fromEnum GT = 2
 
 instance boundedEnumMaybe :: BoundedEnum a => BoundedEnum (Maybe a) where
-  cardinality = Cardinality $ runCardinality (cardinality :: Cardinality a) + 1
+  cardinality = Cardinality $ unwrap (cardinality :: Cardinality a) + 1
   toEnum = to cardinality
     where
     to :: Cardinality a -> Int -> Maybe (Maybe a)
@@ -201,8 +205,8 @@ instance boundedEnumMaybe :: BoundedEnum a => BoundedEnum (Maybe a) where
 instance boundedEnumEither :: (BoundedEnum a, BoundedEnum b) => BoundedEnum (Either a b) where
   cardinality =
     Cardinality
-      $ runCardinality (cardinality :: Cardinality a)
-      + runCardinality (cardinality :: Cardinality b)
+      $ unwrap (cardinality :: Cardinality a)
+      + unwrap (cardinality :: Cardinality b)
   toEnum = to cardinality cardinality
     where
     to :: Cardinality a -> Cardinality (Either a b) -> Int -> Maybe (Either a b)
@@ -211,13 +215,13 @@ instance boundedEnumEither :: (BoundedEnum a, BoundedEnum b) => BoundedEnum (Eit
       | n >= ca && n < cab = Right <$> toEnum (n - ca)
       | otherwise = Nothing
   fromEnum (Left a) = fromEnum a
-  fromEnum (Right b) = fromEnum b + runCardinality (cardinality :: Cardinality a)
+  fromEnum (Right b) = fromEnum b + unwrap (cardinality :: Cardinality a)
 
 instance boundedEnumTuple :: (BoundedEnum a, BoundedEnum b) => BoundedEnum (Tuple a b) where
   cardinality =
     Cardinality
-      $ runCardinality (cardinality :: Cardinality a)
-      * runCardinality (cardinality :: Cardinality b)
+      $ unwrap (cardinality :: Cardinality a)
+      * unwrap (cardinality :: Cardinality b)
   toEnum = to cardinality
     where
     to :: Cardinality b -> Int -> Maybe (Tuple a b)