X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FRtClosureInspect.hs;h=dae9260db0a4e1d51ca0e4839baf19fa052d3a24;hb=aafdba3bce91afb003f5f50e001e141744837bae;hp=10dbb163532cb2d4ce11b2b787c56cba4966208b;hpb=a07a463449d54855f19c160ed0f0a3853663db5f;p=ghc-hetmet.git diff --git a/compiler/ghci/RtClosureInspect.hs b/compiler/ghci/RtClosureInspect.hs index 10dbb16..dae9260 100644 --- a/compiler/ghci/RtClosureInspect.hs +++ b/compiler/ghci/RtClosureInspect.hs @@ -179,7 +179,15 @@ getClosureData :: a -> IO Closure getClosureData a = case unpackClosure# a of (# iptr, ptrs, nptrs #) -> do +#ifndef GHCI_TABLES_NEXT_TO_CODE + -- the info pointer we get back from unpackClosure# is to the + -- beginning of the standard info table, but the Storable instance + -- for info tables takes into account the extra entry pointer + -- when !tablesNextToCode, so we must adjust here: + itbl <- peek (Ptr iptr `plusPtr` negate wORD_SIZE) +#else itbl <- peek (Ptr iptr) +#endif let tipe = readCType (BCI.tipe itbl) elems = fromIntegral (BCI.ptrs itbl) ptrsList = Array 0 (elems - 1) elems ptrs @@ -315,43 +323,51 @@ termTyVars = foldTerm TermFold { -- Pretty printing of terms ---------------------------------- +type Precedence = Int +type TermPrinter = Precedence -> Term -> SDoc +type TermPrinterM m = Precedence -> Term -> m SDoc + app_prec,cons_prec ::Int app_prec = 10 cons_prec = 5 -- TODO Extract this info from GHC itself -pprTerm :: (Int -> Term -> Maybe SDoc) -> Int -> Term -> SDoc -pprTerm y p t | Just doc <- pprTermM y p t = doc +pprTerm :: TermPrinter -> TermPrinter +pprTerm y p t | Just doc <- pprTermM (\p -> Just . y p) p t = doc pprTerm _ _ _ = panic "pprTerm" -pprTermM, pprNewtypeWrap :: Monad m => - (Int -> Term -> m SDoc) -> Int -> Term -> m SDoc -pprTermM y p Term{dc=Left dc_tag, subTerms=tt} = do +pprTermM, ppr_termM, pprNewtypeWrap :: Monad m => TermPrinterM m -> TermPrinterM m +pprTermM y p t = pprDeeper `liftM` ppr_termM y p t + +pprTermM1, ppr_termM1 :: Monad m => Term -> m SDoc +pprTermM1 t = pprDeeper `liftM` ppr_termM1 t + +ppr_termM y p Term{dc=Left dc_tag, subTerms=tt} = do tt_docs <- mapM (y app_prec) tt - return$ cparen (not(null tt) && p >= app_prec) (text dc_tag <+> sep tt_docs) + return$ cparen (not(null tt) && p >= app_prec) (text dc_tag <+> pprDeeperList fsep tt_docs) -pprTermM y p Term{dc=Right dc, subTerms=tt} +ppr_termM y p Term{dc=Right dc, subTerms=tt} {- | dataConIsInfix dc, (t1:t2:tt') <- tt --TODO fixity - = parens (pprTerm1 True t1 <+> ppr dc <+> pprTerm1 True ppr t2) - <+> hsep (map (pprTerm1 True) tt) + = parens (ppr_term1 True t1 <+> ppr dc <+> ppr_term1 True ppr t2) + <+> hsep (map (ppr_term1 True) tt) -} -- TODO Printing infix constructors properly | null tt = return$ ppr dc | otherwise = do tt_docs <- mapM (y app_prec) tt - return$ cparen (p >= app_prec) (ppr dc <+> sep tt_docs) + return$ cparen (p >= app_prec) (ppr dc <+> pprDeeperList fsep tt_docs) -pprTermM y p t@NewtypeWrap{} = pprNewtypeWrap y p t +ppr_termM y p t@NewtypeWrap{} = pprNewtypeWrap y p t -pprTermM _ _ t = pprTermM1 t +ppr_termM _ _ t = ppr_termM1 t -pprTermM1 :: Monad m => Term -> m SDoc -pprTermM1 Prim{value=words, ty=ty} = + +ppr_termM1 Prim{value=words, ty=ty} = return$ text$ repPrim (tyConAppTyCon ty) words -pprTermM1 Term{} = panic "pprTermM1 - unreachable" -pprTermM1 Suspension{bound_to=Nothing} = return$ char '_' -pprTermM1 Suspension{mb_ty=Just ty, bound_to=Just n} +ppr_termM1 Term{} = panic "ppr_termM1 - unreachable" +ppr_termM1 Suspension{bound_to=Nothing} = return$ char '_' +ppr_termM1 Suspension{mb_ty=Just ty, bound_to=Just n} | Just _ <- splitFunTy_maybe ty = return$ ptext SLIT("") | otherwise = return$ parens$ ppr n <> text "::" <> ppr ty -pprTermM1 _ = panic "pprTermM1" +ppr_termM1 _ = panic "ppr_termM1" pprNewtypeWrap y p NewtypeWrap{ty=ty, wrapped_term=t} | Just (tc,_) <- splitNewTyConApp_maybe ty @@ -374,17 +390,10 @@ pprNewtypeWrap _ _ _ = panic "pprNewtypeWrap" -- which I didn't. Therefore, this code replicates a lot -- of what type classes provide for free. --- Concretely a custom term printer takes an explicit --- recursion knot, and produces a list of Term Processors, --- which additionally need a precedence value to --- either produce a SDoc or fail (and they do this in some monad m). - -type Precedence = Int -type RecursionKnot m = Precedence -> Term -> m SDoc -type CustomTermPrinter m = RecursionKnot m +type CustomTermPrinter m = TermPrinterM m -> [Precedence -> Term -> (m (Maybe SDoc))] --- Takes a list of custom printers with a explicit recursion knot and a term, +-- | Takes a list of custom printers with a explicit recursion knot and a term, -- and returns the output of the first succesful printer, or the default printer cPprTerm :: Monad m => CustomTermPrinter m -> Term -> m SDoc cPprTerm printers_ = go 0 where @@ -431,22 +440,23 @@ cPprTermBase y = coerceShow f _p = return . text . show . f . unsafeCoerce# . val - --TODO pprinting of list terms is not lazy + --NOTE pprinting of list terms is not lazy doList p h t = do let elems = h : getListTerms t isConsLast = termType(last elems) /= termType h print_elems <- mapM (y cons_prec) elems return$ if isConsLast then cparen (p >= cons_prec) - . hsep + . pprDeeperList fsep . punctuate (space<>colon) $ print_elems - else brackets (hcat$ punctuate comma print_elems) + else brackets (pprDeeperList fcat$ + punctuate comma print_elems) where Just a /= Just b = not (a `coreEqType` b) _ /= _ = True getListTerms Term{subTerms=[h,t]} = h : getListTerms t - getListTerms Term{subTerms=[]} = [] + getListTerms Term{subTerms=[]} = [] getListTerms t@Suspension{} = [t] getListTerms t = pprPanic "getListTerms" (ppr t) @@ -579,7 +589,7 @@ cvObtainTerm hsc_env bound force mb_ty hval = runTR hsc_env $ do -- and showing the '_' is more useful. t | isThunk t && force -> seq a $ go (pred bound) tv ty a -- We always follow indirections - Indirection _ -> go (pred bound) tv ty $! (ptrs clos ! 0) + Indirection _ -> go bound tv ty $! (ptrs clos ! 0) -- The interesting case Constr -> do Right dcname <- dataConInfoPtrToName (infoPtr clos) @@ -641,11 +651,11 @@ cvObtainTerm hsc_env bound force mb_ty hval = runTR hsc_env $ do | isPointed ty = ASSERT2(not(null pointed) , ptext SLIT("reOrderTerms") $$ (ppr pointed $$ ppr unpointed)) - head pointed : reOrderTerms (tail pointed) unpointed tys + let (t:tt) = pointed in t : reOrderTerms tt unpointed tys | otherwise = ASSERT2(not(null unpointed) , ptext SLIT("reOrderTerms") $$ (ppr pointed $$ ppr unpointed)) - head unpointed : reOrderTerms pointed (tail unpointed) tys + let (t:tt) = unpointed in t : reOrderTerms pointed tt tys expandNewtypes t@Term{ ty=ty, subTerms=tt } | Just (tc, args) <- splitNewTyConApp_maybe ty @@ -728,16 +738,20 @@ cvReconstructType hsc_env max_depth mb_ty hval = runTR_maybe hsc_env $ do -- improved rtti_t computed by RTTI -- The main difference between RTTI types and their normal counterparts -- is that the former are _not_ polymorphic, thus polymorphism must - -- be stripped. Syntactically, forall's must be stripped -computeRTTIsubst :: Type -> Type -> Maybe TvSubst + -- be stripped. Syntactically, forall's must be stripped. + -- We also remove predicates. +computeRTTIsubst :: Type -> Type -> TvSubst computeRTTIsubst ty rtti_ty = + case mb_subst of + Just subst -> subst + Nothing -> pprPanic "Failed to compute a RTTI substitution" + (ppr (ty, rtti_ty)) -- In addition, we strip newtypes too, since the reconstructed type might -- not have recovered them all - tcUnifyTys (const BindMe) - [repType' $ dropForAlls$ ty] - [repType' $ rtti_ty] --- TODO stripping newtypes shouldn't be necessary, test - + -- TODO stripping newtypes shouldn't be necessary, test + where mb_subst = tcUnifyTys (const BindMe) + [rttiView ty] + [rttiView rtti_ty] -- Dealing with newtypes {-