Move renamer splice functionality into a separate module.

This structure now matches that of the type checker.

5 files changed, 152 insertions, 117 deletions

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 1ed7e2310e..d598031376 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -325,6 +325,7 @@ Library
         RnNames
         RnPat
         RnSource
+        RnSplice
         RnTypes
         CoreMonad
         CSE
diff --git a/compiler/rename/RnExpr.lhs b/compiler/rename/RnExpr.lhs
index 01f83bcd53..0c48be80e4 100644
--- a/compiler/rename/RnExpr.lhs
+++ b/compiler/rename/RnExpr.lhs
@@ -20,24 +20,21 @@ module RnExpr (
 import {-# SOURCE #-} TcSplice( runQuasiQuoteExpr )
 #endif  /* GHCI */
 
-import RnSource  ( rnSrcDecls, findSplice )
 import RnBinds   ( rnLocalBindsAndThen, rnLocalValBindsLHS, rnLocalValBindsRHS,
                    rnMatchGroup, rnGRHS, makeMiniFixityEnv)
 import HsSyn
 import TcRnMonad
-import TcEnv            ( thRnBrack )
 import RnEnv
+import RnSplice
 import RnTypes
 import RnPat
 import DynFlags
 import BasicTypes       ( FixityDirection(..) )
 import PrelNames
 
-import Module
 import Name
 import NameSet
 import RdrName
-import LoadIface        ( loadInterfaceForName )
 import UniqSet
 import Data.List
 import Util
@@ -613,60 +610,6 @@ rnArithSeq (FromThenTo expr1 expr2 expr3)
 
 %************************************************************************
 %*                                                                      *
-        Template Haskell brackets
-%*                                                                      *
-%************************************************************************
-
-\begin{code}
-rnBracket :: HsBracket RdrName -> RnM (HsBracket Name, FreeVars)
-rnBracket (VarBr flg n)
-  = do { name <- lookupOccRn n
-       ; this_mod <- getModule
-       ; unless (nameIsLocalOrFrom this_mod name) $  -- Reason: deprecation checking assumes
-         do { _ <- loadInterfaceForName msg name     -- the home interface is loaded, and
-            ; return () }                            -- this is the only way that is going
-                                                     -- to happen
-       ; return (VarBr flg name, unitFV name) }
-  where
-    msg = ptext (sLit "Need interface for Template Haskell quoted Name")
-
-rnBracket (ExpBr e) = do { (e', fvs) <- rnLExpr e
-                         ; return (ExpBr e', fvs) }
-
-rnBracket (PatBr p) = rnPat ThPatQuote p $ \ p' -> return (PatBr p', emptyFVs)
-
-rnBracket (TypBr t) = do { (t', fvs) <- rnLHsType TypBrCtx t
-                         ; return (TypBr t', fvs) }
-
-rnBracket (DecBrL decls)
-  = do { (group, mb_splice) <- findSplice decls
-       ; case mb_splice of
-           Nothing -> return ()
-           Just (SpliceDecl (L loc _) _, _)
-              -> setSrcSpan loc $
-                 addErr (ptext (sLit "Declaration splices are not permitted inside declaration brackets"))
-                -- Why not?  See Section 7.3 of the TH paper.
-
-       ; gbl_env  <- getGblEnv
-       ; let new_gbl_env = gbl_env { tcg_dus = emptyDUs }
-                          -- The emptyDUs is so that we just collect uses for this
-                          -- group alone in the call to rnSrcDecls below
-       ; (tcg_env, group') <- setGblEnv new_gbl_env $
-                              setStage thRnBrack $
-                              rnSrcDecls [] group
-   -- The empty list is for extra dependencies coming from .hs-boot files
-   -- See Note [Extra dependencies from .hs-boot files] in RnSource
-
-              -- Discard the tcg_env; it contains only extra info about fixity
-        ; traceRn (text "rnBracket dec" <+> (ppr (tcg_dus tcg_env) $$
-                   ppr (duUses (tcg_dus tcg_env))))
-        ; return (DecBrG group', duUses (tcg_dus tcg_env)) }
-
-rnBracket (DecBrG _) = panic "rnBracket: unexpected DecBrG"
-\end{code}
-
-%************************************************************************
-%*                                                                      *
 \subsubsection{@Stmt@s: in @do@ expressions}
 %*                                                                      *
 %************************************************************************
diff --git a/compiler/rename/RnSplice.lhs b/compiler/rename/RnSplice.lhs
new file mode 100644
index 0000000000..09ab9defdf
--- /dev/null
+++ b/compiler/rename/RnSplice.lhs
@@ -0,0 +1,132 @@
+\begin{code}
+module RnSplice (
+        rnSplice, rnBracket, checkTH
+  ) where
+
+import Control.Monad    ( unless )
+import FastString
+import Name
+import NameSet
+import HsSyn
+import LoadIface        ( loadInterfaceForName )
+import Module
+import Outputable
+import RdrName
+import RnEnv
+import RnPat
+import RnSource         ( rnSrcDecls, findSplice )
+import RnTypes
+import SrcLoc
+import TcEnv            ( thRnBrack )
+import TcRnMonad
+
+import {-# SOURCE #-} RnExpr( rnLExpr )
+\end{code}
+
+%*********************************************************
+%*                                                      *
+                Splices
+%*                                                      *
+%*********************************************************
+
+Note [Splices]
+~~~~~~~~~~~~~~
+Consider
+        f = ...
+        h = ...$(thing "f")...
+
+The splice can expand into literally anything, so when we do dependency
+analysis we must assume that it might mention 'f'.  So we simply treat
+all locally-defined names as mentioned by any splice.  This is terribly
+brutal, but I don't see what else to do.  For example, it'll mean
+that every locally-defined thing will appear to be used, so no unused-binding
+warnings.  But if we miss the dependency, then we might typecheck 'h' before 'f',
+and that will crash the type checker because 'f' isn't in scope.
+
+Currently, I'm not treating a splice as also mentioning every import,
+which is a bit inconsistent -- but there are a lot of them.  We might
+thereby get some bogus unused-import warnings, but we won't crash the
+type checker.  Not very satisfactory really.
+
+\begin{code}
+rnSplice :: HsSplice RdrName -> RnM (HsSplice Name, FreeVars)
+rnSplice (HsSplice n expr)
+  = do  { checkTH expr "splice"
+        ; loc  <- getSrcSpanM
+        ; n' <- newLocalBndrRn (L loc n)
+        ; (expr', fvs) <- rnLExpr expr
+
+        -- Ugh!  See Note [Splices] above
+        ; lcl_rdr <- getLocalRdrEnv
+        ; gbl_rdr <- getGlobalRdrEnv
+        ; let gbl_names = mkNameSet [gre_name gre | gre <- globalRdrEnvElts gbl_rdr,
+                                                    isLocalGRE gre]
+              lcl_names = mkNameSet (localRdrEnvElts lcl_rdr)
+
+        ; return (HsSplice n' expr', fvs `plusFV` lcl_names `plusFV` gbl_names) }
+
+checkTH :: Outputable a => a -> String -> RnM ()
+#ifdef GHCI
+checkTH _ _ = return () -- OK
+#else
+checkTH e what  -- Raise an error in a stage-1 compiler
+  = addErr (vcat [ptext (sLit "Template Haskell") <+> text what <+>
+                  ptext (sLit "requires GHC with interpreter support"),
+                  ptext (sLit "Perhaps you are using a stage-1 compiler?"),
+                  nest 2 (ppr e)])
+#endif
+\end{code}
+
+%************************************************************************
+%*                                                                      *
+        Template Haskell brackets
+%*                                                                      *
+%************************************************************************
+
+\begin{code}
+rnBracket :: HsBracket RdrName -> RnM (HsBracket Name, FreeVars)
+rnBracket (VarBr flg n)
+  = do { name <- lookupOccRn n
+       ; this_mod <- getModule
+       ; unless (nameIsLocalOrFrom this_mod name) $  -- Reason: deprecation checking assumes
+         do { _ <- loadInterfaceForName msg name     -- the home interface is loaded, and
+            ; return () }                            -- this is the only way that is going
+                                                     -- to happen
+       ; return (VarBr flg name, unitFV name) }
+  where
+    msg = ptext (sLit "Need interface for Template Haskell quoted Name")
+
+rnBracket (ExpBr e) = do { (e', fvs) <- rnLExpr e
+                         ; return (ExpBr e', fvs) }
+
+rnBracket (PatBr p) = rnPat ThPatQuote p $ \ p' -> return (PatBr p', emptyFVs)
+
+rnBracket (TypBr t) = do { (t', fvs) <- rnLHsType TypBrCtx t
+                         ; return (TypBr t', fvs) }
+
+rnBracket (DecBrL decls)
+  = do { (group, mb_splice) <- findSplice decls
+       ; case mb_splice of
+           Nothing -> return ()
+           Just (SpliceDecl (L loc _) _, _)
+              -> setSrcSpan loc $
+                 addErr (ptext (sLit "Declaration splices are not permitted inside declaration brackets"))
+                -- Why not?  See Section 7.3 of the TH paper.
+
+       ; gbl_env  <- getGblEnv
+       ; let new_gbl_env = gbl_env { tcg_dus = emptyDUs }
+                          -- The emptyDUs is so that we just collect uses for this
+                          -- group alone in the call to rnSrcDecls below
+       ; (tcg_env, group') <- setGblEnv new_gbl_env $
+                              setStage thRnBrack $
+                              rnSrcDecls [] group
+   -- The empty list is for extra dependencies coming from .hs-boot files
+   -- See Note [Extra dependencies from .hs-boot files] in RnSource
+
+              -- Discard the tcg_env; it contains only extra info about fixity
+        ; traceRn (text "rnBracket dec" <+> (ppr (tcg_dus tcg_env) $$
+                   ppr (duUses (tcg_dus tcg_env))))
+        ; return (DecBrG group', duUses (tcg_dus tcg_env)) }
+
+rnBracket (DecBrG _) = panic "rnBracket: unexpected DecBrG"
+\end{code}
diff --git a/compiler/rename/RnSplice.lhs-boot b/compiler/rename/RnSplice.lhs-boot
new file mode 100644
index 0000000000..b656cec5a9
--- /dev/null
+++ b/compiler/rename/RnSplice.lhs-boot
@@ -0,0 +1,16 @@
+\begin{code}
+module RnSplice where
+
+import HsSyn
+import TcRnMonad
+import RdrName
+import Name
+import NameSet
+
+import Outputable
+
+rnSplice :: HsSplice RdrName -> RnM (HsSplice Name, FreeVars)
+rnBracket :: HsBracket RdrName -> RnM (HsBracket Name, FreeVars)
+
+checkTH :: Outputable a => a -> String -> RnM ()
+\end{code}
diff --git a/compiler/rename/RnTypes.lhs b/compiler/rename/RnTypes.lhs
index 0412995f04..68f30c7481 100644
--- a/compiler/rename/RnTypes.lhs
+++ b/compiler/rename/RnTypes.lhs
@@ -15,19 +15,16 @@ module RnTypes (
         mkOpAppRn, mkNegAppRn, mkOpFormRn, mkConOpPatRn,
         checkPrecMatch, checkSectionPrec, warnUnusedForAlls,
 
-        -- Splice related stuff
-        rnSplice, checkTH,
-
         -- Binding related stuff
         bindSigTyVarsFV, bindHsTyVars, rnHsBndrSig,
         extractHsTyRdrTyVars, extractHsTysRdrTyVars,
         extractRdrKindSigVars, extractDataDefnKindVars, filterInScope
   ) where
 
-import {-# SOURCE #-} RnExpr( rnLExpr )
 #ifdef GHCI
 import {-# SOURCE #-} TcSplice( runQuasiQuoteType )
-#endif  /* GHCI */
+#endif 	/* GHCI */
+import {-# SOURCE #-} RnSplice( rnSplice )
 
 import DynFlags
 import HsSyn
@@ -838,60 +835,6 @@ opTyErr op ty@(HsOpTy ty1 _ _)
 opTyErr _ ty = pprPanic "opTyErr: Not an op" (ppr ty)
 \end{code}
 
-%*********************************************************
-%*                                                      *
-                Splices
-%*                                                      *
-%*********************************************************
-
-Note [Splices]
-~~~~~~~~~~~~~~
-Consider
-        f = ...
-        h = ...$(thing "f")...
-
-The splice can expand into literally anything, so when we do dependency
-analysis we must assume that it might mention 'f'.  So we simply treat
-all locally-defined names as mentioned by any splice.  This is terribly
-brutal, but I don't see what else to do.  For example, it'll mean
-that every locally-defined thing will appear to be used, so no unused-binding
-warnings.  But if we miss the dependency, then we might typecheck 'h' before 'f',
-and that will crash the type checker because 'f' isn't in scope.
-
-Currently, I'm not treating a splice as also mentioning every import,
-which is a bit inconsistent -- but there are a lot of them.  We might
-thereby get some bogus unused-import warnings, but we won't crash the
-type checker.  Not very satisfactory really.
-
-\begin{code}
-rnSplice :: HsSplice RdrName -> RnM (HsSplice Name, FreeVars)
-rnSplice (HsSplice n expr)
-  = do  { checkTH expr "splice"
-        ; loc  <- getSrcSpanM
-        ; n' <- newLocalBndrRn (L loc n)
-        ; (expr', fvs) <- rnLExpr expr
-
-        -- Ugh!  See Note [Splices] above
-        ; lcl_rdr <- getLocalRdrEnv
-        ; gbl_rdr <- getGlobalRdrEnv
-        ; let gbl_names = mkNameSet [gre_name gre | gre <- globalRdrEnvElts gbl_rdr,
-                                                    isLocalGRE gre]
-              lcl_names = mkNameSet (localRdrEnvElts lcl_rdr)
-
-        ; return (HsSplice n' expr', fvs `plusFV` lcl_names `plusFV` gbl_names) }
-
-checkTH :: Outputable a => a -> String -> RnM ()
-#ifdef GHCI
-checkTH _ _ = return () -- OK
-#else
-checkTH e what  -- Raise an error in a stage-1 compiler
-  = addErr (vcat [ptext (sLit "Template Haskell") <+> text what <+>
-                  ptext (sLit "requires GHC with interpreter support"),
-                  ptext (sLit "Perhaps you are using a stage-1 compiler?"),
-                  nest 2 (ppr e)])
-#endif
-\end{code}
-
 %************************************************************************
 %*                                                                      *
       Finding the free type variables of a (HsType RdrName)