8732859 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

Merge branch 'master' into pure11

commit87328595e43e22b715973a8acefa06a58d8540e4 authorAndy Arvanitis <andyarvanitis@gmail.com> dateTue 24 May 2016, 18:12 (10 years ago) parent6d698ba 9572706

7 files changed+24−7

compare with golang

unifiedsplit

CONTRIBUTORS.md+2 core-tests/test-everything.sh+1−1 examples/failing/2128-class.purs+5 examples/failing/2128-instance.purs+8 psc-ide-client/Main.hs+1−1 psc-ide-server/Main.hs+5−3 src/Language/PureScript/Parser/Declarations.hs+2−2

CONTRIBUTORS.md+2

@@ -31,6 +31,7 @@ This file lists the contributors to the PureScript compiler project, and the ter

3131- [@jacereda](https://github.com/jacereda) (Jorge Acereda) My existing contributions and all future contributions until further notice are Copyright Jorge Acereda, 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).

3232- [@japesinator](https://github.com/japesinator) (JP Smith) My existing contributions and all future contributions until further notice are Copyright JP Smith, 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).

3333- [@joneshf](https://github.com/joneshf) (Hardy Jones) - My existing contributions and all future contributions until further notice are Copyright Hardy Jones, and are licensed to the owners and users of the PureScript compiler project under the terms of the MIT license.

34+- [@kika](https://github.com/kika) (Kirill Pertsev) - My existing contributions and all future contributions until further notice are Copyright Kirill Pertsev, and are licensed to the owners and users of the PureScript compiler project under the terms of the MIT license.

3435- [@kRITZCREEK](https://github.com/kRITZCREEK) (Christoph Hegemann) - My existing contributions and all future contributions until further notice are Copyright Christoph Hegemann, and are licensed to the owners and users of the PureScript compiler project under the terms of the MIT license.

3536- [@L8D](https://github.com/L8D) (Tenor Biel) My existing contributions and all future contributions until further notice are Copyright Tenor Biel, 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).

3637- [@leighman](http://github.com/leighman) (Jack Leigh) My existing contributions and all future contributions until further notice are Copyright Jack Leigh, 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).

@@ -70,6 +71,7 @@ This file lists the contributors to the PureScript compiler project, and the ter

7071- [@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).

7172- [@LiamGoodacre](https://github.com/LiamGoodacre) (Liam Goodacre) My existing contributions and all future contributions until further notice are Copyright Liam Goodacre, 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).

7273- [@bsermons](https://github.com/bsermons) (Brian Sermons) My existing contributions and all future contributions until further notice are Copyright Brian Sermons, 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).

74+- [@bmjames](https://github.com/bmjames) (Ben James) My existing contributions and all future contributions until further notice are Copyright Ben James, 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).

7375

7476### Companies

7577

core-tests/test-everything.sh+1−1

@@ -1,4 +1,4 @@

1−#!/bin/bash

1+#!/usr/bin/env bash

33set -e

examples/failing/2128-class.pursnew file+5

@@ -0,0 +1,5 @@

1+-- @shouldFailWith ErrorParsingModule

2+module Main where

4+class Foo a where

5+ foo :: a -> !!!

examples/failing/2128-instance.pursnew file+8

@@ -0,0 +1,8 @@

1+-- @shouldFailWith ErrorParsingModule

2+module Main where

4+class Foo a where

5+ foo :: a

7+instance fooInt :: Foo Int where

8+ foo = !!!

psc-ide-client/Main.hs+1−1

@@ -35,7 +35,7 @@ main = do

3535client :: PortID -> IO ()

3636client port = do

3737 h <-

38− connectTo "localhost" port `catch`

38+ connectTo "127.0.0.1" port `catch`

3939 (\(SomeException e) ->

4040 putStrLn

4141 ("Couldn't connect to psc-ide-server on port: " ++

psc-ide-server/Main.hs+5−3

@@ -40,10 +40,10 @@ import Language.PureScript.Ide.Util

4040import Language.PureScript.Ide.Error

4141import Language.PureScript.Ide.Types

4242import Language.PureScript.Ide.Watcher

43−import Network hiding (socketPort)

43+import Network hiding (socketPort, accept)

4444import Network.BSD (getProtocolNumber)

4545import Network.Socket hiding (PortNumber, Type,

46− accept, sClose)

46+ sClose)

4747import Options.Applicative

4848import System.Directory

4949import System.FilePath

@@ -167,7 +167,9 @@ acceptCommand sock = do

167167 pure (cmd, h)

168168 where

169169 acceptConnection = liftIO $ do

170− (h,_,_) <- accept sock

170+ -- Use low level accept to prevent accidental reverse name resolution

171+ (s,_) <- accept sock

172+ h <- socketToHandle s ReadWriteMode

171173 hSetEncoding h utf8

172174 hSetBuffering h LineBuffering

173175 pure h

src/Language/PureScript/Parser/Declarations.hs+2−2

@@ -182,7 +182,7 @@ parseTypeClassDeclaration = do

182182 return implies

183183 className <- indented *> properName

184184 idents <- P.many (indented *> kindedIdent)

185− members <- P.option [] . P.try $ do

185+ members <- P.option [] $ do

186186 indented *> reserved "where"

187187 indented *> mark (P.many (same *> positioned parseTypeDeclaration))

188188 return $ TypeClassDeclaration className idents implies members

@@ -206,7 +206,7 @@ parseInstanceDeclaration = do

206206parseTypeInstanceDeclaration :: TokenParser Declaration

207207parseTypeInstanceDeclaration = do

208208 instanceDecl <- parseInstanceDeclaration

209− members <- P.option [] . P.try $ do

209+ members <- P.option [] $ do

210210 indented *> reserved "where"

211211 mark (P.many (same *> positioned parseValueDeclaration))

212212 return $ instanceDecl (ExplicitInstance members)