[project @ 2000-11-06 08:15:20 by simonpj]

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

diff --git a/ghc/compiler/typecheck/TcDefaults.lhs b/ghc/compiler/typecheck/TcDefaults.lhs
index 7335631..b9b74c3 100644 (file)
--- a/ghc/compiler/typecheck/TcDefaults.lhs
+++ b/ghc/compiler/typecheck/TcDefaults.lhs
@@ -12,50 +12,59 @@ import HsSyn                ( HsDecl(..), DefaultDecl(..) )
 import RnHsSyn         ( RenamedHsDecl )
 
 import TcMonad
-import TcEnv           ( tcLookupClassByKey )
+import TcEnv           ( tcLookupGlobal_maybe )
 import TcMonoType      ( tcHsType )
 import TcSimplify      ( tcSimplifyCheckThetas )
 
-import TysWiredIn      ( intTy, doubleTy )
+import TysWiredIn      ( integerTy, doubleTy )
 import Type             ( Type )
-import Unique          ( numClassKey )
-import ErrUtils                ( addShortErrLocLine )
+import PrelNames       ( numClassName )
 import Outputable
-import Util
+import HscTypes                ( TyThing(..) )
 \end{code}
 
 \begin{code}
-default_default = [intTy, doubleTy]        -- language-specified default `default'
+default_default = [integerTy, doubleTy]
 
 tcDefaults :: [RenamedHsDecl]
-          -> TcM s [Type]          -- defaulting types to heave
+          -> TcM [Type]            -- defaulting types to heave
                                    -- into Tc monad for later use
                                    -- in Disambig.
 tcDefaults decls = tc_defaults [default_decl | DefD default_decl <- decls]
 
 tc_defaults [] = returnTc default_default
 
-tc_defaults [DefaultDecl mono_tys locn]
-  = tcAddSrcLoc locn $
-    mapTc tcHsType mono_tys    `thenTc` \ tau_tys ->
-
-    case tau_tys of
-      [] -> returnTc []                -- no defaults
+tc_defaults [DefaultDecl [] locn]
+  = returnTc []                -- no defaults
 
-      _  ->
-           -- Check that all the types are instances of Num
-           -- We only care about whether it worked or not
-
-       tcAddErrCtxt defaultDeclCtxt            $
-       tcLookupClassByKey numClassKey          `thenNF_Tc` \ num ->
-       tcSimplifyCheckThetas
-               [{- Nothing given -}]
-               [ (num, [ty]) | ty <- tau_tys ] `thenTc_`
+tc_defaults [DefaultDecl mono_tys locn]
+  = tcLookupGlobal_maybe numClassName  `thenNF_Tc` \ maybe_num ->
+    case maybe_num of
+       Just (AClass num_class) -> common_case num_class
+       other                   -> returnTc []
+               -- In the Nothing case, Num has not been sucked in, so the 
+               -- defaults will never be used; so simply discard the default decl.
+               -- This slightly benefits modules that don't use any
+               -- numeric stuff at all, by avoid the necessity of
+               -- always sucking in Num
+  where
+    common_case num_class
+      = tcAddSrcLoc locn $
+       mapTc tcHsType mono_tys `thenTc` \ tau_tys ->
+    
+               -- Check that all the types are instances of Num
+               -- We only care about whether it worked or not
+       tcAddErrCtxt defaultDeclCtxt            $
+       tcSimplifyCheckThetas
+                   [{- Nothing given -}]
+                   [ (num_class, [ty]) | ty <- tau_tys ]       `thenTc_`
+    
+       returnTc tau_tys
 
-       returnTc tau_tys
 
-tc_defaults decls
-  = failWithTc (dupDefaultDeclErr decls)
+tc_defaults decls@(DefaultDecl _ loc : _) =
+    tcAddSrcLoc loc $
+    failWithTc (dupDefaultDeclErr decls)
 
 
 defaultDeclCtxt =  ptext SLIT("when checking that each type in a default declaration")
@@ -63,11 +72,9 @@ defaultDeclCtxt =  ptext SLIT("when checking that each type in a default declara
 
 
 dupDefaultDeclErr (DefaultDecl _ locn1 : dup_things)
-  = vcat (item1 : map dup_item dup_things)
+  = hang (ptext SLIT("Multiple default declarations"))
+      4  (vcat (map pp dup_things))
   where
-    item1
-      = addShortErrLocLine locn1 (ptext SLIT("multiple default declarations"))
-
-    dup_item (DefaultDecl _ locn)
-      = addShortErrLocLine locn (ptext SLIT("here was another default declaration"))
+    pp (DefaultDecl _ locn) = ptext SLIT("here was another default declaration") <+> ppr locn
 \end{code}
+