X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Frename%2FRnTypes.lhs;h=b1df31b8bc39549eb27de4f104605141e5be199a;hb=814d2f506d63f785dbfe33189dde606a06e60285;hp=76384abbab816f709655d4b02cdd0a120fb784c9;hpb=7f2909e06884a04199131407c12ba179d5886f46;p=ghc-hetmet.git diff --git a/compiler/rename/RnTypes.lhs b/compiler/rename/RnTypes.lhs index 76384ab..b1df31b 100644 --- a/compiler/rename/RnTypes.lhs +++ b/compiler/rename/RnTypes.lhs @@ -4,13 +4,6 @@ \section[RnSource]{Main pass of renamer} \begin{code} -{-# OPTIONS -w #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and fix --- any warnings in the module. See --- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings --- for details - module RnTypes ( -- Type related stuff rnHsType, rnLHsType, rnLHsTypes, rnContext, @@ -24,33 +17,21 @@ module RnTypes ( import DynFlags import HsSyn import RdrHsSyn ( extractHsRhoRdrTyVars ) -import RnHsSyn ( extractHsTyNames, parrTyCon_name, tupleTyCon_name, - listTyCon_name - ) +import RnHsSyn ( extractHsTyNames ) import RnHsDoc ( rnLHsDoc ) -import RnEnv ( lookupOccRn, lookupBndrRn, lookupSyntaxName, - lookupLocatedOccRn, lookupLocatedBndrRn, - lookupLocatedGlobalOccRn, bindTyVarsRn, - lookupFixityRn, lookupTyFixityRn, lookupConstructorFields, - lookupRecordBndr, mapFvRn, - newIPNameRn, bindPatSigTyVarsFV) +import RnEnv import TcRnMonad import RdrName -import PrelNames ( eqClassName, integralClassName, geName, eqName, - negateName, minusName, lengthPName, indexPName, - plusIntegerName, fromIntegerName, timesIntegerName, - ratioDataConName, fromRationalName, fromStringName ) +import PrelNames import TypeRep ( funTyCon ) -import Constants ( mAX_TUPLE_SIZE ) import Name import SrcLoc import NameSet -import Literal ( inIntRange, inCharRange ) import BasicTypes ( compareFixity, funTyFixity, negateFixity, Fixity(..), FixityDirection(..) ) -import ListSetOps ( removeDups, minusList ) import Outputable +import FastString #include "HsVersions.h" \end{code} @@ -66,9 +47,9 @@ to break several loop. \begin{code} rnHsTypeFVs :: SDoc -> LHsType RdrName -> RnM (LHsType Name, FreeVars) -rnHsTypeFVs doc_str ty - = rnLHsType doc_str ty `thenM` \ ty' -> - returnM (ty', extractHsTyNames ty') +rnHsTypeFVs doc_str ty = do + ty' <- rnLHsType doc_str ty + return (ty', extractHsTyNames ty') rnHsSigType :: SDoc -> LHsType RdrName -> RnM (LHsType Name) -- rnHsSigType is used for source-language type signatures, @@ -86,11 +67,11 @@ rnLHsType doc = wrapLocM (rnHsType doc) rnHsType :: SDoc -> HsType RdrName -> RnM (HsType Name) -rnHsType doc (HsForAllTy Implicit _ ctxt ty) +rnHsType doc (HsForAllTy Implicit _ ctxt ty) = do -- Implicit quantifiction in source code (no kinds on tyvars) -- Given the signature C => T we universally quantify -- over FV(T) \ {in-scope-tyvars} - = getLocalRdrEnv `thenM` \ name_env -> + name_env <- getLocalRdrEnv let mentioned = extractHsRhoRdrTyVars ctxt ty @@ -100,100 +81,107 @@ rnHsType doc (HsForAllTy Implicit _ ctxt ty) -- class C a where { op :: a -> a } forall_tyvars = filter (not . (`elemLocalRdrEnv` name_env) . unLoc) mentioned tyvar_bndrs = userHsTyVarBndrs forall_tyvars - in + rnForAll doc Implicit tyvar_bndrs ctxt ty -rnHsType doc (HsForAllTy Explicit forall_tyvars ctxt tau) +rnHsType doc (HsForAllTy Explicit forall_tyvars ctxt tau) = do -- Explicit quantification. -- Check that the forall'd tyvars are actually -- mentioned in the type, and produce a warning if not - = let + let mentioned = map unLoc (extractHsRhoRdrTyVars ctxt tau) forall_tyvar_names = hsLTyVarLocNames forall_tyvars -- Explicitly quantified but not mentioned in ctxt or tau warn_guys = filter ((`notElem` mentioned) . unLoc) forall_tyvar_names - in - mappM_ (forAllWarn doc tau) warn_guys `thenM_` + + mapM_ (forAllWarn doc tau) warn_guys rnForAll doc Explicit forall_tyvars ctxt tau -rnHsType doc (HsTyVar tyvar) - = lookupOccRn tyvar `thenM` \ tyvar' -> - returnM (HsTyVar tyvar') +rnHsType _ (HsTyVar tyvar) = do + tyvar' <- lookupOccRn tyvar + return (HsTyVar tyvar') +-- If we see (forall a . ty), without foralls on, the forall will give +-- a sensible error message, but we don't want to complain about the dot too +-- Hence the jiggery pokery with ty1 rnHsType doc ty@(HsOpTy ty1 (L loc op) ty2) = setSrcSpan loc $ - do { ty_ops_ok <- doptM Opt_TypeOperators - ; checkErr ty_ops_ok (opTyErr op ty) - ; op' <- lookupOccRn op + do { ops_ok <- doptM Opt_TypeOperators + ; op' <- if ops_ok + then lookupOccRn op + else do { addErr (opTyErr op ty) + ; return (mkUnboundName op) } -- Avoid double complaint ; let l_op' = L loc op' ; fix <- lookupTyFixityRn l_op' ; ty1' <- rnLHsType doc ty1 ; ty2' <- rnLHsType doc ty2 ; mkHsOpTyRn (\t1 t2 -> HsOpTy t1 l_op' t2) (ppr op') fix ty1' ty2' } -rnHsType doc (HsParTy ty) - = rnLHsType doc ty `thenM` \ ty' -> - returnM (HsParTy ty') +rnHsType doc (HsParTy ty) = do + ty' <- rnLHsType doc ty + return (HsParTy ty') -rnHsType doc (HsBangTy b ty) - = rnLHsType doc ty `thenM` \ ty' -> - returnM (HsBangTy b ty') +rnHsType doc (HsBangTy b ty) = do + ty' <- rnLHsType doc ty + return (HsBangTy b ty') -rnHsType doc (HsNumTy i) - | i == 1 = returnM (HsNumTy i) - | otherwise = addErr err_msg `thenM_` returnM (HsNumTy i) +rnHsType _ (HsNumTy i) + | i == 1 = return (HsNumTy i) + | otherwise = addErr err_msg >> return (HsNumTy i) where - err_msg = ptext SLIT("Only unit numeric type pattern is valid") + err_msg = ptext (sLit "Only unit numeric type pattern is valid") -rnHsType doc (HsFunTy ty1 ty2) - = rnLHsType doc ty1 `thenM` \ ty1' -> +rnHsType doc (HsFunTy ty1 ty2) = do + ty1' <- rnLHsType doc ty1 -- Might find a for-all as the arg of a function type - rnLHsType doc ty2 `thenM` \ ty2' -> + ty2' <- rnLHsType doc ty2 -- Or as the result. This happens when reading Prelude.hi -- when we find return :: forall m. Monad m -> forall a. a -> m a -- Check for fixity rearrangements mkHsOpTyRn HsFunTy (ppr funTyCon) funTyFixity ty1' ty2' -rnHsType doc (HsListTy ty) - = rnLHsType doc ty `thenM` \ ty' -> - returnM (HsListTy ty') +rnHsType doc (HsListTy ty) = do + ty' <- rnLHsType doc ty + return (HsListTy ty') -rnHsType doc (HsKindSig ty k) - = rnLHsType doc ty `thenM` \ ty' -> - returnM (HsKindSig ty' k) +rnHsType doc (HsKindSig ty k) = do + ty' <- rnLHsType doc ty + return (HsKindSig ty' k) -rnHsType doc (HsPArrTy ty) - = rnLHsType doc ty `thenM` \ ty' -> - returnM (HsPArrTy ty') +rnHsType doc (HsPArrTy ty) = do + ty' <- rnLHsType doc ty + return (HsPArrTy ty') -- Unboxed tuples are allowed to have poly-typed arguments. These -- sometimes crop up as a result of CPR worker-wrappering dictionaries. -rnHsType doc (HsTupleTy tup_con tys) - = mappM (rnLHsType doc) tys `thenM` \ tys' -> - returnM (HsTupleTy tup_con tys') - -rnHsType doc (HsAppTy ty1 ty2) - = rnLHsType doc ty1 `thenM` \ ty1' -> - rnLHsType doc ty2 `thenM` \ ty2' -> - returnM (HsAppTy ty1' ty2') - -rnHsType doc (HsPredTy pred) - = rnPred doc pred `thenM` \ pred' -> - returnM (HsPredTy pred') - -rnHsType doc (HsSpliceTy _) - = do { addErr (ptext SLIT("Type splices are not yet implemented")) - ; failM } - -rnHsType doc (HsDocTy ty haddock_doc) - = rnLHsType doc ty `thenM` \ ty' -> - rnLHsDoc haddock_doc `thenM` \ haddock_doc' -> - returnM (HsDocTy ty' haddock_doc') - -rnLHsTypes doc tys = mappM (rnLHsType doc) tys +rnHsType doc (HsTupleTy tup_con tys) = do + tys' <- mapM (rnLHsType doc) tys + return (HsTupleTy tup_con tys') + +rnHsType doc (HsAppTy ty1 ty2) = do + ty1' <- rnLHsType doc ty1 + ty2' <- rnLHsType doc ty2 + return (HsAppTy ty1' ty2') + +rnHsType doc (HsPredTy pred) = do + pred' <- rnPred doc pred + return (HsPredTy pred') + +rnHsType _ (HsSpliceTy _) = do + addErr (ptext (sLit "Type splices are not yet implemented")) + failM + +rnHsType doc (HsDocTy ty haddock_doc) = do + ty' <- rnLHsType doc ty + haddock_doc' <- rnLHsDoc haddock_doc + return (HsDocTy ty' haddock_doc') + +rnLHsTypes :: SDoc -> [LHsType RdrName] + -> IOEnv (Env TcGblEnv TcLclEnv) [LHsType Name] +rnLHsTypes doc tys = mapM (rnLHsType doc) tys \end{code} @@ -201,7 +189,7 @@ rnLHsTypes doc tys = mappM (rnLHsType doc) tys rnForAll :: SDoc -> HsExplicitForAll -> [LHsTyVarBndr RdrName] -> LHsContext RdrName -> LHsType RdrName -> RnM (HsType Name) -rnForAll doc exp [] (L _ []) (L _ ty) = rnHsType doc ty +rnForAll doc _ [] (L _ []) (L _ ty) = rnHsType doc ty -- One reason for this case is that a type like Int# -- starts off as (HsForAllTy Nothing [] Int), in case -- there is some quantification. Now that we have quantified @@ -211,10 +199,10 @@ rnForAll doc exp [] (L _ []) (L _ ty) = rnHsType doc ty -- of kind *. rnForAll doc exp forall_tyvars ctxt ty - = bindTyVarsRn doc forall_tyvars $ \ new_tyvars -> - rnContext doc ctxt `thenM` \ new_ctxt -> - rnLHsType doc ty `thenM` \ new_ty -> - returnM (HsForAllTy exp new_tyvars new_ctxt new_ty) + = bindTyVarsRn doc forall_tyvars $ \ new_tyvars -> do + new_ctxt <- rnContext doc ctxt + new_ty <- rnLHsType doc ty + return (HsForAllTy exp new_tyvars new_ctxt new_ty) -- Retain the same implicit/explicit flag as before -- so that we can later print it correctly \end{code} @@ -230,25 +218,27 @@ rnContext :: SDoc -> LHsContext RdrName -> RnM (LHsContext Name) rnContext doc = wrapLocM (rnContext' doc) rnContext' :: SDoc -> HsContext RdrName -> RnM (HsContext Name) -rnContext' doc ctxt = mappM (rnLPred doc) ctxt +rnContext' doc ctxt = mapM (rnLPred doc) ctxt rnLPred :: SDoc -> LHsPred RdrName -> RnM (LHsPred Name) rnLPred doc = wrapLocM (rnPred doc) +rnPred :: SDoc -> HsPred RdrName + -> IOEnv (Env TcGblEnv TcLclEnv) (HsPred Name) rnPred doc (HsClassP clas tys) = do { clas_name <- lookupOccRn clas ; tys' <- rnLHsTypes doc tys - ; returnM (HsClassP clas_name tys') + ; return (HsClassP clas_name tys') } rnPred doc (HsEqualP ty1 ty2) = do { ty1' <- rnLHsType doc ty1 ; ty2' <- rnLHsType doc ty2 - ; returnM (HsEqualP ty1' ty2') + ; return (HsEqualP ty1' ty2') } rnPred doc (HsIParam n ty) = do { name <- newIPNameRn n ; ty' <- rnLHsType doc ty - ; returnM (HsIParam name ty') + ; return (HsIParam name ty') } \end{code} @@ -290,11 +280,11 @@ mkHsOpTyRn mk1 pp_op1 fix1 ty1 (L loc2 (HsOpTy ty21 op2 ty22)) (\t1 t2 -> HsOpTy t1 op2 t2) (ppr op2) fix2 ty21 ty22 loc2 } -mkHsOpTyRn mk1 pp_op1 fix1 ty1 ty2@(L loc2 (HsFunTy ty21 ty22)) +mkHsOpTyRn mk1 pp_op1 fix1 ty1 (L loc2 (HsFunTy ty21 ty22)) = mk_hs_op_ty mk1 pp_op1 fix1 ty1 HsFunTy (ppr funTyCon) funTyFixity ty21 ty22 loc2 -mkHsOpTyRn mk1 pp_op1 fix1 ty1 ty2 -- Default case, no rearrangment +mkHsOpTyRn mk1 _ _ ty1 ty2 -- Default case, no rearrangment = return (mk1 ty1 ty2) --------------- @@ -325,13 +315,13 @@ mkOpAppRn :: LHsExpr Name -- Left operand; already rearranged -- (e11 `op1` e12) `op2` e2 mkOpAppRn e1@(L _ (OpApp e11 op1 fix1 e12)) op2 fix2 e2 - | nofix_error - = addErr (precParseErr (ppr_op op1,fix1) (ppr_op op2,fix2)) `thenM_` - returnM (OpApp e1 op2 fix2 e2) + | nofix_error = do + addErr (precParseErr (ppr_op op1,fix1) (ppr_op op2,fix2)) + return (OpApp e1 op2 fix2 e2) - | associate_right - = mkOpAppRn e12 op2 fix2 e2 `thenM` \ new_e -> - returnM (OpApp e11 op1 fix1 (L loc' new_e)) + | associate_right = do + new_e <- mkOpAppRn e12 op2 fix2 e2 + return (OpApp e11 op1 fix1 (L loc' new_e)) where loc'= combineLocs e12 e2 (nofix_error, associate_right) = compareFixity fix1 fix2 @@ -339,23 +329,23 @@ mkOpAppRn e1@(L _ (OpApp e11 op1 fix1 e12)) op2 fix2 e2 --------------------------- -- (- neg_arg) `op` e2 mkOpAppRn e1@(L _ (NegApp neg_arg neg_name)) op2 fix2 e2 - | nofix_error - = addErr (precParseErr (pp_prefix_minus,negateFixity) (ppr_op op2,fix2)) `thenM_` - returnM (OpApp e1 op2 fix2 e2) + | nofix_error = do + addErr (precParseErr (pp_prefix_minus,negateFixity) (ppr_op op2,fix2)) + return (OpApp e1 op2 fix2 e2) - | associate_right - = mkOpAppRn neg_arg op2 fix2 e2 `thenM` \ new_e -> - returnM (NegApp (L loc' new_e) neg_name) + | associate_right = do + new_e <- mkOpAppRn neg_arg op2 fix2 e2 + return (NegApp (L loc' new_e) neg_name) where loc' = combineLocs neg_arg e2 (nofix_error, associate_right) = compareFixity negateFixity fix2 --------------------------- -- e1 `op` - neg_arg -mkOpAppRn e1 op1 fix1 e2@(L _ (NegApp neg_arg _)) -- NegApp can occur on the right - | not associate_right -- We *want* right association - = addErr (precParseErr (ppr_op op1, fix1) (pp_prefix_minus, negateFixity)) `thenM_` - returnM (OpApp e1 op1 fix1 e2) +mkOpAppRn e1 op1 fix1 e2@(L _ (NegApp _ _)) -- NegApp can occur on the right + | not associate_right= do -- We *want* right association + addErr (precParseErr (ppr_op op1, fix1) (pp_prefix_minus, negateFixity)) + return (OpApp e1 op1 fix1 e2) where (_, associate_right) = compareFixity fix1 negateFixity @@ -365,16 +355,17 @@ mkOpAppRn e1 op fix e2 -- Default case, no rearrangment = ASSERT2( right_op_ok fix (unLoc e2), ppr e1 $$ text "---" $$ ppr op $$ text "---" $$ ppr fix $$ text "---" $$ ppr e2 ) - returnM (OpApp e1 op fix e2) + return (OpApp e1 op fix e2) -- Parser left-associates everything, but -- derived instances may have correctly-associated things to -- in the right operarand. So we just check that the right operand is OK +right_op_ok :: Fixity -> HsExpr Name -> Bool right_op_ok fix1 (OpApp _ _ fix2 _) = not error_please && associate_right where (error_please, associate_right) = compareFixity fix1 fix2 -right_op_ok fix1 other +right_op_ok _ _ = True -- Parser initially makes negation bind more tightly than any other operator @@ -382,10 +373,11 @@ right_op_ok fix1 other mkNegAppRn :: LHsExpr id -> SyntaxExpr id -> RnM (HsExpr id) mkNegAppRn neg_arg neg_name = ASSERT( not_op_app (unLoc neg_arg) ) - returnM (NegApp neg_arg neg_name) + return (NegApp neg_arg neg_name) +not_op_app :: HsExpr id -> Bool not_op_app (OpApp _ _ _ _) = False -not_op_app other = True +not_op_app _ = True --------------------------- mkOpFormRn :: LHsCmdTop Name -- Left operand; already rearranged @@ -396,13 +388,13 @@ mkOpFormRn :: LHsCmdTop Name -- Left operand; already rearranged -- (e11 `op1` e12) `op2` e2 mkOpFormRn a1@(L loc (HsCmdTop (L _ (HsArrForm op1 (Just fix1) [a11,a12])) _ _ _)) op2 fix2 a2 - | nofix_error - = addErr (precParseErr (ppr_op op1,fix1) (ppr_op op2,fix2)) `thenM_` - returnM (HsArrForm op2 (Just fix2) [a1, a2]) + | nofix_error = do + addErr (precParseErr (ppr_op op1,fix1) (ppr_op op2,fix2)) + return (HsArrForm op2 (Just fix2) [a1, a2]) - | associate_right - = mkOpFormRn a12 op2 fix2 a2 `thenM` \ new_c -> - returnM (HsArrForm op1 (Just fix1) + | associate_right = do + new_c <- mkOpFormRn a12 op2 fix2 a2 + return (HsArrForm op1 (Just fix1) [a11, L loc (HsCmdTop (L loc new_c) [] placeHolderType [])]) -- TODO: locs are wrong where @@ -410,7 +402,7 @@ mkOpFormRn a1@(L loc (HsCmdTop (L _ (HsArrForm op1 (Just fix1) [a11,a12])) _ _ _ -- Default case mkOpFormRn arg1 op fix arg2 -- Default case, no rearrangment - = returnM (HsArrForm op (Just fix) [arg1, arg2]) + = return (HsArrForm op (Just fix) [arg1, arg2]) -------------------------------------- @@ -430,26 +422,27 @@ mkConOpPatRn op2 fix2 p1@(L loc (ConPatIn op1 (InfixCon p11 p12))) p2 ; return (ConPatIn op1 (InfixCon p11 (L loc new_p))) } -- XXX loc right? else return (ConPatIn op2 (InfixCon p1 p2)) } -mkConOpPatRn op fix p1 p2 -- Default case, no rearrangment +mkConOpPatRn op _ p1 p2 -- Default case, no rearrangment = ASSERT( not_op_pat (unLoc p2) ) - returnM (ConPatIn op (InfixCon p1 p2)) + return (ConPatIn op (InfixCon p1 p2)) +not_op_pat :: Pat Name -> Bool not_op_pat (ConPatIn _ (InfixCon _ _)) = False -not_op_pat other = True +not_op_pat _ = True -------------------------------------- checkPrecMatch :: Bool -> Name -> MatchGroup Name -> RnM () -- True indicates an infix lhs -- See comments with rnExpr (OpApp ...) about "deriving" -checkPrecMatch False fn match - = returnM () +checkPrecMatch False _ _ + = return () checkPrecMatch True op (MatchGroup ms _) = mapM_ check ms where check (L _ (Match (p1:p2:_) _ _)) - = checkPrec op (unLoc p1) False `thenM_` - checkPrec op (unLoc p2) True + = do checkPrec op (unLoc p1) False + checkPrec op (unLoc p2) True check _ = return () -- This can happen. Consider @@ -460,9 +453,10 @@ checkPrecMatch True op (MatchGroup ms _) -- until the type checker). So we don't want to crash on the -- second eqn. -checkPrec op (ConPatIn op1 (InfixCon _ _)) right - = lookupFixityRn op `thenM` \ op_fix@(Fixity op_prec op_dir) -> - lookupFixityRn (unLoc op1) `thenM` \ op1_fix@(Fixity op1_prec op1_dir) -> +checkPrec :: Name -> Pat Name -> Bool -> IOEnv (Env TcGblEnv TcLclEnv) () +checkPrec op (ConPatIn op1 (InfixCon _ _)) right = do + op_fix@(Fixity op_prec op_dir) <- lookupFixityRn op + op1_fix@(Fixity op1_prec op1_dir) <- lookupFixityRn (unLoc op1) let inf_ok = op1_prec > op_prec || (op1_prec == op_prec && @@ -472,11 +466,11 @@ checkPrec op (ConPatIn op1 (InfixCon _ _)) right info = (ppr_op op, op_fix) info1 = (ppr_op op1, op1_fix) (infol, infor) = if right then (info, info1) else (info1, info) - in + checkErr inf_ok (precParseErr infol infor) -checkPrec op pat right - = returnM () +checkPrec _ _ _ + = return () -- Check precedence of (arg op) or (op arg) respectively -- If arg is itself an operator application, then either @@ -488,11 +482,11 @@ checkSectionPrec direction section op arg = case unLoc arg of OpApp _ op fix _ -> go_for_it (ppr_op op) fix NegApp _ _ -> go_for_it pp_prefix_minus negateFixity - other -> returnM () + _ -> return () where L _ (HsVar op_name) = op - go_for_it pp_arg_op arg_fix@(Fixity arg_prec assoc) - = lookupFixityRn op_name `thenM` \ op_fix@(Fixity op_prec _) -> + go_for_it pp_arg_op arg_fix@(Fixity arg_prec assoc) = do + op_fix@(Fixity op_prec _) <- lookupFixityRn op_name checkErr (op_prec < arg_prec || op_prec == arg_prec && direction == assoc) (sectionPrecErr (ppr_op op_name, op_fix) @@ -502,19 +496,24 @@ checkSectionPrec direction section op arg Precedence-related error messages \begin{code} +precParseErr :: (SDoc, Fixity) -> (SDoc, Fixity) -> SDoc precParseErr op1 op2 - = hang (ptext SLIT("precedence parsing error")) - 4 (hsep [ptext SLIT("cannot mix"), ppr_opfix op1, ptext SLIT("and"), + = hang (ptext (sLit "precedence parsing error")) + 4 (hsep [ptext (sLit "cannot mix"), ppr_opfix op1, ptext (sLit "and"), ppr_opfix op2, - ptext SLIT("in the same infix expression")]) + ptext (sLit "in the same infix expression")]) +sectionPrecErr :: (SDoc, Fixity) -> (SDoc, Fixity) -> HsExpr RdrName -> SDoc sectionPrecErr op arg_op section - = vcat [ptext SLIT("The operator") <+> ppr_opfix op <+> ptext SLIT("of a section"), - nest 4 (ptext SLIT("must have lower precedence than the operand") <+> ppr_opfix arg_op), - nest 4 (ptext SLIT("in the section:") <+> quotes (ppr section))] + = vcat [ptext (sLit "The operator") <+> ppr_opfix op <+> ptext (sLit "of a section"), + nest 4 (ptext (sLit "must have lower precedence than the operand") <+> ppr_opfix arg_op), + nest 4 (ptext (sLit "in the section:") <+> quotes (ppr section))] -pp_prefix_minus = ptext SLIT("prefix `-'") +pp_prefix_minus :: SDoc +pp_prefix_minus = ptext (sLit "prefix `-'") +ppr_op :: Outputable a => a -> SDoc ppr_op op = quotes (ppr op) -- Here, op can be a Name or a (Var n), where n is a Name +ppr_opfix :: (SDoc, Fixity) -> SDoc ppr_opfix (pp_op, fixity) = pp_op <+> brackets (ppr fixity) \end{code} @@ -525,14 +524,27 @@ ppr_opfix (pp_op, fixity) = pp_op <+> brackets (ppr fixity) %********************************************************* \begin{code} +forAllWarn :: SDoc -> LHsType RdrName -> Located RdrName + -> TcRnIf TcGblEnv TcLclEnv () forAllWarn doc ty (L loc tyvar) = ifOptM Opt_WarnUnusedMatches $ - addWarnAt loc (sep [ptext SLIT("The universally quantified type variable") <+> quotes (ppr tyvar), - nest 4 (ptext SLIT("does not appear in the type") <+> quotes (ppr ty))] + addWarnAt loc (sep [ptext (sLit "The universally quantified type variable") <+> quotes (ppr tyvar), + nest 4 (ptext (sLit "does not appear in the type") <+> quotes (ppr ty))] $$ doc) -opTyErr op ty - = hang (ptext SLIT("Illegal operator") <+> quotes (ppr op) <+> ptext SLIT("in type") <+> quotes (ppr ty)) - 2 (parens (ptext SLIT("Use -XTypeOperators to allow operators in types"))) +opTyErr :: RdrName -> HsType RdrName -> SDoc +opTyErr op ty@(HsOpTy ty1 _ _) + = hang (ptext (sLit "Illegal operator") <+> quotes (ppr op) <+> ptext (sLit "in type") <+> quotes (ppr ty)) + 2 extra + where + extra | op == dot_tv_RDR && forall_head ty1 + = ptext (sLit "Perhaps you intended to use -XRankNTypes or similar flag") + | otherwise + = ptext (sLit "Use -XTypeOperators to allow operators in types") + + forall_head (L _ (HsTyVar tv)) = tv == forall_tv_RDR + forall_head (L _ (HsAppTy ty _)) = forall_head ty + forall_head _other = False +opTyErr _ ty = pprPanic "opTyErr: Not an op" (ppr ty) \end{code}