X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fstranal%2FSaLib.lhs;h=72b3ebbc862324789ebb3e8d3dd734105d73643c;hb=fc6e8220115637e4610ef4ac1c0aa55fe4ca529f;hp=e3fd7abc052fb999e8fbfad4b2d0df175cc022db;hpb=7a3bd641457666e10d0a47be9f22762e03defbf0;p=ghc-hetmet.git

diff --git a/ghc/compiler/stranal/SaLib.lhs b/ghc/compiler/stranal/SaLib.lhs
index e3fd7ab..72b3ebb 100644
--- a/ghc/compiler/stranal/SaLib.lhs
+++ b/ghc/compiler/stranal/SaLib.lhs
@@ -1,35 +1,32 @@
 %
-% (c) The GRASP/AQUA Project, Glasgow University, 1993-1996
+% (c) The GRASP/AQUA Project, Glasgow University, 1993-1998
 %
 \section[SaLib]{Basic datatypes, functions for the strictness analyser}
 
 See also: the ``library'' for the ``back end'' (@SaBackLib@).
 
 \begin{code}
-#include "HsVersions.h"
+#ifndef OLD_STRICTNESS
+module SaLib () where
+#else
 
 module SaLib (
 	AbsVal(..),
 	AnalysisKind(..),
-	AbsValEnv{-abstract-}, SYN_IE(StrictEnv), SYN_IE(AbsenceEnv),
-	SYN_IE(StrAnalFlags), getStrAnalFlags,
+	AbsValEnv{-abstract-}, StrictEnv, AbsenceEnv,
+	mkAbsApproxFun,
 	nullAbsValEnv, addOneToAbsValEnv, growAbsValEnvList,
 	lookupAbsValEnv,
 	absValFromStrictness
     ) where
 
-IMP_Ubiq(){-uitous-}
+#include "HsVersions.h"
 
-import CoreSyn		( SYN_IE(CoreExpr) )
-import Id		( nullIdEnv, addOneToIdEnv, growIdEnvList,
-			  lookupIdEnv, SYN_IE(IdEnv),
-			  GenId{-instance Outputable-}
-			)
+import Type		( Type )
+import VarEnv
 import IdInfo		( StrictnessInfo(..) )
-import Demand		( Demand{-instance Outputable-} )
-import Outputable	( Outputable(..){-instance * []-} )
-import PprType		( GenType{-instance Outputable-} )
-import Pretty		( ppStr, ppCat )
+import Demand		( Demand )
+import Outputable
 \end{code}
 
 %************************************************************************
@@ -44,7 +41,7 @@ import Pretty		( ppStr, ppCat )
 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.
@@ -64,28 +61,31 @@ data AbsVal
 			    --    AbsProd [AbsBot, ..., AbsBot]
 
   | AbsFun	    	    -- An abstract function, with the given:
-	    [Id]	    -- arguments
-	    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
-	    		    -- abstract function which is strict in its i'th
-			    -- argument if the i'th element of the Demand
-			    -- list so indicates.
-			    -- The list of arguments is always non-empty.
-			    -- In effect, AbsApproxFun [] = AbsTop
+	    AbsVal	    -- abstract function which is strict in its
+			    -- arguments if the  Demand so indicates.
+	-- INVARIANT: the [Demand] is non-empty
+
+	-- AbsApproxFun has to take a *list* of demands, no just one,
+	-- because function spaces are now lifted.  Hence, (f bot top)
+	-- might be bot, but the partial application (f bot) is a *function*,
+	-- not bot.
+
+mkAbsApproxFun :: Demand -> AbsVal -> AbsVal
+mkAbsApproxFun d (AbsApproxFun ds val) = AbsApproxFun (d:ds) val
+mkAbsApproxFun d val	   	       = AbsApproxFun [d]    val
 
 instance Outputable AbsVal where
-    ppr sty AbsTop = ppStr "AbsTop"
-    ppr sty AbsBot = ppStr "AbsBot"
-    ppr sty (AbsProd prod) = ppCat [ppStr "AbsProd", ppr sty prod]
-    ppr sty (AbsFun args body env)
-      = ppCat [ppStr "AbsFun{", ppr sty args,
-	       ppStr "???", -- ppStr "}{env:", ppr sty (keysFM env `zip` eltsFM env),
-	       ppStr "}" ]
-    ppr sty (AbsApproxFun demands)
-      = ppCat [ppStr "AbsApprox{", ppr sty demands, ppStr "}" ]
+    ppr AbsTop = ptext SLIT("AbsTop")
+    ppr AbsBot = ptext SLIT("AbsBot")
+    ppr (AbsProd prod) = hsep [ptext SLIT("AbsProd"), ppr prod]
+    ppr (AbsFun bndr_ty body) = ptext SLIT("AbsFun")
+    ppr (AbsApproxFun demands val)
+      = ptext SLIT("AbsApprox") <+> brackets (interpp'SP demands) <+> ppr val
 \end{code}
 
 %-----------
@@ -95,35 +95,36 @@ implicitly bound to @AbsTop@, the completely uninformative,
 pessimistic value---see @absEval@ of a @Var@.
 
 \begin{code}
-data AbsValEnv = AbsValEnv StrAnalFlags (IdEnv AbsVal)
-
-type StrAnalFlags
-  = (Bool,	-- True <=> AllStrict flag is set
-     Bool)	-- True <=> NumbersStrict flag is set
+newtype AbsValEnv = AbsValEnv (IdEnv AbsVal)
 
 type StrictEnv  = AbsValEnv	-- Environment for strictness analysis
 type AbsenceEnv = AbsValEnv	-- Environment for absence analysis
 
-nullAbsValEnv flags -- this is the one and only way to create AbsValEnvs
-  = AbsValEnv flags nullIdEnv
+nullAbsValEnv -- this is the one and only way to create AbsValEnvs
+  = AbsValEnv emptyVarEnv
 
-addOneToAbsValEnv (AbsValEnv x idenv) y z = AbsValEnv x (addOneToIdEnv idenv y z)
-growAbsValEnvList (AbsValEnv x idenv) ys  = AbsValEnv x (growIdEnvList idenv ys)
+addOneToAbsValEnv (AbsValEnv idenv) y z = AbsValEnv (extendVarEnv idenv y z)
+growAbsValEnvList (AbsValEnv idenv) ys  = AbsValEnv (extendVarEnvList idenv ys)
 
-lookupAbsValEnv (AbsValEnv _ idenv) y
-  = lookupIdEnv idenv y
-
-getStrAnalFlags (AbsValEnv flags _) = flags
+lookupAbsValEnv (AbsValEnv idenv) y
+  = lookupVarEnv idenv y
 \end{code}
 
 \begin{code}
-absValFromStrictness :: AnalysisKind -> StrictnessInfo bdee -> AbsVal
-
-absValFromStrictness anal NoStrictnessInfo 	       = AbsTop
+absValFromStrictness :: AnalysisKind -> StrictnessInfo -> AbsVal
+
+absValFromStrictness anal NoStrictnessInfo = AbsTop
+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
+  where
+    res | not bot_result = AbsTop
+	| otherwise      = case anal of
+				StrAnal -> AbsBot
+				AbsAnal -> AbsTop
+\end{code}
 
-absValFromStrictness StrAnal BottomGuaranteed 	       = AbsBot -- Guaranteed bottom
-absValFromStrictness AbsAnal BottomGuaranteed 	       = AbsTop	-- Check for poison in
-								-- arguments (if any)
-absValFromStrictness anal (StrictnessInfo []        _) = AbsTop
-absValFromStrictness anal (StrictnessInfo args_info _) = AbsApproxFun args_info
+\begin{code}
+#endif /* OLD_STRICTNESS */
 \end{code}