X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcDefaults.lhs;h=6c9de36a3c099979b3336f97596373b9c94847b7;hb=ff818166a0a06e77becad9e28ed116f3b7f5cc8b;hp=f6e337e5b340156f146c01a3e31b16230e9d7168;hpb=c29022c49449b7d8862dcc2259e16cafe9461945;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcDefaults.lhs b/ghc/compiler/typecheck/TcDefaults.lhs
index f6e337e..6c9de36 100644
--- a/ghc/compiler/typecheck/TcDefaults.lhs
+++ b/ghc/compiler/typecheck/TcDefaults.lhs
@@ -1,5 +1,5 @@
 %
-% (c) The AQUA Project, Glasgow University, 1993-1995
+% (c) The AQUA Project, Glasgow University, 1993-1998
 %
 \section[TcDefaults]{Typechecking \tr{default} declarations}
 
@@ -8,66 +8,72 @@ module TcDefaults ( tcDefaults ) where
 
 #include "HsVersions.h"
 
-import HsSyn		( HsDecl(..), DefaultDecl(..) )
-import RnHsSyn		( RenamedHsDecl(..) )
-
-import TcMonad
-import TcEnv		( tcLookupClassByKey )
-import TcMonoType	( tcHsType )
-import TcSimplify	( tcSimplifyCheckThetas )
-
-import TysWiredIn	( intTy, doubleTy )
-import Type             ( Type )
-import Unique		( numClassKey )
-import ErrUtils		( addShortErrLocLine )
+import HsSyn		( DefaultDecl(..), LDefaultDecl )
+import Name		( Name )
+import TcRnMonad
+import TcEnv		( tcLookupClass )
+import TcHsType		( tcHsSigType, UserTypeCtxt( DefaultDeclCtxt ) )
+import TcSimplify	( tcSimplifyDefault )
+import TcType           ( Type, mkClassPred, isTauTy )
+import PrelNames	( numClassName )
+import SrcLoc		( Located(..) )
 import Outputable
-import Util
 \end{code}
 
 \begin{code}
-default_default = [intTy, doubleTy] 	    -- language-specified default `default'
-
-tcDefaults :: [RenamedHsDecl]
-	   -> TcM s [Type] 	    -- defaulting types to heave
+tcDefaults :: [LDefaultDecl Name]
+	   -> TcM (Maybe [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
-
-      _  ->
-	    -- 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_`
-
-	returnTc tau_tys
-
-tc_defaults decls
-  = failWithTc (dupDefaultDeclErr decls)
 
+tcDefaults [] 
+  = getDefaultTys		-- No default declaration, so get the
+				-- default types from the envt; 
+				-- i.e. use the curent ones
+				-- (the caller will put them back there)
+	-- It's important not to return defaultDefaultTys here (which
+	-- we used to do) because in a TH program, tcDefaults [] is called
+	-- repeatedly, once for each group of declarations between top-level
+	-- splices.  We don't want to carefully set the default types in
+	-- one group, only for the next group to ignore them and install
+	-- defaultDefaultTys
+
+tcDefaults [L locn (DefaultDecl [])]
+  = returnM (Just [])		-- Default declaration specifying no types
+
+tcDefaults [L locn (DefaultDecl mono_tys)]
+  = setSrcSpan locn 			$
+    addErrCtxt defaultDeclCtxt		$
+    tcLookupClass numClassName		`thenM` \ num_class ->
+    mappM tc_default_ty mono_tys	`thenM` \ tau_tys ->
+    
+    	-- Check that all the types are instances of Num
+    	-- We only care about whether it worked or not
+    tcSimplifyDefault [mkClassPred num_class [ty] | ty <- tau_tys]	`thenM_`
+    
+    returnM (Just tau_tys)
+
+tcDefaults decls@(L locn (DefaultDecl _) : _) =
+    setSrcSpan locn $
+    failWithTc (dupDefaultDeclErr decls)
+
+
+tc_default_ty hs_ty 
+ = tcHsSigType DefaultDeclCtxt hs_ty		`thenM` \ ty ->
+   checkTc (isTauTy ty) (polyDefErr hs_ty)	`thenM_`
+   returnM ty
 
 defaultDeclCtxt =  ptext SLIT("when checking that each type in a default declaration")
 		    $$ ptext SLIT("is an instance of class Num")
 
 
-dupDefaultDeclErr (DefaultDecl _ locn1 : dup_things)
-  = vcat (item1 : map dup_item dup_things)
+dupDefaultDeclErr (L _ (DefaultDecl _) : dup_things)
+  = hang (ptext SLIT("Multiple default declarations"))
+      4  (vcat (map pp dup_things))
   where
-    item1
-      = addShortErrLocLine locn1 (ptext SLIT("multiple default declarations"))
+    pp (L locn (DefaultDecl _)) = ptext SLIT("here was another default declaration") <+> ppr locn
 
-    dup_item (DefaultDecl _ locn)
-      = addShortErrLocLine locn (ptext SLIT("here was another default declaration"))
+polyDefErr ty 
+  = hang (ptext SLIT("Illegal polymorphic type in default declaration") <> colon) 4 (ppr ty) 
 \end{code}
+