[commit: ghc] master: De-orphan the Outputable Char instance (0e7aad2)

Ian Lynagh igloo at earth.li
Sun Aug 5 17:38:42 CEST 2012


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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0e7aad2c6cda3db0a050bfe8afc56bbb2815e30c

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

commit 0e7aad2c6cda3db0a050bfe8afc56bbb2815e30c
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Aug 5 14:18:22 2012 +0100

    De-orphan the Outputable Char instance

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

 compiler/hsSyn/HsSyn.lhs      |    4 ----
 compiler/utils/Outputable.lhs |    3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/compiler/hsSyn/HsSyn.lhs b/compiler/hsSyn/HsSyn.lhs
index b770fac..aa48739 100644
--- a/compiler/hsSyn/HsSyn.lhs
+++ b/compiler/hsSyn/HsSyn.lhs
@@ -9,7 +9,6 @@ which is declared in the various \tr{Hs*} modules.  This module,
 therefore, is almost nothing but re-exporting.
 
 \begin{code}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# OPTIONS -fno-warn-tabs #-}
 -- The above warning supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and
@@ -96,9 +95,6 @@ data HsExtCore name	-- Read from Foo.hcr
 
 
 \begin{code}
-instance Outputable Char where
-  ppr c = text [c]
-
 instance (OutputableBndr name, HasOccName name)
 	=> Outputable (HsModule name) where
 
diff --git a/compiler/utils/Outputable.lhs b/compiler/utils/Outputable.lhs
index 35abf5b..2ac49b3 100644
--- a/compiler/utils/Outputable.lhs
+++ b/compiler/utils/Outputable.lhs
@@ -597,6 +597,9 @@ class Outputable a where
 \end{code}
 
 \begin{code}
+instance Outputable Char where
+    ppr c = text [c]
+
 instance Outputable Bool where
     ppr True  = ptext (sLit "True")
     ppr False = ptext (sLit "False")





More information about the Cvs-ghc mailing list