Apply few more automatic refactorings

phadej · phadej · commit fb13db912a1a · 2015-11-09T00:26:29.000+02:00
diff --git a/src/Language/PureScript.hs b/src/Language/PureScript.hs
@@ -15,7 +15,6 @@
 
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Language.PureScript
diff --git a/src/Language/PureScript/Bundle.hs b/src/Language/PureScript/Bundle.hs
@@ -19,7 +19,6 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
-{-# LANGUAGE RecordWildCards #-}
 
 module Language.PureScript.Bundle (
      bundle
@@ -531,7 +530,7 @@ codeGen optionsMainModule optionsNamespace ms = renderToString (NN (JSSourceElem
 -- | The bundling function.
 -- This function performs dead code elimination, filters empty modules
 -- and generates and prints the final Javascript bundle.
-bundle :: forall m. (Applicative m, MonadError ErrorMessage m)
+bundle :: (Applicative m, MonadError ErrorMessage m)
        => [(ModuleIdentifier, String)] -- ^ The input modules.  Each module should be javascript rendered from 'Language.PureScript.Make' or @psc@.
        -> [ModuleIdentifier] -- ^ Entry points.  These module identifiers are used as the roots for dead-code elimination
        -> Maybe String -- ^ An optional main module.
diff --git a/src/Language/PureScript/Docs/Render.hs b/src/Language/PureScript/Docs/Render.hs
@@ -49,9 +49,7 @@ renderDeclarationWithOptions opts Declaration{..} =
       [ keywordClass ]
       ++ maybeToList superclasses
       ++ [renderType' (typeApp declTitle args)]
-      ++ if any (isTypeClassMember . cdeclInfo) declChildren
-            then [keywordWhere]
-            else []
+      ++ [keywordWhere | any (isTypeClassMember . cdeclInfo) declChildren]
 
       where
       superclasses
diff --git a/src/Language/PureScript/Linter.hs b/src/Language/PureScript/Linter.hs
@@ -12,7 +12,6 @@
 --
 -----------------------------------------------------------------------------
 
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
diff --git a/src/Language/PureScript/Parser/Lexer.hs b/src/Language/PureScript/Parser/Lexer.hs
@@ -158,7 +158,7 @@ instance Show PositionedToken where
   show = prettyPrintToken . ptToken
 
 lex :: FilePath -> String -> Either P.ParseError [PositionedToken]
-lex filePath input = P.parse parseTokens filePath input
+lex = P.parse parseTokens
 
 parseTokens :: P.Parsec String u [PositionedToken]
 parseTokens = whitespace *> P.many parsePositionedToken <* P.skipMany parseComment <* P.eof
diff --git a/src/Language/PureScript/Pretty/Types.hs b/src/Language/PureScript/Pretty/Types.hs
@@ -133,7 +133,7 @@ matchType = buildPrettyPrinter operators matchTypeAtom
                     ]
                   , [ Wrap constrained $ \deps ty -> constraintsAsBox deps ty ]
                   , [ Wrap forall_ $ \idents ty -> text ("forall " ++ unwords idents ++ ". ") <> ty ]
-                  , [ Wrap kinded $ \k ty -> ty `before` (text (" :: " ++ prettyPrintKind k)) ]
+                  , [ Wrap kinded $ \k ty -> ty `before` text (" :: " ++ prettyPrintKind k) ]
                   ]
 
 forall_ :: Pattern () Type ([String], Type)
diff --git a/src/Language/PureScript/Sugar/TypeClasses/Deriving.hs b/src/Language/PureScript/Sugar/TypeClasses/Deriving.hs
@@ -168,7 +168,7 @@ mkFromSpineFunction mn (DataDeclaration _ _ _ args) = lamCase "$x" <$> (addCatch
     return $ CaseAlternative [ prodBinder [ StringBinder (runProperName ctorName), ArrayBinder (map VarBinder idents)]]
                . Right
                $ liftApplicative (mkJust $ Constructor (Qualified (Just mn) ctorName))
-                                 (zipWith fromSpineFun (map (Var . (Qualified Nothing)) idents) tys)
+                                 (zipWith fromSpineFun (map (Var . Qualified Nothing) idents) tys)
 
   addCatch :: [CaseAlternative] -> [CaseAlternative]
   addCatch = (++ [catchAll])
@@ -191,7 +191,7 @@ mkFromSpineFunction mn (DataDeclaration _ _ _ args) = lamCase "$x" <$> (addCatch
                    $ liftApplicative (mkRecFun rs) (map (\(x, y) -> fromSpineFun (Accessor "recValue" (mkVar x)) y) rs)
 
   mkRecFun :: [(String, Type)] -> Expr
-  mkRecFun xs = mkJust $ foldr (\s e -> lam s e) recLiteral (map fst xs)
+  mkRecFun xs = mkJust $ foldr lam recLiteral (map fst xs)
      where recLiteral = ObjectLiteral $ map (\(s,_) -> (s,mkVar s)) xs
 mkFromSpineFunction mn (PositionedDeclaration _ _ d) = mkFromSpineFunction mn d
 mkFromSpineFunction _ _ = internalError "mkFromSpineFunction: expected DataDeclaration"
@@ -218,13 +218,13 @@ mkVarMn :: Maybe ModuleName -> String -> Expr
 mkVarMn mn s = Var (Qualified mn (Ident s))
 
 mkVar :: String -> Expr
-mkVar s = mkVarMn Nothing s
+mkVar = mkVarMn Nothing
 
 mkPrelVar :: String -> Expr
-mkPrelVar s = mkVarMn (Just (ModuleName [ProperName C.prelude])) s
+mkPrelVar = mkVarMn (Just (ModuleName [ProperName C.prelude]))
 
 mkGenVar :: String -> Expr
-mkGenVar s = mkVarMn (Just (ModuleName [ProperName "Data", ProperName C.generic])) s
+mkGenVar = mkVarMn (Just (ModuleName [ProperName "Data", ProperName C.generic]))
 
 decomposeRec :: Type -> [(String, Type)]
 decomposeRec = sortBy (comparing fst) . go

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ matchType = buildPrettyPrinter operators matchTypeAtom`
`133`	`133`	`]`
`134`	`134`	`, [ Wrap constrained $ \deps ty -> constraintsAsBox deps ty ]`
`135`	`135`	`, [ Wrap forall_ $ \idents ty -> text ("forall " ++ unwords idents ++ ". ") <> ty ]`
`136`		- , [ Wrap kinded $ \k ty -> ty `before` (text (" :: " ++ prettyPrintKind k)) ]
	`136`	+ , [ Wrap kinded $ \k ty -> ty `before` text (" :: " ++ prettyPrintKind k) ]
`137`	`137`	`]`
`138`	`138`
`139`	`139`	`forall_ :: Pattern () Type ([String], Type)`