[commit: ghc] master: Convert prefix uses of (<>) to infix <> (ecc43c1)

Ian Lynagh igloo at earth.li
Sun Aug 5 20:54:52 CEST 2012


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ecc43c17c87fed9221851ed6c6fa4a8b8967b20e

>---------------------------------------------------------------

commit ecc43c17c87fed9221851ed6c6fa4a8b8967b20e
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Aug 5 16:53:18 2012 +0100

    Convert prefix uses of (<>) to infix <>

>---------------------------------------------------------------

 compiler/hsSyn/HsExpr.lhs       |    2 +-
 compiler/nativeGen/SPARC/Ppr.hs |    2 +-
 compiler/nativeGen/X86/Ppr.hs   |    8 ++++----
 compiler/stgSyn/StgSyn.lhs      |   10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/compiler/hsSyn/HsExpr.lhs b/compiler/hsSyn/HsExpr.lhs
index 12a5fad..80429d7 100644
--- a/compiler/hsSyn/HsExpr.lhs
+++ b/compiler/hsSyn/HsExpr.lhs
@@ -434,7 +434,7 @@ ppr_expr (SectionR op expr)
     pp_expr = pprDebugParendExpr expr
 
     pp_prefixly = hang (hsep [text "( \\ x_ ->", ppr op, ptext (sLit "x_")])
-                       4 ((<>) pp_expr rparen)
+                       4 (pp_expr <> rparen)
     pp_infixly v = sep [pprInfixOcc v, pp_expr]
 
 ppr_expr (ExplicitTuple exprs boxity)
diff --git a/compiler/nativeGen/SPARC/Ppr.hs b/compiler/nativeGen/SPARC/Ppr.hs
index b384b6e..e57e5e2 100644
--- a/compiler/nativeGen/SPARC/Ppr.hs
+++ b/compiler/nativeGen/SPARC/Ppr.hs
@@ -535,7 +535,7 @@ pprInstr (BF cond b blockid)
         ppr (mkAsmTempLabel (getUnique blockid))
     ]
 
-pprInstr (JMP addr) = (<>) (ptext (sLit "\tjmp\t")) (pprAddr addr)
+pprInstr (JMP addr) = ptext (sLit "\tjmp\t") <> pprAddr addr
 pprInstr (JMP_TBL op _ _)  = pprInstr (JMP op)
 
 pprInstr (CALL (Left imm) n _)
diff --git a/compiler/nativeGen/X86/Ppr.hs b/compiler/nativeGen/X86/Ppr.hs
index 7a40e6b..5a97efc 100644
--- a/compiler/nativeGen/X86/Ppr.hs
+++ b/compiler/nativeGen/X86/Ppr.hs
@@ -613,13 +613,13 @@ pprInstr (JXX cond blockid)
 
 pprInstr        (JXX_GBL cond imm) = pprCondInstr (sLit "j") cond (pprImm imm)
 
-pprInstr        (JMP (OpImm imm) _) = (<>) (ptext (sLit "\tjmp ")) (pprImm imm)
+pprInstr        (JMP (OpImm imm) _) = ptext (sLit "\tjmp ") <> pprImm imm
 pprInstr (JMP op _)          = sdocWithPlatform $ \platform ->
-                               (<>) (ptext (sLit "\tjmp *")) (pprOperand (archWordSize (target32Bit platform)) op)
+                               ptext (sLit "\tjmp *") <> pprOperand (archWordSize (target32Bit platform)) op
 pprInstr (JMP_TBL op _ _ _)  = pprInstr (JMP op [])
-pprInstr        (CALL (Left imm) _)    = (<>) (ptext (sLit "\tcall ")) (pprImm imm)
+pprInstr        (CALL (Left imm) _)    = ptext (sLit "\tcall ") <> pprImm imm
 pprInstr (CALL (Right reg) _)   = sdocWithPlatform $ \platform ->
-                                  (<>) (ptext (sLit "\tcall *")) (pprReg (archWordSize (target32Bit platform)) reg)
+                                  ptext (sLit "\tcall *") <> pprReg (archWordSize (target32Bit platform)) reg
 
 pprInstr (IDIV sz op)   = pprSizeOp (sLit "idiv") sz op
 pprInstr (DIV sz op)    = pprSizeOp (sLit "div")  sz op
diff --git a/compiler/stgSyn/StgSyn.lhs b/compiler/stgSyn/StgSyn.lhs
index 1b608bd..84a4c69 100644
--- a/compiler/stgSyn/StgSyn.lhs
+++ b/compiler/stgSyn/StgSyn.lhs
@@ -635,7 +635,7 @@ pprGenStgBinding :: (OutputableBndr bndr, Outputable bdee, Ord bdee)
 
 pprGenStgBinding (StgNonRec bndr rhs)
   = hang (hsep [pprBndr LetBind bndr, equals])
-        4 ((<>) (ppr rhs) semi)
+        4 (ppr rhs <> semi)
 
 pprGenStgBinding (StgRec pairs)
   = vcat $ ifPprDebug (ptext $ sLit "{- StgRec (begin) -}") :
@@ -643,7 +643,7 @@ pprGenStgBinding (StgRec pairs)
   where
     ppr_bind (bndr, expr)
       = hang (hsep [pprBndr LetBind bndr, equals])
-             4 ((<>) (ppr expr) semi)
+             4 (ppr expr <> semi)
 
 pprStgBinding :: StgBinding -> SDoc
 pprStgBinding  bind  = pprGenStgBinding bind
@@ -739,12 +739,12 @@ pprStgExpr (StgLet bind expr)
 pprStgExpr (StgLetNoEscape lvs_whole lvs_rhss bind expr)
   = sep [hang (ptext (sLit "let-no-escape {"))
                 2 (pprGenStgBinding bind),
-           hang ((<>) (ptext (sLit "} in "))
-                   (ifPprDebug (
+           hang (ptext (sLit "} in ") <>
+                   ifPprDebug (
                     nest 4 (
                       hcat [ptext  (sLit "-- lvs: ["), interppSP (uniqSetToList lvs_whole),
                              ptext (sLit "]; rhs lvs: ["), interppSP (uniqSetToList lvs_rhss),
-                             char ']']))))
+                             char ']'])))
                 2 (ppr expr)]
 
 pprStgExpr (StgSCC cc tick push expr)





More information about the Cvs-ghc mailing list