[project @ 2000-03-23 17:45:17 by simonpj]

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

diff --git a/ghc/compiler/stranal/SaLib.lhs b/ghc/compiler/stranal/SaLib.lhs
index 1a057b6..813410c 100644 (file)
--- a/ghc/compiler/stranal/SaLib.lhs
+++ b/ghc/compiler/stranal/SaLib.lhs
@@ -19,6 +19,7 @@ module SaLib (
 #include "HsVersions.h"
 
 import Id              ( Id )
+import Type            ( Type )
 import CoreSyn         ( CoreExpr )
 import VarEnv
 import IdInfo          ( StrictnessInfo(..) )
@@ -58,9 +59,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 +81,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}
 
 %-----------