Updates for 1.0 core libraries

bower.json

@@ -14,11 +14,11 @@
     "tests"
   ],
   "dependencies": {
-    "purescript-maybe": "^0.3.0",
-    "purescript-functions": "^0.1.0"
+    "purescript-maybe": "^1.0.0-rc.1",
+    "purescript-functions": "^1.0.0-rc.1"
   },
-  "repository": {                                                          
-    "type": "git",                                                         
-    "url": "git://github.com/paf31/purescript-nullable.git"            
-  } 
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/paf31/purescript-nullable.git"
+  }
 }

src/Data/Nullable.js

@@ -1,8 +1,6 @@
 /* global exports */
 "use strict";
 
-// module Data.Nullable
-
 exports["null"] = null;
 
 exports.nullable = function(a, r, f) {
@@ -11,4 +9,4 @@ exports.nullable = function(a, r, f) {
 
 exports.notNull = function(x) {
     return x;
-}; 
+};

src/Data/Nullable.purs

@@ -7,10 +7,11 @@ module Data.Nullable
   , toNullable
   ) where
 
-import Prelude
+import Prelude (class Ord, class Eq, class Show, compare, eq, show)
 
-import Data.Maybe    
-import Data.Function
+import Data.Function (on)
+import Data.Function.Uncurried (Fn3, runFn3)
+import Data.Maybe (Maybe(..), maybe)
 
 -- | A nullable type.
 -- |
@@ -20,17 +21,17 @@ foreign import data Nullable :: * -> *
 
 -- | The null value.
 foreign import null :: forall a. Nullable a
-    
+
 foreign import nullable :: forall a r. Fn3 (Nullable a) r (a -> r) r
 
 -- | Wrap a non-null value.
 foreign import notNull :: forall a. a -> Nullable a
-        
+
 -- | Takes `Nothing` to `null`, and `Just a` to `a`.
 toNullable :: forall a. Maybe a -> Nullable a
 toNullable = maybe null notNull
 
--- | Represent `null` using `Maybe a` as `Nothing`. 
+-- | Represent `null` using `Maybe a` as `Nothing`.
 toMaybe :: forall a. Nullable a -> Maybe a
 toMaybe n = runFn3 nullable n Nothing Just
 

test/Main.purs

@@ -2,17 +2,17 @@ module Test.Main where
 
 import Prelude
 
-import Data.Maybe
-import Data.Nullable
+import Data.Maybe (Maybe(..))
+import Data.Nullable (toNullable, toMaybe)
 
-import Control.Monad.Eff.Console
+import Control.Monad.Eff.Console (logShow)
 
 main = do
-  print $ toNullable (Nothing :: Maybe Number)
-  print $ toNullable (Just 42)
+  logShow $ toNullable (Nothing :: Maybe Number)
+  logShow $ toNullable (Just 42)
 
-  print $ toMaybe $ toNullable (Nothing :: Maybe Number)
-  print $ toMaybe $ toNullable (Just 42)
+  logShow $ toMaybe $ toNullable (Nothing :: Maybe Number)
+  logShow $ toMaybe $ toNullable (Just 42)
 
-  print $ toNullable Nothing == toNullable (Just 42)
-  print $ toNullable Nothing `compare` toNullable (Just 42)
+  logShow $ toNullable Nothing == toNullable (Just 42)
+  logShow $ toNullable Nothing `compare` toNullable (Just 42)