From: simonmar Date: Thu, 19 Sep 2002 13:22:07 +0000 (+0000) Subject: [project @ 2002-09-19 13:22:07 by simonmar] X-Git-Tag: Approx_11550_changesets_converted~1653 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=d45f529caa46cec03ca3c1c65232230add7eed61;p=ghc-hetmet.git [project @ 2002-09-19 13:22:07 by simonmar] Remove vestiges of GHC.Prim.assert --- diff --git a/ghc/compiler/prelude/PrelInfo.lhs b/ghc/compiler/prelude/PrelInfo.lhs index 450dea5..76c8f6d 100644 --- a/ghc/compiler/prelude/PrelInfo.lhs +++ b/ghc/compiler/prelude/PrelInfo.lhs @@ -11,7 +11,7 @@ module PrelInfo ( wiredInThings, -- Names of wired in things wiredInThingEnv, ghcPrimExports, - cCallableClassDecl, cReturnableClassDecl, assertDecl, + cCallableClassDecl, cReturnableClassDecl, -- Random other things maybeCharLikeCon, maybeIntLikeCon, @@ -103,14 +103,6 @@ ghcPrimExports :: [RdrAvailInfo] cCallableOcc = nameOccName cCallableClassName cReturnableOcc = nameOccName cReturnableClassName -assertDecl - = IfaceSig { - tcdName = getRdrName assertName, - tcdType = HsForAllTy (Just [liftedAlpha]) [] (HsTyVar alpha), - tcdIdInfo = [], - tcdLoc = noSrcLoc - } - cCallableClassDecl = mkClassDecl ([], getRdrName cCallableClassName, [openAlpha]) diff --git a/ghc/compiler/rename/RnHiFiles.lhs b/ghc/compiler/rename/RnHiFiles.lhs index 76f636c..25706e3 100644 --- a/ghc/compiler/rename/RnHiFiles.lhs +++ b/ghc/compiler/rename/RnHiFiles.lhs @@ -39,7 +39,7 @@ import RnEnv import TcRnMonad import PrelNames ( gHC_PRIM_Name, gHC_PRIM ) -import PrelInfo ( ghcPrimExports, cCallableClassDecl, cReturnableClassDecl, assertDecl ) +import PrelInfo ( ghcPrimExports, cCallableClassDecl, cReturnableClassDecl ) import Name ( Name {-instance NamedThing-}, nameModule, isInternalName ) import NameEnv @@ -740,8 +740,7 @@ ghcPrimIface = ParsedIface { pi_usages = [], pi_exports = (1, [(gHC_PRIM_Name, ghcPrimExports)]), pi_decls = [(1,cCallableClassDecl), - (1,cReturnableClassDecl), - (1,assertDecl)], + (1,cReturnableClassDecl)], pi_fixity = [FixitySig (nameRdrName (idName seqId)) (Fixity 0 InfixR) noSrcLoc], -- seq is infixr 0