Ticky is an RTS-only way; also fix collateral damage to other ways

[ghc-hetmet.git] / compiler / typecheck / TcDeriv.lhs

diff --git a/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs
index af53740..a273b4a 100644 (file)
--- a/compiler/typecheck/TcDeriv.lhs
+++ b/compiler/typecheck/TcDeriv.lhs
@@ -420,6 +420,7 @@ baleOut err = addErrTc err >> returnM (Nothing, Nothing)
 \begin{code}
 mkDataTypeEqn orig gla_exts tvs cls cls_tys tycon tc_args rep_tc rep_tc_args
   | Just err <- checkSideConditions gla_exts cls cls_tys rep_tc
+       -- NB: pass the *representation* tycon to checkSideConditions
   = baleOut (derivingThingErr cls cls_tys (mkTyConApp tycon tc_args) err)
 
   | otherwise 
@@ -496,7 +497,11 @@ sideConditions
        (dataClassKey,     cond_glaExts `andCond` cond_std)
     ]
 
-type Condition = (Bool, TyCon) -> Maybe SDoc   -- Nothing => OK
+type Condition = (Bool, TyCon) -> Maybe SDoc
+       -- Bool is gla-exts flag
+       -- TyCon is the *representation* tycon if the 
+       --      data type is an indexed one
+       -- Nothing => OK
 
 orCond :: Condition -> Condition -> Condition
 orCond c1 c2 tc 
@@ -573,7 +578,7 @@ std_class_via_iso clas      -- These standard classes can be derived for a newtype
                        -- using the isomorphism trick *even if no -fglasgow-exts*
   = classKey clas `elem`  [eqClassKey, ordClassKey, ixClassKey, boundedClassKey]
        -- Not Read/Show because they respect the type
-       -- Not Enum, becuase newtypes are never in Enum
+       -- Not Enum, because newtypes are never in Enum
 
 
 new_dfun_name clas tycon       -- Just a simple wrapper