[project @ 1999-11-29 17:34:14 by simonpj]

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

diff --git a/ghc/compiler/hsSyn/HsBinds.lhs b/ghc/compiler/hsSyn/HsBinds.lhs
index 5e96627..c09ccc3 100644 (file)
--- a/ghc/compiler/hsSyn/HsBinds.lhs
+++ b/ghc/compiler/hsSyn/HsBinds.lhs
@@ -20,6 +20,7 @@ import PprCore                ()         -- Instances for Outputable
 
 --others:
 import Id              ( Id )
+import NameSet         ( NameSet, nameSetToList )
 import BasicTypes      ( RecFlag(..), Fixity )
 import Outputable      
 import Bag
@@ -100,7 +101,7 @@ data MonoBinds id pat
                    SrcLoc
 
   | FunMonoBind     id
-                   Bool                        -- True => infix declaration
+                   Bool                -- True => infix declaration
                    [Match id pat]
                    SrcLoc
 
@@ -110,10 +111,11 @@ data MonoBinds id pat
   | CoreMonoBind    id                 -- TRANSLATION
                    CoreExpr            -- No zonking; this is a final CoreExpr with Ids and Types!
 
-  | AbsBinds                   -- Binds abstraction; TRANSLATION
-               [TyVar]   -- Type variables
-               [id]                      -- Dicts
-               [([TyVar], id, id)]  -- (type variables, polymorphic, momonmorphic) triples
+  | AbsBinds                           -- Binds abstraction; TRANSLATION
+               [TyVar]                 -- Type variables
+               [id]                    -- Dicts
+               [([TyVar], id, id)]     -- (type variables, polymorphic, momonmorphic) triples
+               NameSet                 -- Set of *polymorphic* variables that have an INLINE pragma
                (MonoBinds id pat)      -- The "business end"
 
        -- Creates bindings for *new* (polymorphic, overloaded) locals
@@ -188,11 +190,12 @@ ppr_monobind (VarMonoBind name expr)
 ppr_monobind (CoreMonoBind name expr)
       = sep [ppr name <+> equals, nest 4 (ppr expr)]
 
-ppr_monobind (AbsBinds tyvars dictvars exports val_binds)
+ppr_monobind (AbsBinds tyvars dictvars exports inlines val_binds)
      = sep [ptext SLIT("AbsBinds"),
            brackets (interpp'SP tyvars),
            brackets (interpp'SP dictvars),
-           brackets (interpp'SP exports)]
+           brackets (sep (punctuate comma (map ppr exports))),
+           brackets (interpp'SP (nameSetToList inlines))]
        $$
        nest 4 (ppr val_binds)
 \end{code}
@@ -215,19 +218,22 @@ data Sig name
                SrcLoc
 
   | ClassOpSig name            -- Selector name
-               (Maybe name)    -- Default-method name (if any)
+               name            -- Default-method name (if any)
+               Bool            -- True <=> there is an explicit, programmer-supplied
+                               -- default declaration in the class decl
                (HsType name)
                SrcLoc
 
   | SpecSig    name            -- specialise a function or datatype ...
                (HsType name)   -- ... to these types
-               (Maybe name)    -- ... maybe using this as the code for it
                SrcLoc
 
   | InlineSig  name            -- INLINE f
+               (Maybe Int)     -- phase
                SrcLoc
 
   | NoInlineSig        name            -- NOINLINE f
+               (Maybe Int)     -- phase
                SrcLoc
 
   | SpecInstSig (HsType name)  -- (Class tys); should be a specialisation of the 
@@ -246,10 +252,10 @@ sigsForMe f sigs
   = filter sig_for_me sigs
   where
     sig_for_me (Sig         n _ _)       = f n
-    sig_for_me (ClassOpSig  n _ _ _)     = f n
-    sig_for_me (SpecSig     n _ _ _)     = f n
-    sig_for_me (InlineSig   n     _)     = f n  
-    sig_for_me (NoInlineSig n     _)     = f n  
+    sig_for_me (ClassOpSig  n _ _ _ _)           = f n
+    sig_for_me (SpecSig     n _ _)       = f n
+    sig_for_me (InlineSig   n _   _)     = f n  
+    sig_for_me (NoInlineSig n _   _)     = f n  
     sig_for_me (SpecInstSig _ _)         = False
     sig_for_me (FixSig (FixitySig n _ _)) = f n
 
@@ -258,8 +264,16 @@ isFixitySig (FixSig _) = True
 isFixitySig _         = False
 
 isClassOpSig :: Sig name -> Bool
-isClassOpSig (ClassOpSig _ _ _ _) = True
-isClassOpSig _                   = False
+isClassOpSig (ClassOpSig _ _ _ _ _) = True
+isClassOpSig _                     = False
+
+isPragSig :: Sig name -> Bool
+       -- Identifies pragmas 
+isPragSig (SpecSig _ _ _)     = True
+isPragSig (InlineSig   _ _ _) = True
+isPragSig (NoInlineSig _ _ _) = True
+isPragSig (SpecInstSig _ _)   = True
+isPragSig other                      = False
 \end{code}
 
 \begin{code}
@@ -273,26 +287,26 @@ instance Outputable name => Outputable (FixitySig name) where
 ppr_sig (Sig var ty _)
       = sep [ppr var <+> dcolon, nest 4 (ppr ty)]
 
-ppr_sig (ClassOpSig var _ ty _)
+ppr_sig (ClassOpSig var _ _ ty _)
       = sep [ppr var <+> dcolon, nest 4 (ppr ty)]
 
-ppr_sig (SpecSig var ty using _)
+ppr_sig (SpecSig var ty _)
       = sep [ hsep [text "{-# SPECIALIZE", ppr var, dcolon],
-             nest 4 (hsep [ppr ty, pp_using using, text "#-}"])
+             nest 4 (ppr ty <+> text "#-}")
        ]
-      where
-       pp_using Nothing   = empty
-       pp_using (Just me) = hsep [char '=', ppr me]
 
-ppr_sig (InlineSig var _)
-        = hsep [text "{-# INLINE", ppr var, text "#-}"]
+ppr_sig (InlineSig var phase _)
+        = hsep [text "{-# INLINE", ppr_phase phase, ppr var, text "#-}"]
 
-ppr_sig (NoInlineSig var _)
-        = hsep [text "{-# NOINLINE", ppr var, text "#-}"]
+ppr_sig (NoInlineSig var phase _)
+        = hsep [text "{-# NOINLINE", ppr_phase phase, ppr var, text "#-}"]
 
 ppr_sig (SpecInstSig ty _)
       = hsep [text "{-# SPECIALIZE instance", ppr ty, text "#-}"]
 
 ppr_sig (FixSig fix_sig) = ppr fix_sig
+
+ppr_phase Nothing = empty
+ppr_phase (Just n) = int n
 \end{code}