Skip to content

Commit

Permalink
Merge pull request #1 from purescript/compiler/0.12
Browse files Browse the repository at this point in the history
Compiler/0.12
  • Loading branch information
garyb authored May 24, 2018
2 parents 8492ee6 + 5ecd2e5 commit d8527d8
Show file tree
Hide file tree
Showing 7 changed files with 713 additions and 686 deletions.
39 changes: 22 additions & 17 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +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.
39 changes: 20 additions & 19 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
{
"name": "purescript-maps",
"homepage": "https://github.com/purescript/purescript-maps",
"authors": [
"Phil Freeman <paf31@cantab.net>",
"John A. De Goes <john@degoes.net>"
],
"description": "Purely functional maps implemented in PureScript",
"name": "purescript-ordered-collections",
"homepage": "https://github.com/purescript/purescript-ordered-collections",
"repository": {
"type": "git",
"url": "git://github.com/purescript/purescript-maps.git"
"url": "git://github.com/purescript/purescript-ordered-collections.git"
},
"license": "MIT",
"license": "BSD-3-Clause",
"ignore": [
"**/.*",
"bower_components",
Expand All @@ -21,17 +16,23 @@
"package.json"
],
"dependencies": {
"purescript-arrays": "#compiler/0.12",
"purescript-functions": "#compiler/0.12",
"purescript-lists": "#compiler/0.12",
"purescript-st": "#compiler/0.12",
"purescript-gen": "#compiler/0.12",
"purescript-foldable-traversable": "#compiler/0.12"
"purescript-arrays": "^5.0.0",
"purescript-foldable-traversable": "^4.0.0",
"purescript-gen": "^2.0.0",
"purescript-lists": "^5.0.0",
"purescript-maybe": "^4.0.0",
"purescript-partial": "^2.0.0",
"purescript-prelude": "^4.0.0",
"purescript-st": "^4.0.0",
"purescript-tailrec": "^4.0.0",
"purescript-tuples": "^5.0.0",
"purescript-unfoldable": "^4.0.0",
"purescript-unsafe-coerce": "^4.0.0"
},
"devDependencies": {
"purescript-quickcheck": "#compiler/0.12",
"purescript-minibench": "#compiler/0.12",
"purescript-console": "#compiler/0.12",
"purescript-assert": "#compiler/0.12"
"purescript-quickcheck": "^5.0.0",
"purescript-minibench": "^2.0.0",
"purescript-console": "^4.0.0",
"purescript-assert": "^4.0.0"
}
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"bench": "npm run bench:build && npm run bench:run"
},
"devDependencies": {
"eslint": "^3.17.1",
"pulp": "^10.0.4",
"purescript-psa": "^0.5.0-rc.1",
"rimraf": "^2.6.1"
"eslint": "^4.19.1",
"pulp": "^12.2.0",
"purescript-psa": "^0.6.0",
"rimraf": "^2.6.2"
}
}
Loading

0 comments on commit d8527d8

Please sign in to comment.