Fix Trac #4841: behave right with TypeSynonymInstances and NoFlexibleInstances

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

diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index d6177b4..4b5730b 100644 (file)
--- a/compiler/typecheck/TcEnv.lhs
+++ b/compiler/typecheck/TcEnv.lhs
@@ -548,9 +548,9 @@ tcGetDefaultTys :: Bool             -- True <=> interactive context
                          Bool)) -- True <=> Use extended defaulting rules
 tcGetDefaultTys interactive
   = do { dflags <- getDOpts
-        ; let ovl_strings = dopt Opt_OverloadedStrings dflags
+        ; let ovl_strings = xopt Opt_OverloadedStrings dflags
               extended_defaults = interactive
-                               || dopt Opt_ExtendedDefaultRules dflags
+                               || xopt Opt_ExtendedDefaultRules dflags
                                        -- See also Trac #1974 
               flags = (ovl_strings, extended_defaults)
     
@@ -606,8 +606,8 @@ as well as explicit user written ones.
 \begin{code}
 data InstInfo a
   = InstInfo {
-      iSpec  :: Instance,              -- Includes the dfun id.  Its forall'd type 
-      iBinds :: InstBindings a         -- variables scope over the stuff in InstBindings!
+      iSpec   :: Instance,        -- Includes the dfun id.  Its forall'd type
+      iBinds  :: InstBindings a   -- variables scope over the stuff in InstBindings!
     }
 
 iDFunId :: InstInfo a -> DFunId