Style fixes and -Walls for a couple files.

This commit is contained in:
Max New 2014-01-13 09:21:39 -06:00
parent cf9d21b0c8
commit 0e40a32adc
2 changed files with 10 additions and 28 deletions

View file

@ -1,37 +1,25 @@
{-# OPTIONS_GHC -Wall -fno-warn-name-shadowing #-}
module Build.Dependencies (getSortedDependencies, readDeps) where
import Data.Data
import Control.Applicative
import Control.Monad.Error
import qualified Control.Monad.State as State
import qualified Data.Aeson as Json
import qualified Data.ByteString.Lazy.Char8 as BSC
import qualified Data.Char as Char
import qualified Data.Graph as Graph
import qualified Data.List as List
import qualified Data.Map as Map
import qualified Data.Maybe as Maybe
import qualified Data.Set as Set
import System.Directory
import System.Exit
import System.FilePath as FP
import System.IO
import Text.PrettyPrint (Doc)
import Build.Print (failure)
import qualified SourceSyntax.Module as Module
import qualified SourceSyntax.Type as Type
import qualified Parse.Parse as Parse
import qualified Metadata.Prelude as Prelude
import qualified Transform.Check as Check
import qualified Transform.SortDefinitions as SD
import qualified Type.Inference as TI
import qualified Type.Constrain.Declaration as TcDecl
import qualified Transform.Canonicalize as Canonical
import qualified Elm.Internal.Paths as Path
import qualified Elm.Internal.Name as N
import qualified Elm.Internal.Version as V
import qualified Elm.Internal.Dependencies as Deps
getSortedDependencies :: [FilePath] -> Module.Interfaces -> FilePath -> IO [String]
@ -125,13 +113,7 @@ findSrcFile dirs path = foldr tryDir notFound dirs
then return path'
else next
getFile (dir:dirs) path = do
let path' = dir </> path
exists <- liftIO $ doesFileExist path'
case exists of
True -> (,) path' `fmap` liftIO (readFile path')
False -> getFile dirs path
isNative :: String -> Bool
isNative name = List.isPrefixOf "Native." name
toFilePath :: String -> FilePath

View file

@ -1,17 +1,15 @@
{-# OPTIONS_GHC -Wall #-}
module Build.File (build) where
import Control.Applicative ((<$>), (<*>), pure)
import Control.Monad (when)
import Control.Applicative ((<$>))
import Control.Monad.Error (runErrorT)
import Control.Monad.RWS.Strict
import Data.Monoid (Last(..))
import System.Directory
import System.Exit
import System.FilePath
import System.IO
import qualified Data.Binary as Binary
import qualified Data.List as List
import qualified Data.Maybe as Maybe
import qualified Data.Map as Map
import qualified Data.ByteString.Lazy as L
@ -37,10 +35,11 @@ type Build a = BuildT IO a
type BInterfaces = Map.Map String (Bool, M.ModuleInterface)
evalBuild :: Flag.Flags -> M.Interfaces -> Build () -> IO (Maybe String)
evalBuild fs is b = do
(_, s) <- evalRWST b fs (fmap notUpdated is)
evalBuild flags interfaces b = do
(_, s) <- evalRWST b flags (fmap notUpdated interfaces)
return . getLast $ s
where notUpdated i = (False, i)
where
notUpdated i = (False, i)
-- | Builds a list of files, returning the moduleName of the last one.
-- Returns \"\" if the list is empty
@ -49,7 +48,8 @@ build flags is = fmap (Maybe.fromMaybe "") . evalBuild flags is . buildAll
buildAll :: [FilePath] -> Build ()
buildAll fs = mapM_ (uncurry build1) (zip [1..] fs)
where build1 num fname = do
where build1 :: Integer -> FilePath -> Build ()
build1 num fname = do
shouldCompile <- shouldBeCompiled fname
if shouldCompile
then compile number fname