Skip to content

Commit

Permalink
RFCT Make imports more explicit
Browse files Browse the repository at this point in the history
  • Loading branch information
luispedro committed Sep 14, 2022
1 parent 3d5ff14 commit 01ce5e0
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions Execs/Main.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{-# LANGUAGE PackageImports #-}
{- Copyright 2013-2022 NGLess Authors
- License: MIT
-}
Expand Down Expand Up @@ -33,8 +32,8 @@ module Main
-
-}

import Data.Maybe
import Control.Monad
import Data.Maybe (isJust, fromMaybe)
import Control.Monad (forM_, unless, when, void)
import Control.Monad.IO.Class (liftIO, MonadIO(..))
import Options.Applicative
import System.FilePath
Expand All @@ -55,25 +54,25 @@ import qualified Data.Text.IO as T
import qualified Data.Text.Encoding as T
import qualified Data.ByteString as B

import Interpret
import Interpret (interpret)
import JSONScript (writeScriptJSON)
import Validation
import ValidationIO
import Validation (validate, uses_STDOUT)
import ValidationIO (validateIO)
import Transform
import Language
import Types
import Parse
import Parse (parsengless)
import Configuration
import qualified Version
import ReferenceDatabases
import Output
import NGLess
import NGLess.NGError
import NGLess.NGLEnvironment
import Modules
import Modules (Module)
import qualified CmdArgs
import FileManagement
import StandardModules.NGLStdlib
import StandardModules.NGLStdlib (loadStdlibModules)
import Citations (collectCitations)
import Utils.Network
import Utils.Batch (getNcpus)
Expand Down Expand Up @@ -260,8 +259,8 @@ modeExec opts@CmdArgs.DefaultMode{} = do
setQuiet
outputListLno' DebugOutput ["Validating script..."]
errs <- validateIO modules sc
when (isJust errs) $ do
let errormessage = T.intercalate "\n\n" (fromJust errs)
whenJust errs $ \errs' -> do
let errormessage = T.intercalate "\n\n" errs'
liftIO $ fatalError (T.unpack errormessage)
when (CmdArgs.validateOnly opts) $ do
outputListLno' InfoOutput ["Script OK."]
Expand All @@ -285,7 +284,7 @@ modeExec opts@CmdArgs.DefaultMode{} = do
Left e -> case fromException e of
Just ec -> liftIO $ throwIO (ec :: ExitCode) -- rethrow
Nothing -> case fromException e of
Just e@NGError{} -> Control.Monad.Except.throwError e
Just nge@NGError{} -> Control.Monad.Except.throwError nge
Nothing -> do
outputListLno' ErrorOutput [show e]
liftIO $ do
Expand Down

0 comments on commit 01ce5e0

Please sign in to comment.