[commit: ghc] wip/pattern-synonyms: Pattern synonyms have no implicit Ids (939d2ac)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/pattern-synonyms
Link       : http://ghc.haskell.org/trac/ghc/changeset/939d2ac005b9401eaf6ffd8dad64bc2f332cbe48/ghc

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

commit 939d2ac005b9401eaf6ffd8dad64bc2f332cbe48
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Apr 29 13:10:09 2014 +0100

    Pattern synonyms have no implicit Ids


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

939d2ac005b9401eaf6ffd8dad64bc2f332cbe48
 compiler/iface/IfaceSyn.lhs |  6 ------
 compiler/iface/TcIface.lhs  |  5 ++++-
 compiler/main/HscTypes.lhs  | 20 +++++++++++---------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/compiler/iface/IfaceSyn.lhs b/compiler/iface/IfaceSyn.lhs
index f8c35ba..40daad1 100644
--- a/compiler/iface/IfaceSyn.lhs
+++ b/compiler/iface/IfaceSyn.lhs
@@ -59,7 +59,6 @@ import BooleanFormula ( BooleanFormula )
 
 import Control.Monad
 import System.IO.Unsafe
-import Data.Maybe ( isJust )
 
 infixl 3 &&&
 \end{code}
@@ -1004,11 +1003,6 @@ ifaceDeclImplicitBndrs (IfaceClass {ifCtxt = sc_ctxt, ifName = cls_tc_occ,
     dc_occ = mkClassDataConOcc cls_tc_occ
     is_newtype = n_sigs + n_ctxt == 1 -- Sigh
 
-ifaceDeclImplicitBndrs (IfacePatSyn{ ifName = ps_occ, ifPatWrapper = wrapper_name })
-  = [wrap_occ | isJust wrapper_name]
-  where
-    wrap_occ = mkDataConWrapperOcc ps_occ
-
 ifaceDeclImplicitBndrs _ = []
 
 -- -----------------------------------------------------------------------------
diff --git a/compiler/iface/TcIface.lhs b/compiler/iface/TcIface.lhs
index 7fc7758..d293a78 100644
--- a/compiler/iface/TcIface.lhs
+++ b/compiler/iface/TcIface.lhs
@@ -590,7 +590,10 @@ tc_iface_decl _ _ (IfacePatSyn{ ifName = occ_name
                               , ifPatArgs = args })
   = do { name <- lookupIfaceTop occ_name
        ; matcher <- tcExt "Matcher" matcher_name
-       ; wrapper <- maybe (return Nothing) (fmap Just . tcExt "Wrapper") wrapper_name
+       ; wrapper <- case wrapper_name of
+                        Nothing -> return Nothing
+                        Just wn -> do { wid <- tcExt "Wrapper" wn
+                                      ; return (Just wid) }
        ; argNames <- mapM (newIfaceName . mkVarOccFS) args
        ; return $ AConLike . PatSynCon $
              buildPatSyn name is_infix matcher wrapper argNames }
diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index d0f59a1..875badf 100644
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -1505,15 +1505,17 @@ implicitTyThings :: TyThing -> [TyThing]
 implicitTyThings (AnId _)       = []
 implicitTyThings (ACoAxiom _cc) = []
 implicitTyThings (ATyCon tc)    = implicitTyConThings tc
-implicitTyThings (AConLike cl)  = case cl of
-    RealDataCon dc ->
-        -- For data cons add the worker and (possibly) wrapper
-        map AnId (dataConImplicitIds dc)
-    PatSynCon ps ->
-        -- For bidirectional pattern synonyms, add the wrapper
-        case patSynWrapper ps of
-            Nothing -> []
-            Just id -> [AnId id]
+implicitTyThings (AConLike cl)  = implicitConLikeThings cl
+
+implicitConLikeThings :: ConLike -> [TyThing]
+implicitConLikeThings (RealDataCon dc)
+  = map AnId (dataConImplicitIds dc)
+    -- For data cons add the worker and (possibly) wrapper
+
+implicitConLikeThings (PatSynCon {})
+  = []  -- Pattern synonyms have no implicit Ids; the wrapper and matcher
+        -- are not "implicit"; they are simply new top-level bindings,
+        -- and they have their own declaration in an interface fiel
 
 implicitClassThings :: Class -> [TyThing]
 implicitClassThings cl