diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-11-13 16:18:24 -0800 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-11-16 15:32:56 -0800 |
| commit | ac1a379363618a6f2f17fff65ce9129164b6ef30 (patch) | |
| tree | 65a0154fa86cf8dda560f62ecc6ae7555da65ac7 /ghc | |
| parent | 9193629a6d8c7605ba81e62bc7f9a04a8ce65013 (diff) | |
| download | haskell-ac1a379363618a6f2f17fff65ce9129164b6ef30.tar.gz | |
Revert "Unify hsig and hs-boot; add preliminary "hs-boot" merging."
Summary:
This reverts commit 06d46b1e4507e09eb2a7a04998a92610c8dc6277.
This also has a Haddock submodule update.
Test Plan: validate
Reviewers: simonpj, austin, bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1475
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/Main.hs | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/ghc/Main.hs b/ghc/Main.hs index 647bbadcf9..d14a897dc7 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -22,7 +22,7 @@ import CmdLineParser -- Implementations of the various modes (--show-iface, mkdependHS. etc.) import LoadIface ( showIface ) import HscMain ( newHscEnv ) -import DriverPipeline ( oneShot, compileFile, mergeRequirement ) +import DriverPipeline ( oneShot, compileFile ) import DriverMkDepend ( doMkDependHS ) #ifdef GHCI import InteractiveUI ( interactiveUI, ghciWelcomeMsg, defaultGhciSettings ) @@ -157,7 +157,6 @@ main' postLoadMode dflags0 args flagWarnings = do DoMake -> (CompManager, dflt_target, LinkBinary) DoMkDependHS -> (MkDepend, dflt_target, LinkBinary) DoAbiHash -> (OneShot, dflt_target, LinkBinary) - DoMergeRequirements -> (OneShot, dflt_target, LinkBinary) _ -> (OneShot, dflt_target, LinkBinary) let dflags1 = case lang of @@ -253,7 +252,6 @@ main' postLoadMode dflags0 args flagWarnings = do DoInteractive -> ghciUI srcs Nothing DoEval exprs -> ghciUI srcs $ Just $ reverse exprs DoAbiHash -> abiHash (map fst srcs) - DoMergeRequirements -> doMergeRequirements (map fst srcs) ShowPackages -> liftIO $ showPackages dflags6 liftIO $ dumpFinalStats dflags6 @@ -459,16 +457,14 @@ data PostLoadMode | DoEval [String] -- ghc -e foo -e bar => DoEval ["bar", "foo"] | DoAbiHash -- ghc --abi-hash | ShowPackages -- ghc --show-packages - | DoMergeRequirements -- ghc --merge-requirements doMkDependHSMode, doMakeMode, doInteractiveMode, - doAbiHashMode, showPackagesMode, doMergeRequirementsMode :: Mode + doAbiHashMode, showPackagesMode :: Mode doMkDependHSMode = mkPostLoadMode DoMkDependHS doMakeMode = mkPostLoadMode DoMake doInteractiveMode = mkPostLoadMode DoInteractive doAbiHashMode = mkPostLoadMode DoAbiHash showPackagesMode = mkPostLoadMode ShowPackages -doMergeRequirementsMode = mkPostLoadMode DoMergeRequirements showInterfaceMode :: FilePath -> Mode showInterfaceMode fp = mkPostLoadMode (ShowInterface fp) @@ -608,7 +604,6 @@ mode_flags = , defFlag "C" (PassFlag (setMode (stopBeforeMode HCc))) , defFlag "S" (PassFlag (setMode (stopBeforeMode (As False)))) , defFlag "-make" (PassFlag (setMode doMakeMode)) - , defFlag "-merge-requirements" (PassFlag (setMode doMergeRequirementsMode)) , defFlag "-interactive" (PassFlag (setMode doInteractiveMode)) , defFlag "-abi-hash" (PassFlag (setMode doAbiHashMode)) , defFlag "e" (SepArg (\s -> setMode (doEvalMode s) "-e")) @@ -718,16 +713,6 @@ doMake srcs = do when (failed ok_flag) (liftIO $ exitWith (ExitFailure 1)) return () --- ---------------------------------------------------------------------------- --- Run --merge-requirements mode - -doMergeRequirements :: [String] -> Ghc () -doMergeRequirements srcs = mapM_ doMergeRequirement srcs - -doMergeRequirement :: String -> Ghc () -doMergeRequirement src = do - hsc_env <- getSession - liftIO $ mergeRequirement hsc_env (mkModuleName src) -- --------------------------------------------------------------------------- -- --show-iface mode |