[project @ 1998-02-25 12:59:55 by sof]

[ghc-hetmet.git] / ghc / compiler / simplCore / MagicUFs.lhs

diff --git a/ghc/compiler/simplCore/MagicUFs.lhs b/ghc/compiler/simplCore/MagicUFs.lhs
index 79f659e..9df17ea 100644 (file)
--- a/ghc/compiler/simplCore/MagicUFs.lhs
+++ b/ghc/compiler/simplCore/MagicUFs.lhs
@@ -4,8 +4,6 @@
 \section[MagicUFs]{Magic unfoldings that the simplifier knows about}
 
 \begin{code}
-#include "HsVersions.h"
-
 module MagicUFs (
        MagicUnfoldingFun,  -- absolutely abstract
 
@@ -13,12 +11,12 @@ module MagicUFs (
        applyMagicUnfoldingFun
     ) where
 
-IMP_Ubiq(){-uitous-}
-IMPORT_DELOOPER(IdLoop)                -- paranoia checking
+#include "HsVersions.h"
 
+import Id              ( addInlinePragma )
 import CoreSyn
 import SimplEnv                ( SimplEnv )
-import SimplMonad      ( SYN_IE(SmplM), SimplCount )
+import SimplMonad      ( SmplM, SimplCount )
 import Type            ( mkFunTys )
 import TysWiredIn      ( mkListTy )
 import Unique          ( Unique{-instances-} )
@@ -446,11 +444,11 @@ foldl_fun env (TypeArg ty1:TypeArg ty2:ValArg arg_k:ValArg arg_z:ValArg arg_list
                                      t] ->
 
         let
-         c     = addIdUnfolding pre_c (iWantToBeINLINEd UnfoldAlways)
+         c     = addInlinePragma pre_c
          c_rhs = Lam b (Lam g' (Lam a
                  (Let (NonRec t (App (App (argToExpr arg_k) (VarArg a)) (VarArg b)))
                         (App (Var g') (VarArg t)))))
-         n     = addIdUnfolding pre_n (iWantToBeINLINEd UnfoldAlways)
+         n     = addInlinePragma pre_n
          n_rhs = Lam a' (Var a')
         in
         returnSmpl (Let (NonRec c c_rhs) $
@@ -489,13 +487,13 @@ foldl_fun env (TypeArg ty1:TypeArg ty2:ValArg arg_k:ValArg arg_z:ValArg arg_list
                                      t] ->
 
         let
-         c     = addIdUnfolding pre_c (iWantToBeINLINEd UnfoldAlways)
+         c     = addInlinePragma pre_c
          c_rhs = Lam b (Lam g_ (Lam a
                  (Let (NonRec t (App (App (argToExpr arg_k) (VarArg a)) (VarArg b)))
                         (App (Var g_) (VarArg t)))))
-         n     = addIdUnfolding pre_n (iWantToBeINLINEd UnfoldAlways)
+         n     = addInlinePragma pre_n
          n_rhs = Lam a' (Var a')
-         r     = addIdUnfolding pre_r (iWantToBeINLINEd UnfoldAlways)
+         r     = addInlinePragma pre_r
          r_rhs = mkGenApp (Var foldrId)
                                        [TypeArg ty2,TypeArg (mkFunTys [ty1] ty1),
                                         ValArg (VarArg c),