[project @ 2002-11-20 23:27:37 by chak]

[ghc-hetmet.git] / ghc / compiler / stranal / SaLib.lhs

diff --git a/ghc/compiler/stranal/SaLib.lhs b/ghc/compiler/stranal/SaLib.lhs
index 9135e87..ac9c267 100644 (file)
--- a/ghc/compiler/stranal/SaLib.lhs
+++ b/ghc/compiler/stranal/SaLib.lhs
@@ -18,11 +18,10 @@ module SaLib (
 
 #include "HsVersions.h"
 
-import Id              ( Id )
-import CoreSyn         ( CoreExpr )
+import Type            ( Type )
 import VarEnv
 import IdInfo          ( StrictnessInfo(..) )
-import Demand          ( Demand, pprDemands )
+import Demand          ( Demand )
 import Outputable
 \end{code}
 
@@ -38,7 +37,7 @@ import Outputable
 data AnalysisKind
   = StrAnal    -- We're doing strictness analysis
   | AbsAnal    -- We're doing absence analysis
-  deriving Text
+  deriving Show
 \end{code}
 
 @AbsVal@ is the data type of HNF abstract values.
@@ -58,9 +57,8 @@ data AbsVal
                            --    AbsProd [AbsBot, ..., AbsBot]
 
   | AbsFun                 -- An abstract function, with the given:
-           Id              -- argument
-           CoreExpr        -- body
-           AbsValEnv       -- and environment
+           Type                 -- Type of the *argument* to the function
+           (AbsVal -> AbsVal)  -- The function
 
   | AbsApproxFun           -- This is used to represent a coarse
            [Demand]        -- approximation to a function value.  It's an
@@ -81,12 +79,9 @@ instance Outputable AbsVal where
     ppr AbsTop = ptext SLIT("AbsTop")
     ppr AbsBot = ptext SLIT("AbsBot")
     ppr (AbsProd prod) = hsep [ptext SLIT("AbsProd"), ppr prod]
-    ppr (AbsFun arg body env)
-      = hsep [ptext SLIT("AbsFun{"), ppr arg,
-              ptext SLIT("???"), -- text "}{env:", ppr (keysFM env `zip` eltsFM env),
-              char '}' ]
+    ppr (AbsFun bndr_ty body) = ptext SLIT("AbsFun")
     ppr (AbsApproxFun demands val)
-      = hsep [ptext SLIT("AbsApprox "), hcat (map ppr demands), ppr val]
+      = ptext SLIT("AbsApprox") <+> brackets (interpp'SP demands) <+> ppr val
 \end{code}
 
 %-----------
@@ -115,7 +110,7 @@ lookupAbsValEnv (AbsValEnv idenv) y
 absValFromStrictness :: AnalysisKind -> StrictnessInfo -> AbsVal
 
 absValFromStrictness anal NoStrictnessInfo = AbsTop
-absValFromStrictness anal (StrictnessInfo args_info bot_result _)
+absValFromStrictness anal (StrictnessInfo args_info bot_result)
   = case args_info of  -- Check the invariant that the arg list on 
        [] -> res       -- AbsApproxFun is non-empty
        _  -> AbsApproxFun args_info res