From e2d91dedfcf2aacd159772a151b2dfb9d74ecb86 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Mon, 26 May 1997 02:33:24 +0000
Subject: [PATCH] [project @ 1997-05-26 02:33:24 by sof] Updated imports;
 modified checkInScope to use isAlgCon

---
 ghc/compiler/stgSyn/StgLint.lhs |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ghc/compiler/stgSyn/StgLint.lhs b/ghc/compiler/stgSyn/StgLint.lhs
index 001d195..053d8e7 100644
--- a/ghc/compiler/stgSyn/StgLint.lhs
+++ b/ghc/compiler/stgSyn/StgLint.lhs
@@ -13,24 +13,24 @@ IMP_Ubiq(){-uitous-}
 import StgSyn
 
 import Bag		( Bag, emptyBag, isEmptyBag, snocBag, foldBag )
-import Id		( idType, isDataCon, dataConArgTys,
+import Id		( idType, isAlgCon, dataConArgTys,
 			  emptyIdSet, isEmptyIdSet, elementOfIdSet,
-			  mkIdSet, intersectIdSets,
+			  mkIdSet, intersectIdSets, 
 			  unionIdSets, idSetToList, SYN_IE(IdSet),
 			  GenId{-instanced NamedThing-}, SYN_IE(Id)
 			)
 import Literal		( literalType, Literal{-instance Outputable-} )
 import Maybes		( catMaybes )
 import Name		( isLocallyDefined, getSrcLoc )
-import Outputable	( Outputable(..){-instance * []-} )
+import Outputable	( PprStyle, Outputable(..){-instance * []-} )
 import PprType		( GenType{-instance Outputable-}, TyCon )
-import PprStyle         ( PprStyle )
 import Pretty		-- quite a bit of it
 import PrimOp		( primOpType )
 import SrcLoc		( SrcLoc{-instance Outputable-} )
 import Type		( mkFunTys, splitFunTy, maybeAppDataTyConExpandingDicts,
 			  isTyVarTy, eqTy, splitFunTyExpandingDicts, SYN_IE(Type)
 			)
+import TyCon		( isDataTyCon )
 import Util		( zipEqual, pprPanic, panic, panic# )
 
 infixr 9 `thenL`, `thenL_`, `thenMaybeL`, `thenMaybeL_`
@@ -182,10 +182,10 @@ lintStgExpr e@(StgCase scrut _ _ _ alts)
 
 	-- Check that it is a data type
     case (maybeAppDataTyConExpandingDicts scrut_ty) of
-      Nothing -> addErrL (mkCaseDataConMsg e)	`thenL_`
-		 returnL Nothing
-      Just (tycon, _, _)
+      Just (tycon, _, _) | isDataTyCon tycon
 	      -> lintStgAlts alts scrut_ty tycon
+      other   -> addErrL (mkCaseDataConMsg e)	`thenL_`
+		 returnL Nothing
   where
     scrut_ty = get_ty alts
 
@@ -423,7 +423,7 @@ checkFunApp fun_ty arg_tys msg loc scope errs
 \begin{code}
 checkInScope :: Id -> LintM ()
 checkInScope id loc scope errs
-  = if isLocallyDefined id && not (isDataCon id) && not (id `elementOfIdSet` scope) then
+  = if isLocallyDefined id && not (isAlgCon id) && not (id `elementOfIdSet` scope) then
 	((), addErr errs (\ sty -> hsep [ppr sty id, ptext SLIT("is out of scope")]) loc)
     else
 	((), errs)
-- 
1.7.10.4