X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Futils%2FPretty.lhs;h=a518c0b6f6f34bc97b34c085bc016fb624c040ec;hb=f2aaae9757e7532485c97f6c9a9ed5437542d1dd;hp=47d4b1e19e582225cae5e7da5d80aa0966706c52;hpb=831a35dd00faff195cf938659c2dd736192b865f;p=ghc-hetmet.git

diff --git a/compiler/utils/Pretty.lhs b/compiler/utils/Pretty.lhs
index 47d4b1e..a518c0b 100644
--- a/compiler/utils/Pretty.lhs
+++ b/compiler/utils/Pretty.lhs
@@ -152,6 +152,7 @@ Relative to John's original paper, there are the following new features:
 
 
 \begin{code}
+{-# LANGUAGE BangPatterns #-}
 {-# OPTIONS -fno-warn-unused-imports #-}
 -- XXX GHC 6.9 seems to be confused by unpackCString# being used only in
 --     a RULE
@@ -184,7 +185,7 @@ import BufWrite
 import FastString
 import FastTypes
 import Panic
-
+import StaticFlags
 import Numeric (fromRat)
 import System.IO
 --import Foreign.Ptr (castPtr)
@@ -998,12 +999,8 @@ spaces n | n <=# _ILIT(0) = ""
 
 \begin{code}
 pprCols :: Int
-pprCols = 100 -- could make configurable
+pprCols = opt_PprCols
 
--- NB. printDoc prints FastStrings in UTF-8: hPutFS below does no decoding.
--- This is what we usually want, because the IO library has no encoding
--- functionality, and we're assuming UTF-8 source code so we might as well
--- assume UTF-8 output too.
 printDoc :: Mode -> Handle -> Doc -> IO ()
 printDoc LeftMode hdl doc
   = do { printLeftRender hdl doc; hFlush hdl }
@@ -1013,7 +1010,9 @@ printDoc mode hdl doc
   where
     put (Chr c)  next = hPutChar hdl c >> next
     put (Str s)  next = hPutStr  hdl s >> next
-    put (PStr s) next = hPutFS   hdl s >> next
+    put (PStr s) next = hPutStr  hdl (unpackFS s) >> next
+                        -- NB. not hPutFS, we want this to go through
+                        -- the I/O library's encoding layer. (#3398)
     put (LStr s l) next = hPutLitString hdl s l >> next
 
     done = hPutChar hdl '\n'