Merge pull request #13 from purescript/compiler/0.12

Update for PureScript 0.12

Author: garyb

.gitignore

@@ -4,3 +4,4 @@
 /bower_components/
 /node_modules/
 /output/
+package-lock.json

LICENSE

@@ -1,20 +1,26 @@
-The MIT License (MIT)
+Copyright 2018 PureScript
 
-Copyright (c) 2014 PureScript
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bower.json

@@ -2,7 +2,7 @@
   "name": "purescript-bifunctors",
   "homepage": "https://github.com/purescript/purescript-bifunctors",
   "description": "Bifunctors and biapplicatives",
-  "license": "MIT",
+  "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
     "url": "git://github.com/purescript/purescript-bifunctors.git"
@@ -17,7 +17,7 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-control": "^3.0.0",
-    "purescript-newtype": "^2.0.0"
+    "purescript-prelude": "^4.0.0",
+    "purescript-newtype": "^3.0.0"
   }
 }

package.json

@@ -5,8 +5,8 @@
     "build": "pulp build -- --censor-lib --strict"
   },
   "devDependencies": {
-    "pulp": "^10.0.4",
-    "purescript-psa": "^0.5.0-rc.1",
-    "rimraf": "^2.6.1"
+    "pulp": "^12.2.0",
+    "purescript-psa": "^0.6.0",
+    "rimraf": "^2.6.2"
   }
 }

src/Control/Biapply.purs

@@ -1,6 +1,6 @@
 module Control.Biapply where
 
-import Data.Function (const, id)
+import Data.Function (const, identity)
 
 import Data.Bifunctor (class Bifunctor, bimap)
 
@@ -10,7 +10,7 @@ import Data.Bifunctor (class Bifunctor, bimap)
 -- | ```purescript
 -- | bipure f g <<$>> x <<*>> y
 -- | ```
-infixl 4 id as <<$>>
+infixl 4 identity as <<$>>
 
 -- | `Biapply` captures type constructors of two arguments which support lifting of
 -- | functions of one or more arguments, in the sense of `Apply`.
@@ -21,7 +21,7 @@ infixl 4 biapply as <<*>>
 
 -- | Keep the results of the second computation.
 biapplyFirst :: forall w a b c d. Biapply w => w a b -> w c d -> w c d
-biapplyFirst a b = bimap (const id) (const id) <<$>> a <<*>> b
+biapplyFirst a b = bimap (const identity) (const identity) <<$>> a <<*>> b
 
 infixl 4 biapplyFirst as *>>
 

src/Data/Bifunctor.purs

@@ -1,6 +1,6 @@
 module Data.Bifunctor where
 
-import Control.Category (id)
+import Control.Category (identity)
 
 -- | A `Bifunctor` is a `Functor` from the pair category `(Type, Type)` to `Type`.
 -- |
@@ -12,16 +12,16 @@ import Control.Category (id)
 -- |
 -- | Laws:
 -- |
--- | - Identity: `bimap id id == id`
+-- | - Identity: `bimap identity identity == identity`
 -- | - Composition: `bimap f1 g1 <<< bimap f2 g2 == bimap (f1 <<< f2) (g1 <<< g2)`
 -- |
 class Bifunctor f where
   bimap :: forall a b c d. (a -> b) -> (c -> d) -> f a c -> f b d
 
 -- | Map a function over the first type argument of a `Bifunctor`.
 lmap :: forall f a b c. Bifunctor f => (a -> b) -> f a c -> f b c
-lmap f = bimap f id
+lmap f = bimap f identity
 
 -- | Map a function over the second type arguments of a `Bifunctor`.
 rmap :: forall f a b c. Bifunctor f => (b -> c) -> f a b -> f a c
-rmap = bimap id
+rmap = bimap identity