Commit 766b34f8 authored by Thomas Schilling's avatar Thomas Schilling

Let parseModule take a ModSummary like checkAndLoadModule did.

To get the ModSummary for a ModuleName getModSummary can be used.
It's not called find* or lookup* because it assumes that the module is
in the module graph and throws an exception if it cannot be found.
Overall, I'm not quite sure about the usefulness of this function
since the user has no control about which filetype to grab (hs or
hs-boot).
parent d4be0e20
......@@ -1083,7 +1083,7 @@ checkModule m = do
let modl = GHC.mkModuleName m
prev_context <- GHC.getContext
ok <- handleSourceError (\e -> GHC.printExceptionAndWarnings e >> return False) $ do
r <- GHC.typecheckModule =<< GHC.parseModule modl
r <- GHC.typecheckModule =<< GHC.parseModule =<< GHC.getModSummary modl
io $ putStrLn (showSDoc (
case GHC.moduleInfo r of
cm | Just scope <- GHC.modInfoTopLevelScope cm ->
......
......@@ -303,7 +303,7 @@ mkIface_ hsc_env maybe_old_fingerprint
, isNothing (ifRuleOrph r) ]
; when (not (isEmptyBag orph_warnings))
(do { printErrorsAndWarnings dflags errs_and_warns
(do { printErrorsAndWarnings dflags errs_and_warns -- XXX
; when (errorsFound dflags errs_and_warns)
(exitWith (ExitFailure 1)) })
......
......@@ -53,6 +53,7 @@ module GHC (
parsedSource, coreModule,
compileToCoreModule, compileToCoreSimplified,
compileCoreToObj,
getModSummary,
-- * Parsing Haddock comments
parseHaddockComment,
......@@ -1013,6 +1014,14 @@ type TypecheckedSource = LHsBinds Id
-- - default methods are turned into top-level decls.
-- - dictionary bindings
-- | Return the 'ModSummary' of a module with the given name.
--
-- The module must be part of the module graph (see 'hsc_mod_graph' and
-- 'ModuleGraph'). If this is not the case, this function will throw an
-- 'GhcApiError'.
--
-- Note that the module graph may contain several 'ModSummary's matching the
-- same name (for example both a @.hs@ and a @.hs-boot@).
getModSummary :: GhcMonad m => ModuleName -> m ModSummary
getModSummary mod = do
mg <- liftM hsc_mod_graph getSession
......@@ -1023,9 +1032,8 @@ getModSummary mod = do
-- | Parse a module.
--
-- Throws a 'SourceError' on parse error.
parseModule :: GhcMonad m => ModuleName -> m ParsedModule
parseModule mod = do
ms <- getModSummary mod
parseModule :: GhcMonad m => ModSummary -> m ParsedModule
parseModule ms = do
hsc_env0 <- getSession
let hsc_env = hsc_env0 { hsc_dflags = ms_hspp_opts ms }
rdr_module <- parseFile hsc_env ms
......@@ -1195,9 +1203,8 @@ compileCore simplify fn = do
Just modSummary -> do
-- Now we have the module name;
-- parse, typecheck and desugar the module
let mod = ms_mod_name modSummary
mod_guts <- coreModule `fmap`
(desugarModule =<< typecheckModule =<< parseModule mod)
(desugarModule =<< typecheckModule =<< parseModule modSummary)
liftM gutsToCoreModule $
if simplify
then do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment