[project @ 1997-07-25 22:41:46 by sof]

[ghc-hetmet.git] / ghc / compiler / simplCore / AnalFBWW.lhs

diff --git a/ghc/compiler/simplCore/AnalFBWW.lhs b/ghc/compiler/simplCore/AnalFBWW.lhs
index 43a5646..33ee877 100644 (file)
--- a/ghc/compiler/simplCore/AnalFBWW.lhs
+++ b/ghc/compiler/simplCore/AnalFBWW.lhs
@@ -8,9 +8,9 @@
 
 module AnalFBWW ( analFBWW ) where
 
-import Ubiq{-uitous-}
+IMP_Ubiq(){-uitous-}
 
-import CoreSyn         ( CoreBinding(..) )
+import CoreSyn         ( SYN_IE(CoreBinding) )
 import Util            ( panic{-ToDo:rm-} )
 
 --import Util
@@ -59,7 +59,7 @@ maybeFBtoFB (Nothing) = IsNotFB
 
 addArgs :: Int -> OurFBType -> OurFBType
 addArgs n (IsFB (FBType args prod))
-       = IsFB (FBType (take n (repeat FBBadConsum) ++ args) prod)
+       = IsFB (FBType (nOfThem n FBBadConsum ++ args) prod)
 addArgs n IsNotFB = IsNotFB
 addArgs n IsCons = panic "adding argument to a cons"
 addArgs n IsBottom = IsNotFB
@@ -74,7 +74,7 @@ joinFBType :: OurFBType -> OurFBType -> OurFBType
 joinFBType (IsBottom) a = a
 joinFBType a (IsBottom) = a
 joinFBType (IsFB (FBType args prod)) (IsFB (FBType args' prod'))
-       | length args == length args' = (IsFB (FBType (zipWith argJ args args')
+       | length args == length args' = (IsFB (FBType (zipWith{-Equal-} argJ args args')
                                                      (prodJ prod prod')))
    where
        argJ FBGoodConsum FBGoodConsum = FBGoodConsum