From: simonpj <unknown>
Date: Sat, 31 Aug 2002 08:37:56 +0000 (+0000)
Subject: [project @ 2002-08-31 08:37:56 by simonpj]
X-Git-Tag: nhc98-1-18-release~882
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c0322a4ca55b1d85c3fb08a4780af3ed5890435a;p=ghc-base.git

[project @ 2002-08-31 08:37:56 by simonpj]
Remove GHC.Base.assert until I can figure out what happened
---

diff --git a/GHC/Base.lhs b/GHC/Base.lhs
index e3bc346..7ee7d7d 100644
--- a/GHC/Base.lhs
+++ b/GHC/Base.lhs
@@ -595,10 +595,14 @@ id x			=  x
 lazy :: a -> a
 lazy x = x
 
+-- 	SLPJ: this was transferred from the TH branch
+--	and I've forgotten what it was for... so I'll
+--	comment it back out for now.  It conflicts with
+--	'assert' in GHC.Prim
 -- Assertion function. This simply ignores its boolean argument.
 -- The compiler may rewrite it to (assertError line)
-assert :: Bool -> a -> a
-assert pred r = r
+-- assert :: Bool -> a -> a
+-- assert pred r = r
  
 -- constant function
 const			:: a -> b -> a