From 3cbb4112ec0d75f517fb07ccb6ae42039686b757 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Thu, 5 Jun 1997 09:19:00 +0000
Subject: [PATCH] [project @ 1997-06-05 09:16:04 by sof] Do not use loop
breaker modules with 2.0x
---
ghc/compiler/types/TyVar.lhs | 1 -
ghc/compiler/types/Type.lhs | 8 +++++++-
ghc/compiler/utils/FiniteMap.lhs | 5 +++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ghc/compiler/types/TyVar.lhs b/ghc/compiler/types/TyVar.lhs
index 73ae74208dcb..0fdfc32b9749 100644
--- a/ghc/compiler/types/TyVar.lhs
+++ b/ghc/compiler/types/TyVar.lhs
@@ -24,7 +24,6 @@ module TyVar (
) where
CHK_Ubiq() -- debugging consistency check
---IMPORT_DELOOPER(IdLoop) -- for paranoia checking
-- friends
import Usage ( GenUsage, SYN_IE(Usage), usageOmega )
diff --git a/ghc/compiler/types/Type.lhs b/ghc/compiler/types/Type.lhs
index 8c045552b0d8..294f4235cd6e 100644
--- a/ghc/compiler/types/Type.lhs
+++ b/ghc/compiler/types/Type.lhs
@@ -42,12 +42,18 @@ module Type (
) where
IMP_Ubiq()
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
IMPORT_DELOOPER(IdLoop) -- for paranoia checking
IMPORT_DELOOPER(TyLoop)
--IMPORT_DELOOPER(PrelLoop) -- for paranoia checking
+#else
+import {-# SOURCE #-} Id ( Id, dataConArgTys )
+import {-# SOURCE #-} TysPrim ( voidTy )
+import {-# SOURCE #-} TysWiredIn ( tupleTyCon )
+#endif
-- friends:
-import Class ( classSig, classOpLocalType, GenClass{-instances-} )
+import Class ( classSig, classOpLocalType, GenClass{-instances-}, SYN_IE(Class) )
import Kind ( mkBoxedTypeKind, resultKind, notArrowKind, Kind )
import TyCon ( mkFunTyCon, isFunTyCon, isEnumerationTyCon, isTupleTyCon, maybeTyConSingleCon,
isPrimTyCon, isAlgTyCon, isDataTyCon, isSynTyCon, maybeNewTyCon, isNewTyCon,
diff --git a/ghc/compiler/utils/FiniteMap.lhs b/ghc/compiler/utils/FiniteMap.lhs
index 37243a43af5b..319e386a8e9b 100644
--- a/ghc/compiler/utils/FiniteMap.lhs
+++ b/ghc/compiler/utils/FiniteMap.lhs
@@ -69,7 +69,12 @@ module FiniteMap (
#endif
) where
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
IMPORT_DELOOPER(SpecLoop)
+#else
+import {-# SOURCE #-} Name
+#endif
+
#if __GLASGOW_HASKELL__ >= 202
import GlaExts
#endif
--
GitLab