[commit: ghc] master: Fix build on OS X due to macro-like string in comment (9487305)

git at git.haskell.org git at git.haskell.org
Sat Jul 26 09:41:36 UTC 2014


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

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

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

commit 9487305393307d5eb34069c5821c11bb98b5ec90
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Sat Jul 26 10:41:28 2014 +0100

    Fix build on OS X due to macro-like string in comment
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>


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

9487305393307d5eb34069c5821c11bb98b5ec90
 compiler/main/Packages.lhs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index a6ecb16..c240956e 100644
--- a/compiler/main/Packages.lhs
+++ b/compiler/main/Packages.lhs
@@ -864,8 +864,8 @@ mkModuleMap pkg_db ipid_map = foldr extend_modmap emptyUFM pkgids
     pkgids = map packageConfigId (eltsUFM pkg_db)
 
     extend_modmap pkgid modmap = addListToUFM_C (plusUFM_C merge) modmap es
-      where -- ASSERT(m == m' && pkg == pkg' && e == e'
-            --          && (e || not (v || v')))
+      where -- Invariant: m == m' && pkg == pkg' && e == e'
+            --              && (e || not (v || v'))
             -- Some notes about the assert. Merging only ever occurs when
             -- we find a reexport.  The interesting condition:
             --      e || not (v || v')



More information about the ghc-commits mailing list