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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1bb4428cbc194cb959166fc8e12d0edd140e3796

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

commit 1bb4428cbc194cb959166fc8e12d0edd140e3796
Author: Ian Lynagh <[email protected]>
Date:   Tue Jun 12 12:22:51 2012 +0100

    Remove the Show Var instance

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

 compiler/basicTypes/Var.lhs     |    3 ---
 compiler/vectorise/Vectorise.hs |    4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/compiler/basicTypes/Var.lhs b/compiler/basicTypes/Var.lhs
index af7cb35..c6e743f 100644
--- a/compiler/basicTypes/Var.lhs
+++ b/compiler/basicTypes/Var.lhs
@@ -231,9 +231,6 @@ ppr_id_scope GlobalId              = ptext (sLit "gid")
 ppr_id_scope (LocalId Exported)    = ptext (sLit "lidx")
 ppr_id_scope (LocalId NotExported) = ptext (sLit "lid")
 
-instance Show Var where
-  showsPrec p var = showsPrecSDoc p (ppr var)
-
 instance NamedThing Var where
   getName = varName
 
diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs
index 3ac9c51..637897d 100644
--- a/compiler/vectorise/Vectorise.hs
+++ b/compiler/vectorise/Vectorise.hs
@@ -264,7 +264,7 @@ vectTopBinder var inline expr
           Just (vdty, _) 
             | eqType vty vdty -> return ()
             | otherwise       -> 
-              cantVectorise ("Type mismatch in vectorisation pragma for " ++ 
show var) $
+              cantVectorise ("Type mismatch in vectorisation pragma for " ++ 
showSDoc (ppr var)) $
                 (text "Expected type" <+> ppr vty)
                 $$
                 (text "Inferred type" <+> ppr vdty)
@@ -352,7 +352,7 @@ vectTopRhs recFs var expr
        ; vectDecl     <- lookupVectDecl var
        ; let isDFun = isDFunId var
 
-       ; traceVt ("vectTopRhs of " ++ show var ++ info globalScalar isDFun 
vectDecl ++ ":") $ 
+       ; traceVt ("vectTopRhs of " ++ showSDoc (ppr var) ++ info globalScalar 
isDFun vectDecl ++ ":") $ 
            ppr expr
 
        ; rhs globalScalar isDFun vectDecl



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

Reply via email to