X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Frename%2FRnSource.lhs;h=5a071ee2e2112736121dbdfe55ae586c95a69ba1;hb=4c719df405e70f6d58c6e351df8bf94a3af6b1fe;hp=d47125743d139a754a37f7b16bb158bb25e9b884;hpb=f0c99958649b8909612b1b9c9b48aad970dfce05;p=ghc-hetmet.git

diff --git a/compiler/rename/RnSource.lhs b/compiler/rename/RnSource.lhs
index d471257..5a071ee 100644
--- a/compiler/rename/RnSource.lhs
+++ b/compiler/rename/RnSource.lhs
@@ -5,9 +5,7 @@
 
 \begin{code}
 module RnSource ( 
-	rnSrcDecls, addTcgDUs, 
-	rnTyClDecls, 
-	rnSplice, checkTH
+	rnSrcDecls, addTcgDUs, rnTyClDecls 
     ) where
 
 #include "HsVersions.h"
@@ -15,8 +13,7 @@ module RnSource (
 import {-# SOURCE #-} RnExpr( rnLExpr )
 
 import HsSyn
-import RdrName		( RdrName, isRdrDataCon, elemLocalRdrEnv, 
-			  globalRdrEnvElts, GlobalRdrElt(..), isLocalGRE, rdrNameOcc )
+import RdrName		( RdrName, isRdrDataCon, elemLocalRdrEnv, rdrNameOcc )
 import RdrHsSyn		( extractGenericPatTyVars, extractHsRhoRdrTyVars )
 import RnHsSyn
 import RnTypes		( rnLHsType, rnLHsTypes, rnHsSigType, rnHsTypeFVs, rnContext )
@@ -40,7 +37,6 @@ import Class		( FunDep )
 import Name		( Name, nameOccName )
 import NameSet
 import NameEnv
-import OccName 
 import Outputable
 import Bag
 import FastString
@@ -220,6 +216,8 @@ rnTyClDecls tycl_decls = do  (decls', _fvs) <- rnList rnTyClDecl tycl_decls
 			     return decls'
 
 addTcgDUs :: TcGblEnv -> DefUses -> TcGblEnv 
+-- This function could be defined lower down in the module hierarchy, 
+-- but there doesn't seem anywhere very logical to put it.
 addTcgDUs tcg_env dus = tcg_env { tcg_dus = tcg_dus tcg_env `plusDU` dus }
 
 rnList :: (a -> RnM (b, FreeVars)) -> [Located a] -> RnM ([Located b], FreeVars)
@@ -663,10 +661,10 @@ rnTyClDecl (tydecl@TyData {tcdND = new_or_data, tcdCtxt = context,
 		    else lookupLocatedTopBndrRn tycon
 	; context' <- rnContext data_doc context
 	; typats' <- rnTyPats data_doc typatsMaybe
-	; (derivs', deriv_fvs) <- rn_derivs derivs
 	; condecls' <- rnConDecls (unLoc tycon') condecls
 		-- No need to check for duplicate constructor decls
 		-- since that is done by RnNames.extendGlobalRdrEnvRn
+	; (derivs', deriv_fvs) <- rn_derivs derivs
 	; return (TyData {tcdND = new_or_data, tcdCtxt = context', 
 			   tcdLName = tycon', tcdTyVars = tyvars', 
 			   tcdTyPats = typats', tcdKindSig = Nothing, 
@@ -693,11 +691,11 @@ rnTyClDecl (tydecl@TyData {tcdND = new_or_data, tcdCtxt = context,
 		-- do not scope over the constructor signatures
 		-- 	data T a where { T1 :: forall b. b-> b }
 
-	; (derivs', deriv_fvs) <- rn_derivs derivs
 	; condecls' <- rnConDecls (unLoc tycon') condecls
 		-- No need to check for duplicate constructor decls
 		-- since that is done by RnNames.extendGlobalRdrEnvRn
 
+	; (derivs', deriv_fvs) <- rn_derivs derivs
 	; return (TyData {tcdND = new_or_data, tcdCtxt = noLoc [], 
 			   tcdLName = tycon', tcdTyVars = tyvars', 
 			   tcdTyPats = typats', tcdKindSig = sig,
@@ -809,6 +807,7 @@ badGadtStupidTheta _
 	  ptext (sLit "(You can put a context on each contructor, though.)")]
 \end{code}
 
+
 %*********************************************************
 %*							*
 \subsection{Support code for type/data declarations}
@@ -1099,55 +1098,3 @@ rnHsTyVar _doc tyvar = lookupOccRn tyvar
 \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'] <- newLocalsRn [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 (occEnvElts 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 "illegal in a stage-1 compiler"),
-	          nest 2 (ppr e)])
-#endif   
-\end{code}