[project @ 1997-06-05 21:15:00 by sof]

import updates

ghc/compiler/codeGen/CgBindery.lhs

@@ -27,7 +27,6 @@ module CgBindery (
     ) where
 
 IMP_Ubiq(){-uitous-}
---IMPORT_DELOOPER(CgLoop1)		-- here for paranoia-checking
 
 import AbsCSyn
 import CgMonad

ghc/compiler/codeGen/CgCase.lhs

@@ -13,7 +13,11 @@
 module CgCase (	cgCase, saveVolatileVarsAndRegs ) where
 
 IMP_Ubiq(){-uitous-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(CgLoop2)		( cgExpr, getPrimOpArgAmodes )
+#else
+import {-# SOURCE #-} CgExpr
+#endif
 
 import CgMonad
 import StgSyn

ghc/compiler/codeGen/CgClosure.lhs

@@ -13,7 +13,11 @@ with {\em closures} on the RHSs of let(rec)s.  See also
 module CgClosure ( cgTopRhsClosure, cgRhsClosure ) where
 
 IMP_Ubiq(){-uitous-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(CgLoop2)	( cgExpr )
+#else
+import {-# SOURCE #-} CgExpr ( cgExpr )
+#endif
 
 import CgMonad
 import AbsCSyn

ghc/compiler/codeGen/CgExpr.lhs

@@ -13,7 +13,9 @@
 module CgExpr ( cgExpr, getPrimOpArgAmodes ) where
 
 IMP_Ubiq(){-uitous-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(CgLoop2)	-- here for paranoia-checking
+#endif
 
 import Constants	( mAX_SPEC_SELECTEE_SIZE )
 import StgSyn

ghc/compiler/codeGen/CgLetNoEscape.lhs

@@ -13,7 +13,11 @@
 module CgLetNoEscape ( cgLetNoEscapeClosure ) where
 
 IMP_Ubiq(){-uitious-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(CgLoop2)		( cgExpr )
+#else
+import {-# SOURCE #-} CgExpr ( cgExpr )
+#endif
 
 import StgSyn
 import CgMonad

ghc/compiler/codeGen/CgMonad.lhs

@@ -47,9 +47,15 @@ module CgMonad (
 	CompilationInfo(..)
     ) where
 
+IMPORT_1_3(List(nub))
 IMP_Ubiq(){-uitous-}
+
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(CgLoop1)		-- stuff from CgBindery and CgUsages
-IMPORT_1_3(List(nub))
+#else
+import {-# SOURCE #-} CgBindery 
+import {-# SOURCE #-} CgUsages
+#endif
 
 import AbsCSyn
 import AbsCUtils	( mkAbsCStmts )