[commit: ghc] master: Fixes a compiler error with -DDEBUG (#10265) (6b96eeb)
git at git.haskell.org
git at git.haskell.org
Wed Apr 8 18:39:13 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/6b96eeb72a17e35c59830952732170d29d99a598/ghc
>---------------------------------------------------------------
commit 6b96eeb72a17e35c59830952732170d29d99a598
Author: Dave Laing <dave.laing.80 at gmail.com>
Date: Wed Apr 8 14:38:59 2015 -0400
Fixes a compiler error with -DDEBUG (#10265)
Test Plan: validate
Reviewers: austin, ezyang, erikd, rwbarton
Reviewed By: ezyang, erikd, rwbarton
Subscribers: erikd, thomie
Differential Revision: https://phabricator.haskell.org/D821
GHC Trac Issues: #10265
>---------------------------------------------------------------
6b96eeb72a17e35c59830952732170d29d99a598
compiler/main/Packages.hs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs
index a25e8e7..985a11a 100644
--- a/compiler/main/Packages.hs
+++ b/compiler/main/Packages.hs
@@ -1266,9 +1266,9 @@ instance Monoid LookupResult where
l `mappend` LookupHidden{} = l
LookupFound m1 `mappend` LookupFound m2
- = ASSERT (fst m1 /= fst m2) LookupMultiple [m1, m2]
+ = ASSERT(fst m1 /= fst m2) LookupMultiple [m1, m2]
LookupFound m `mappend` LookupMultiple ms
- = ASSERT (not (any ((==fst m).fst) ms)) LookupMultiple (m:ms)
+ = ASSERT(not (any ((==fst m).fst) ms)) LookupMultiple (m:ms)
LookupFound m `mappend` LookupFoundSigs ms check
| fst m == check = LookupFound m
| otherwise = LookupMultiple (m:ms)
@@ -1283,7 +1283,7 @@ instance Monoid LookupResult where
= l2 `mappend` l1
LookupFoundSigs ms1 m1 `mappend` LookupFoundSigs ms2 m2
- = ASSERT (m1 /= m2) LookupMultiple (ms1 ++ ms2)
+ = ASSERT(m1 /= m2) LookupMultiple (ms1 ++ ms2)
data ModuleSuggestion = SuggestVisible ModuleName Module ModuleOrigin
| SuggestHidden ModuleName Module ModuleOrigin
More information about the ghc-commits
mailing list