[project @ 2002-09-16 11:24:20 by simonpj]

[ghc-base.git] / GHC / Base.lhs

diff --git a/GHC/Base.lhs b/GHC/Base.lhs
index 7ee7d7d..fe42991 100644 (file)
--- a/GHC/Base.lhs
+++ b/GHC/Base.lhs
@@ -595,14 +595,13 @@ 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
+--     SLPJ: in 5.04 etc 'assert' is in GHC.Prim,
+--     but from Template Haskell onwards it's simply
+--     defined here in Base.lhs
+assert :: Bool -> a -> a
+assert pred r = r
  
 -- constant function
 const                  :: a -> b -> a