[commit: ghc] master: nativeGen: detabify/dewhitespace SPARC/ShortcutJump (234afe2)

git at git.haskell.org git at git.haskell.org
Sun Jul 20 21:57:32 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/234afe274e4477be96232b9af37f4d843f9fcf29/ghc

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

commit 234afe274e4477be96232b9af37f4d843f9fcf29
Author: Austin Seipp <austin at well-typed.com>
Date:   Fri Jul 18 22:27:03 2014 -0500

    nativeGen: detabify/dewhitespace SPARC/ShortcutJump
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


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

234afe274e4477be96232b9af37f4d843f9fcf29
 compiler/nativeGen/SPARC/ShortcutJump.hs | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/compiler/nativeGen/SPARC/ShortcutJump.hs b/compiler/nativeGen/SPARC/ShortcutJump.hs
index 142ec6e..123a345 100644
--- a/compiler/nativeGen/SPARC/ShortcutJump.hs
+++ b/compiler/nativeGen/SPARC/ShortcutJump.hs
@@ -1,17 +1,9 @@
-
-{-# OPTIONS_GHC -fno-warn-tabs #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and
--- detab the module (please do the detabbing in a separate patch). See
---     http://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
--- for details
-
 module SPARC.ShortcutJump (
-	JumpDest(..), getJumpDestBlockId,
-	canShortcut,
-	shortcutJump,
-	shortcutStatics,
-	shortBlockId
+        JumpDest(..), getJumpDestBlockId,
+        canShortcut,
+        shortcutJump,
+        shortcutStatics,
+        shortBlockId
 )
 
 where
@@ -29,8 +21,8 @@ import Unique
 
 
 data JumpDest
-	= DestBlockId BlockId 
-	| DestImm Imm
+        = DestBlockId BlockId
+        | DestImm Imm
 
 getJumpDestBlockId :: JumpDest -> Maybe BlockId
 getJumpDestBlockId (DestBlockId bid) = Just bid
@@ -59,9 +51,9 @@ shortcutLabel fn lab
 
 shortcutStatic :: (BlockId -> Maybe JumpDest) -> CmmStatic -> CmmStatic
 shortcutStatic fn (CmmStaticLit (CmmLabel lab))
-	= CmmStaticLit (CmmLabel (shortcutLabel fn lab))
+        = CmmStaticLit (CmmLabel (shortcutLabel fn lab))
 shortcutStatic fn (CmmStaticLit (CmmLabelDiffOff lbl1 lbl2 off))
-	= CmmStaticLit (CmmLabelDiffOff (shortcutLabel fn lbl1) lbl2 off)
+        = CmmStaticLit (CmmLabelDiffOff (shortcutLabel fn lbl1) lbl2 off)
 -- slightly dodgy, we're ignoring the second label, but this
 -- works with the way we use CmmLabelDiffOff for jump tables now.
 shortcutStatic _ other_static
@@ -75,6 +67,3 @@ shortBlockId fn blockid =
       Just (DestBlockId blockid')  -> shortBlockId fn blockid'
       Just (DestImm (ImmCLbl lbl)) -> lbl
       _other -> panic "shortBlockId"
-
-
-



More information about the ghc-commits mailing list