X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcSplice.lhs;h=bc10f3e56ea65aa1d82e85d267f1112ebaf58fca;hb=b99310f05faee2abec850da4349fcd5c0498f7ca;hp=e23155d0de4ff22c6641cfed9c3a0a44a8f67170;hpb=b89a7fb470edee5762fba51effb64d1c071df373;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcSplice.lhs b/compiler/typecheck/TcSplice.lhs
index e23155d..bc10f3e 100644
--- a/compiler/typecheck/TcSplice.lhs
+++ b/compiler/typecheck/TcSplice.lhs
@@ -376,11 +376,7 @@ runMeta :: (SrcSpan -> th_syn -> Either Message hs_syn)
 	-> TcM hs_syn		-- Of type t
 runMeta convert expr
   = do	{ 	-- Desugar
-#if defined(GHCI) && defined(DEBUGGER)
-	  ds_expr <- unsetOptM Opt_Debugging $ initDsTc (dsLExpr expr)
-#else 
 	  ds_expr <- initDsTc (dsLExpr expr)
-#endif
 	-- Compile and link it; might fail if linking fails
 	; hsc_env <- getTopEnv
 	; src_span <- getSrcSpanM
@@ -398,17 +394,17 @@ runMeta convert expr
 		-- exception-cacthing thing so that if there are any lurking 
 		-- exceptions in the data structure returned by hval, we'll
 		-- encounter them inside the try
-	  either_tval <- tryAllM $ do
-		{ th_syn <- TH.runQ (unsafeCoerce# hval)
-		; case convert (getLoc expr) th_syn of
-		    Left err     -> do { addErrTc err; return Nothing }
-		    Right hs_syn -> return (Just hs_syn) }
-
-	; case either_tval of
-	      Right (Just v) -> return v
-	      Right Nothing  -> failM	-- Error already in Tc monad
-	      Left exn       -> failWithTc (mk_msg "run" exn)	-- Exception
-	}}}
+          either_th_syn <- tryAllM $ tryM $ TH.runQ $ unsafeCoerce# hval
+        ; case either_th_syn of
+            Left exn             -> failWithTc (mk_msg "run" exn)
+            Right (Left exn)     -> failM  -- Error already in Tc monad
+            Right (Right th_syn) -> do
+        { either_hs_syn <- tryAllM $ return $! convert (getLoc expr) th_syn
+        ; case either_hs_syn of
+            Left exn             -> failWithTc (mk_msg "interpret result of" exn)
+            Right (Left err)     -> do { addErrTc err; failM }
+            Right (Right hs_syn) -> return hs_syn
+        }}}}
   where
     mk_msg s exn = vcat [text "Exception when trying to" <+> text s <+> text "compile-time code:",
 			 nest 2 (text (Panic.showException exn)),
@@ -505,8 +501,7 @@ lookupThName th_name@(TH.Name occ flavour)
 	    Nothing | not (isSrcRdrName rdr_name)	-- Exact, Orig
 		    -> lookupImportedName rdr_name
 		    | otherwise				-- Unqual, Qual
-		    -> do { 
-				  mb_name <- lookupSrcOcc_maybe rdr_name
+		    -> do { mb_name <- lookupSrcOcc_maybe rdr_name
 			  ; case mb_name of
 			      Just name -> return name
 			      Nothing   -> failWithTc (notInScope th_name) }
@@ -600,18 +595,19 @@ reifyTyCon tc
 
 reifyTyCon tc
   = do 	{ cxt <- reifyCxt (tyConStupidTheta tc)
-	; cons <- mapM reifyDataCon (tyConDataCons tc)
+	; let tvs = tyConTyVars tc
+	; cons <- mapM (reifyDataCon (mkTyVarTys tvs)) (tyConDataCons tc)
 	; let name = reifyName tc
-	      tvs  = reifyTyVars (tyConTyVars tc)
+	      r_tvs  = reifyTyVars tvs
 	      deriv = []	-- Don't know about deriving
-	      decl | isNewTyCon tc = TH.NewtypeD cxt name tvs (head cons) deriv
-		   | otherwise	   = TH.DataD    cxt name tvs cons 	  deriv
+	      decl | isNewTyCon tc = TH.NewtypeD cxt name r_tvs (head cons) deriv
+		   | otherwise	   = TH.DataD    cxt name r_tvs cons 	  deriv
 	; return (TH.TyConI decl) }
 
-reifyDataCon :: DataCon -> TcM TH.Con
-reifyDataCon dc
+reifyDataCon :: [Type] -> DataCon -> TcM TH.Con
+reifyDataCon tys dc
   | isVanillaDataCon dc
-  = do 	{ arg_tys <- reifyTypes (dataConOrigArgTys dc)
+  = do 	{ arg_tys <- reifyTypes (dataConInstOrigArgTys dc tys)
 	; let stricts = map reifyStrict (dataConStrictMarks dc)
 	      fields  = dataConFieldLabels dc
 	      name    = reifyName dc