diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-06-11 21:47:07 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-06-11 21:47:07 +0100 |
| commit | 630379c162876c184a88f73f7948de806374a1f8 (patch) | |
| tree | c3cda5695c2802d3aaafa9091d589324c84bcf95 | |
| parent | 667c577946a913f156826f852f28827da2920328 (diff) | |
| download | haskell-630379c162876c184a88f73f7948de806374a1f8.tar.gz | |
Pass DynFlags down to printForC and printForAsm
| -rw-r--r-- | compiler/cmm/PprC.hs | 2 | ||||
| -rw-r--r-- | compiler/cmm/PprCmmDecl.hs | 6 | ||||
| -rw-r--r-- | compiler/utils/Outputable.lhs | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs index 39d5a845b8..bd7b35310c 100644 --- a/compiler/cmm/PprC.hs +++ b/compiler/cmm/PprC.hs @@ -71,7 +71,7 @@ pprCs dflags cmms writeCs :: DynFlags -> Handle -> [RawCmmGroup] -> 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 1143d9beff..5c1c6f0b6a 100644 --- a/compiler/cmm/PprCmmDecl.hs +++ b/compiler/cmm/PprCmmDecl.hs @@ -48,6 +48,7 @@ import CLabel import PprCmmExpr import Cmm +import DynFlags import Outputable import Platform import FastString @@ -67,8 +68,9 @@ pprCmms platform cmms = pprCode CStyle (vcat (intersperse separator $ map (pprPl separator = space $$ ptext (sLit "-------------------") $$ space writeCmms :: (PlatformOutputable info, PlatformOutputable g) - => Platform -> Handle -> [GenCmmGroup CmmStatics info g] -> IO () -writeCmms platform handle cmms = printForC handle (pprCmms platform cmms) + => DynFlags -> Handle -> [GenCmmGroup CmmStatics info g] -> IO () +writeCmms dflags handle cmms = printForC dflags handle (pprCmms platform cmms) + where platform = targetPlatform dflags ----------------------------------------------------------------------------- diff --git a/compiler/utils/Outputable.lhs b/compiler/utils/Outputable.lhs index dffb26f443..e9cfaec9c9 100644 --- a/compiler/utils/Outputable.lhs +++ b/compiler/utils/Outputable.lhs @@ -340,13 +340,13 @@ printForUserPartWay _ handle d unqual doc (runSDoc doc (initSDocContext (mkUserStyle unqual (PartWay d)))) -- printForC, printForAsm do what they sound like -printForC :: Handle -> SDoc -> IO () -printForC handle doc = +printForC :: DynFlags -> Handle -> SDoc -> IO () +printForC _ handle doc = Pretty.printDoc LeftMode handle (runSDoc doc (initSDocContext (PprCode CStyle))) -printForAsm :: Handle -> SDoc -> IO () -printForAsm handle doc = +printForAsm :: DynFlags -> Handle -> SDoc -> IO () +printForAsm _ handle doc = Pretty.printDoc LeftMode handle (runSDoc doc (initSDocContext (PprCode AsmStyle))) |