[commit: ghc] master: Placate clang (#8444, #8445) (f57ba1d)

[git at git.haskell.org]

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

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

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

commit f57ba1d74ca434f6025347c70769c9f1889abcc5
Author: Austin Seipp <austin at well-typed.com>
Date:   Fri Oct 25 03:39:19 2013 -0500

    Placate clang (#8444, #8445)
    
    Once again the whitespace rules (and the rules concerning expansion of
    tokens) have bitten us.
    
    Authored-by: Authored-by: Luke Iannini <lukexi at me.com>
    Signed-off-by: Austin Seipp <austin at well-typed.com>


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

f57ba1d74ca434f6025347c70769c9f1889abcc5
 compiler/deSugar/DsBinds.lhs  |    2 +-
 compiler/utils/FastString.lhs |    4 ++--
 includes/MachDeps.h           |    2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/compiler/deSugar/DsBinds.lhs b/compiler/deSugar/DsBinds.lhs
index cbdc98f..46ab91c 100644
--- a/compiler/deSugar/DsBinds.lhs
+++ b/compiler/deSugar/DsBinds.lhs
@@ -810,7 +810,7 @@ wrapInEqRCase e mkBody = do
   cov <- newSysLocalDs (mkCoercionType Representational ty1 ty2)
   body' <- mkBody (mkCoVarCo cov)
   return $
-        ASSERT (tc == coercibleTyCon)
+        ASSERT(tc == coercibleTyCon)
         mkWildCase
                 e
                 (exprType e)
diff --git a/compiler/utils/FastString.lhs b/compiler/utils/FastString.lhs
index 4c03cc7..a4908b5 100644
--- a/compiler/utils/FastString.lhs
+++ b/compiler/utils/FastString.lhs
@@ -241,7 +241,7 @@ string_table = unsafePerformIO $ do
   tab <- IO $ \s1# -> case newArray# hASH_TBL_SIZE_UNBOXED (panic "string_table") s1# of
                           (# s2#, arr# #) ->
                               (# s2#, FastStringTable uid arr# #)
-  forM_ [0..hASH_TBL_SIZE-1] $ \i -> do
+  forM_ [0.. hASH_TBL_SIZE-1] $ \i -> do
      bucket <- newIORef []
      updTbl tab i bucket
 
@@ -544,7 +544,7 @@ nilFS = mkFastString ""
 
 getFastStringTable :: IO [[FastString]]
 getFastStringTable = do
-  buckets <- forM [0..hASH_TBL_SIZE-1] $ \idx -> do
+  buckets <- forM [0.. hASH_TBL_SIZE-1] $ \idx -> do
     bucket <- lookupTbl string_table idx
     readIORef bucket
   return buckets
diff --git a/includes/MachDeps.h b/includes/MachDeps.h
index 4c86e19..f176ef8 100644
--- a/includes/MachDeps.h
+++ b/includes/MachDeps.h
@@ -100,8 +100,10 @@
 #ifndef WORD_SIZE_IN_BITS
 #if SIZEOF_HSWORD == 4
 #define WORD_SIZE_IN_BITS       32
+#define WORD_SIZE_IN_BITS_FLOAT 32.0
 #else 
 #define WORD_SIZE_IN_BITS       64
+#define WORD_SIZE_IN_BITS_FLOAT 64.0
 #endif
 #endif