Skip to content

Commit d8527d8

Browse files
authored
Merge pull request #1 from purescript/compiler/0.12
Compiler/0.12
2 parents 8492ee6 + 5ecd2e5 commit d8527d8

File tree

7 files changed

+713
-686
lines changed

7 files changed

+713
-686
lines changed

LICENSE

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
1-
The MIT License (MIT)
1+
Copyright 2018 PureScript
22

3-
Copyright (c) 2014 PureScript
3+
Redistribution and use in source and binary forms, with or without modification,
4+
are permitted provided that the following conditions are met:
45

5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
6+
1. Redistributions of source code must retain the above copyright notice, this
7+
list of conditions and the following disclaimer.
118

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
9+
2. Redistributions in binary form must reproduce the above copyright notice,
10+
this list of conditions and the following disclaimer in the documentation and/or
11+
other materials provided with the distribution.
1412

15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
13+
3. Neither the name of the copyright holder nor the names of its contributors
14+
may be used to endorse or promote products derived from this software without
15+
specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
21+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
24+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bower.json

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
{
2-
"name": "purescript-maps",
3-
"homepage": "https://github.com/purescript/purescript-maps",
4-
"authors": [
5-
"Phil Freeman <[email protected]>",
6-
"John A. De Goes <[email protected]>"
7-
],
8-
"description": "Purely functional maps implemented in PureScript",
2+
"name": "purescript-ordered-collections",
3+
"homepage": "https://github.com/purescript/purescript-ordered-collections",
94
"repository": {
105
"type": "git",
11-
"url": "git://github.com/purescript/purescript-maps.git"
6+
"url": "git://github.com/purescript/purescript-ordered-collections.git"
127
},
13-
"license": "MIT",
8+
"license": "BSD-3-Clause",
149
"ignore": [
1510
"**/.*",
1611
"bower_components",
@@ -21,17 +16,23 @@
2116
"package.json"
2217
],
2318
"dependencies": {
24-
"purescript-arrays": "#compiler/0.12",
25-
"purescript-functions": "#compiler/0.12",
26-
"purescript-lists": "#compiler/0.12",
27-
"purescript-st": "#compiler/0.12",
28-
"purescript-gen": "#compiler/0.12",
29-
"purescript-foldable-traversable": "#compiler/0.12"
19+
"purescript-arrays": "^5.0.0",
20+
"purescript-foldable-traversable": "^4.0.0",
21+
"purescript-gen": "^2.0.0",
22+
"purescript-lists": "^5.0.0",
23+
"purescript-maybe": "^4.0.0",
24+
"purescript-partial": "^2.0.0",
25+
"purescript-prelude": "^4.0.0",
26+
"purescript-st": "^4.0.0",
27+
"purescript-tailrec": "^4.0.0",
28+
"purescript-tuples": "^5.0.0",
29+
"purescript-unfoldable": "^4.0.0",
30+
"purescript-unsafe-coerce": "^4.0.0"
3031
},
3132
"devDependencies": {
32-
"purescript-quickcheck": "#compiler/0.12",
33-
"purescript-minibench": "#compiler/0.12",
34-
"purescript-console": "#compiler/0.12",
35-
"purescript-assert": "#compiler/0.12"
33+
"purescript-quickcheck": "^5.0.0",
34+
"purescript-minibench": "^2.0.0",
35+
"purescript-console": "^4.0.0",
36+
"purescript-assert": "^4.0.0"
3637
}
3738
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"bench": "npm run bench:build && npm run bench:run"
1111
},
1212
"devDependencies": {
13-
"eslint": "^3.17.1",
14-
"pulp": "^10.0.4",
15-
"purescript-psa": "^0.5.0-rc.1",
16-
"rimraf": "^2.6.1"
13+
"eslint": "^4.19.1",
14+
"pulp": "^12.2.0",
15+
"purescript-psa": "^0.6.0",
16+
"rimraf": "^2.6.2"
1717
}
1818
}

0 commit comments

Comments
 (0)