e716ea5 · rowtype-yoga/purescript-native

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

Travis tweaks (#2178)

* Build haddock --fast * Use Stackage LTS-6.1 * Add build-job for ghc 8.0 * Fix GHC-8.0 warnings

commite716ea5027592b1b86a7aa766cbf525731f7bcc9 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSun 5 Jun 2016, 21:24 (10 years ago) parent3154b24

24 files changed+54−51

compare with golang

unifiedsplit

.travis.yml+6

@@ -21,6 +21,12 @@ matrix:

2121 # env: BUILD_TYPE=normal STACKAGE_NIGHTLY=true

2222 # allow_failures: true

2323

24+ - compiler: cc-linux-ghc8.0-normal

25+ os: linux

26+ dist: trusty

27+ sudo: required

28+ env: BUILD_TYPE=normal STACK_YAML=stack-ghc-8.0.yaml

29+

2430 - compiler: cc-linux-lts-sdist

2531 os: linux

2632 dist: trusty

src/Language/PureScript/AST/Declarations.hs+3

@@ -218,7 +218,10 @@ data ValueFixity = ValueFixity Fixity (Qualified (Either Ident (ProperName 'Cons

218218data TypeFixity = TypeFixity Fixity (Qualified (ProperName 'TypeName)) (OpName 'TypeOpName)

219219 deriving (Eq, Ord, Show, Read)

220220

221+pattern ValueFixityDeclaration :: Fixity -> Qualified (Either Ident (ProperName 'ConstructorName)) -> OpName 'ValueOpName -> Declaration

221222pattern ValueFixityDeclaration fixity name op = FixityDeclaration (Left (ValueFixity fixity name op))

223+

224+pattern TypeFixityDeclaration :: Fixity -> Qualified (ProperName 'TypeName) -> OpName 'TypeOpName -> Declaration

222225pattern TypeFixityDeclaration fixity name op = FixityDeclaration (Right (TypeFixity fixity name op))

223226

224227-- | The members of a type class instance declaration

src/Language/PureScript/CodeGen/JS/Optimizer.hs+2−2

@@ -39,12 +39,12 @@ import qualified Language.PureScript.Constants as C

3939-- |

4040-- Apply a series of optimizer passes to simplified Javascript code

4141--

42−optimize :: (Monad m, MonadReader Options m, MonadSupply m) => JS -> m JS

42+optimize :: (MonadReader Options m, MonadSupply m) => JS -> m JS

4343optimize js = do

4444 noOpt <- asks optionsNoOptimizations

4545 if noOpt then return js else optimize' js

4646

47−optimize' :: (Monad m, MonadReader Options m, MonadSupply m) => JS -> m JS

47+optimize' :: (MonadReader Options m, MonadSupply m) => JS -> m JS

4848optimize' js = do

4949 opts <- ask

5050 js' <- untilFixedPoint (inlineFnComposition . tidyUp . applyAll

src/Language/PureScript/Docs/ParseAndBookmark.hs+1−1

@@ -44,7 +44,7 @@ parseAndBookmark inputFiles depsFiles = do

4444 addBookmarks <$> parseFiles (inputFiles' ++ depsFiles')

4545

4646parseFiles ::

47− (MonadError P.MultipleErrors m, MonadIO m) =>

47+ (MonadError P.MultipleErrors m) =>

4848 [(FileInfo, FilePath)]

4949 -> m [(FileInfo, P.Module)]

5050parseFiles =

src/Language/PureScript/Ide.hs+6−6

@@ -94,24 +94,24 @@ handleCommand Cwd =

9494handleCommand Reset = resetPscIdeState *> pure (TextResult "State has been reset.")

9595handleCommand Quit = liftIO exitSuccess

9696

97−findCompletions :: (PscIde m, MonadLogger m) =>

97+findCompletions :: (PscIde m) =>

9898 [Filter] -> Matcher -> Maybe P.ModuleName -> m Success

9999findCompletions filters matcher currentModule = do

100100 modules <- getAllModulesWithReexportsAndCache currentModule

101101 pure . CompletionResult . mapMaybe completionFromMatch . getCompletions filters matcher $ modules

102102

103−findType :: (PscIde m, MonadLogger m) =>

103+findType :: (PscIde m) =>

104104 DeclIdent -> [Filter] -> Maybe P.ModuleName -> m Success

105105findType search filters currentModule = do

106106 modules <- getAllModulesWithReexportsAndCache currentModule

107107 pure . CompletionResult . mapMaybe completionFromMatch . getExactMatches search filters $ modules

108108

109−findPursuitCompletions :: (MonadIO m, MonadLogger m) =>

109+findPursuitCompletions :: (MonadIO m) =>

110110 PursuitQuery -> m Success

111111findPursuitCompletions (PursuitQuery q) =

112112 PursuitResult <$> liftIO (searchPursuitForDeclarations q)

113113

114−findPursuitPackages :: (MonadIO m, MonadLogger m) =>

114+findPursuitPackages :: (MonadIO m) =>

115115 PursuitQuery -> m Success

116116findPursuitPackages (PursuitQuery q) =

117117 PursuitResult <$> liftIO (findPackagesForModuleIdent q)

@@ -141,7 +141,7 @@ listAvailableModules' dirs =

141141 let cleanedModules = filter (`notElem` [".", ".."]) dirs

142142 in map T.pack cleanedModules

143143

144−caseSplit :: (PscIde m, MonadLogger m, MonadError PscIdeError m) =>

144+caseSplit :: (PscIde m, MonadError PscIdeError m) =>

145145 Text -> Int -> Int -> CS.WildcardAnnotations -> Text -> m Success

146146caseSplit l b e csa t = do

147147 patterns <- CS.makePattern l b e csa <$> CS.caseSplit t

@@ -150,7 +150,7 @@ caseSplit l b e csa t = do

150150addClause :: Text -> CS.WildcardAnnotations -> Success

151151addClause t wca = MultilineTextResult (CS.addClause t wca)

152152

153−importsForFile :: (MonadIO m, MonadLogger m, MonadError PscIdeError m) =>

153+importsForFile :: (MonadIO m, MonadError PscIdeError m) =>

154154 FilePath -> m Success

155155importsForFile fp = do

156156 imports <- getImportsForFile fp

src/Language/PureScript/Ide/CaseSplit.hs+2−4

@@ -13,7 +13,6 @@

1313-----------------------------------------------------------------------------

1414

1515{-# LANGUAGE OverloadedStrings #-}

16−{-# LANGUAGE PackageImports #-}

1716

1817module Language.PureScript.Ide.CaseSplit

1918 ( WildcardAnnotations()

@@ -29,7 +28,6 @@ import Prelude.Compat hiding (lex)

2928

3029import Control.Arrow (second)

3130import Control.Monad.Error.Class

32−import "monad-logger" Control.Monad.Logger

3331import Data.List (find)

3432import Data.Monoid

3533import Data.Text (Text)

@@ -55,7 +53,7 @@ explicitAnnotations = WildcardAnnotations True

5553noAnnotations :: WildcardAnnotations

5654noAnnotations = WildcardAnnotations False

5755

58−caseSplit :: (PscIde m, MonadLogger m, MonadError PscIdeError m) =>

56+caseSplit :: (PscIde m, MonadError PscIdeError m) =>

5957 Text -> m [Constructor]

6058caseSplit q = do

6159 type' <- parseType' (T.unpack q)

@@ -65,7 +63,7 @@ caseSplit q = do

6563 let appliedCtors = map (second (map applyTypeVars)) ctors

6664 pure appliedCtors

6765

68−findTypeDeclaration :: (PscIde m, MonadLogger m, MonadError PscIdeError m) =>

66+findTypeDeclaration :: (PscIde m, MonadError PscIdeError m) =>

6967 P.ProperName 'P.TypeName -> m ExternsDeclaration

7068findTypeDeclaration q = do

7169 efs <- getExternFiles

src/Language/PureScript/Ide/Imports.hs+2−4

@@ -13,7 +13,6 @@

1313-----------------------------------------------------------------------------

1414

1515{-# LANGUAGE OverloadedStrings #-}

16−{-# LANGUAGE PackageImports #-}

1716

1817module Language.PureScript.Ide.Imports

1918 ( addImplicitImport

@@ -34,7 +33,6 @@ import Prelude.Compat

3433import Control.Applicative ((<|>))

3534import Control.Monad.Error.Class

3635import Control.Monad.IO.Class

37−import "monad-logger" Control.Monad.Logger

3836import Data.Bifunctor (first, second)

3937import Data.Function (on)

4038import qualified Data.List as List

@@ -182,7 +180,7 @@ addImplicitImport' imports mn =

182180-- So @addExplicitImport "/File.purs" "bind" "Prelude"@ with an already existing

183181-- @import Prelude (bind)@ in the file File.purs returns @["import Prelude

184182-- (bind, unit)"]@

185−addExplicitImport :: (MonadIO m, MonadError PscIdeError m, MonadLogger m) =>

183+addExplicitImport :: (MonadIO m, MonadError PscIdeError m) =>

186184 FilePath -> ExternDecl -> P.ModuleName -> m [Text]

187185addExplicitImport fp decl moduleName = do

188186 (mn, pre, imports, post) <- parseImportsFromFile fp

@@ -265,7 +263,7 @@ updateAtFirstOrPrepend p t d l =

265263--

266264-- * If more than one possible imports are found, reports the possibilities as a

267265-- list of completions.

268−addImportForIdentifier :: (PscIde m, MonadError PscIdeError m, MonadLogger m)

266+addImportForIdentifier :: (PscIde m, MonadError PscIdeError m)

269267 => FilePath -- ^ The Sourcefile to read from

270268 -> Text -- ^ The identifier to import

271269 -> [Filter] -- ^ Filters to apply before searching for

src/Language/PureScript/Ide/State.hs+1−1

@@ -91,7 +91,7 @@ getAllModulesWithReexportsAndCache (Just mn) = do

9191 _ -> getAllModulesWithReexports

9292

9393-- | Looks up a single Module inside the loaded Modules

94−getModule :: (PscIde m, MonadLogger m) => ModuleIdent -> m (Maybe Module)

94+getModule :: (PscIde m) => ModuleIdent -> m (Maybe Module)

9595getModule m = getModule' <$> getPscIdeState <*> pure m

9696

9797-- | Pure version of @getModule@

src/Language/PureScript/Linter/Exhaustive.hs+2−2

@@ -140,7 +140,7 @@ missingCasesSingle env mn (LiteralBinder (ObjectLiteral bs)) (LiteralBinder (Obj

140140 where

141141 fm = fromMaybe e

142142

143− compBS :: Eq a => b -> a -> Maybe b -> Maybe b -> (a, (b, b))

143+ compBS :: b -> a -> Maybe b -> Maybe b -> (a, (b, b))

144144 compBS e s b b' = (s, compB e b b')

145145

146146 (sortedNames, binders) = unzip $ genericMerge (compBS NullBinder) sbs sbs'

@@ -274,7 +274,7 @@ checkExhaustive env mn numArgs cas expr = makeResult . first nub $ foldl' step (

274274 --

275275 -- The binder information is provided so that it can be embedded in the constraint,

276276 -- and then included in the error message.

277− addPartialConstraint :: MonadSupply m => ([[Binder]], Bool) -> Expr -> m Expr

277+ addPartialConstraint :: ([[Binder]], Bool) -> Expr -> m Expr

278278 addPartialConstraint (bss, complete) e = do

279279 tyVar <- ("p" ++) . show <$> fresh

280280 var <- freshName

src/Language/PureScript/Linter/Imports.hs+1−2

@@ -169,8 +169,7 @@ lintImports (Module ss _ mn mdecls (Just mexports)) env usedImps = do

169169 go (q, name) = M.alter (Just . maybe [name] (name :)) q

170170

171171 extractByQual

172− :: Eq a

173− => ModuleName

172+ :: ModuleName

174173 -> M.Map (Qualified a) [ImportRecord a]

175174 -> (a -> Name)

176175 -> [(ModuleName, Qualified Name)]

src/Language/PureScript/Make.hs+2−2

@@ -132,7 +132,7 @@ data RebuildPolicy

132132 | RebuildAlways deriving (Show, Read, Eq, Ord)

133133

134134-- | Rebuild a single module

135−rebuildModule :: forall m. (Monad m, MonadBaseControl IO m, MonadReader Options m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)

135+rebuildModule :: forall m. (Monad m, MonadBaseControl IO m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)

136136 => MakeActions m

137137 -> [ExternsFile]

138138 -> Module

@@ -159,7 +159,7 @@ rebuildModule MakeActions{..} externs m@(Module _ _ moduleName _ _) = do

159159-- If timestamps have not changed, the externs file can be used to provide the module's types without

160160-- having to typecheck the module again.

161161--

162−make :: forall m. (Monad m, MonadBaseControl IO m, MonadReader Options m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)

162+make :: forall m. (Monad m, MonadBaseControl IO m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)

163163 => MakeActions m

164164 -> [Module]

165165 -> m [ExternsFile]

src/Language/PureScript/Parser/Common.hs+1−1

@@ -72,7 +72,7 @@ augment p q f = flip (maybe id $ flip f) <$> p <*> P.optionMaybe q

7272-- |

7373-- Run the first parser, then match the second zero or more times, applying the specified function for each match

7474--

75−fold :: P.Stream s m t => P.ParsecT s u m a -> P.ParsecT s u m b -> (a -> b -> a) -> P.ParsecT s u m a

75+fold :: P.ParsecT s u m a -> P.ParsecT s u m b -> (a -> b -> a) -> P.ParsecT s u m a

7676fold first more combine = do

7777 a <- first

7878 bs <- P.many more

src/Language/PureScript/Pretty/Common.hs+1−1

@@ -114,7 +114,7 @@ blockIndent = 4

114114-- |

115115-- Pretty print with a new indentation level

116116--

117−withIndent :: (Emit gen) => StateT PrinterState Maybe gen -> StateT PrinterState Maybe gen

117+withIndent :: StateT PrinterState Maybe gen -> StateT PrinterState Maybe gen

118118withIndent action = do

119119 modify $ \st -> st { indent = indent st + blockIndent }

120120 result <- action

src/Language/PureScript/Sugar/CaseDeclarations.hs+1−1

@@ -144,7 +144,7 @@ toTuple (ValueDeclaration _ _ bs result) = (bs, result)

144144toTuple (PositionedDeclaration _ _ d) = toTuple d

145145toTuple _ = internalError "Not a value declaration"

146146

147−makeCaseDeclaration :: forall m. (MonadSupply m, MonadError MultipleErrors m) => Ident -> [([Binder], Either [(Guard, Expr)] Expr)] -> m Declaration

147+makeCaseDeclaration :: forall m. (MonadSupply m) => Ident -> [([Binder], Either [(Guard, Expr)] Expr)] -> m Declaration

148148makeCaseDeclaration ident alternatives = do

149149 let namedArgs = map findName . fst <$> alternatives

150150 argNames = foldl1 resolveNames namedArgs

src/Language/PureScript/Sugar/Names.hs+1−1

@@ -292,7 +292,7 @@ renameInModule imports (Module ss coms mn decls exps) =

292292 -- qualified references are replaced with their canoncial qualified names

293293 -- (e.g. M.Map -> Data.Map.Map).

294294 update

295− :: (Ord a, Show a)

295+ :: (Ord a)

296296 => M.Map (Qualified a) [ImportRecord a]

297297 -> (a -> Name)

298298 -> Qualified a

src/Language/PureScript/Sugar/Names/Env.hs+1−1

@@ -375,7 +375,7 @@ getExports env mn =

375375--

376376checkImportConflicts

377377 :: forall m a

378− . (Show a, MonadError MultipleErrors m, MonadWriter MultipleErrors m, Ord a)

378+ . (MonadError MultipleErrors m, MonadWriter MultipleErrors m)

379379 => ModuleName

380380 -> (a -> Name)

381381 -> [ImportRecord a]

src/Language/PureScript/Sugar/Names/Exports.hs+1−2

@@ -117,8 +117,7 @@ resolveExports env ss mn imps exps refs =

117117 -- Extracts a list of values for a module based on a lookup table. If the

118118 -- boolean is true the values are filtered by the qualification

119119 extract

120− :: (Show a, Ord a)

121− => Bool

120+ :: Bool

122121 -> ModuleName

123122 -> (a -> Name)

124123 -> M.Map (Qualified a) [ImportRecord a]

src/Language/PureScript/TypeChecker.hs+8−8

@@ -53,7 +53,7 @@ addDataType moduleName dtype name args dctors ctorKind = do

5353 addDataConstructor moduleName dtype name (map fst args) dctor tys

5454

5555addDataConstructor

56− :: (MonadState CheckState m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)

56+ :: (MonadState CheckState m, MonadError MultipleErrors m)

5757 => ModuleName

5858 -> DataDeclType

5959 -> ProperName 'TypeName

@@ -71,7 +71,7 @@ addDataConstructor moduleName dtype name args dctor tys = do

7171 putEnv $ env { dataConstructors = M.insert (Qualified (Just moduleName) dctor) (dtype, name, polyType, fields) (dataConstructors env) }

7272

7373addTypeSynonym

74− :: (MonadState CheckState m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)

74+ :: (MonadState CheckState m, MonadError MultipleErrors m)

7575 => ModuleName

7676 -> ProperName 'TypeName

7777 -> [(String, Maybe Kind)]

@@ -85,7 +85,7 @@ addTypeSynonym moduleName name args ty kind = do

8585 , typeSynonyms = M.insert (Qualified (Just moduleName) name) (args, ty) (typeSynonyms env) }

8686

8787valueIsNotDefined

88− :: (MonadState CheckState m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)

88+ :: (MonadState CheckState m, MonadError MultipleErrors m)

8989 => ModuleName

9090 -> Ident

9191 -> m ()

@@ -96,7 +96,7 @@ valueIsNotDefined moduleName name = do

9696 Nothing -> return ()

9797

9898addValue

99− :: (MonadState CheckState m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)

99+ :: (MonadState CheckState m)

100100 => ModuleName

101101 -> Ident

102102 -> Type

@@ -107,7 +107,7 @@ addValue moduleName name ty nameKind = do

107107 putEnv (env { names = M.insert (moduleName, name) (ty, nameKind, Defined) (names env) })

108108

109109addTypeClass

110− :: (MonadState CheckState m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)

110+ :: (MonadState CheckState m)

111111 => ModuleName

112112 -> ProperName 'ClassName

113113 -> [(String, Maybe Kind)]

@@ -123,7 +123,7 @@ addTypeClass moduleName pn args implies ds =

123123 toPair _ = internalError "Invalid declaration in TypeClassDeclaration"

124124

125125addTypeClassDictionaries

126− :: (MonadState CheckState m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)

126+ :: (MonadState CheckState m)

127127 => Maybe ModuleName

128128 -> M.Map (Qualified (ProperName 'ClassName)) (M.Map (Qualified Ident) TypeClassDictionaryInScope)

129129 -> m ()

@@ -132,7 +132,7 @@ addTypeClassDictionaries mn entries =

132132 where insertState st = M.insertWith (M.unionWith M.union) mn entries (typeClassDictionaries . checkEnv $ st)

133133

134134checkDuplicateTypeArguments

135− :: (MonadState CheckState m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)

135+ :: (MonadState CheckState m, MonadError MultipleErrors m)

136136 => [String]

137137 -> m ()

138138checkDuplicateTypeArguments args = for_ firstDup $ \dup ->

@@ -159,7 +159,7 @@ checkTypeClassInstance _ ty = throwError . errorMessage $ InvalidInstanceHead ty

159159-- Check that type synonyms are fully-applied in a type

160160--

161161checkTypeSynonyms

162− :: (MonadState CheckState m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)

162+ :: (MonadState CheckState m, MonadError MultipleErrors m)

163163 => Type

164164 -> m ()

165165checkTypeSynonyms = void . replaceAllTypeSynonyms

src/Language/PureScript/TypeChecker/Rows.hs+1−3

@@ -9,17 +9,15 @@ import Prelude.Compat

1010import Control.Monad

1111import Control.Monad.Error.Class (MonadError(..))

12−import Control.Monad.State.Class (MonadState(..))

1312

1413import Data.List

1514

1615import Language.PureScript.AST

1716import Language.PureScript.Errors

18−import Language.PureScript.TypeChecker.Monad

1917import Language.PureScript.Types

2018

2119-- | Ensure rows do not contain duplicate labels

22−checkDuplicateLabels :: forall m. (MonadError MultipleErrors m, MonadState CheckState m) => Expr -> m ()

20+checkDuplicateLabels :: forall m. (MonadError MultipleErrors m) => Expr -> m ()

2321checkDuplicateLabels =

2422 let (_, f, _) = everywhereOnValuesM def go def

2523 in void . f

src/Language/PureScript/TypeChecker/Skolems.hs+1−1

@@ -89,7 +89,7 @@ skolemizeTypesInValue ident sko scope ss =

8989-- |

9090-- Ensure skolem variables do not escape their scope

9191--

92−skolemEscapeCheck :: (MonadError MultipleErrors m, MonadState CheckState m) => Expr -> m ()

92+skolemEscapeCheck :: (MonadError MultipleErrors m) => Expr -> m ()

9393skolemEscapeCheck (TypedValue False _ _) = return ()

9494skolemEscapeCheck root@TypedValue{} =

9595 -- Every skolem variable is created when a ForAll type is skolemized.

src/Language/PureScript/TypeChecker/Types.hs+2−2

@@ -133,7 +133,7 @@ type TypeData = M.Map (ModuleName, Ident) (Type, NameKind, NameVisibility)

133133type UntypedData = [(Ident, Type)]

134134

135135typeDictionaryForBindingGroup ::

136− (MonadState CheckState m, MonadError MultipleErrors m, MonadWriter MultipleErrors m) =>

136+ (MonadState CheckState m) =>

137137 ModuleName ->

138138 [(Ident, Expr)] ->

139139 m ([(Ident, Expr)], [(Ident, (Expr, Type, Bool))], TypeData, UntypedData)

@@ -206,7 +206,7 @@ overTypes f = let (_, f', _) = everywhereOnValues id g id in f'

206206

207207-- | Check the kind of a type, failing if it is not of kind *.

208208checkTypeKind ::

209− (MonadState CheckState m, MonadError MultipleErrors m) =>

209+ (MonadError MultipleErrors m) =>

210210 Type ->

211211 Kind ->

212212 m ()

stack-ghc-8.0.yamlnew file+5

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

1+resolver: nightly-2016-05-29

2+packages:

3+- '.'

4+extra-deps:

5+- pipes-http-1.0.2

stack.yaml+2−5

@@ -1,8 +1,5 @@

1−resolver: lts-5.4

1+resolver: lts-6.1

22packages:

33- '.'

4−extra-deps:

5−- bower-json-0.8.0

6−- language-javascript-0.6.0.4

7−- parsec-3.1.11

4+extra-deps: []

85flags: {}

travis/build.sh+1−1

@@ -45,7 +45,7 @@ then

4545elif [ "$BUILD_TYPE" = "haddock" ]

4646then

4747 echo ">>> Checking haddock documentation..."

48− $STACK haddock

48+ $STACK haddock --fast

4949else

5050 echo "Unrecognised BUILD_TYPE: $BUILD_TYPE"

5151 exit 1