X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Debug%2FTrace.hs;h=7c9295f0ee848e9ce1cf38db9292d473c470da2e;hb=99a329d9b272925dcdf474ce2369e9421b51e51c;hp=19e8ac62883aecf7f79fe9f06b42395cc955b33c;hpb=29246dd4eb44d03cc48cbd894821d3c9501d8829;p=ghc-base.git

diff --git a/Debug/Trace.hs b/Debug/Trace.hs
index 19e8ac6..7c9295f 100644
--- a/Debug/Trace.hs
+++ b/Debug/Trace.hs
@@ -14,44 +14,46 @@
 
 module Debug.Trace (
 	-- * Tracing
-	trace -- :: String -> a -> a
+	putTraceMsg,      -- :: String -> IO ()
+	trace             -- :: String -> a -> a
   ) where
 
 import Prelude
 import System.IO.Unsafe
-import System.IO
 
 #ifdef __GLASGOW_HASKELL__
-import GHC.IOBase
-import GHC.Handle
+#ifdef mingw32_HOST_OS
+import Foreign.C.String
 #endif
+#endif
+
+-- | 'putTraceMsg' function outputs the trace message from IO monad.
+-- Usually the output stream is 'stderr' but if the function is called
+-- from Windows GUI application then the output will be directed to the Windows
+-- debug console.
+putTraceMsg :: String -> IO ()
+putTraceMsg msg = do
+#ifndef __GLASGOW_HASKELL__
+    hPutStr handle msg
+    hPutChar handle '\n'
+#else
+    withCString "%s\n" $ \cfmt ->
+     withCString msg  $ \cmsg ->
+      debugBelch cfmt cmsg
 
-#ifdef __HUGS__
-import Hugs.IOExts
+foreign import ccall unsafe debugBelch :: CString -> CString -> IO ()
 #endif
 
-#ifdef __GLASGOW_HASKELL__
 {-# NOINLINE trace #-}
 {-|
-When called, 'trace' prints the string in its first argument to
-standard error, before returning the second argument as its result.
-The 'trace' function is not referentially transparent, and should only
-be used for debugging, or for monitoring execution. Some
-implementations of 'trace' may decorate the string that\'s output to
-indicate that you\'re tracing.
+When called, 'trace' outputs the string in its first argument, before 
+returning the second argument as its result. The 'trace' function is not 
+referentially transparent, and should only be used for debugging, or for 
+monitoring execution. Some implementations of 'trace' may decorate the string 
+that\'s output to indicate that you\'re tracing. The function is implemented on
+top of 'putTraceMsg'.
 -}
 trace :: String -> a -> a
 trace string expr = unsafePerformIO $ do
-    hPutStr stderr string
-    hPutChar stderr '\n'
-    fd <- withHandle_ "trace" stderr $ (return.haFD)
-    postTraceHook fd
+    putTraceMsg string
     return expr
-
-foreign import ccall "PostTraceHook" postTraceHook :: Int -> IO ()
-#endif
-
-#ifdef __NHC__
-trace :: String -> a -> a
-trace str expr = unsafePerformIO $ do hPutStr stderr str; return expr
-#endif