git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Delinting again
commit80fc5f5f379fddaefab958ffa97be2658e31eb43 authorGary Burgess <gary.burgess@gmail.com> dateThu 27 Feb 2014, 16:12 (13 years ago) parent3b12e0b
3 files changed+9−9
src/Language/PureScript/Sugar/Names.hs+2−2 src/Language/PureScript/TypeChecker.hs+2−2 src/Language/PureScript/TypeChecker/Monad.hs+5−5
src/Language/PureScript/Sugar/Names.hs+2−2
@@ -54,8 +54,8 @@ addTypeclass env mn id = env { exportedTypeClasses = M.insertWith addExport mn (
5454addExport :: (Ord s, Show s) => S.Set s -> S.Set s -> S.Set s
5555addExport new old =
5656 if null overlap
57− then S.union new old
58− else error $ (show $ head overlap) ++ " has already been defined"
57+ then new `S.union` old
58+ else error $ show (head overlap) ++ " has already been defined"
5959 where overlap = S.toList $ S.intersection new old
6060
6161rename :: [Module] -> Either String [Module]
src/Language/PureScript/TypeChecker.hs+2−2
@@ -111,9 +111,9 @@ typeCheckAll mainModuleName moduleName (d@(DataBindingGroupDeclaration tys) : re
111111 let syns = mapMaybe toTypeSynonym tys
112112 let dataDecls = mapMaybe toDataDecl tys
113113 (syn_ks, data_ks) <- kindsOfAll moduleName syns (map (\(name, args, dctors) -> (name, args, concatMap snd dctors)) dataDecls)
114− forM_ (zip dataDecls data_ks) $ \((name, args, dctors), ctorKind) -> do
114+ forM_ (zip dataDecls data_ks) $ \((name, args, dctors), ctorKind) ->
115115 addDataType moduleName name args dctors ctorKind
116− forM_ (zip syns syn_ks) $ \((name, args, ty), kind) -> do
116+ forM_ (zip syns syn_ks) $ \((name, args, ty), kind) ->
117117 addTypeSynonym moduleName name args ty kind
118118 ds <- typeCheckAll mainModuleName moduleName rest
119119 return $ d : ds
src/Language/PureScript/TypeChecker/Monad.hs+5−5
@@ -91,11 +91,11 @@ data Environment = Environment {
9191-- The basic types existing in the external javascript environment
9292--
9393jsTypes ::M.Map (Qualified ProperName) Kind
94−jsTypes = M.fromList [ (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "Function"), (FunKind Star (FunKind Star Star)))
95− , (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "Array"), (FunKind Star Star))
96− , (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "String"), (Star))
97− , (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "Number"), (Star))
98− , (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "Boolean"), (Star)) ]
94+jsTypes = M.fromList [ (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "Function"), FunKind Star (FunKind Star Star))
95+ , (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "Array"), FunKind Star Star)
96+ , (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "String"), Star)
97+ , (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "Number"), Star)
98+ , (Qualified (Just $ ModuleName [ProperName "Prim"]) (ProperName "Boolean"), Star) ]
9999
100100-- |
101101-- The initial environment with no values and only the default javascript types defined