From 8133c305d14d748d7720272b1eaa67847d00e241 Mon Sep 17 00:00:00 2001 From: simonpj Date: Wed, 9 Oct 2002 15:51:43 +0000 Subject: [PATCH] [project @ 2002-10-09 15:51:43 by simonpj] Dont try to splice if compiler isnt bootstrapped --- ghc/compiler/typecheck/TcRnDriver.lhs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ghc/compiler/typecheck/TcRnDriver.lhs b/ghc/compiler/typecheck/TcRnDriver.lhs index 10d0c35..ae5a12e 100644 --- a/ghc/compiler/typecheck/TcRnDriver.lhs +++ b/ghc/compiler/typecheck/TcRnDriver.lhs @@ -73,7 +73,7 @@ import TcTyClsDecls ( tcTyAndClassDecls ) import RnNames ( rnImports, exportsFromAvail, reportUnusedNames ) import RnIfaces ( slurpImpDecls, checkVersions, RecompileRequired, outOfDate ) import RnHiFiles ( readIface, loadOldIface ) -import RnEnv ( lookupSrcName, lookupOccRn, +import RnEnv ( lookupSrcName, lookupOccRn, plusGlobalRdrEnv, ubiquitousNames, implicitModuleFVs, implicitStmtFVs, dataTcOccs ) import RnExpr ( rnStmts, rnExpr ) import RnNames ( importsFromLocalDecls ) @@ -112,7 +112,7 @@ import HscTypes ( PersistentCompilerState(..), InteractiveContext(..), #ifdef GHCI import RdrName ( rdrEnvElts ) import RnHiFiles ( loadInterface ) -import RnEnv ( mkGlobalRdrEnv, plusGlobalRdrEnv ) +import RnEnv ( mkGlobalRdrEnv ) import HscTypes ( GlobalRdrElt(..), GlobalRdrEnv, ImportReason(..), Provenance(..), isLocalGRE ) #endif @@ -600,7 +600,10 @@ tcRnSrcDecls ds Just (splice_expr, rest_ds) -> do { setGblEnv tcg_env $ do { - + +#ifndef GHCI + failWithTc (text "Can't do a top-level splice; need a bootstrapped compiler") +#else -- Rename the splice expression, and get its supporting decls (rn_splice_expr, fvs) <- initRn SourceMode (rnExpr splice_expr) ; tcg_env <- importSupportingDecls fvs ; @@ -613,7 +616,9 @@ tcRnSrcDecls ds (tcg_env, src_fvs2) <- tcRnSrcDecls (spliced_decls ++ rest_ds) ; return (tcg_env, src_fvs1 `plusFV` src_fvs2) - }}}} + } +#endif /* GHCI */ + }}} \end{code} -- 1.7.10.4