diff options
| author | Shea Levy <shea@shealevy.com> | 2016-12-20 01:19:18 +0000 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2016-12-20 01:25:48 +0000 |
| commit | 27f79255634d9789f367273504545c1ebfad90a0 (patch) | |
| tree | 9d2977cd52f18abcc824dae743ec7c4a3e6f04c0 /compiler/rename | |
| parent | c0c1f801f4ca26f1db68ac527341a1cf051cb7d6 (diff) | |
| download | haskell-27f79255634d9789f367273504545c1ebfad90a0.tar.gz | |
Allow use of the external interpreter in stage1.
Summary:
Now that we have -fexternal-interpreter, we can lose most of the GHCI ifdefs.
This was originally added in https://phabricator.haskell.org/D2826
but that led to a compatibility issue with ghc 7.10.x on Windows.
That's fixed here and the revert reverted.
Reviewers: goldfire, hvr, austin, bgamari, Phyx
Reviewed By: Phyx
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2884
GHC Trac Issues: #13008
Diffstat (limited to 'compiler/rename')
| -rw-r--r-- | compiler/rename/RnEnv.hs | 4 | ||||
| -rw-r--r-- | compiler/rename/RnSplice.hs | 22 |
2 files changed, 0 insertions, 26 deletions
diff --git a/compiler/rename/RnEnv.hs b/compiler/rename/RnEnv.hs index f8969a8e13..97718f88d2 100644 --- a/compiler/rename/RnEnv.hs +++ b/compiler/rename/RnEnv.hs @@ -341,16 +341,12 @@ lookupExactOcc_either name ; if name `inLocalRdrEnvScope` lcl_env then return (Right name) else -#ifdef GHCI do { th_topnames_var <- fmap tcg_th_topnames getGblEnv ; th_topnames <- readTcRef th_topnames_var ; if name `elemNameSet` th_topnames then return (Right name) else return (Left exact_nm_err) } -#else /* !GHCI */ - return (Left exact_nm_err) -#endif /* !GHCI */ } gres -> return (Left (sameNameErr gres)) -- Ugh! See Note [Template Haskell ambiguity] } diff --git a/compiler/rename/RnSplice.hs b/compiler/rename/RnSplice.hs index 0c41ed30b6..ccfd00257b 100644 --- a/compiler/rename/RnSplice.hs +++ b/compiler/rename/RnSplice.hs @@ -5,9 +5,7 @@ module RnSplice ( rnSpliceType, rnSpliceExpr, rnSplicePat, rnSpliceDecl, rnBracket, checkThLocalName -#ifdef GHCI , traceSplice, SpliceInfo(..) -#endif ) where #include "HsVersions.h" @@ -35,7 +33,6 @@ import {-# SOURCE #-} RnExpr ( rnLExpr ) import TcEnv ( checkWellStaged ) import THNames ( liftName ) -#ifdef GHCI import DynFlags import FastString import ErrUtils ( dumpIfSet_dyn_printer ) @@ -57,7 +54,6 @@ import {-# SOURCE #-} TcSplice import GHCi.RemoteTypes ( ForeignRef ) import qualified Language.Haskell.TH as TH (Q) -#endif import qualified GHC.LanguageExtensions as LangExt @@ -201,23 +197,6 @@ quotedNameStageErr br = sep [ text "Stage error: the non-top-level quoted name" <+> ppr br , text "must be used at the same stage at which is is bound" ] -#ifndef GHCI -rnTopSpliceDecls :: HsSplice RdrName -> RnM ([LHsDecl RdrName], FreeVars) -rnTopSpliceDecls e = failTH e "Template Haskell top splice" - -rnSpliceType :: HsSplice RdrName -> PostTc Name Kind - -> RnM (HsType Name, FreeVars) -rnSpliceType e _ = failTH e "Template Haskell type splice" - -rnSpliceExpr :: HsSplice RdrName -> RnM (HsExpr Name, FreeVars) -rnSpliceExpr e = failTH e "Template Haskell splice" - -rnSplicePat :: HsSplice RdrName -> RnM (Either (Pat RdrName) (Pat Name), FreeVars) -rnSplicePat e = failTH e "Template Haskell pattern splice" - -rnSpliceDecl :: SpliceDecl RdrName -> RnM (SpliceDecl Name, FreeVars) -rnSpliceDecl e = failTH e "Template Haskell declaration splice" -#else {- ********************************************************* @@ -760,7 +739,6 @@ illegalUntypedSplice = text "Untyped splices may not appear in typed brackets" -- = vcat [ hang (text "In the splice:") -- 2 (char '$' <> pprParendExpr expr) -- , text "To see what the splice expanded to, use -ddump-splices" ] -#endif checkThLocalName :: Name -> RnM () checkThLocalName name |