Skip to content

Commit 0644920

Browse files
5outh5outh
committed
Merge branch 'master' into typed-binders
2 parents 91130e4 + 4dd8c87 commit 0644920

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1234
-1125
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ node_modules
1515
tmp/
1616
.stack-work/
1717
tests/support/flattened/
18+
output

‎.travis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ matrix:
99
- env: GHCVER=7.8.4 COVERAGE_SUITE=psci-tests
1010
compiler: ": #GHC 7.8.4 - psci-tests"
1111
addons: {apt: {packages: [cabal-install-1.22,ghc-7.8.4,happy-1.19.5,alex-3.1.4], sources: [hvr-ghc]}}
12-
- env: GHCVER=7.8.4 STACKAGE=lts-22
13-
compiler: ": #GHC 7.8.4 - lts-2.22"
12+
- env: GHCVER=7.8.4 STACKAGE=lts-2.22
13+
compiler: ": #GHC 7.8.4 - lts-2.22-1"
1414
addons: {apt: {packages: [cabal-install-1.22,ghc-7.8.4,happy-1.19.5,alex-3.1.4], sources: [hvr-ghc]}}
1515
- env: GHCVER=7.6.3
1616
compiler: ": #GHC 7.6.3"
1717
addons: {apt: {packages: [cabal-install-1.22,ghc-7.6.3,happy-1.19.5,alex-3.1.4], sources: [hvr-ghc]}}
1818
- env: GHCVER=7.10.1
1919
compiler: ": #GHC 7.10.1"
2020
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1,happy-1.19.5,alex-3.1.4], sources: [hvr-ghc]}}
21-
- env: GHCVER=7.10.2 STACKAGE=lts=3.4 RUNSDISTTESTS=YES
22-
compiler: ": #GHC 7.10.2 lts-3.4"
21+
- env: GHCVER=7.10.2 STACKAGE=lts=3.6 RUNSDISTTESTS=YES
22+
compiler: ": #GHC 7.10.2 lts-3.6"
2323
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2,happy-1.19.5,alex-3.1.4], sources: [hvr-ghc]}}
24-
- env: GHCVER=7.10.2 STACKAGE=nightly-2015-08-24
25-
compiler: ": #GHC 7.10.2 nightly-2015-09-09"
24+
- env: GHCVER=7.10.2 STACKAGE=nightly-2015-09-29
25+
compiler: ": #GHC 7.10.2 nightly-2015-09-29"
2626
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2,happy-1.19.5,alex-3.1.4], sources: [hvr-ghc]}}
2727
before_install:
2828
- unset CC

‎CONTRIBUTORS.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ This file lists the contributors to the PureScript compiler project, and the ter
5353
- [@utkarshkukreti](https://github.com/utkarshkukreti) (Utkarsh Kukreti) My existing contributions and all future contributions until further notice are Copyright Utkarsh Kukreti, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
5454
- [@vkorablin](https://github.com/vkorablin) (Vladimir Korablin) - My existing contributions and all future contributions until further notice are Copyright Vladimir Korablin, and are licensed to the owners and users of the PureScript compiler project under the terms of the MIT license.
5555
- [@zudov](https://github.com/zudov) (Konstantin Zudov) My existing contributions and all future contributions until further notice are Copyright Konstantin Zudov, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
56+
- [@senju](https://github.com/senju) - My existing contributions and all future contributions until further notice are Copyright senju, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
5657
<http://opensource.org/licenses/MIT>.
5758

5859
### Companies

‎INSTALL.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,25 @@ requirements.
2424
## Compiling from source
2525

2626
GHC 7.6.1 or newer is required to compile from source. The easiest way is to
27-
use `cabal-install`:
27+
use stack:
2828

2929
```
30-
$ cabal update && cabal install purescript
30+
$ stack install purescript
3131
```
3232

33+
This will then copy the compiler and utilities into `~/.local/bin`.
34+
35+
36+
If you don't have stack installed yet there are install instructions
37+
[here](https://github.com/commercialhaskell/stack/blob/master/doc/install_and_upgrade.md).
38+
39+
If you don't have ghc installed yet, stack will prompt you to run `stack setup`
40+
which will install ghc for you.
41+
3342
The PureScript compiler has been known to run on OS X 10.6 when built with GHC
3443
7.6.
3544

45+
3646
## The "curses" library
3747

3848
`psci` depends on the `curses` library (via the Haskell package `terminfo`). If

‎LICENSE‎

Lines changed: 167 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ PureScript uses the following Haskell library packages. Their license files foll
3131
array
3232
attoparsec
3333
base
34+
binary
3435
blaze-builder
3536
bower-json
3637
boxes
@@ -45,9 +46,10 @@ PureScript uses the following Haskell library packages. Their license files foll
4546
haskeline
4647
integer-gmp
4748
language-javascript
49+
lifted-base
50+
monad-control
4851
mtl
4952
nats
50-
old-locale
5153
optparse-applicative
5254
parsec
5355
pattern-arrows
@@ -59,12 +61,14 @@ PureScript uses the following Haskell library packages. Their license files foll
5961
scientific
6062
semigroups
6163
split
64+
stm
6265
syb
6366
template-haskell
6467
terminfo
6568
text
6669
time
6770
transformers
71+
transformers-base
6872
transformers-compat
6973
unix
7074
unordered-containers
@@ -449,6 +453,39 @@ base LICENSE file:
449453

450454
-----------------------------------------------------------------------------
451455

456+
binary LICENSE file:
457+
458+
Copyright (c) Lennart Kolmodin
459+
460+
All rights reserved.
461+
462+
Redistribution and use in source and binary forms, with or without
463+
modification, are permitted provided that the following conditions
464+
are met:
465+
466+
1. Redistributions of source code must retain the above copyright
467+
notice, this list of conditions and the following disclaimer.
468+
469+
2. Redistributions in binary form must reproduce the above copyright
470+
notice, this list of conditions and the following disclaimer in the
471+
documentation and/or other materials provided with the distribution.
472+
473+
3. Neither the name of the author nor the names of his contributors
474+
may be used to endorse or promote products derived from this software
475+
without specific prior written permission.
476+
477+
THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
478+
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
479+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
480+
DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
481+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
482+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
483+
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
484+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
485+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
486+
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
487+
POSSIBILITY OF SUCH DAMAGE.
488+
452489
blaze-builder LICENSE file:
453490

454491
Copyright Jasper Van der Jeugt 2010, Simon Meier 2010 & 2011
@@ -967,6 +1004,70 @@ language-javascript LICENSE file:
9671004
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9681005
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9691006

1007+
lifted-base LICENSE file:
1008+
1009+
Copyright © 2010-2012, Bas van Dijk, Anders Kaseorg
1010+
All rights reserved.
1011+
1012+
Redistribution and use in source and binary forms, with or without
1013+
modification, are permitted provided that the following conditions are
1014+
met:
1015+
1016+
• Redistributions of source code must retain the above copyright
1017+
notice, this list of conditions and the following disclaimer.
1018+
1019+
• Redistributions in binary form must reproduce the above copyright
1020+
notice, this list of conditions and the following disclaimer in the
1021+
documentation and/or other materials provided with the distribution.
1022+
1023+
• Neither the name of the author nor the names of other contributors
1024+
may be used to endorse or promote products derived from this
1025+
software without specific prior written permission.
1026+
1027+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1028+
“AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1029+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1030+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1031+
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1032+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1033+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1034+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1035+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1036+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1037+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1038+
1039+
monad-control LICENSE file:
1040+
1041+
Copyright © 2010, Bas van Dijk, Anders Kaseorg
1042+
All rights reserved.
1043+
1044+
Redistribution and use in source and binary forms, with or without
1045+
modification, are permitted provided that the following conditions are
1046+
met:
1047+
1048+
• Redistributions of source code must retain the above copyright
1049+
notice, this list of conditions and the following disclaimer.
1050+
1051+
• Redistributions in binary form must reproduce the above copyright
1052+
notice, this list of conditions and the following disclaimer in the
1053+
documentation and/or other materials provided with the distribution.
1054+
1055+
• Neither the name of the author nor the names of other contributors
1056+
may be used to endorse or promote products derived from this
1057+
software without specific prior written permission.
1058+
1059+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1060+
“AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1061+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1062+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1063+
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1064+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1065+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1066+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1067+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1068+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1069+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1070+
9701071
mtl LICENSE file:
9711072

9721073
The Glasgow Haskell Compiler License
@@ -1034,72 +1135,6 @@ nats LICENSE file:
10341135
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
10351136
POSSIBILITY OF SUCH DAMAGE.
10361137

1037-
old-locale LICENSE file:
1038-
1039-
This library (libraries/base) is derived from code from two
1040-
sources:
1041-
1042-
* Code from the GHC project which is largely (c) The University of
1043-
Glasgow, and distributable under a BSD-style license (see below),
1044-
1045-
* Code from the Haskell 98 Report which is (c) Simon Peyton Jones
1046-
and freely redistributable (but see the full license for
1047-
restrictions).
1048-
1049-
The full text of these licenses is reproduced below. Both of the
1050-
licenses are BSD-style or compatible.
1051-
1052-
-----------------------------------------------------------------------------
1053-
1054-
The Glasgow Haskell Compiler License
1055-
1056-
Copyright 2004, The University Court of the University of Glasgow.
1057-
All rights reserved.
1058-
1059-
Redistribution and use in source and binary forms, with or without
1060-
modification, are permitted provided that the following conditions are met:
1061-
1062-
- Redistributions of source code must retain the above copyright notice,
1063-
this list of conditions and the following disclaimer.
1064-
1065-
- Redistributions in binary form must reproduce the above copyright notice,
1066-
this list of conditions and the following disclaimer in the documentation
1067-
and/or other materials provided with the distribution.
1068-
1069-
- Neither name of the University nor the names of its contributors may be
1070-
used to endorse or promote products derived from this software without
1071-
specific prior written permission.
1072-
1073-
THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
1074-
GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
1075-
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
1076-
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
1077-
UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
1078-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
1079-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
1080-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
1081-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
1082-
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
1083-
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
1084-
DAMAGE.
1085-
1086-
-----------------------------------------------------------------------------
1087-
1088-
Code derived from the document "Report on the Programming Language
1089-
Haskell 98", is distributed under the following license:
1090-
1091-
Copyright (c) 2002 Simon Peyton Jones
1092-
1093-
The authors intend this Report to belong to the entire Haskell
1094-
community, and so we grant permission to copy and distribute it for
1095-
any purpose, provided that it is reproduced in its entirety,
1096-
including this Notice. Modified versions of this Report may also be
1097-
copied and distributed for any purpose, provided that the modified
1098-
version is clearly presented as such, and that it does not claim to
1099-
be a definition of the Haskell 98 Language.
1100-
1101-
-----------------------------------------------------------------------------
1102-
11031138
optparse-applicative LICENSE file:
11041139

11051140
Copyright (c) 2012, Paolo Capriotti
@@ -1450,6 +1485,40 @@ split LICENSE file:
14501485
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
14511486
SUCH DAMAGE.
14521487

1488+
stm LICENSE file:
1489+
1490+
The Glasgow Haskell Compiler License
1491+
1492+
Copyright 2004, The University Court of the University of Glasgow.
1493+
All rights reserved.
1494+
1495+
Redistribution and use in source and binary forms, with or without
1496+
modification, are permitted provided that the following conditions are met:
1497+
1498+
- Redistributions of source code must retain the above copyright notice,
1499+
this list of conditions and the following disclaimer.
1500+
1501+
- Redistributions in binary form must reproduce the above copyright notice,
1502+
this list of conditions and the following disclaimer in the documentation
1503+
and/or other materials provided with the distribution.
1504+
1505+
- Neither name of the University nor the names of its contributors may be
1506+
used to endorse or promote products derived from this software without
1507+
specific prior written permission.
1508+
1509+
THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF
1510+
GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
1511+
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
1512+
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
1513+
UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE
1514+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
1515+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
1516+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
1517+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
1518+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
1519+
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
1520+
DAMAGE.
1521+
14531522
syb LICENSE file:
14541523

14551524
This library (libraries/syb) is derived from code from several
@@ -1674,6 +1743,36 @@ transformers LICENSE file:
16741743
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
16751744
DAMAGE.
16761745

1746+
transformers-base LICENSE file:
1747+
1748+
Copyright (c) 2011, Mikhail Vorozhtsov, Bas van Dijk
1749+
All rights reserved.
1750+
1751+
Redistribution and use in source and binary forms, with or without
1752+
modification, are permitted provided that the following conditions are met:
1753+
1754+
- Redistributions of source code must retain the above copyright notice,
1755+
this list of conditions and the following disclaimer.
1756+
- Redistributions in binary form must reproduce the above copyright
1757+
notice, this list of conditions and the following disclaimer in the
1758+
documentation and/or other materials provided with the distribution.
1759+
- Neither the names of the copyright owners nor the names of the
1760+
contributors may be used to endorse or promote products derived
1761+
from this software without specific prior written permission.
1762+
1763+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1764+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1765+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1766+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1767+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1768+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1769+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1770+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1771+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1772+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1773+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1774+
1775+
16771776
transformers-compat LICENSE file:
16781777

16791778
Copyright 2012 Edward Kmett
@@ -1836,7 +1935,7 @@ vector LICENSE file:
18361935

18371936
void LICENSE file:
18381937

1839-
Copyright 2013 Edward Kmett
1938+
Copyright 2015 Edward Kmett
18401939

18411940
All rights reserved.
18421941

‎bundle/README‎

100755100644
File mode changed.

0 commit comments

Comments
 (0)