diff --git a/ghc/lib/std/PrelArr.lhs b/ghc/lib/std/PrelArr.lhs index bc3a4b4709642c8d26013bbbd58a0435e0650fc1..4f4d89ef88748ec806e568af0392f5001796a42f 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 aa70ab3e53a8d30e4b69248ced6aaafb70c4b0d8..9801d77d89de502c28fac67e9cd0d5753716f0e4 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 70b3f47ef7bfa2909af2734a9d678a60f3da2d63..57b21590745900291d61d78d9dc951ac71e6e101 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 caa8c50886f89d89e5c3bbf5836f0e86f1d91f9e..a11d913e3c24f55996c723812cfe2deb5028d02d 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 7ad15ac4e037e9d493bec66a438929600baa0be7..236558c35ee2c379ce63f63e5efa10a93a716cbd 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),