X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FInst.lhs;h=dc31266362836ed7794651d575d170044f0b345e;hb=cc3ff9f596ba3c9f5b4393f212a09b924ad340c1;hp=6e0740641d7da89adf584dcbf8a7de30631ce582;hpb=72fbe070fb40d6b53229693359b535ed4977c6fb;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/Inst.lhs b/ghc/compiler/typecheck/Inst.lhs index 6e07406..dc31266 100644 --- a/ghc/compiler/typecheck/Inst.lhs +++ b/ghc/compiler/typecheck/Inst.lhs @@ -11,6 +11,7 @@ module Inst ( InstOrigin(..), OverloadedLit(..), SYN_IE(LIE), emptyLIE, unitLIE, plusLIE, consLIE, zonkLIE, plusLIEs, + pprLIE, pprLIEInFull, SYN_IE(InstanceMapper), @@ -35,19 +36,20 @@ import HsSyn ( HsLit(..), HsExpr(..), HsBinds, Fixity, MonoBinds(..), InPat, OutPat, Stmt, DoOrListComp, Match, GRHSsAndBinds, ArithSeqInfo, HsType, Fake ) import RnHsSyn ( SYN_IE(RenamedArithSeqInfo), SYN_IE(RenamedHsExpr) ) -import TcHsSyn ( TcIdOcc(..), SYN_IE(TcExpr), SYN_IE(TcIdBndr), +import TcHsSyn ( SYN_IE(TcExpr), SYN_IE(TcDictBinds), SYN_IE(TcMonoBinds), mkHsTyApp, mkHsDictApp, tcIdTyVars ) import TcMonad import TcEnv ( tcLookupGlobalValueByKey, tcLookupTyConByKey ) -import TcType ( SYN_IE(TcType), SYN_IE(TcRhoType), TcMaybe, SYN_IE(TcTyVarSet), +import TcType ( TcIdOcc(..), SYN_IE(TcIdBndr), + SYN_IE(TcType), SYN_IE(TcRhoType), TcMaybe, SYN_IE(TcTyVarSet), tcInstType, zonkTcType, tcSplitForAllTy, tcSplitRhoTy ) -import Bag ( emptyBag, unitBag, unionBags, unionManyBags, +import Bag ( emptyBag, unitBag, unionBags, unionManyBags, bagToList, listToBag, consBag, Bag ) import Class ( classInstEnv, - SYN_IE(Class), GenClass, SYN_IE(ClassInstEnv), SYN_IE(ClassOp) + SYN_IE(Class), GenClass, SYN_IE(ClassInstEnv) ) import ErrUtils ( addErrLoc, SYN_IE(Error) ) import Id ( GenId, idType, mkInstId, SYN_IE(Id) ) @@ -67,8 +69,8 @@ import Type ( GenType, eqSimpleTy, instantiateTy, ) import TyVar ( unionTyVarSets, GenTyVar ) import TysPrim ( intPrimTy ) -import TysWiredIn ( intDataCon, integerTy ) -import Unique ( showUnique, fromRationalClassOpKey, rationalTyConKey, +import TysWiredIn ( intDataCon, integerTy, isIntTy, isIntegerTy, inIntRange ) +import Unique ( fromRationalClassOpKey, rationalTyConKey, fromIntClassOpKey, fromIntegerClassOpKey, Unique ) import Util ( panic, zipEqual, zipWithEqual, assoc, assertPanic, pprTrace{-ToDo:rm-} ) @@ -94,6 +96,16 @@ plusLIEs lies = unionManyBags lies zonkLIE :: LIE s -> NF_TcM s (LIE s) zonkLIE lie = mapBagNF_Tc zonkInst lie + +pprLIE :: PprStyle -> LIE s -> Doc +pprLIE sty lie = pprQuote sty $ \ sty -> + braces (hsep (punctuate comma (map (pprInst sty) (bagToList lie)))) + + +pprLIEInFull sty insts + = vcat (map go (bagToList insts)) + where + go inst = ppr sty inst <+> pprOrigin sty inst \end{code} %************************************************************************ @@ -235,14 +247,26 @@ newMethodAtLoc orig loc real_id tys -- Local function, similar to newMethod but newOverloadedLit :: InstOrigin s -> OverloadedLit -> TcType s - -> NF_TcM s (LIE s, TcIdOcc s) -newOverloadedLit orig lit ty + -> NF_TcM s (TcExpr s, LIE s) +newOverloadedLit orig (OverloadedIntegral i) ty + | isIntTy ty && inIntRange i -- Short cut for Int + = returnNF_Tc (int_lit, emptyLIE) + + | isIntegerTy ty -- Short cut for Integer + = returnNF_Tc (integer_lit, emptyLIE) + + where + intprim_lit = HsLitOut (HsIntPrim i) intPrimTy + integer_lit = HsLitOut (HsInt i) integerTy + int_lit = HsApp (HsVar (RealId intDataCon)) intprim_lit + +newOverloadedLit orig lit ty -- The general case = tcGetSrcLoc `thenNF_Tc` \ loc -> tcGetUnique `thenNF_Tc` \ new_uniq -> let lit_inst = LitInst new_uniq lit ty orig loc in - returnNF_Tc (unitLIE lit_inst, instToId lit_inst) + returnNF_Tc (HsVar (instToId lit_inst), unitLIE lit_inst) \end{code} @@ -365,26 +389,23 @@ relevant in error messages. \begin{code} instance Outputable (Inst s) where - ppr sty inst = pprQuote sty (\ sty -> ppr_inst sty (\ o l -> empty) inst) + ppr sty inst = pprQuote sty (\ sty -> pprInst sty inst) -pprInst sty inst = ppr_inst sty (\ o l -> pprOrigin o l sty) inst +pprInst sty (LitInst u lit ty orig loc) + = hsep [case lit of + OverloadedIntegral i -> integer i + OverloadedFractional f -> rational f, + ptext SLIT("at"), + ppr sty ty, + show_uniq sty u] -ppr_inst sty ppr_orig (LitInst u lit ty orig loc) - = hang (ppr_orig orig loc) - 4 (hsep [case lit of - OverloadedIntegral i -> integer i - OverloadedFractional f -> rational f, - ptext SLIT("at"), - ppr sty ty, - show_uniq sty u]) +pprInst sty (Dict u clas ty orig loc) + = hsep [ppr sty clas, pprParendGenType sty ty, show_uniq sty u] -ppr_inst sty ppr_orig (Dict u clas ty orig loc) - = hang (ppr_orig orig loc) - 4 (hsep [ppr sty clas, pprParendGenType sty ty, show_uniq sty u]) - -ppr_inst sty ppr_orig (Method u id tys rho orig loc) - = hang (ppr_orig orig loc) - 4 (hsep [ppr sty id, ptext SLIT("at"), interppSP sty tys, show_uniq sty u]) +pprInst sty (Method u id tys rho orig loc) + = hsep [ppr sty id, ptext SLIT("at"), + interppSP sty tys, + show_uniq sty u] show_uniq PprDebug u = ppr PprDebug u show_uniq sty u = empty @@ -393,7 +414,7 @@ show_uniq sty u = empty Printing in error messages \begin{code} -noInstanceErr inst sty = hang (ptext SLIT("No instance for:")) 4 (ppr sty inst) +noInstanceErr inst sty = ptext SLIT("No instance for:") <+> ppr sty inst \end{code} %************************************************************************ @@ -403,7 +424,7 @@ noInstanceErr inst sty = hang (ptext SLIT("No instance for:")) 4 (ppr sty inst) %************************************************************************ \begin{code} -type InstanceMapper = Class -> (ClassInstEnv, ClassOp -> SpecEnv) +type InstanceMapper = Class -> ClassInstEnv \end{code} A @ClassInstEnv@ lives inside a class, and identifies all the instances @@ -431,7 +452,7 @@ lookupInst :: Inst s lookupInst dict@(Dict _ clas ty orig loc) = case lookupMEnv matchTy (get_inst_env clas orig) ty of Nothing -> tcAddSrcLoc loc $ - tcAddErrCtxt (pprOrigin orig loc) $ + tcAddErrCtxt (\sty -> pprOrigin sty dict) $ failTc (noInstanceErr dict) Just (dfun_id, tenv) @@ -461,20 +482,27 @@ lookupInst inst@(Method _ id tys rho orig loc) -- Literals lookupInst inst@(LitInst u (OverloadedIntegral i) ty orig loc) - | i >= toInteger minInt && i <= toInteger maxInt - = -- It's overloaded but small enough to fit into an Int - tcLookupGlobalValueByKey fromIntClassOpKey `thenNF_Tc` \ from_int -> - newMethodAtLoc orig loc from_int [ty] `thenNF_Tc` \ (method_inst, method_id) -> - returnTc ([method_inst], VarMonoBind (instToId inst) (HsApp (HsVar method_id) int_lit)) - - | otherwise - = -- Alas, it is overloaded and a big literal! - tcLookupGlobalValueByKey fromIntegerClassOpKey `thenNF_Tc` \ from_integer -> + | isIntTy ty && in_int_range -- Short cut for Int + = returnTc ([], VarMonoBind inst_id int_lit) + + | isIntegerTy ty -- Short cut for Integer + = returnTc ([], VarMonoBind inst_id integer_lit) + + | in_int_range -- It's overloaded but small enough to fit into an Int + = tcLookupGlobalValueByKey fromIntClassOpKey `thenNF_Tc` \ from_int -> + newMethodAtLoc orig loc from_int [ty] `thenNF_Tc` \ (method_inst, method_id) -> + returnTc ([method_inst], VarMonoBind inst_id (HsApp (HsVar method_id) int_lit)) + + | otherwise -- Alas, it is overloaded and a big literal! + = tcLookupGlobalValueByKey fromIntegerClassOpKey `thenNF_Tc` \ from_integer -> newMethodAtLoc orig loc from_integer [ty] `thenNF_Tc` \ (method_inst, method_id) -> - returnTc ([method_inst], VarMonoBind (instToId inst) (HsApp (HsVar method_id) (HsLitOut (HsInt i) integerTy))) + returnTc ([method_inst], VarMonoBind inst_id (HsApp (HsVar method_id) integer_lit)) where + in_int_range = inIntRange i intprim_lit = HsLitOut (HsIntPrim i) intPrimTy + integer_lit = HsLitOut (HsInt i) integerTy int_lit = HsApp (HsVar (RealId intDataCon)) intprim_lit + inst_id = instToId inst lookupInst inst@(LitInst u (OverloadedFractional f) ty orig loc) = tcLookupGlobalValueByKey fromRationalClassOpKey `thenNF_Tc` \ from_rational -> @@ -508,8 +536,8 @@ lookupSimpleInst class_inst_env clas ty (_, theta, _) = splitSigmaTy (idType dfun) noSimpleInst clas ty sty - = sep [ptext SLIT("No instance for class"), ppr sty clas, - ptext SLIT("at type"), ppr sty ty] + = ptext SLIT("No instance for") <+> + (pprQuote sty $ \ sty -> ppr sty clas <+> ppr sty ty) \end{code} @@ -632,44 +660,46 @@ get_inst_env :: Class -> InstOrigin s -> ClassInstEnv -- get_inst_env clas (DerivingOrigin inst_mapper _ _) -- = fst (inst_mapper clas) get_inst_env clas (InstanceSpecOrigin inst_mapper _ _) - = fst (inst_mapper clas) + = inst_mapper clas get_inst_env clas other_orig = classInstEnv clas -pprOrigin :: InstOrigin s -> SrcLoc -> Error - -pprOrigin orig locn sty - = hsep [text "arising from", pp_orig, text "at", ppr sty locn] +pprOrigin :: PprStyle -> Inst s -> Doc +pprOrigin sty inst + = hsep [text "arising from", pp_orig orig, text "at", ppr sty locn] where - pp_orig - = case orig of - OccurrenceOf id -> - hsep [ptext SLIT("use of"), ppr sty id] - OccurrenceOfCon id -> - hsep [ptext SLIT("use of"), ppr sty id] - LiteralOrigin lit -> - hsep [ptext SLIT("the literal"), ppr sty lit] - InstanceDeclOrigin -> - ptext SLIT("an instance declaration") - ArithSeqOrigin seq -> - hsep [ptext SLIT("the arithmetic sequence:"), ppr sty seq] - SignatureOrigin -> - ptext SLIT("a type signature") - DoOrigin -> - ptext SLIT("a do statement") - ClassDeclOrigin -> - ptext SLIT("a class declaration") - InstanceSpecOrigin _ clas ty -> - hsep [text "a SPECIALIZE instance pragma; class", - ppr sty clas, text "type:", ppr sty ty] - ValSpecOrigin name -> - hsep [ptext SLIT("a SPECIALIZE user-pragma for"), ppr sty name] - CCallOrigin clabel Nothing{-ccall result-} -> - hsep [ptext SLIT("the result of the _ccall_ to"), text clabel] - CCallOrigin clabel (Just arg_expr) -> - hsep [ptext SLIT("an argument in the _ccall_ to"), text clabel <> comma, text "namely", ppr sty arg_expr] - LitLitOrigin s -> - hcat [ptext SLIT("the ``literal-literal''"), text s] - UnknownOrigin -> - ptext SLIT("...oops -- I don't know where the overloading came from!") + (orig, locn) = case inst of + Dict _ _ _ orig loc -> (orig,loc) + Method _ _ _ _ orig loc -> (orig,loc) + LitInst _ _ _ orig loc -> (orig,loc) + + pp_orig (OccurrenceOf id) + = hsep [ptext SLIT("use of"), ppr sty id] + pp_orig (OccurrenceOfCon id) + = hsep [ptext SLIT("use of"), ppr sty id] + pp_orig (LiteralOrigin lit) + = hsep [ptext SLIT("the literal"), ppr sty lit] + pp_orig (InstanceDeclOrigin) + = ptext SLIT("an instance declaration") + pp_orig (ArithSeqOrigin seq) + = hsep [ptext SLIT("the arithmetic sequence:"), ppr sty seq] + pp_orig (SignatureOrigin) + = ptext SLIT("a type signature") + pp_orig (DoOrigin) + = ptext SLIT("a do statement") + pp_orig (ClassDeclOrigin) + = ptext SLIT("a class declaration") + pp_orig (InstanceSpecOrigin _ clas ty) + = hsep [text "a SPECIALIZE instance pragma; class", + ppr sty clas, text "type:", ppr sty ty] + pp_orig (ValSpecOrigin name) + = hsep [ptext SLIT("a SPECIALIZE user-pragma for"), ppr sty name] + pp_orig (CCallOrigin clabel Nothing{-ccall result-}) + = hsep [ptext SLIT("the result of the _ccall_ to"), text clabel] + pp_orig (CCallOrigin clabel (Just arg_expr)) + = hsep [ptext SLIT("an argument in the _ccall_ to"), text clabel <> comma, text "namely", ppr sty arg_expr] + pp_orig (LitLitOrigin s) + = hsep [ptext SLIT("the ``literal-literal''"), text s] + pp_orig (UnknownOrigin) + = ptext SLIT("...oops -- I don't know where the overloading came from!") \end{code}