[remove old CharIO hack now that ghc supports proper locale support for IO
John Meacham <john@repetae.net>**20100702220830
 Ignore-this: 4e4510cdea62d0c0c2f2be70b9608d6b
] hunk ./Makefile.am 18
-HSFILES=src/C/Generate.hs src/CharIO.hs src/Cmm/Number.hs src/Cmm/OpEval.hs src/DerivingDrift/DataP.hs \
+HSFILES=src/C/Generate.hs src/Cmm/Number.hs src/Cmm/OpEval.hs src/DerivingDrift/DataP.hs \
hunk ./src/CharIO.hs 1
-{-# OPTIONS_GHC -cpp #-}
-{-# LANGUAGE CPP  #-}
-module CharIO(
-    putStr,
-    putStrLn,
-    hPutStrLn,
-    putErr,
-    putErrLn,
-    putErrDie,
-    readFile,
-    print,
-    hGetContents,
-    runMain
-    ) where
-
-import Control.Exception
-import Prelude hiding(readFile, print, putStr, putStrLn)
-import System
-import Support.Compat
-import qualified IO
-import System.IO.UTF8 as U
-
-
-
-flushOut = Control.Exception.catch  (IO.hFlush IO.stdout) (\(e::SomeException') -> return ())
-
-putErr s = flushOut >> U.hPutStr IO.stderr s
-putErrLn s = flushOut >> U.hPutStrLn IO.stderr s
-putErrDie s = flushOut >> U.hPutStrLn IO.stderr s >> System.exitFailure
-
-
-
-runMain :: IO a -> IO ()
-#if __GLASGOW_HASKELL__ < 610
-runMain action = Control.Exception.catch (action >> return ()) $ \x -> case x of
-        ExitException _ -> throw x
-        _ -> putErrDie $ show x
-#else
-runMain action = Control.Exception.catches (action >> return ())
-                   [ Handler $ \ (e::ErrorCall) -> putErrDie $ show e
-                   , Handler $ \ (e::IOException) -> putErrDie $ show e ]
-#endif
rmfile ./src/CharIO.hs
hunk ./src/DerivingDrift/Drift.hs 7
-import CharIO
hunk ./src/DerivingDrift/Drift.hs 18
+import Util.Gen
hunk ./src/DerivingDrift/Drift.hs 25
-                CharIO.print $ hsModuleName hsModule
-                mapM_ CharIO.putErrLn ss
+                print $ hsModuleName hsModule
+                mapM_ putErrLn ss
hunk ./src/E/Main.hs 10
-import Prelude hiding(putStrLn, putStr,print)
hunk ./src/E/Main.hs 15
-import CharIO
hunk ./src/E/Main.hs 46
-import Util.Gen hiding(putErrLn,putErr,putErrDie)
+import Util.Gen
hunk ./src/E/Program.hs 3
-import Prelude hiding(putStrLn, putStr,print)
hunk ./src/E/Program.hs 12
-import CharIO
hunk ./src/E/Program.hs 22
-import qualified IO
+import System.IO
hunk ./src/E/Program.hs 128
-printProgram prog = hPrintProgram IO.stderr prog
+printProgram prog = hPrintProgram stderr prog
hunk ./src/E/Program.hs 130
-printCheckName'' = hPrintCheckName IO.stderr
+printCheckName'' = hPrintCheckName stderr
hunk ./src/E/Program.hs 132
-hPrintCheckName :: IO.Handle -> DataTable -> TVr -> E -> IO ()
+hPrintCheckName :: Handle -> DataTable -> TVr -> E -> IO ()
hunk ./src/E/Rules.hs 46
-import qualified CharIO
hunk ./src/E/Rules.hs 104
-    putDocMLn' CharIO.putStr $  (tshow n) <+> text "forall" <+> hsep (map p vs) <+> text "."
+    putDocMLn' putStr $  (tshow n) <+> text "forall" <+> hsep (map p vs) <+> text "."
hunk ./src/E/Rules.hs 107
-    putDocMLn' CharIO.putStr (indent 2 (pprint e1) <+> text "::" <+> ty )
-    putDocMLn' CharIO.putStr $ text " ==>" <+> pprint e2
+    putDocMLn' putStr (indent 2 (pprint e1) <+> text "::" <+> ty )
+    putDocMLn' putStr $ text " ==>" <+> pprint e2
hunk ./src/FindFixpoint.hs 4
-import CharIO
hunk ./src/FindFixpoint.hs 8
-import GenUtil
-import Monad(liftM)
+import Util.Gen
hunk ./src/FindFixpoint.hs 22
-    fail x = Ms' (\_ -> (CharIO.putErrDie x))
+    fail x = Ms' (\_ -> (putErrDie x))
hunk ./src/FindFixpoint.hs 44
-            Just _ -> CharIO.putErrLn
+            Just _ -> putErrLn
hunk ./src/FindFixpoint.hs 47
-            Just _ -> CharIO.putErr
+            Just _ -> putErr
hunk ./src/FrontEnd/Exports.hs 10
-import Prelude hiding (putStr,putStrLn)
+import Prelude
hunk ./src/FrontEnd/Exports.hs 14
-import CharIO
hunk ./src/FrontEnd/Rename.hs 5
-import Control.Monad.State
hunk ./src/Ho/Build.hs 20
-import Monad
-import Prelude hiding(print,putStrLn)
-import System.IO hiding(print,putStrLn)
hunk ./src/Ho/Build.hs 30
-import CharIO
hunk ./src/Ho/Build.hs 57
-import Util.Gen hiding(putErrLn,putErr,putErrDie)
+import Util.Gen
hunk ./src/Ho/Build.hs 855
-            CharIO.putStrLn $  (pprint $ hoExports hoE :: String)
+            putStrLn $  (pprint $ hoExports hoE :: String)
hunk ./src/Ho/Build.hs 858
-            CharIO.putStrLn $  (pprint $ hoDefs hoE :: String)
+            putStrLn $  (pprint $ hoDefs hoE :: String)
hunk ./src/Ho/Build.hs 861
-            CharIO.putStrLn $  (pprint $ hoKinds hoE :: String)
+            putStrLn $  (pprint $ hoKinds hoE :: String)
hunk ./src/Ho/Build.hs 874
-             putDocM CharIO.putStr (showDataTable (hoDataTable hoB))
+             putDocM putStr (showDataTable (hoDataTable hoB))
hunk ./src/Ho/Library.hs 33
-import qualified CharIO
hunk ./src/Ho/Library.hs 55
-    fc <- CharIO.readFile fp
+    fc <- readFile fp
hunk ./src/Main.hs 6
-import Prelude hiding(putStrLn, putStr,print)
+import Prelude
hunk ./src/Main.hs 10
-import CharIO
hunk ./src/Main.hs 11
-import E.Rules
+import E.Main
hunk ./src/Main.hs 13
+import E.Rules
hunk ./src/Main.hs 15
-import FrontEnd.HsSyn(Module(..))
hunk ./src/Main.hs 16
+import FrontEnd.HsSyn(Module(..))
hunk ./src/Main.hs 22
-import E.Main
hunk ./src/Main.hs 24
+import Util.Gen
hunk ./src/Main.hs 36
-main = runMain $ bracketHtml $ do
+main = bracketHtml $ do
hunk ./src/Stats.hs 47
-import CharIO
hunk ./src/Stats.hs 68
-    mapM_ CharIO.putErrLn $ ( draw . fmap p ) (Node (greets,0) fs)  where
+    mapM_ putStrLn $ ( draw . fmap p ) (Node (greets,0) fs)  where
hunk ./src/Stats.hs 108
-    mapM_ CharIO.putErrLn $ ( draw . fmap p ) (Node (greets,0) fs)  where
+    mapM_ putStrLn $ ( draw . fmap p ) (Node (greets,0) fs)  where
hunk ./src/Stats.hs 114
-    mapM_ CharIO.putErrLn $ ( draw . fmap p ) (Node (greets,0) fs)  where
+    mapM_ putStrLn $ ( draw . fmap p ) (Node (greets,0) fs)  where
hunk ./src/Stats.hs 197
-        when p (CharIO.putStrLn $ (show a ++ ": " ++ show n))
+        when p (putStrLn $ (show a ++ ": " ++ show n))
hunk ./src/Stats.hs 203
-            CharIO.putStrLn (show (unsafeIntToAtom x) ++ ": " ++ show y)
+            putStrLn (show (unsafeIntToAtom x) ++ ": " ++ show y)
hunk ./src/Util/FilterInput.hs 4
-import CharIO
hunk ./src/Util/FilterInput.hs 6
-import System.IO(Handle)
+import System.IO
hunk ./src/Util/FilterInput.hs 12
+import Util.Gen
hunk ./src/Util/Gen.hs 3
-module Util.Gen(module Util.Gen, module GenUtil) where
+module Util.Gen(module Util.Gen, module GenUtil, intercalate) where
hunk ./src/Util/Gen.hs 14
-import GenUtil hiding(replicateM)
+import GenUtil hiding(replicateM, intercalate)