projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1996-03-21 12:46:33 by partain]
[ghc-hetmet.git]
/
ghc
/
compiler
/
simplCore
/
SATMonad.lhs
diff --git
a/ghc/compiler/simplCore/SATMonad.lhs
b/ghc/compiler/simplCore/SATMonad.lhs
index
265df48
..
b61deb3
100644
(file)
--- a/
ghc/compiler/simplCore/SATMonad.lhs
+++ b/
ghc/compiler/simplCore/SATMonad.lhs
@@
-1,5
+1,5
@@
%
%
-% (c) The GRASP/AQUA Project, Glasgow University, 1992-1995
+% (c) The GRASP/AQUA Project, Glasgow University, 1992-1996
%
%************************************************************************
%* *
%
%************************************************************************
%* *
@@
-7,9
+7,20
@@
%* *
%************************************************************************
%* *
%************************************************************************
+96/03: We aren't using the static-argument transformation right now.
+
\begin{code}
#include "HsVersions.h"
\begin{code}
#include "HsVersions.h"
+module SATMonad where
+
+import Ubiq{-uitous-}
+import Util ( panic )
+
+junk_from_SATMonad = panic "SATMonad.junk"
+
+{- LATER: to end of file:
+
module SATMonad (
SATInfo(..), updSAEnv,
SatM(..), initSAT, emptyEnvSAT,
module SATMonad (
SATInfo(..), updSAEnv,
SatM(..), initSAT, emptyEnvSAT,
@@
-20,7
+31,7
@@
module SATMonad (
) where
import Type ( mkTyVarTy, mkSigmaTy, TyVarTemplate,
) where
import Type ( mkTyVarTy, mkSigmaTy, TyVarTemplate,
- extractTyVarsFromTy, splitSigmaTy, splitTyArgs,
+ splitSigmaTy, splitTyArgs,
glueTyArgs, instantiateTy, TauType(..),
Class, ThetaType(..), SigmaType(..),
InstTyEnv(..)
glueTyArgs, instantiateTy, TauType(..),
Class, ThetaType(..), SigmaType(..),
InstTyEnv(..)
@@
-135,7
+146,7
@@
newSATName id ty us env
getArgLists :: CoreExpr -> ([Arg Type],[Arg Id])
getArgLists expr
= let
getArgLists :: CoreExpr -> ([Arg Type],[Arg Id])
getArgLists expr
= let
- (uvs, tvs, lambda_bounds, body) = digForLambdas expr
+ (uvs, tvs, lambda_bounds, body) = collectBinders expr
in
([ Static (mkTyVarTy tv) | tv <- tvs ],
[ Static v | v <- lambda_bounds ])
in
([ Static (mkTyVarTy tv) | tv <- tvs ],
[ Static v | v <- lambda_bounds ])
@@
-201,7
+212,7
@@
saTransform binder rhs
-- this binder *will* get inlined but if it happen to be
-- a top level binder it is never removed as dead code,
-- therefore we have to remove that information (of it being
-- this binder *will* get inlined but if it happen to be
-- a top level binder it is never removed as dead code,
-- therefore we have to remove that information (of it being
- -- top-level or exported somehow.
+ -- top-level or exported somehow.)
-- A better fix is to use binder directly but with the TopLevel
-- tag (or Exported tag) modified.
fake_binder = mkSysLocal
-- A better fix is to use binder directly but with the TopLevel
-- tag (or Exported tag) modified.
fake_binder = mkSysLocal
@@
-250,4
+261,5
@@
dropStatics (_:args) (t:ts) = t:dropStatics args ts
isStatic :: Arg a -> Bool
isStatic NotStatic = False
isStatic _ = True
isStatic :: Arg a -> Bool
isStatic NotStatic = False
isStatic _ = True
+-}
\end{code}
\end{code}