X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Frename%2FRnMonad.lhs;h=9b7bf0fac6761d0d3bf529cbc0cba20ea8460d2e;hb=f3998ec18fd0f3d56b377d41e2a2958aaf9460ec;hp=cde9eef625b5c5876d9f7c6fc9db3fda973afa83;hpb=5cf27e8f1731c52fe63a5b9615f927484164c61b;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs index cde9eef..9b7bf0f 100644 --- a/ghc/compiler/rename/RnMonad.lhs +++ b/ghc/compiler/rename/RnMonad.lhs @@ -43,7 +43,7 @@ import RnHsSyn ( RnName, mkRnName, mkRnUnbound, mkRnImplicit, import RnUtils ( RnEnv(..), extendLocalRnEnv, lookupRnEnv, lookupGlobalRnEnv, lookupTcRnEnv, unknownNameErr, badClassOpErr, qualNameErr, - dupNamesErr, shadowedNameWarn, negateNameWarn + dupNamesErr, shadowedNameWarn ) import Bag ( Bag, emptyBag, isEmptyBag, snocBag ) @@ -292,12 +292,10 @@ newLocalNames :: String -- Documentation string -> RnMonad x s [RnName] newLocalNames str names_w_loc - = mapRn (addWarnRn . negateNameWarn) negs `thenRn_` - mapRn (addErrRn . qualNameErr str) quals `thenRn_` + = mapRn (addErrRn . qualNameErr str) quals `thenRn_` mapRn (addErrRn . dupNamesErr str) dups `thenRn_` mkLocalNames these where - negs = filter ((== Unqual SLIT("negate")).fst) names_w_loc quals = filter (isQual.fst) names_w_loc (these, dups) = removeDups cmp_fst names_w_loc cmp_fst (a,_) (b,_) = cmp a b