IMP_Ubiq()
IMPORT_1_3(Ratio(Rational))
-import HsSyn ( HsLit(..), HsExpr(..), HsBinds, Fixity,
- InPat, OutPat, Stmt, Qualifier, Match,
+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 ( TcIdOcc(..), SYN_IE(TcExpr), SYN_IE(TcIdBndr),
+ 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),
- tcInstType, zonkTcType )
+ tcInstType, zonkTcType, tcSplitForAllTy, tcSplitRhoTy )
-import Bag ( emptyBag, unitBag, unionBags, unionManyBags, listToBag, consBag )
+import Bag ( emptyBag, unitBag, unionBags, unionManyBags,
+ listToBag, consBag, Bag )
import Class ( classInstEnv,
SYN_IE(Class), GenClass, SYN_IE(ClassInstEnv), SYN_IE(ClassOp)
)
import ErrUtils ( addErrLoc, SYN_IE(Error) )
-import Id ( GenId, idType, mkInstId )
+import Id ( GenId, idType, mkInstId, SYN_IE(Id) )
import PrelInfo ( isCcallishClass, isNoDictClass )
import MatchEnv ( lookupMEnv, insertMEnv )
-import Name ( OccName(..), Name, mkLocalName, mkSysLocalName, occNameString )
+import Name ( OccName(..), Name, mkLocalName,
+ mkSysLocalName, occNameString, getOccName )
import Outputable
import PprType ( GenClass, TyCon, GenType, GenTyVar, pprParendGenType )
-import PprStyle ( PprStyle(..) )
import Pretty
import SpecEnv ( SpecEnv )
import SrcLoc ( SrcLoc, noSrcLoc )
import Type ( GenType, eqSimpleTy, instantiateTy,
isTyVarTy, mkDictTy, splitForAllTy, splitSigmaTy,
splitRhoTy, matchTy, tyVarsOfType, tyVarsOfTypes,
- mkSynTy
+ mkSynTy, SYN_IE(Type)
)
import TyVar ( unionTyVarSets, GenTyVar )
import TysPrim ( intPrimTy )
fromIntClassOpKey, fromIntegerClassOpKey, Unique
)
import Util ( panic, zipEqual, zipWithEqual, assoc, assertPanic, pprTrace{-ToDo:rm-} )
+#if __GLASGOW_HASKELL__ >= 202
+import Maybes
+#endif
\end{code}
%************************************************************************
in
(if length tyvars /= length tys then pprTrace "newMethod" (ppr PprDebug (idType id)) else \x->x) $
tcInstType (zip{-Equal "newMethod"-} tyvars tys) rho
- TcId id -> let (tyvars, rho) = splitForAllTy (idType id)
- in returnNF_Tc (instantiateTy (zipEqual "newMethod(2)" tyvars tys) rho)
+ TcId id -> tcSplitForAllTy (idType id) `thenNF_Tc` \ (tyvars, rho) ->
+ returnNF_Tc (instantiateTy (zipEqual "newMethod(2)" tyvars tys) rho)
) `thenNF_Tc` \ rho_ty ->
-- Our friend does the rest
newMethodWithGivenTy orig id tys rho_ty
str = VarOcc (SLIT("d.") _APPEND_ (occNameString (getOccName clas)))
instToId (Method u id tys rho_ty orig loc)
- = TcId (mkInstId u tau_ty (mkLocalName u str loc))
+ = TcId (mkInstId u tau_ty (mkLocalName u occ loc))
where
- (_, tau_ty) = splitRhoTy rho_ty -- NB The method Id has just the tau type
- str = VarOcc (SLIT("m.") _APPEND_ (occNameString (getOccName id)))
-
+ occ = getOccName id
+ (_, tau_ty) = splitRhoTy rho_ty
+ -- I hope we don't need tcSplitRhoTy...
+ -- NB The method Id has just the tau type
+
instToId (LitInst u list ty orig loc)
= TcId (mkInstId u ty (mkSysLocalName u SLIT("lit") loc))
\end{code}
\begin{code}
instance Outputable (Inst s) where
- ppr sty inst = ppr_inst sty ppNil (\ o l -> ppNil) inst
+ ppr sty inst = pprQuote sty (\ sty -> ppr_inst sty (\ o l -> empty) inst)
-pprInst sty hdr inst = ppr_inst sty hdr (\ o l -> pprOrigin hdr o l sty) inst
+pprInst sty inst = ppr_inst sty (\ o l -> pprOrigin o l sty) inst
-ppr_inst sty hdr ppr_orig (LitInst u lit ty orig loc)
- = ppHang (ppr_orig orig loc)
- 4 (ppCat [case lit of
- OverloadedIntegral i -> ppInteger i
- OverloadedFractional f -> ppRational f,
- ppStr "at",
+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])
-ppr_inst sty hdr ppr_orig (Dict u clas ty orig loc)
- = ppHang (ppr_orig orig loc)
- 4 (ppCat [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 (pprQuote sty $ \ sty ->
+ hsep [ppr sty clas, pprParendGenType sty ty, show_uniq sty u])
-ppr_inst sty hdr ppr_orig (Method u id tys rho orig loc)
- = ppHang (ppr_orig orig loc)
- 4 (ppCat [ppr sty id, ppStr "at", interppSP sty tys, 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"),
+ pprQuote sty $ \ sty -> interppSP sty tys,
+ show_uniq sty u])
show_uniq PprDebug u = ppr PprDebug u
-show_uniq sty u = ppNil
+show_uniq sty u = empty
\end{code}
Printing in error messages
\begin{code}
-noInstanceErr inst sty = ppHang (ppPStr SLIT("No instance for:")) 4 (ppr sty inst)
+noInstanceErr inst sty = hang (ptext SLIT("No instance for:")) 4 (ppr sty inst)
\end{code}
%************************************************************************
\begin{code}
lookupInst :: Inst s
-> TcM s ([Inst s],
- (TcIdOcc s, TcExpr s)) -- The new binding
+ TcDictBinds s) -- The new binding
-- Dictionaries
lookupInst dict@(Dict _ clas ty orig loc)
= case lookupMEnv matchTy (get_inst_env clas orig) ty of
Nothing -> tcAddSrcLoc loc $
- tcAddErrCtxt (pprOrigin ""{-hdr-} orig loc) $
+ tcAddErrCtxt (pprOrigin orig loc) $
failTc (noInstanceErr dict)
Just (dfun_id, tenv)
let
rhs = mkHsDictApp (mkHsTyApp (HsVar (RealId dfun_id)) ty_args) dict_ids
in
- returnTc (dicts, (instToId dict, rhs))
+ returnTc (dicts, VarMonoBind (instToId dict) rhs)
-- Methods
lookupInst inst@(Method _ id tys rho orig loc)
- = newDictsAtLoc orig loc theta `thenNF_Tc` \ (dicts, dict_ids) ->
- returnTc (dicts, (instToId inst, mkHsDictApp (mkHsTyApp (HsVar id) tys) dict_ids))
- where
- (theta,_) = splitRhoTy rho
+ = tcSplitRhoTy rho `thenNF_Tc` \ (theta, _) ->
+ newDictsAtLoc orig loc theta `thenNF_Tc` \ (dicts, dict_ids) ->
+ returnTc (dicts, VarMonoBind (instToId inst) (mkHsDictApp (mkHsTyApp (HsVar id) tys) dict_ids))
-- Literals
= -- 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], (instToId inst, HsApp (HsVar method_id) int_lit))
+ 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 ->
newMethodAtLoc orig loc from_integer [ty] `thenNF_Tc` \ (method_inst, method_id) ->
- returnTc ([method_inst], (instToId inst, HsApp (HsVar method_id) (HsLitOut (HsInt i) integerTy)))
+ returnTc ([method_inst], VarMonoBind (instToId inst) (HsApp (HsVar method_id) (HsLitOut (HsInt i) integerTy)))
where
intprim_lit = HsLitOut (HsIntPrim i) intPrimTy
int_lit = HsApp (HsVar (RealId intDataCon)) intprim_lit
rational_lit = HsLitOut (HsFrac f) rational_ty
in
newMethodAtLoc orig loc from_rational [ty] `thenNF_Tc` \ (method_inst, method_id) ->
- returnTc ([method_inst], (instToId inst, HsApp (HsVar method_id) rational_lit))
+ returnTc ([method_inst], VarMonoBind (instToId inst) (HsApp (HsVar method_id) rational_lit))
\end{code}
There is a second, simpler interface, when you want an instance of a
(_, theta, _) = splitSigmaTy (idType dfun)
noSimpleInst clas ty sty
- = ppSep [ppStr "No instance for class", ppQuote (ppr sty clas),
- ppStr "at type", ppQuote (ppr sty ty)]
+ = sep [ptext SLIT("No instance for class"), ppr sty clas,
+ ptext SLIT("at type"), ppr sty ty]
\end{code}
get_inst_env clas other_orig = classInstEnv clas
-pprOrigin :: String -> InstOrigin s -> SrcLoc -> Error
-
-pprOrigin hdr orig locn
- = addErrLoc locn hdr $ \ sty ->
- case orig of
- OccurrenceOf id ->
- ppBesides [ppPStr SLIT("at a use of an overloaded identifier: `"),
- ppr sty id, ppChar '\'']
- OccurrenceOfCon id ->
- ppBesides [ppPStr SLIT("at a use of an overloaded constructor: `"),
- ppr sty id, ppChar '\'']
- InstanceDeclOrigin ->
- ppStr "in an instance declaration"
- LiteralOrigin lit ->
- ppCat [ppStr "at an overloaded literal:", ppr sty lit]
- ArithSeqOrigin seq ->
- ppCat [ppStr "at an arithmetic sequence:", ppr sty seq]
- SignatureOrigin ->
- ppStr "in a type signature"
- DoOrigin ->
- ppStr "in a do statement"
- ClassDeclOrigin ->
- ppStr "in a class declaration"
- InstanceSpecOrigin _ clas ty ->
- ppBesides [ppStr "in a SPECIALIZE instance pragma; class \"",
- ppr sty clas, ppStr "\" type: ", ppr sty ty]
- ValSpecOrigin name ->
- ppBesides [ppStr "in a SPECIALIZE user-pragma for `",
- ppr sty name, ppStr "'"]
- CCallOrigin clabel Nothing{-ccall result-} ->
- ppBesides [ppStr "in the result of the _ccall_ to `",
- ppStr clabel, ppStr "'"]
- CCallOrigin clabel (Just arg_expr) ->
- ppBesides [ppStr "in an argument in the _ccall_ to `",
- ppStr clabel, ppStr "', namely: ", ppr sty arg_expr]
- LitLitOrigin s ->
- ppBesides [ppStr "in this ``literal-literal'': ", ppStr s]
- UnknownOrigin ->
- ppStr "in... oops -- I don't know where the overloading came from!"
+pprOrigin :: InstOrigin s -> SrcLoc -> Error
+
+pprOrigin orig locn sty
+ = hsep [text "arising from", pp_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!")
\end{code}
projects / ghc-hetmet.git / blobdiff