X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FInteractiveEval.hs;h=352fbf055f31da98409101bc35b433e4fd27e13f;hb=a8d8c534d5363c865ee2c4948ccd52a64a62c55f;hp=794459c4587ed70a14688f7791eef0a9b7b1c391;hpb=709c9ce0ec4ecaabc1e4ee0f05dbad87fc6aca4d;p=ghc-hetmet.git diff --git a/compiler/main/InteractiveEval.hs b/compiler/main/InteractiveEval.hs index 794459c..352fbf0 100644 --- a/compiler/main/InteractiveEval.hs +++ b/compiler/main/InteractiveEval.hs @@ -82,7 +82,7 @@ import Data.Array import Exception import Control.Concurrent import Data.List (sortBy) -import Foreign.StablePtr +-- import Foreign.StablePtr import System.IO -- ----------------------------------------------------------------------------- @@ -308,7 +308,7 @@ traceRunStatus expr bindings final_ids let history' = mkHistory hsc_env apStack info `consBL` history -- probably better make history strict here, otherwise -- our BoundedList will be pointless. - liftIO $ evaluate history' + _ <- liftIO $ evaluate history' status <- withBreakAction True (hsc_dflags hsc_env) breakMVar statusMVar $ do @@ -586,7 +586,7 @@ bindLocalsAtBreakpoint hsc_env apStack (Just info) = do -- has been accidentally evaluated, or something else has gone wrong. -- So that we don't fall over in a heap when this happens, just don't -- bind any free variables instead, and we emit a warning. - mb_hValues <- mapM (getIdValFromApStack apStack) offsets + mb_hValues <- mapM (getIdValFromApStack apStack) (map fromIntegral offsets) let filtered_ids = [ id | (id, Just _hv) <- zip ids mb_hValues ] when (any isNothing mb_hValues) $ debugTraceMsg (hsc_dflags hsc_env) 1 $