Skip to content

Commit

Permalink
Merge pull request #49 from purescript/compiler/0.12
Browse files Browse the repository at this point in the history
Update for PureScript 0.12
  • Loading branch information
garyb authored May 22, 2018
2 parents daae61d + ab8a337 commit f7d91cd
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 30 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/bower_components/
/node_modules/
/output/
package-lock.json
38 changes: 22 additions & 16 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
7 changes: 3 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"name": "purescript-control",
"homepage": "https://github.com/purescript/purescript-control",
"description": "Common control classes and utility functions",
"license": "MIT",
"license": "BSD-3-Clause",
"repository": {
"type": "git",
"url": "git://github.com/purescript/purescript-control.git"
Expand All @@ -17,9 +16,9 @@
"package.json"
],
"dependencies": {
"purescript-prelude": "^3.0.0"
"purescript-prelude": "^4.0.0"
},
"devDependencies": {
"purescript-eff": "^3.1.0"
"purescript-effect": "^2.0.0"
}
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"test": "pulp test"
},
"devDependencies": {
"pulp": "^12.0.1",
"purescript-psa": "^0.5.0-rc.1",
"rimraf": "^2.6.1"
"pulp": "^12.2.0",
"purescript-psa": "^0.6.0",
"rimraf": "^2.6.2"
}
}
4 changes: 2 additions & 2 deletions src/Control/Extend.purs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module Control.Extend
, module Data.Functor
) where

import Control.Category (id)
import Control.Category (identity)

import Data.Functor (class Functor, map, void, ($>), (<#>), (<$), (<$>))
import Data.Semigroup (class Semigroup, (<>))
Expand Down Expand Up @@ -56,4 +56,4 @@ infixr 1 composeCoKleisliFlipped as =<=
-- |
-- | `duplicate` is dual to `Control.Bind.join`.
duplicate :: forall a w. Extend w => w a -> w (w a)
duplicate = extend id
duplicate = extend identity
4 changes: 3 additions & 1 deletion src/Control/Lazy.purs
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ instance lazyUnit :: Lazy Unit where
-- |
-- | The `Lazy` instance allows us to generate the result lazily.
fix :: forall l. Lazy l => (l -> l) -> l
fix f = defer (\_ -> f (fix f))
fix f = go
where
go = defer \_ -> f go
4 changes: 2 additions & 2 deletions test/Test/Control/Lazy.purs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module Test.Control.Lazy (testLazy) where

import Control.Applicative (pure)
import Control.Monad.Eff (Eff)
import Control.Lazy (fix)
import Data.Unit (Unit, unit)
import Effect (Effect)

foo :: forall a. a -> Unit
foo _ = unit
Expand All @@ -15,5 +15,5 @@ foo' :: forall a. a -> Unit
foo' = fix foofoo

-- the idea here is that foo and foo' are the same function
testLazy :: Eff () Unit
testLazy :: Effect Unit
testLazy = pure (foo' unit)
4 changes: 2 additions & 2 deletions test/Test/Main.purs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module Test.Main (main) where

import Control.Monad.Eff (Eff)
import Effect (Effect)
import Data.Unit (Unit)

import Test.Control.Lazy (testLazy)

main :: Eff () Unit
main :: Effect Unit
main = testLazy

0 comments on commit f7d91cd

Please sign in to comment.