X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcDefaults.lhs;h=82290dbe4643f8011183136a4d99b1dd91fbdeef;hb=5538aeebb0a92ec73552d92df3afbb70612ca56d;hp=c0330d4ae6f8a5222dee87e9ffd87041b7c5667e;hpb=788faebb40b51d37e73ed94dfc99460d39a1a811;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcDefaults.lhs b/ghc/compiler/typecheck/TcDefaults.lhs
index c0330d4..82290db 100644
--- a/ghc/compiler/typecheck/TcDefaults.lhs
+++ b/ghc/compiler/typecheck/TcDefaults.lhs
@@ -4,44 +4,38 @@
 \section[TcDefaults]{Typechecking \tr{default} declarations}
 
 \begin{code}
-module TcDefaults ( tcDefaults, defaultDefaultTys ) where
+module TcDefaults ( tcDefaults ) where
 
 #include "HsVersions.h"
 
-import HsSyn		( HsDecl(..), DefaultDecl(..) )
-import RnHsSyn		( RenamedHsDecl )
-
-import TcMonad
+import HsSyn		( DefaultDecl(..) )
+import Name		( Name )
+import TcRnMonad
 import TcEnv		( tcLookupGlobal_maybe )
 import TcMonoType	( tcHsType )
-import TcSimplify	( tcSimplifyCheckThetas )
-
-import TysWiredIn	( integerTy, doubleTy )
-import Type             ( Type, mkClassPred )
+import TcSimplify	( tcSimplifyDefault )
+import TcType           ( Type, mkClassPred, isTauTy )
 import PrelNames	( numClassName )
 import Outputable
 import HscTypes		( TyThing(..) )
 \end{code}
 
 \begin{code}
-defaultDefaultTys = [integerTy, doubleTy]
-
-tcDefaults :: [RenamedHsDecl]
+tcDefaults :: [DefaultDecl Name]
 	   -> 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 defaultDefaultTys
+tcDefaults [] = returnM defaultDefaultTys
 
-tc_defaults [DefaultDecl [] locn]
-  = returnTc []		-- no defaults
+tcDefaults [DefaultDecl [] locn]
+  = returnM []		-- no defaults
 
-tc_defaults [DefaultDecl mono_tys locn]
-  = tcLookupGlobal_maybe numClassName	`thenNF_Tc` \ maybe_num ->
+tcDefaults [DefaultDecl mono_tys locn]
+  = tcLookupGlobal_maybe numClassName	`thenM` \ maybe_num ->
     case maybe_num of
 	Just (AClass num_class) -> common_case num_class
-	other	          	-> returnTc []
+	other	          	-> returnM []
 		-- 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
@@ -49,24 +43,26 @@ tc_defaults [DefaultDecl mono_tys locn]
 		-- always sucking in Num
   where
     common_case num_class
-      = tcAddSrcLoc locn $
-    	mapTc tcHsType mono_tys	`thenTc` \ tau_tys ->
+      = addSrcLoc locn 		$
+    	addErrCtxt defaultDeclCtxt	$
+    	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
-    	tcAddErrCtxt defaultDeclCtxt		$
-    	tcSimplifyCheckThetas
- 		    [{- Nothing given -}]
- 		    [ mkClassPred num_class [ty] | ty <- tau_tys ]	`thenTc_`
+    	tcSimplifyDefault [mkClassPred num_class [ty] | ty <- tau_tys]	`thenM_`
     
-    	returnTc tau_tys
+    	returnM tau_tys
 
-
-tc_defaults decls@(DefaultDecl _ loc : _) =
-    tcAddSrcLoc loc $
+tcDefaults decls@(DefaultDecl _ loc : _) =
+    addSrcLoc loc $
     failWithTc (dupDefaultDeclErr decls)
 
 
+tc_default_ty hs_ty 
+ = tcHsType 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")
 
@@ -76,5 +72,8 @@ dupDefaultDeclErr (DefaultDecl _ locn1 : dup_things)
       4  (vcat (map pp dup_things))
   where
     pp (DefaultDecl _ locn) = ptext SLIT("here was another default declaration") <+> ppr locn
+
+polyDefErr ty 
+  = hang (ptext SLIT("Illegal polymorphic type in default declaration") <> colon) 4 (ppr ty) 
 \end{code}