[project @ 1997-06-06 22:27:06 by sof]

last minute 2.04 fixes

diff --git a/ghc/compiler/basicTypes/FieldLabel.lhs b/ghc/compiler/basicTypes/FieldLabel.lhs
index 7eea7b8..47725c4 100644 (file)
--- a/ghc/compiler/basicTypes/FieldLabel.lhs
+++ b/ghc/compiler/basicTypes/FieldLabel.lhs
@@ -14,7 +14,7 @@ import Name           --( Name{-instance Eq/Outputable-}, nameUnique )
 import Type            ( SYN_IE(Type) )
 
 import Outputable
-import UniqFM           ( SYN_IE(Uniquable) )
+import UniqFM           ( Uniquable(..) )
 \end{code}
 
 \begin{code}

diff --git a/ghc/compiler/basicTypes/Id.hi-boot b/ghc/compiler/basicTypes/Id.hi-boot
index f9f5448..2d7ce7e 100644 (file)
--- a/ghc/compiler/basicTypes/Id.hi-boot
+++ b/ghc/compiler/basicTypes/Id.hi-boot
@@ -5,10 +5,10 @@ _declarations_
 1 type Id = Id.GenId Type.Type ;
 1 data GenId ty ;
 1 data StrictnessMark = MarkedStrict | NotMarkedStrict ;
-1 dataConArgTys _:_ Id -> [Type.Type] -> [Type.Type] ;;
-1 idType _:_ Id -> Type.Type ;;
-1 isNullaryDataCon _:_ Id -> PrelBase.Bool ;;
-1 mkDataCon _:_ Name.Name -> [StrictnessMark] -> [FieldLabel.FieldLabel] -> [TyVar.TyVar] -> [(Class.Class,Type.Type)] -> [TyVar.TyVar] -> [(Class.Class,Type.Type)] -> [Type.Type] -> TyCon.TyCon -> Id ;;
-1 mkTupleCon _:_ PrelBase.Int -> Name.Name -> Type.Type -> Id ;;
-1 nmbrId _:_ Id -> PprEnv.NmbrEnv -> (PprEnv.NmbrEnv, Id) ;;
-1 pprId _:_ _forall_ [ty] {Outputable.Outputable ty} => Outputable.PprStyle -> GenId ty -> Pretty.Doc ;;
+1 dataConArgTys _:_ Id.Id -> [Type.Type] -> [Type.Type] ;;
+1 idType _:_ Id.Id -> Type.Type ;;
+1 isNullaryDataCon _:_ Id.Id -> PrelBase.Bool ;;
+1 mkDataCon _:_ Name.Name -> [Id.StrictnessMark] -> [FieldLabel.FieldLabel] -> [TyVar.TyVar] -> [(Class.Class,Type.Type)] -> [TyVar.TyVar] -> [(Class.Class,Type.Type)] -> [Type.Type] -> TyCon.TyCon -> Id.Id ;;
+1 mkTupleCon _:_ PrelBase.Int -> Name.Name -> Type.Type -> Id.Id ;;
+1 nmbrId _:_ Id.Id -> PprEnv.NmbrEnv -> (PprEnv.NmbrEnv, Id.Id) ;;
+1 pprId _:_ _forall_ [ty] {Outputable.Outputable ty} => Outputable.PprStyle -> Id.GenId ty -> Pretty.Doc ;;

diff --git a/ghc/compiler/basicTypes/Name.lhs b/ghc/compiler/basicTypes/Name.lhs
index 1285857..89fe135 100644 (file)
--- a/ghc/compiler/basicTypes/Name.lhs
+++ b/ghc/compiler/basicTypes/Name.lhs
@@ -75,7 +75,7 @@ import Usage            ( SYN_IE(UVar), SYN_IE(Usage) )
 import Unique          ( pprUnique, showUnique, Unique )
 import UniqSet         ( UniqSet(..), emptyUniqSet, unitUniqSet, unionUniqSets, uniqSetToList, isEmptyUniqSet,
                          unionManyUniqSets, minusUniqSet, mkUniqSet, elementOfUniqSet, addListToUniqSet, addOneToUniqSet )
-import UniqFM          ( UniqFM, SYN_IE(Uniquable) )
+import UniqFM          ( UniqFM, Uniquable(..) )
 import Util            --( cmpPString, panic, assertPanic {-, pprTrace ToDo:rm-} )
 
 \end{code}

diff --git a/ghc/compiler/basicTypes/UniqSupply.lhs b/ghc/compiler/basicTypes/UniqSupply.lhs
index 98e2888..adffd47 100644 (file)
--- a/ghc/compiler/basicTypes/UniqSupply.lhs
+++ b/ghc/compiler/basicTypes/UniqSupply.lhs
@@ -33,6 +33,9 @@ import PreludeGlaST
 #elif __GLASGOW_HASKELL__ >= 202
 import GlaExts
 import STBase
+# if __GLASGOW_HASKELL__ == 202
+import PrelBase ( Char(..) )
+# endif
 # define WHASH      GlaExts.W#
 #else
 import PreludeGlaST

diff --git a/ghc/compiler/basicTypes/Unique.lhs b/ghc/compiler/basicTypes/Unique.lhs
index 591b27a..a25498b 100644 (file)
--- a/ghc/compiler/basicTypes/Unique.lhs
+++ b/ghc/compiler/basicTypes/Unique.lhs
@@ -229,6 +229,9 @@ import PreludeGlaST
 #else
 import GlaExts
 import ST
+#if __GLASGOW_HASKELL__ == 202
+import PrelBase ( Char(..) )
+#endif
 #endif
 
 IMP_Ubiq(){-uitous-}

diff --git a/ghc/compiler/coreSyn/CoreUnfold.hi-boot b/ghc/compiler/coreSyn/CoreUnfold.hi-boot
index 6b8536c..2c20727 100644 (file)
--- a/ghc/compiler/coreSyn/CoreUnfold.hi-boot
+++ b/ghc/compiler/coreSyn/CoreUnfold.hi-boot
@@ -4,5 +4,5 @@ CoreUnfold Unfolding UnfoldingGuidance mkUnfolding noUnfolding;
 _declarations_
 1 data Unfolding;
 1 data UnfoldingGuidance;
-1 mkUnfolding _:_ PragmaInfo.PragmaInfo -> CoreSyn.CoreExpr -> Unfolding ;;
-1 noUnfolding _:_ Unfolding ;;
+1 mkUnfolding _:_ PragmaInfo.PragmaInfo -> CoreSyn.CoreExpr -> CoreUnfold.Unfolding ;;
+1 noUnfolding _:_ CoreUnfold.Unfolding ;;

diff --git a/ghc/compiler/hsSyn/HsBinds.hi-boot b/ghc/compiler/hsSyn/HsBinds.hi-boot
index bcd4813..dd00458 100644 (file)
--- a/ghc/compiler/hsSyn/HsBinds.hi-boot
+++ b/ghc/compiler/hsSyn/HsBinds.hi-boot
@@ -5,4 +5,3 @@ _instances_
 _declarations_
 1 data HsBinds a b c d ;
 1 nullBinds _:_ _forall_ [a b c d] => HsBinds.HsBinds a b c d -> PrelBase.Bool ;;
-

diff --git a/ghc/compiler/hsSyn/HsBinds.lhs b/ghc/compiler/hsSyn/HsBinds.lhs
index 0c167d6..1f32b3e 100644 (file)
--- a/ghc/compiler/hsSyn/HsBinds.lhs
+++ b/ghc/compiler/hsSyn/HsBinds.lhs
@@ -17,9 +17,6 @@ IMP_Ubiq()
 IMPORT_DELOOPER(HsLoop)        ( pprMatches, pprGRHSsAndBinds,
                          Match, GRHSsAndBinds,
                          pprExpr, HsExpr )
-#else
-import {-# SOURCE #-} HsMatches ( pprMatches, Match, pprGRHSsAndBinds, GRHSsAndBinds )
-import {-# SOURCE #-} HsExpr    ( pprExpr, HsExpr )
 #endif
 
 import HsPragmas       ( GenPragmas, ClassOpPragmas )
@@ -39,6 +36,12 @@ import Bag
 import SrcLoc          ( SrcLoc{-instances-} )
 import TyVar           ( GenTyVar{-instances-} )
 import Unique          ( Unique {- instance Eq -} )
+
+#if __GLASGOW_HASKELL__ >= 202
+import {-# SOURCE #-} HsExpr    ( pprExpr, HsExpr )
+import {-# SOURCE #-} HsMatches ( pprMatches, Match, pprGRHSsAndBinds, GRHSsAndBinds )
+#endif
+
 \end{code}
 
 %************************************************************************

diff --git a/ghc/compiler/hsSyn/HsExpr.hi-boot b/ghc/compiler/hsSyn/HsExpr.hi-boot
index adfbbad..0398326 100644 (file)
--- a/ghc/compiler/hsSyn/HsExpr.hi-boot
+++ b/ghc/compiler/hsSyn/HsExpr.hi-boot
@@ -1,9 +1,6 @@
 _interface_ HsExpr 1
 _exports_
-HsExpr HsExpr pprExpr ;
+HsExpr HsExpr pprExpr;
 _declarations_
 1 data HsExpr a b c d;
-1 pprExpr _:_ _forall_ [a b c d] {Name.NamedThing c, Outputable.Outputable c, 
-                                 Outputable.Outputable d, PrelBase.Eq a, 
-                                 Outputable.Outputable a, PrelBase.Eq b, Outputable.Outputable b}
-                  => Outputable.PprStyle -> HsExpr a b c d -> Pretty.Doc ;;
+1 pprExpr _:_ _forall_ [a b c d] {Name.NamedThing c, Outputable.Outputable c, Outputable.Outputable d, PrelBase.Eq a, Outputable.Outputable a, PrelBase.Eq b, Outputable.Outputable b} => Outputable.PprStyle -> HsExpr.HsExpr a b c d -> Pretty.Doc ;;

diff --git a/ghc/compiler/hsSyn/HsMatches.hi-boot b/ghc/compiler/hsSyn/HsMatches.hi-boot
index f282fb4..c1a24ca 100644 (file)
--- a/ghc/compiler/hsSyn/HsMatches.hi-boot
+++ b/ghc/compiler/hsSyn/HsMatches.hi-boot
@@ -4,18 +4,6 @@ HsMatches Match GRHSsAndBinds pprMatch pprMatches pprGRHSsAndBinds ;
 _declarations_
 1 data Match a b c d ;
 1 data GRHSsAndBinds a b c d ;
-1 pprGRHSsAndBinds _:_ _forall_ [a b c d] {Name.NamedThing c, Outputable.Outputable c, 
-                                          Outputable.Outputable d, PrelBase.Eq a, 
-                                          Outputable.Outputable a, PrelBase.Eq b, Outputable.Outputable b}
-                  => Outputable.PprStyle -> PrelBase.Bool -> GRHSsAndBinds a b c d -> Pretty.Doc ;;
-
-1 pprMatch _:_ _forall_ [a b c d] {Name.NamedThing c, Outputable.Outputable c, 
-                                  Outputable.Outputable d, PrelBase.Eq a, 
-                                  Outputable.Outputable a, PrelBase.Eq b, Outputable.Outputable b} 
-               => Outputable.PprStyle -> PrelBase.Bool -> Match a b c d -> Pretty.Doc ;;
-
-1 pprMatches _:_ _forall_ [a b c d] {Name.NamedThing c, Outputable.Outputable c,
-                                   Outputable.Outputable d, PrelBase.Eq a,
-                                   Outputable.Outputable a, PrelBase.Eq b, Outputable.Outputable b}
-               => Outputable.PprStyle -> (PrelBase.Bool, Pretty.Doc) -> [Match a b c d] -> Pretty.Doc ;;
-
+1 pprGRHSsAndBinds _:_ _forall_ [a b c d] {Name.NamedThing c, Outputable.Outputable c, Outputable.Outputable d, PrelBase.Eq a, Outputable.Outputable a, PrelBase.Eq b, Outputable.Outputable b} => Outputable.PprStyle -> PrelBase.Bool -> HsMatches.GRHSsAndBinds a b c d -> Pretty.Doc ;;
+1 pprMatch _:_ _forall_ [a b c d] {Name.NamedThing c, Outputable.Outputable c, Outputable.Outputable d, PrelBase.Eq a, Outputable.Outputable a, PrelBase.Eq b, Outputable.Outputable b} => Outputable.PprStyle -> PrelBase.Bool -> HsMatches.Match a b c d -> Pretty.Doc ;;
+1 pprMatches _:_ _forall_ [a b c d] {Name.NamedThing c, Outputable.Outputable c, Outputable.Outputable d, PrelBase.Eq a, Outputable.Outputable a, PrelBase.Eq b, Outputable.Outputable b} => Outputable.PprStyle -> (PrelBase.Bool, Pretty.Doc) -> [HsMatches.Match a b c d] -> Pretty.Doc ;;

diff --git a/ghc/compiler/nativeGen/MachRegs.lhs b/ghc/compiler/nativeGen/MachRegs.lhs
index 2baaf71..5beabc1 100644 (file)
--- a/ghc/compiler/nativeGen/MachRegs.lhs
+++ b/ghc/compiler/nativeGen/MachRegs.lhs
@@ -62,7 +62,6 @@ module MachRegs (
 #if __GLASGOW_HASKELL__ >= 202
 import GlaExts hiding (Addr)
 import FastString
-import Ubiq
 #else
 IMP_Ubiq(){-uitous-}
 #endif

diff --git a/ghc/compiler/nativeGen/PprMach.lhs b/ghc/compiler/nativeGen/PprMach.lhs
index a016d3e..9ac660e 100644 (file)
--- a/ghc/compiler/nativeGen/PprMach.lhs
+++ b/ghc/compiler/nativeGen/PprMach.lhs
@@ -21,7 +21,6 @@ IMP_Ubiq(){-uitious-}
 import qualified GlaExts (Addr(..))
 import GlaExts hiding (Addr(..))
 import FastString
-import Ubiq
 #else
 IMP_Ubiq(){-uitious-}
 #endif

diff --git a/ghc/compiler/nativeGen/RegAllocInfo.lhs b/ghc/compiler/nativeGen/RegAllocInfo.lhs
index be0d40d..4db8a0b 100644 (file)
--- a/ghc/compiler/nativeGen/RegAllocInfo.lhs
+++ b/ghc/compiler/nativeGen/RegAllocInfo.lhs
@@ -55,7 +55,6 @@ module RegAllocInfo (
 import qualified GlaExts (Addr(..))
 import GlaExts hiding (Addr(..))
 import FastString
-import Ubiq
 #else
 IMP_Ubiq(){-uitous-}
 import Pretty ( Doc )

diff --git a/ghc/compiler/profiling/CostCentre.hi-boot b/ghc/compiler/profiling/CostCentre.hi-boot
index 0f70e0d..f6a15fc 100644 (file)
--- a/ghc/compiler/profiling/CostCentre.hi-boot
+++ b/ghc/compiler/profiling/CostCentre.hi-boot
@@ -3,14 +3,14 @@ _exports_
 CostCentre CostCentre noCostCentre useCurrentCostCentre overheadCostCentre dontCareCostCentre subsumedCosts preludeCafsCostCentre mkAllCafsCC preludeDictsCostCentre mkAllDictsCC cafifyCC mkUserCC;
 _declarations_
 1 data CostCentre;
-1 noCostCentre _:_ CostCentre ;;
-1 useCurrentCostCentre _:_ CostCentre ;;
-1 overheadCostCentre _:_ CostCentre ;;
-1 dontCareCostCentre _:_ CostCentre ;;
-1 subsumedCosts _:_ CostCentre ;;
-1 preludeCafsCostCentre _:_ CostCentre ;;
-1 mkAllCafsCC _:_ FastString.FastString -> FastString.FastString -> CostCentre ;;;;
-1 preludeDictsCostCentre _:_ PrelBase.Bool -> CostCentre ;;
-1 mkAllDictsCC _:_ FastString.FastString -> FastString.FastString -> PrelBase.Bool -> CostCentre ;;
-1 cafifyCC _:_ CostCentre -> CostCentre ;;
-1 mkUserCC _:_ FastString.FastString -> FastString.FastString -> FastString.FastString -> CostCentre ;;
+1 noCostCentre _:_ CostCentre.CostCentre ;;
+1 useCurrentCostCentre _:_ CostCentre.CostCentre ;;
+1 overheadCostCentre _:_ CostCentre.CostCentre ;;
+1 dontCareCostCentre _:_ CostCentre.CostCentre ;;
+1 subsumedCosts _:_ CostCentre.CostCentre ;;
+1 preludeCafsCostCentre _:_ CostCentre.CostCentre ;;
+1 mkAllCafsCC _:_ FastString.FastString -> FastString.FastString -> CostCentre.CostCentre ;;
+1 preludeDictsCostCentre _:_ PrelBase.Bool -> CostCentre.CostCentre ;;
+1 mkAllDictsCC _:_ FastString.FastString -> FastString.FastString -> PrelBase.Bool -> CostCentre.CostCentre ;;
+1 cafifyCC _:_ CostCentre.CostCentre -> CostCentre.CostCentre ;;
+1 mkUserCC _:_ FastString.FastString -> FastString.FastString -> FastString.FastString -> CostCentre.CostCentre ;;

diff --git a/ghc/compiler/reader/Lex.lhs b/ghc/compiler/reader/Lex.lhs
index 111a29c..3632ed3 100644 (file)
--- a/ghc/compiler/reader/Lex.lhs
+++ b/ghc/compiler/reader/Lex.lhs
@@ -20,12 +20,15 @@ module Lex (
 
 
 IMPORT_1_3(Char(isDigit, isAlpha, isAlphanum, isUpper,isLower, isSpace, ord))
-IMPORT_DELOOPER(Ubiq)
 
 #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
+IMPORT_DELOOPER(Ubiq)
 IMPORT_DELOOPER(IdLoop)    -- get the CostCentre type&constructors from here
 #else
 import {-# SOURCE #-} CostCentre
+# if __GLASGOW_HASKELL__ == 202
+import PrelBase ( Char(..) )
+# endif
 #endif
 
 import CmdLineOpts     ( opt_IgnoreIfacePragmas )

diff --git a/ghc/compiler/types/Class.lhs b/ghc/compiler/types/Class.lhs
index 7fa1711..16496e0 100644 (file)
--- a/ghc/compiler/types/Class.lhs
+++ b/ghc/compiler/types/Class.lhs
@@ -48,7 +48,7 @@ import Maybes         ( assocMaybe )
 import Name            ( changeUnique, Name, OccName, occNameString )
 import Outputable
 import Unique          -- Keys for built-in classes
-import UniqFM           ( SYN_IE(Uniquable))
+import UniqFM           ( Uniquable(..) )
 import Pretty          ( Doc, hsep, ptext )
 import SrcLoc          ( SrcLoc )
 import Util

diff --git a/ghc/compiler/types/Type.hi-boot b/ghc/compiler/types/Type.hi-boot
index 887c5f0..9e92b95 100644 (file)
--- a/ghc/compiler/types/Type.hi-boot
+++ b/ghc/compiler/types/Type.hi-boot
@@ -7,5 +7,5 @@ Type Type GenType splitFunTy splitSigmaTy;
 _declarations_
 1 type Type = Type.GenType TyVar.TyVar Usage.UVar ;
 1 data GenType a b;
-1 splitFunTy _:_ _forall_ [a b] => Type.GenType a b -> ([GenType a b], Type.GenType a b) ;;
+1 splitFunTy _:_ _forall_ [a b] => Type.GenType a b -> ([Type.GenType a b], Type.GenType a b) ;;
 1 splitSigmaTy _:_ _forall_ [a b] => Type.GenType a b -> ([a],[(Class.Class,Type.GenType a b)], Type.GenType a b) ;;

diff --git a/ghc/compiler/utils/FastString.lhs b/ghc/compiler/utils/FastString.lhs
index c003f79..463cc79 100644 (file)
--- a/ghc/compiler/utils/FastString.lhs
+++ b/ghc/compiler/utils/FastString.lhs
@@ -44,6 +44,8 @@ module FastString
 #if __GLASGOW_HASKELL__ <= 201
 import PreludeGlaST
 import PreludeGlaMisc
+import HandleHack
+import Ubiq
 #else
 import GlaExts
 import Foreign
@@ -51,11 +53,14 @@ import IOBase
 import IOHandle
 import ST
 import STBase
+import {-# SOURCE #-} Unique  ( mkUniqueGrimily, Unique )
+import {-# SOURCE #-} UniqFM  ( Uniquable(..) )
+#if __GLASGOW_HASKELL__ == 202
+import PrelBase ( Char (..) )
+#endif
 #endif
-import HandleHack
 
 import PrimPacked
-import Ubiq
 
 #define hASH_TBL_SIZE 993
 

diff --git a/ghc/compiler/utils/PrimPacked.lhs b/ghc/compiler/utils/PrimPacked.lhs
index 508c409..5c3715b 100644 (file)
--- a/ghc/compiler/utils/PrimPacked.lhs
+++ b/ghc/compiler/utils/PrimPacked.lhs
@@ -42,6 +42,9 @@ import GHC
 import ArrBase
 import ST
 import STBase
+#if __GLASGOW_HASKELL__ == 202
+import PrelBase ( Char(..) )
+#endif
 #endif
 
 \end{code} 

diff --git a/ghc/compiler/utils/StringBuffer.lhs b/ghc/compiler/utils/StringBuffer.lhs
index 4b4a13e..0175a2b 100644 (file)
--- a/ghc/compiler/utils/StringBuffer.lhs
+++ b/ghc/compiler/utils/StringBuffer.lhs
@@ -59,10 +59,11 @@ module StringBuffer
        _ByteArray
        ) where
 
-import Ubiq
 #if __GLASGOW_HASKELL__ <= 200
 import PreludeGlaST
 import PreludeGlaMisc
+import HandleHack
+import Ubiq
 #else
 import GlaExts
 import Foreign
@@ -71,10 +72,12 @@ import IOHandle
 import ST
 import STBase
 import Char (isDigit)
+# if __GLASGOW_HASKELL__ == 202
+import PrelBase ( Char(..) )
+# endif
 #endif
 import PrimPacked
 import FastString
-import HandleHack
 
 \end{code}