Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/b926bd65c66ed4018101531eacf5bb7c3068c624

>---------------------------------------------------------------

commit b926bd65c66ed4018101531eacf5bb7c3068c624
Author: Ian Lynagh <[email protected]>
Date:   Mon Oct 3 13:22:52 2011 +0100

    Follow changes to HValue/Any handling
    
    Also removed the type argument to Any in primops.txt.pp. I don't
    see why we need it, and it now breaks haddocking GHC.Prim.

>---------------------------------------------------------------

 compiler/prelude/primops.txt.pp |    2 +-
 ghc/GhciMonad.hs                |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/prelude/primops.txt.pp b/compiler/prelude/primops.txt.pp
index 09d2dd3..5d53713 100644
--- a/compiler/prelude/primops.txt.pp
+++ b/compiler/prelude/primops.txt.pp
@@ -1849,7 +1849,7 @@ pseudoop   "lazy"
 
        Like {\tt seq}, the argument of {\tt lazy} can have an unboxed type. }
 
-primtype Any a
+primtype Any
        { The type constructor {\tt Any} is type to which you can unsafely 
coerce any
        lifted type, and back. 
 
diff --git a/ghc/GhciMonad.hs b/ghc/GhciMonad.hs
index d7d5b44..66b3c05 100644
--- a/ghc/GhciMonad.hs
+++ b/ghc/GhciMonad.hs
@@ -373,4 +373,4 @@ turnOffBuffering
 getHandle :: IORef (Ptr ()) -> IO Handle
 getHandle ref = do
   (Ptr addr) <- readIORef ref
-  case addrToHValue# addr of (# hval #) -> return (unsafeCoerce# hval)
+  case addrToAny# addr of (# hval #) -> return (unsafeCoerce# hval)



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to