From: simonpj <unknown>
Date: Tue, 21 Dec 2004 09:08:08 +0000 (+0000)
Subject: [project @ 2004-12-21 09:08:08 by simonpj]
X-Git-Tag: Initial_conversion_from_CVS_complete~1329
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b783b8644d142d12c832e261ba60bc81c19c3a12;p=ghc-hetmet.git

[project @ 2004-12-21 09:08:08 by simonpj]
Fix bogon in type comparison
---

diff --git a/ghc/compiler/types/Type.lhs b/ghc/compiler/types/Type.lhs
index d7fa64d..d3b87ff 100644
--- a/ghc/compiler/types/Type.lhs
+++ b/ghc/compiler/types/Type.lhs
@@ -961,7 +961,7 @@ cmpTypeX env _ _ = LT
 -------------
 cmpTypesX :: RnEnv2 -> [Type] -> [Type] -> Ordering
 cmpTypesX env []        []        = EQ
-cmpTypesX env (t1:tys1) (t2:tys2) = cmpTypeX env t1 t2 `compare` cmpTypesX env tys1 tys2
+cmpTypesX env (t1:tys1) (t2:tys2) = cmpTypeX env t1 t2 `thenCmp` cmpTypesX env tys1 tys2
 cmpTypesX env []        tys       = LT
 cmpTypesX env ty        []        = GT
 
@@ -972,7 +972,7 @@ cmpPredX env (IParam n1 ty1) (IParam n2 ty2) = (n1 `compare` n2) `thenCmp` cmpTy
 	-- This comparison is used exclusively (I think) for the
 	-- finite map built in TcSimplify
 cmpPredX env (ClassP c1 tys1) (ClassP c2 tys2) = (c1 `compare` c2) `thenCmp` cmpTypesX env tys1 tys2
-cmpPredX env (IParam _ _)     (ClassP _ _)	= LT
+cmpPredX env (IParam _ _)     (ClassP _ _)     = LT
 cmpPredX env (ClassP _ _)     (IParam _ _)     = GT
 \end{code}