Merge in changes from HEAD

[ghc-hetmet.git] / compiler / types / OptCoercion.lhs

diff --git a/compiler/types/OptCoercion.lhs b/compiler/types/OptCoercion.lhs
index c955712..559ea65 100644 (file)
--- a/compiler/types/OptCoercion.lhs
+++ b/compiler/types/OptCoercion.lhs
@@ -100,10 +100,13 @@ opt_co env sym co
 \r
 opt_co' env _   (Refl ty)           = Refl (substTy env ty)\r
 opt_co' env sym (SymCo co)          = opt_co env (not sym) co\r
-opt_co' env sym (TyConAppCo tc cos) = TyConAppCo tc (map (opt_co env sym) cos)\r
+\r
+opt_co' env sym (TyConAppCo tc cos) = mkTyConAppCo tc (map (opt_co env sym) cos)\r
 opt_co' env sym (AppCo co1 co2)     = mkAppCo (opt_co env sym co1) (opt_co env sym co2)\r
 opt_co' env sym (ForAllCo tv co)    = case substTyVarBndr env tv of\r
-                                         (env', tv') -> ForAllCo tv' (opt_co env' sym co)\r
+                                         (env', tv') -> mkForAllCo tv' (opt_co env' sym co)\r
+     -- Use the "mk" functions to check for nested Refls\r
+\r
 opt_co' env sym (CoVarCo cv)\r
   | Just co <- lookupCoVar env cv\r
   = opt_co (zapCvSubstEnv env) sym co\r