From: sof <unknown>
Date: Thu, 5 Jun 1997 21:00:05 +0000 (+0000)
Subject: [project @ 1997-06-05 20:59:36 by sof]
X-Git-Tag: Approximately_1000_patches_recorded~376
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=0e61daaa0c9871cabc76f49515699d8b3e6111e3;p=ghc-hetmet.git

[project @ 1997-06-05 20:59:36 by sof]
import updates
---

diff --git a/ghc/compiler/hsSyn/HsBinds.lhs b/ghc/compiler/hsSyn/HsBinds.lhs
index 51f98c8..0c167d6 100644
--- a/ghc/compiler/hsSyn/HsBinds.lhs
+++ b/ghc/compiler/hsSyn/HsBinds.lhs
@@ -13,16 +13,22 @@ module HsBinds where
 IMP_Ubiq()
 
 -- friends:
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(HsLoop)	( pprMatches, pprGRHSsAndBinds,
 			  Match, GRHSsAndBinds,
-			  HsExpr, pprExpr )
+			  pprExpr, HsExpr )
+#else
+import {-# SOURCE #-} HsMatches ( pprMatches, Match, pprGRHSsAndBinds, GRHSsAndBinds )
+import {-# SOURCE #-} HsExpr    ( pprExpr, HsExpr )
+#endif
+
 import HsPragmas	( GenPragmas, ClassOpPragmas )
 import HsTypes		( HsType )
 import CoreSyn		( SYN_IE(CoreExpr) )
 
 --others:
 import Id		( SYN_IE(DictVar), SYN_IE(Id), GenId )
-import Name		( getOccName, OccName, NamedThing(..) )
+import Name		( OccName, NamedThing(..) )
 import Outputable	( interpp'SP, ifnotPprForUser, pprQuote,
 			  Outputable(..){-instance * (,)-}
 			)
diff --git a/ghc/compiler/hsSyn/HsExpr.lhs b/ghc/compiler/hsSyn/HsExpr.lhs
index e72c1fd..1acfd71 100644
--- a/ghc/compiler/hsSyn/HsExpr.lhs
+++ b/ghc/compiler/hsSyn/HsExpr.lhs
@@ -11,7 +11,12 @@ module HsExpr where
 IMP_Ubiq(){-uitous-}
 
 -- friends:
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(HsLoop) ( pprMatches, pprMatch, Match )
+#else
+import {-# SOURCE #-} HsMatches ( pprMatches, pprMatch, Match )
+#endif
+
 import HsBinds		( HsBinds )
 import HsBasic		( HsLit )
 import BasicTypes	( Fixity(..), FixityDirection(..) )
@@ -25,7 +30,6 @@ import PprType		( pprGenType, pprParendGenType, GenType{-instance-} )
 import Pretty
 import SrcLoc		( SrcLoc )
 import Usage		( GenUsage{-instance-} )
---import Util		( panic{-ToDo:rm eventually-} )
 #if __GLASGOW_HASKELL__ >= 202
 import Name
 #endif