X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=145d6bdfcd10b73857208d5872415d851016425f;hb=f3ebc8951ad495a5a027f1f482b45648dfe11c58;hp=4c14ff6338093305224eea31f5f5d1a2b8692bc4;hpb=24ee75415832b05f53726f2bbdf52972b1cfb613;p=ghc-hetmet.git diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs index 4c14ff6..145d6bd 100644 --- a/compiler/main/GHC.hs +++ b/compiler/main/GHC.hs @@ -85,8 +85,7 @@ module GHC ( Resume(resumeStmt, resumeThreadId, resumeBreakInfo, resumeSpan, resumeHistory, resumeHistoryIx), History(historyBreakInfo, historyEnclosingDecl), - GHC.getHistorySpan, getHistoryModule, getHistoryTick, - GHC.findEnclosingDeclSpanByTick, + GHC.getHistorySpan, getHistoryModule, getResumeContext, abandon, abandonAll, InteractiveEval.back, @@ -95,7 +94,7 @@ module GHC ( isModuleInterpreted, compileExpr, HValue, dynCompileExpr, lookupName, - obtainTerm, obtainTerm1, + GHC.obtainTerm, GHC.obtainTerm1, GHC.obtainTermB, reconstructType, modInfoModBreaks, ModBreaks(..), BreakIndex, BreakInfo(breakInfo_number, breakInfo_module), @@ -1989,7 +1988,16 @@ getHistorySpan :: Session -> History -> IO SrcSpan getHistorySpan sess h = withSession sess $ \hsc_env -> return$ InteractiveEval.getHistorySpan hsc_env h -findEnclosingDeclSpanByTick :: Session -> Module -> BreakIndex -> IO SrcSpan -findEnclosingDeclSpanByTick sess m t = withSession sess $ \ hsc_env -> - return$ InteractiveEval.findEnclosingDeclSpanByTick hsc_env m t +obtainTerm :: Session -> Bool -> Id -> IO Term +obtainTerm sess force id = withSession sess $ \hsc_env -> + InteractiveEval.obtainTerm hsc_env force id + +obtainTerm1 :: Session -> Bool -> Maybe Type -> a -> IO Term +obtainTerm1 sess force mb_ty a = withSession sess $ \hsc_env -> + InteractiveEval.obtainTerm1 hsc_env force mb_ty a + +obtainTermB :: Session -> Int -> Bool -> Id -> IO Term +obtainTermB sess bound force id = withSession sess $ \hsc_env -> + InteractiveEval.obtainTermB hsc_env bound force id + #endif