From: simonpj Date: Thu, 28 Jan 1999 11:32:13 +0000 (+0000) Subject: [project @ 1999-01-28 11:32:11 by simonpj] X-Git-Tag: Approximately_9120_patches~6667 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b052d2df1e9cce8b56bf2d4557020d68a1c3ab35;p=ghc-hetmet.git [project @ 1999-01-28 11:32:11 by simonpj] Wibble --- diff --git a/ghc/lib/std/PrelArr.lhs b/ghc/lib/std/PrelArr.lhs index bc3a4b4..4f4d89e 100644 --- a/ghc/lib/std/PrelArr.lhs +++ b/ghc/lib/std/PrelArr.lhs @@ -640,5 +640,4 @@ thawArray (Array ixs arr#) = ST $ \ s# -> case writeArray# to# cur# ele st# of { s1# -> copy (cur# +# 1#) end# from# to# s1# }} - \end{code} diff --git a/ghc/lib/std/PrelConc.lhs b/ghc/lib/std/PrelConc.lhs index aa70ab3..9801d77 100644 --- a/ghc/lib/std/PrelConc.lhs +++ b/ghc/lib/std/PrelConc.lhs @@ -34,7 +34,7 @@ module PrelConc ( import PrelBase import PrelErr ( parError, seqError ) -import PrelST ( ST(..), STret(..), liftST ) +import PrelST ( liftST ) import PrelIOBase ( IO(..), MVar(..), unsafePerformIO ) import PrelBase ( Int(..) ) diff --git a/ghc/lib/std/PrelErr.lhs b/ghc/lib/std/PrelErr.lhs index 70b3f47..57b2159 100644 --- a/ghc/lib/std/PrelErr.lhs +++ b/ghc/lib/std/PrelErr.lhs @@ -155,9 +155,9 @@ noMethodBindingError s = throw (NoMethodError (untangle s "No instance nor d irrefutPatError s = throw (PatternMatchFail (untangle s "Irrefutable pattern failed for pattern")) nonExhaustiveGuardsError s = throw (NonExhaustiveGuards (untangle s "Non-exhaustive guards in")) patError s = throw (PatternMatchFail (untangle s "Non-exhaustive patterns in")) -recSelError s = throw (RecSelError (untangle s "Missing field in record selection:")) -recConError s = throw (RecConError (untangle s "Missing field in record construction:")) -recUpdError s = throw (RecUpdError (untangle s "Record to doesn't contain field(s) to be updated")) +recSelError s = throw (RecSelError (untangle s "Missing field in record selection")) +recConError s = throw (RecConError (untangle s "Missing field in record construction")) +recUpdError s = throw (RecUpdError (untangle s "Record doesn't contain field(s) to be updated")) assertError :: String -> Bool -> a -> a @@ -182,7 +182,7 @@ untangle coded message = location ++ ": " ++ message - ++ details + ++ "\'" ++ details ++ "\'" ++ "\n" where (location, details) diff --git a/ghc/lib/std/PrelHandle.lhs b/ghc/lib/std/PrelHandle.lhs index caa8c50..a11d913 100644 --- a/ghc/lib/std/PrelHandle.lhs +++ b/ghc/lib/std/PrelHandle.lhs @@ -53,7 +53,6 @@ import PrelForeign ( makeForeignObj ) #else #define FILE_OBJECT Addr #endif - \end{code} %********************************************************* @@ -104,7 +103,6 @@ withHandle (Handle h) act = do writeHandle (Handle h) hc = stToIO (writeVar h hc) #endif - \end{code} nullFile__ is only used for closed handles, plugging it in as a null diff --git a/ghc/lib/std/Prelude.lhs b/ghc/lib/std/Prelude.lhs index 7ad15ac..236558c 100644 --- a/ghc/lib/std/Prelude.lhs +++ b/ghc/lib/std/Prelude.lhs @@ -9,6 +9,7 @@ module Prelude ( -- Everything from these modules module PrelList, + -- Everything corresponding to the Report's PreludeText ReadS, ShowS, Read(readsPrec, readList),