[project @ 1996-05-01 18:36:59 by partain]

[ghc-hetmet.git] / ghc / compiler / typecheck / TcPragmas.lhs

diff --git a/ghc/compiler/typecheck/TcPragmas.lhs b/ghc/compiler/typecheck/TcPragmas.lhs
index 12b7009..40df4a8 100644 (file)
--- a/ghc/compiler/typecheck/TcPragmas.lhs
+++ b/ghc/compiler/typecheck/TcPragmas.lhs
@@ -13,12 +13,10 @@ module TcPragmas (
        tcGenPragmas
     ) where
 
-import TcMonad         -- typechecking monadic machinery
+import TcMonad         hiding ( rnMtoTcM )
 import HsSyn           -- the stuff being typechecked
 
 import PrelInfo                ( PrimOp(..)    -- to see CCallOp
-                         IF_ATTACK_PRAGMAS(COMMA tagOf_PrimOp)
-                         IF_ATTACK_PRAGMAS(COMMA pprPrimOp)
                        )
 import Type
 import CmdLineOpts
@@ -557,21 +555,21 @@ tc_unfolding e (ImpUnfolding guidance uf_core)
            clas       = lookupCE rec_ce c
            super_clas = lookupCE rec_ce sc
        in
-       returnB_Tc (getSuperDictSelId clas super_clas)
+       returnB_Tc (classSuperDictSelId clas super_clas)
 
     tc_uf_Id lve (ClassOpUfId c op_name)
       = let
            clas = lookupCE rec_ce c
            op   = lookup_class_op clas op_name
        in
-       returnB_Tc (getClassOpId clas op)
+       returnB_Tc (classOpId clas op)
 
     tc_uf_Id lve (DefaultMethodUfId c op_name)
       = let
            clas = lookupCE rec_ce c
            op   = lookup_class_op clas op_name
        in
-       returnB_Tc (getDefaultMethodId clas op)
+       returnB_Tc (classDefaultMethodId clas op)
 
     tc_uf_Id lve uf_id@(DictFunUfId c ty)
       = tc_uf_type nullTVE ty  `thenB_Tc` \ new_ty ->
@@ -624,7 +622,7 @@ tc_unfolding e (ImpUnfolding guidance uf_core)
 
     ---------------
     lookup_class_op clas (ClassOpName _ _ _ tag)
-      = getClassOps clas !! (tag - 1)
+      = classOps clas !! (tag - 1)
 
     ---------------------------------------------------------------------
     tc_uf_type :: TVE -> UnfoldingType Name -> Baby_TcM Type
@@ -665,7 +663,7 @@ tcDataPragmas rec_tce tve rec_tycon new_tyvars (DataPragmas con_decls specs)
                                      (length new_tyvars) maybe_tys locn)
                                `thenB_Tc_`
 
-       checkB_Tc (not (all isUnboxedDataType (catMaybes maybe_tys)))
+       checkB_Tc (not (all isUnboxedType (catMaybes maybe_tys)))
                (badSpecialisationErr "data" "not all unboxed types"
                                      (length new_tyvars) maybe_tys locn)
                                `thenB_Tc_`