[project @ 1996-07-15 16:16:46 by partain]

[ghc-hetmet.git] / ghc / compiler / basicTypes / IdUtils.lhs

diff --git a/ghc/compiler/basicTypes/IdUtils.lhs b/ghc/compiler/basicTypes/IdUtils.lhs
index afdc973..12c8d34 100644 (file)
--- a/ghc/compiler/basicTypes/IdUtils.lhs
+++ b/ghc/compiler/basicTypes/IdUtils.lhs
@@ -12,15 +12,16 @@ IMP_Ubiq()
 IMPORT_DELOOPER(PrelLoop)              -- here for paranoia checking
 
 import CoreSyn
-import CoreUnfold      ( UnfoldingGuidance(..) )
-import Id              ( mkPreludeId, mkTemplateLocals )
+import CoreUnfold      ( UnfoldingGuidance(..), Unfolding )
+import Id              ( mkImported, mkTemplateLocals )
 import IdInfo          -- quite a few things
-import Name            ( mkBuiltinName )
-import PrelMods                ( pRELUDE_BUILTIN )
+import SpecEnv         ( SpecEnv )
+import Name            ( mkPrimitiveName, OrigName(..) )
+import PrelMods                ( gHC_BUILTINS )
 import PrimOp          ( primOpInfo, tagOf_PrimOp, primOp_str,
                          PrimOpInfo(..), PrimOpResultInfo(..) )
 import RnHsSyn         ( RnName(..) )
-import Type            ( mkForAllTys, mkFunTys, mkTyVarTy, applyTyCon )
+import Type            ( mkForAllTys, mkFunTy, mkFunTys, mkTyVarTy, applyTyCon )
 import TysWiredIn      ( boolTy )
 import Unique          ( mkPrimOpIdUnique )
 import Util            ( panic )
@@ -35,35 +36,35 @@ primOpNameInfo op = (primOp_str  op, WiredInId (primOpId op))
 primOpId op
   = case (primOpInfo op) of
       Dyadic str ty ->
-       mk_prim_Id op pRELUDE_BUILTIN str [] [ty,ty] (dyadic_fun_ty ty) 2
+       mk_prim_Id op str [] [ty,ty] (dyadic_fun_ty ty) 2
 
       Monadic str ty ->
-       mk_prim_Id op pRELUDE_BUILTIN str [] [ty] (monadic_fun_ty ty) 1
+       mk_prim_Id op str [] [ty] (monadic_fun_ty ty) 1
 
       Compare str ty ->
-       mk_prim_Id op pRELUDE_BUILTIN str [] [ty,ty] (compare_fun_ty ty) 2
+       mk_prim_Id op str [] [ty,ty] (compare_fun_ty ty) 2
 
       Coercing str ty1 ty2 ->
-       mk_prim_Id op pRELUDE_BUILTIN str [] [ty1] (mkFunTys [ty1] ty2) 1
+       mk_prim_Id op str [] [ty1] (ty1 `mkFunTy` ty2) 1
 
       PrimResult str tyvars arg_tys prim_tycon kind res_tys ->
-       mk_prim_Id op pRELUDE_BUILTIN str
+       mk_prim_Id op str
            tyvars
            arg_tys
            (mkForAllTys tyvars (mkFunTys arg_tys (applyTyCon prim_tycon res_tys)))
            (length arg_tys) -- arity
 
       AlgResult str tyvars arg_tys tycon res_tys ->
-       mk_prim_Id op pRELUDE_BUILTIN str
+       mk_prim_Id op str
            tyvars
            arg_tys
            (mkForAllTys tyvars (mkFunTys arg_tys (applyTyCon tycon res_tys)))
            (length arg_tys) -- arity
   where
-    mk_prim_Id prim_op mod name tyvar_tmpls arg_tys ty arity
-      = mkPreludeId (mkBuiltinName key mod name) ty
+    mk_prim_Id prim_op name tyvar_tmpls arg_tys ty arity
+      = mkImported (mkPrimitiveName key (OrigName gHC_BUILTINS name)) ty
           (noIdInfo `addInfo` (mkArityInfo arity)
-                 `addInfo_UF` (mkUnfolding EssentialUnfolding
+                 `addInfo_UF` (mkUnfolding UnfoldAlways
                                 (mk_prim_unfold prim_op tyvar_tmpls arg_tys)))
       where
        key = mkPrimOpIdUnique (IBOX(tagOf_PrimOp prim_op))
@@ -72,7 +73,7 @@ primOpId op
 
 \begin{code}
 dyadic_fun_ty  ty = mkFunTys [ty, ty] ty
-monadic_fun_ty ty = mkFunTys [ty] ty
+monadic_fun_ty ty = ty `mkFunTy` ty
 compare_fun_ty ty = mkFunTys [ty, ty] boolTy
 \end{code}