Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : sdoc
http://hackage.haskell.org/trac/ghc/changeset/b46f25ec9d71e50a1ab1288ab2f83f97b8f427ba >--------------------------------------------------------------- commit b46f25ec9d71e50a1ab1288ab2f83f97b8f427ba Author: Ian Lynagh <[email protected]> Date: Wed May 25 15:51:14 2011 +0100 More DynFlags + SDoc >--------------------------------------------------------------- compiler/cmm/PprC.hs | 2 +- compiler/cmm/PprCmmDecl.hs | 5 +++-- compiler/utils/Outputable.lhs | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs index aa7d914..18b0d82 100644 --- a/compiler/cmm/PprC.hs +++ b/compiler/cmm/PprC.hs @@ -81,7 +81,7 @@ pprCs dflags cmms writeCs :: DynFlags -> Handle -> [RawCmm] -> IO () writeCs dflags handle cmms - = printForC handle (pprCs dflags cmms) + = printForC dflags handle (pprCs dflags cmms) -- -------------------------------------------------------------------------- -- Now do some real work diff --git a/compiler/cmm/PprCmmDecl.hs b/compiler/cmm/PprCmmDecl.hs index 1f520bf..da11332 100644 --- a/compiler/cmm/PprCmmDecl.hs +++ b/compiler/cmm/PprCmmDecl.hs @@ -44,6 +44,7 @@ import PprCmmExpr import Outputable import FastString +import DynFlags import Data.List import System.IO @@ -59,8 +60,8 @@ pprCmms cmms = pprCode CStyle (vcat (intersperse separator $ map ppr cmms)) where separator = space $$ ptext (sLit "-------------------") $$ space -writeCmms :: (Outputable info, Outputable g) => Handle -> [GenCmm CmmStatic info g] -> IO () -writeCmms handle cmms = printForC handle (pprCmms cmms) +writeCmms :: (Outputable info, Outputable g) => DynFlags -> Handle -> [GenCmm CmmStatic info g] -> IO () +writeCmms dflags handle cmms = printForC dflags handle (pprCmms cmms) ----------------------------------------------------------------------------- diff --git a/compiler/utils/Outputable.lhs b/compiler/utils/Outputable.lhs index c563aa5..6a9c5d5 100644 --- a/compiler/utils/Outputable.lhs +++ b/compiler/utils/Outputable.lhs @@ -358,10 +358,10 @@ printForUserPartWay dflags handle d unqual doc (runSDoc doc (initSDocContext' dflags (mkUserStyle unqual (PartWay d)))) -- printForC, printForAsm do what they sound like -printForC :: Handle -> SDoc -> IO () -printForC handle doc = +printForC :: DynFlags -> Handle -> SDoc -> IO () +printForC dflags handle doc = Pretty.printDoc LeftMode handle - (runSDoc doc (initSDocContext (PprCode CStyle))) + (runSDoc doc (initSDocContext' dflags (PprCode CStyle))) printForAsm :: Handle -> SDoc -> IO () printForAsm handle doc = _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
