diff options
author | Tamar Christina <tamar@zhox.com> | 2016-12-19 19:09:18 +0000 |
---|---|---|
committer | Tamar Christina <tamar@zhox.com> | 2016-12-19 19:09:18 +0000 |
commit | f1dfce1cb2a823696d6d3a9ea41c2bc73d949f12 (patch) | |
tree | b14692ca8e33e8f925a1fa47542eb3499fc79f0e /compiler/rename/RnEnv.hs | |
parent | bb74bc79daf8b91b21a1b68b0a406828d188ed92 (diff) | |
download | haskell-f1dfce1cb2a823696d6d3a9ea41c2bc73d949f12.tar.gz |
Revert "Allow use of the external interpreter in stage1."
This reverts commit 52ba9470a7e85d025dc84a6789aa809cdd68b566.
Diffstat (limited to 'compiler/rename/RnEnv.hs')
-rw-r--r-- | compiler/rename/RnEnv.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rename/RnEnv.hs b/compiler/rename/RnEnv.hs index 97718f88d2..f8969a8e13 100644 --- a/compiler/rename/RnEnv.hs +++ b/compiler/rename/RnEnv.hs @@ -341,12 +341,16 @@ 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] } |