Ensure runhaskell is rebuild in stage2

[ghc-hetmet.git] / compiler / hsSyn / HsImpExp.lhs

diff --git a/compiler/hsSyn/HsImpExp.lhs b/compiler/hsSyn/HsImpExp.lhs
index ebd18ea..78e417c 100644 (file)
--- a/compiler/hsSyn/HsImpExp.lhs
+++ b/compiler/hsSyn/HsImpExp.lhs
@@ -6,17 +6,15 @@
 HsImpExp: Abstract syntax: imports, exports, interfaces
 
 \begin{code}
-{-# OPTIONS_GHC -w #-}
+{-# OPTIONS -fno-warn-incomplete-patterns #-}
 -- The above warning supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and fix
 -- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
 -- for details
 
 module HsImpExp where
 
-#include "HsVersions.h"
-
 import Module          ( ModuleName )
 import HsDoc           ( HsDoc )
 
@@ -47,25 +45,26 @@ data ImportDecl name
 \begin{code}
 instance (Outputable name) => Outputable (ImportDecl name) where
     ppr (ImportDecl mod from qual as spec)
-      = hang (hsep [ptext SLIT("import"), ppr_imp from, 
+      = hang (hsep [ptext (sLit "import"), ppr_imp from, 
                     pp_qual qual, ppr mod, pp_as as])
             4 (pp_spec spec)
       where
        pp_qual False   = empty
-       pp_qual True    = ptext SLIT("qualified")
+       pp_qual True    = ptext (sLit "qualified")
 
        pp_as Nothing   = empty
-       pp_as (Just a)  = ptext SLIT("as ") <+> ppr a
+       pp_as (Just a)  = ptext (sLit "as ") <+> ppr a
 
-       ppr_imp True  = ptext SLIT("{-# SOURCE #-}")
+       ppr_imp True  = ptext (sLit "{-# SOURCE #-}")
        ppr_imp False = empty
 
        pp_spec Nothing = empty
        pp_spec (Just (False, spec))
                        = parens (interpp'SP spec)
        pp_spec (Just (True, spec))
-                       = ptext SLIT("hiding") <+> parens (interpp'SP spec)
+                       = ptext (sLit "hiding") <+> parens (interpp'SP spec)
 
+ideclName :: ImportDecl name -> Located ModuleName
 ideclName (ImportDecl mod_nm _ _ _ _) = mod_nm
 \end{code}
 
@@ -115,8 +114,8 @@ instance (Outputable name) => Outputable (IE name) where
     ppr (IEThingWith thing withs)
        = ppr thing <> parens (fsep (punctuate comma (map pprHsVar withs)))
     ppr (IEModuleContents mod)
-       = ptext SLIT("module") <+> ppr mod
-    ppr (IEGroup n doc)         = text ("<IEGroup: " ++ (show n) ++ ">") 
+       = ptext (sLit "module") <+> ppr mod
+    ppr (IEGroup n _)           = text ("<IEGroup: " ++ (show n) ++ ">")
     ppr (IEDoc doc)             = ppr doc
     ppr (IEDocNamed string)     = text ("<IEDocNamed: " ++ string ++ ">")
 \end{code}
@@ -131,13 +130,13 @@ pprHsVar v | isOperator ppr_v = parens ppr_v
 isOperator :: SDoc -> Bool
 isOperator ppr_v 
   = case showSDocUnqual ppr_v of
-       ('(':s)   -> False              -- (), (,) etc
-       ('[':s)   -> False              -- []
-       ('$':c:s) -> not (isAlpha c)    -- Don't treat $d as an operator
-       (':':c:s) -> not (isAlpha c)    -- Don't treat :T as an operator
-       ('_':s)   -> False              -- Not an operator
-       (c:s)     -> not (isAlpha c)    -- Starts with non-alpha
-       other     -> False
+        ('(':_)   -> False              -- (), (,) etc
+        ('[':_)   -> False              -- []
+        ('$':c:_) -> not (isAlpha c)    -- Don't treat $d as an operator
+        (':':c:_) -> not (isAlpha c)    -- Don't treat :T as an operator
+        ('_':_)   -> False              -- Not an operator
+        (c:_)     -> not (isAlpha c)    -- Starts with non-alpha
+        _         -> False
     -- We use (showSDoc (ppr v)), rather than isSymOcc (getOccName v) simply so
     -- that we don't need NamedThing in the context of all these functions.
     -- Gruesome, but simple.