projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[project @ 1997-06-18 23:52:36 by simonpj]
[ghc-hetmet.git]
/
ghc
/
compiler
/
utils
/
FiniteMap.lhs
diff --git
a/ghc/compiler/utils/FiniteMap.lhs
b/ghc/compiler/utils/FiniteMap.lhs
index
319e386
..
e550d1e
100644
(file)
--- a/
ghc/compiler/utils/FiniteMap.lhs
+++ b/
ghc/compiler/utils/FiniteMap.lhs
@@
-303,6
+303,7
@@
plusFM_C combiner fm1 (Branch split_key elt2 _ left right)
-- It's worth doing plusFM specially, because we don't need
-- to do the lookup in fm1.
+-- FM2 over-rides FM1.
plusFM EmptyFM fm2 = fm2
plusFM fm1 EmptyFM = fm1