git.iko.soy/elk
on master help sign in
Style fixes and -Walls for a couple files.
commit0e40a32adc3c1e95146084c15c5ec0adda2c7332 authorMax New <maxsnew@gmail.com> dateMon 13 Jan 2014, 09:21 (13 years ago) parentcf9d21b
2 files changed+10−28
compare with master
unifiedsplit
compiler/Build/Dependencies.hs+2−20 compiler/Build/File.hs+8−8
compiler/Build/Dependencies.hs+2−20
@@ -1,37 +1,25 @@
1+{-# OPTIONS_GHC -Wall -fno-warn-name-shadowing #-}
12module Build.Dependencies (getSortedDependencies, readDeps) where
23
3−import Data.Data
44import Control.Applicative
55import Control.Monad.Error
66import qualified Control.Monad.State as State
77import qualified Data.Aeson as Json
88import qualified Data.ByteString.Lazy.Char8 as BSC
9−import qualified Data.Char as Char
109import qualified Data.Graph as Graph
1110import qualified Data.List as List
1211import qualified Data.Map as Map
1312import qualified Data.Maybe as Maybe
1413import qualified Data.Set as Set
1514import System.Directory
16−import System.Exit
1715import System.FilePath as FP
18−import System.IO
19−import Text.PrettyPrint (Doc)
2016
2117import Build.Print (failure)
2218
2319import qualified SourceSyntax.Module as Module
24−import qualified SourceSyntax.Type as Type
2520import qualified Parse.Parse as Parse
26−import qualified Metadata.Prelude as Prelude
27−import qualified Transform.Check as Check
28−import qualified Transform.SortDefinitions as SD
29−import qualified Type.Inference as TI
30−import qualified Type.Constrain.Declaration as TcDecl
31−import qualified Transform.Canonicalize as Canonical
3221import qualified Elm.Internal.Paths as Path
3322import qualified Elm.Internal.Name as N
34−import qualified Elm.Internal.Version as V
3523import qualified Elm.Internal.Dependencies as Deps
3624
3725getSortedDependencies :: [FilePath] -> Module.Interfaces -> FilePath -> IO [String]
@@ -125,13 +113,7 @@ findSrcFile dirs path = foldr tryDir notFound dirs
125113 then return path'
126114 else next
127115
128−getFile (dir:dirs) path = do
129− let path' = dir </> path
130− exists <- liftIO $ doesFileExist path'
131− case exists of
132− True -> (,) path' `fmap` liftIO (readFile path')
133− False -> getFile dirs path
134−
116+isNative :: String -> Bool
135117isNative name = List.isPrefixOf "Native." name
136118
137119toFilePath :: String -> FilePath
compiler/Build/File.hs+8−8
@@ -1,17 +1,15 @@
1+{-# OPTIONS_GHC -Wall #-}
12module Build.File (build) where
23
3−import Control.Applicative ((<$>), (<*>), pure)
4−import Control.Monad (when)
4+import Control.Applicative ((<$>))
55import Control.Monad.Error (runErrorT)
66import Control.Monad.RWS.Strict
7−import Data.Monoid (Last(..))
87import System.Directory
98import System.Exit
109import System.FilePath
1110import System.IO
1211
1312import qualified Data.Binary as Binary
14−import qualified Data.List as List
1513import qualified Data.Maybe as Maybe
1614import qualified Data.Map as Map
1715import qualified Data.ByteString.Lazy as L
@@ -37,10 +35,11 @@ type Build a = BuildT IO a
3735type BInterfaces = Map.Map String (Bool, M.ModuleInterface)
3836
3937evalBuild :: Flag.Flags -> M.Interfaces -> Build () -> IO (Maybe String)
40−evalBuild fs is b = do
41− (_, s) <- evalRWST b fs (fmap notUpdated is)
38+evalBuild flags interfaces b = do
39+ (_, s) <- evalRWST b flags (fmap notUpdated interfaces)
4240 return . getLast $ s
43− where notUpdated i = (False, i)
41+ where
42+ notUpdated i = (False, i)
4443
4544-- | Builds a list of files, returning the moduleName of the last one.
4645-- Returns \"\" if the list is empty
@@ -49,7 +48,8 @@ build flags is = fmap (Maybe.fromMaybe "") . evalBuild flags is . buildAll
4948
5049buildAll :: [FilePath] -> Build ()
5150buildAll fs = mapM_ (uncurry build1) (zip [1..] fs)
52− where build1 num fname = do
51+ where build1 :: Integer -> FilePath -> Build ()
52+ build1 num fname = do
5353 shouldCompile <- shouldBeCompiled fname
5454 if shouldCompile
5555 then compile number fname