diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-10-19 19:16:14 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-11-16 15:32:56 -0800 |
| commit | 3d88e8990320780520a670191d704a37bff5c910 (patch) | |
| tree | 3ce718ec170aa61cb467d65b9734f6cd1fb3260e | |
| parent | 2d1a563bf25a4e402088feb1cdcac3d7bc50c6d3 (diff) | |
| download | haskell-3d88e8990320780520a670191d704a37bff5c910.tar.gz | |
s/FrontendMerge/FrontendInterface/g
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
| -rw-r--r-- | compiler/main/HscMain.hs | 4 | ||||
| -rw-r--r-- | compiler/typecheck/TcRnTypes.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs index 1497a2d7b8..9ffd3c9d84 100644 --- a/compiler/main/HscMain.hs +++ b/compiler/main/HscMain.hs @@ -609,7 +609,7 @@ genericHscFrontend mod_summary = genericHscFrontend' :: ModSummary -> Hsc FrontendResult genericHscFrontend' mod_summary | ms_hsc_src mod_summary == HsBootMerge - = FrontendMerge `fmap` hscMergeFrontEnd mod_summary + = FrontendInterface `fmap` hscMergeFrontEnd mod_summary | otherwise = FrontendTypecheck `fmap` hscFileFrontEnd mod_summary @@ -662,7 +662,7 @@ hscIncrementalCompile always_do_basic_recompilation_check m_tc_result ms_hsc_src mod_summary == HsSrcFile then finish hsc_env mod_summary tc_result mb_old_hash else finishTypecheckOnly hsc_env mod_summary tc_result mb_old_hash - FrontendMerge raw_iface -> + FrontendInterface raw_iface -> finishMerge hsc_env mod_summary raw_iface mb_old_hash liftIO $ hscMaybeWriteIface dflags (hm_iface hmi) no_change mod_summary return (status, hmi) diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs index 3f703fa9e3..f4cfa4f780 100644 --- a/compiler/typecheck/TcRnTypes.hs +++ b/compiler/typecheck/TcRnTypes.hs @@ -341,7 +341,7 @@ data DsMetaVal -- to have a TcGblEnv which is only defined here. data FrontendResult = FrontendTypecheck TcGblEnv - | FrontendMerge ModIface + | FrontendInterface ModIface -- | 'TcGblEnv' describes the top-level of the module at the -- point at which the typechecker is finished work. |