Replace ghcError with throwGhcException #612

This commit is contained in:
Michael Snoyman 2013-10-15 10:33:45 +03:00
parent ad6e99d589
commit 0c386c9f46

View File

@ -39,7 +39,7 @@ import GHC.Paths (libdir)
import HscTypes (HscEnv (..), emptyHomePackageTable) import HscTypes (HscEnv (..), emptyHomePackageTable)
import qualified Module import qualified Module
import MonadUtils (liftIO) import MonadUtils (liftIO)
import Panic (ghcError, panic) import Panic (throwGhcException, panic)
import SrcLoc (Located, mkGeneralLocated) import SrcLoc (Located, mkGeneralLocated)
import qualified StaticFlags import qualified StaticFlags
import StaticFlags (v_Ld_inputs) import StaticFlags (v_Ld_inputs)
@ -234,7 +234,7 @@ parseModeFlags args = do
Nothing -> doMakeMode Nothing -> doMakeMode
Just (m, _) -> m Just (m, _) -> m
errs = errs1 ++ map (mkGeneralLocated "on the commandline") errs2 errs = errs1 ++ map (mkGeneralLocated "on the commandline") errs2
when (not (null errs)) $ ghcError $ errorsToGhcException errs when (not (null errs)) $ throwGhcException $ errorsToGhcException errs
return (mode, flags' ++ leftover, warns) return (mode, flags' ++ leftover, warns)
type ModeM = CmdLineP (Maybe (Mode, String), [String], [Located String]) type ModeM = CmdLineP (Maybe (Mode, String), [String], [Located String])