X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Frename%2FRnBinds.lhs;h=1733e7a47b7ee9297fbf19be49c7db9b1704577c;hb=c1681a73fa4ca4cf8758264ae387ac09a9e900d8;hp=d7a5952ee297a5896cd45b7e6edda3a3253a03ad;hpb=bb7d80b3b8d1396d481d3b24302bee24a3d92f71;p=ghc-hetmet.git

diff --git a/compiler/rename/RnBinds.lhs b/compiler/rename/RnBinds.lhs
index d7a5952..1733e7a 100644
--- a/compiler/rename/RnBinds.lhs
+++ b/compiler/rename/RnBinds.lhs
@@ -27,18 +27,18 @@ import TcRnMonad
 import RnTypes		( rnHsSigType, rnLHsType, rnHsTypeFVs, 
 			  rnLPat, rnPatsAndThen, patSigErr, checkPrecMatch )
 import RnEnv		( bindLocatedLocalsRn, lookupLocatedBndrRn, 
-			  lookupLocatedInstDeclBndr, newIPNameRn,
+			  lookupInstDeclBndr, newIPNameRn,
 			  lookupLocatedSigOccRn, bindPatSigTyVarsFV,
 			  bindLocalFixities, bindSigTyVarsFV, 
 			  warnUnusedLocalBinds, mapFvRn, extendTyVarEnvFVRn,
 			)
 import DynFlags	( DynFlag(..) )
-import Name		( Name, nameOccName, nameSrcLoc )
+import Name
 import NameEnv
 import NameSet
 import PrelNames	( isUnboundName )
 import RdrName		( RdrName, rdrNameOcc )
-import SrcLoc		( mkSrcSpan, Located(..), unLoc )
+import SrcLoc		( Located(..), unLoc )
 import ListSetOps	( findDupsEq )
 import BasicTypes	( RecFlag(..) )
 import Digraph		( SCC(..), stronglyConnComp )
@@ -422,7 +422,7 @@ rnMethodBinds cls sig_fn gen_tyvars binds
 rnMethodBind cls sig_fn gen_tyvars (L loc (FunBind { fun_id = name, fun_infix = inf, 
 					             fun_matches = MatchGroup matches _ }))
   = setSrcSpan loc $ 
-    lookupLocatedInstDeclBndr cls name			`thenM` \ sel_name -> 
+    lookupInstDeclBndr cls name			`thenM` \ sel_name -> 
     let plain_name = unLoc sel_name in
 	-- We use the selector name as the binder
 
@@ -555,10 +555,10 @@ rnMatch' ctxt match@(Match pats maybe_rhs_sig grhss)
   = 
 	-- Deal with the rhs type signature
     bindPatSigTyVarsFV rhs_sig_tys	$ 
-    doptM Opt_GlasgowExts		`thenM` \ opt_GlasgowExts ->
+    doptM Opt_PatternSignatures `thenM` \ opt_PatternSignatures ->
     (case maybe_rhs_sig of
 	Nothing -> returnM (Nothing, emptyFVs)
-	Just ty | opt_GlasgowExts -> rnHsTypeFVs doc_sig ty	`thenM` \ (ty', ty_fvs) ->
+	Just ty | opt_PatternSignatures -> rnHsTypeFVs doc_sig ty	`thenM` \ (ty', ty_fvs) ->
 				     returnM (Just ty', ty_fvs)
 		| otherwise	  -> addLocErr ty patSigErr	`thenM_`
 				     returnM (Nothing, emptyFVs)
@@ -596,11 +596,11 @@ rnGRHS :: HsMatchContext Name -> LGRHS RdrName -> RnM (LGRHS Name, FreeVars)
 rnGRHS ctxt = wrapLocFstM (rnGRHS' ctxt)
 
 rnGRHS' ctxt (GRHS guards rhs)
-  = do	{ opt_GlasgowExts <- doptM Opt_GlasgowExts
+  = do	{ pattern_guards_allowed <- doptM Opt_PatternGuards
 	; ((guards', rhs'), fvs) <- rnStmts (PatGuard ctxt) guards $
 				    rnLExpr rhs
 
-	; checkM (opt_GlasgowExts || is_standard_guard guards')
+	; checkM (pattern_guards_allowed || is_standard_guard guards')
 	  	 (addWarn (nonStdGuardErr guards'))
 
 	; return (GRHS guards' rhs', fvs) }
@@ -629,10 +629,20 @@ dupSigDeclErr sigs@(L loc sig : _)
     ppr_sig (L loc sig) = ppr loc <> colon <+> ppr sig
 
 unknownSigErr (L loc sig)
-  = addErrAt loc $
-	sep [ptext SLIT("Misplaced") <+> what_it_is <> colon, ppr sig]
+  = do	{ mod <- getModule
+	; addErrAt loc $
+		vcat [sep [ptext SLIT("Misplaced") <+> what_it_is <> colon, ppr sig],
+		      extra_stuff mod sig] }
   where
     what_it_is = hsSigDoc sig
+    extra_stuff mod  (TypeSig (L _ n) _)
+	| nameIsLocalOrFrom mod n
+	= ptext SLIT("The type signature must be given where")
+		<+> quotes (ppr n) <+> ptext SLIT("is declared")
+	| otherwise
+	= ptext SLIT("You cannot give a type signature for an imported value")
+
+    extra_stuff mod other = empty
 
 methodBindErr mbind
  =  hang (ptext SLIT("Pattern bindings (except simple variables) not allowed in instance declarations"))
@@ -643,6 +653,6 @@ bindsInHsBootFile mbinds
        2 (ppr mbinds)
 
 nonStdGuardErr guards
-  = hang (ptext SLIT("accepting non-standard pattern guards (-fglasgow-exts to suppress this message)"))
+  = hang (ptext SLIT("accepting non-standard pattern guards (use -XPatternGuards to suppress this message)"))
        4 (interpp'SP guards)
 \end{code}