X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=System%2FIO.hs;h=904082cb95fec265c2e18d0325a89c4394e70509;hb=f7a485978f04e84b086f1974b88887cc72d832d0;hp=752ae9babb56ba907673caf0bdb8a22360551b82;hpb=7f1f4e7a695c402ddd3a1dc2cc7114e649a78ebc;p=ghc-base.git

diff --git a/System/IO.hs b/System/IO.hs
index 752ae9b..904082c 100644
--- a/System/IO.hs
+++ b/System/IO.hs
@@ -1,16 +1,14 @@
 {-# OPTIONS -fno-implicit-prelude #-}
 -----------------------------------------------------------------------------
--- 
+-- |
 -- Module      :  System.IO
 -- Copyright   :  (c) The University of Glasgow 2001
--- License     :  BSD-style (see the file libraries/core/LICENSE)
+-- License     :  BSD-style (see the file libraries/base/LICENSE)
 -- 
 -- Maintainer  :  libraries@haskell.org
 -- Stability   :  provisional
 -- Portability :  portable
 --
--- $Id: IO.hs,v 1.1 2001/06/28 14:15:04 simonmar Exp $
---
 -- The standard IO library.
 --
 -----------------------------------------------------------------------------
@@ -37,6 +35,7 @@ module System.IO (
     hGetPosn,		       -- :: Handle -> IO HandlePosn
     hSetPosn,		       -- :: HandlePosn -> IO ()
     hSeek,		       -- :: Handle -> SeekMode -> Integer -> IO ()
+    hTell,		       -- :: Handle -> IO Integer
     hWaitForInput,	       -- :: Handle -> Int -> IO Bool
     hReady,		       -- :: Handle -> IO Bool
     hGetChar,		       -- :: Handle -> IO Char
@@ -67,7 +66,7 @@ module System.IO (
     -- Non-standard extension (but will hopefully become standard with 1.5) is
     -- to export the Prelude io functions via IO (in addition to exporting them
     -- from the prelude...for now.) 
-    IO,
+    IO,			       -- instance MonadFix
     FilePath,		       -- :: String
     IOError,
     ioError,		       -- :: IOError -> IO a
@@ -92,6 +91,11 @@ module System.IO (
     hGetBuf,		       -- :: Handle -> Ptr a -> Int -> IO Int
  
     fixIO,		       -- :: (a -> IO a) -> IO a
+
+    hSetEcho,			-- :: Handle -> Bool -> IO ()
+    hGetEcho,			-- :: Handle -> IO Bool
+
+    hIsTerminalDevice,	 	-- :: Handle -> IO Bool
   ) where
 
 #ifdef __GLASGOW_HASKELL__
@@ -106,13 +110,7 @@ import GHC.Read
 import GHC.Show
 #endif
 
-import Data.Dynamic
-
--- -----------------------------------------------------------------------------
--- Typeable instance for Handle
-
-#include "Dynamic.h"
-INSTANCE_TYPEABLE0(Handle,handleTc,"Handle")
+import System.IO.Error
 
 -- -----------------------------------------------------------------------------
 -- Standard IO