Print infix function definitions correctly in HsSyn

[ghc-hetmet.git] / compiler / rename / RnEnv.lhs

diff --git a/compiler/rename/RnEnv.lhs b/compiler/rename/RnEnv.lhs
index 51b30c3..33c0d11 100644 (file)
--- a/compiler/rename/RnEnv.lhs
+++ b/compiler/rename/RnEnv.lhs
@@ -232,8 +232,7 @@ lookupInstDeclBndr :: Name -> Located RdrName -> RnM (Located Name)
 -- name is only in scope qualified.  I.e. even if method op is
 -- in scope as M.op, we still allow plain 'op' on the LHS of
 -- an instance decl
-lookupInstDeclBndr cls rdr = lookup_located_sub_bndr is_op
-                               (ptext SLIT("method of class")) rdr
+lookupInstDeclBndr cls rdr = lookup_located_sub_bndr is_op doc rdr
   where
     doc = ptext SLIT("method of class") <+> quotes (ppr cls)
     is_op gre@(GRE {gre_par = ParentIs n}) = n == cls
@@ -572,10 +571,7 @@ lookupFixityRn name
 
 ---------------
 lookupTyFixityRn :: Located Name -> RnM Fixity
-lookupTyFixityRn (L loc n)
-  = do { glaExts <- doptM Opt_GlasgowExts
-       ; when (not glaExts) (addWarnAt loc (infixTyConWarn n))
-       ; lookupFixityRn n }
+lookupTyFixityRn (L loc n) = lookupFixityRn n
 
 ---------------
 dataTcOccs :: RdrName -> [RdrName]
@@ -938,8 +934,4 @@ dupNamesErr descriptor located_names
 
 badQualBndrErr rdr_name
   = ptext SLIT("Qualified name in binding position:") <+> ppr rdr_name
-
-infixTyConWarn op
-  = vcat [ftext FSLIT("Accepting non-standard infix type constructor") <+> quotes (ppr op),
-         ftext FSLIT("Use -fglasgow-exts to avoid this warning")]
 \end{code}