import TcMonad
import Inst ( Inst, OverloadedLit(..), InstOrigin(..),
emptyLIE, plusLIE, LIE,
- newMethod, newOverloadedLit,
- newDicts, instToIdBndr
+ newMethod, newOverloadedLit, newDicts, newClassDicts
)
import Name ( Name, getOccName, getSrcLoc )
import FieldLabel ( fieldLabelName )
tcLookupValueByKey, newLocalId, badCon
)
import TcType ( TcType, TcTyVar, tcInstTyVars, newTyVarTy )
-import TcMonoType ( tcHsType )
-import TcUnify ( unifyTauTy, unifyListTy,
- unifyTupleTy, unifyUnboxedTupleTy
- )
+import TcMonoType ( tcHsSigType )
+import TcUnify ( unifyTauTy, unifyListTy, unifyTupleTy )
-import Bag ( Bag )
import CmdLineOpts ( opt_IrrefutableTuples )
import DataCon ( DataCon, dataConSig, dataConFieldLabels,
dataConSourceArity
)
-import Id ( Id, idType, isDataConId_maybe )
-import Type ( Type, isTauTy, mkTyConApp, boxedTypeKind )
-import Subst ( substTy, substTheta )
+import Id ( Id, idType, isDataConWrapId_maybe )
+import Type ( Type, isTauTy, mkTyConApp, mkClassPred, boxedTypeKind )
+import PprType ( {- instance Outputable Type -} )
+import Subst ( substTy, substClasses )
import TysPrim ( charPrimTy, intPrimTy, floatPrimTy,
doublePrimTy, addrPrimTy
)
import Unique ( eqClassOpKey, geClassOpKey, minusClassOpKey,
cCallableClassKey
)
+import BasicTypes ( isBoxed )
import Bag
import Util ( zipEqual )
import Outputable
= tcPat tc_bndr parend_pat pat_ty
tcPat tc_bndr (SigPatIn pat sig) pat_ty
- = tcHsType sig `thenTc` \ sig_ty ->
+ = tcHsSigType sig `thenTc` \ sig_ty ->
-- Check that the signature isn't a polymorphic one, which
-- we don't permit (at present, anyway)
tcPats tc_bndr pats (repeat elem_ty) `thenTc` \ (pats', lie_req, tvs, ids, lie_avail) ->
returnTc (ListPat elem_ty pats', lie_req, tvs, ids, lie_avail)
-tcPat tc_bndr pat_in@(TuplePatIn pats boxed) pat_ty
+tcPat tc_bndr pat_in@(TuplePatIn pats boxity) pat_ty
= tcAddErrCtxt (patCtxt pat_in) $
- (if boxed
- then unifyTupleTy arity pat_ty
- else unifyUnboxedTupleTy arity pat_ty) `thenTc` \ arg_tys ->
-
- tcPats tc_bndr pats arg_tys `thenTc` \ (pats', lie_req, tvs, ids, lie_avail) ->
+ unifyTupleTy boxity arity pat_ty `thenTc` \ arg_tys ->
+ tcPats tc_bndr pats arg_tys `thenTc` \ (pats', lie_req, tvs, ids, lie_avail) ->
-- possibly do the "make all tuple-pats irrefutable" test:
let
- unmangled_result = TuplePat pats' boxed
+ unmangled_result = TuplePat pats' boxity
-- Under flag control turn a pattern (x,y,z) into ~(x,y,z)
-- so that we can experiment with lazy tuple-matching.
-- it was easy to do.
possibly_mangled_result
- | opt_IrrefutableTuples && boxed = LazyPat unmangled_result
- | otherwise = unmangled_result
+ | opt_IrrefutableTuples && isBoxed boxity = LazyPat unmangled_result
+ | otherwise = unmangled_result
in
returnTc (possibly_mangled_result, lie_req, tvs, ids, lie_avail)
where
-- cf tcExpr on LitLits
= tcLookupClassByKey cCallableClassKey `thenNF_Tc` \ cCallableClass ->
newDicts (LitLitOrigin (_UNPK_ s))
- [(cCallableClass, [pat_ty])] `thenNF_Tc` \ (dicts, _) ->
+ [mkClassPred cCallableClass [pat_ty]] `thenNF_Tc` \ (dicts, _) ->
returnTc (LitPat lit pat_ty, dicts, emptyBag, emptyBag, emptyLIE)
\end{code}
tcConstructor pat con_name pat_ty
= -- Check that it's a constructor
tcLookupValue con_name `thenNF_Tc` \ con_id ->
- case isDataConId_maybe con_id of {
+ case isDataConWrapId_maybe con_id of {
Nothing -> failWithTc (badCon con_id);
Just data_con ->
in
tcInstTyVars (ex_tvs ++ tvs) `thenNF_Tc` \ (all_tvs', ty_args', tenv) ->
let
- ex_theta' = substTheta tenv ex_theta
+ ex_theta' = substClasses tenv ex_theta
arg_tys' = map (substTy tenv) arg_tys
n_ex_tvs = length ex_tvs
ex_tvs' = take n_ex_tvs all_tvs'
result_ty = mkTyConApp tycon (drop n_ex_tvs ty_args')
in
- newDicts (PatOrigin pat) ex_theta' `thenNF_Tc` \ (lie_avail, dicts) ->
+ newClassDicts (PatOrigin pat) ex_theta' `thenNF_Tc` \ (lie_avail, dicts) ->
-- Check overall type matches
unifyTauTy pat_ty result_ty `thenTc_`
polyPatSig :: TcType -> SDoc
polyPatSig sig_ty
- = hang (ptext SLIT("Polymorphic type signature in pattern"))
+ = hang (ptext SLIT("Illegal polymorphic type signature in pattern:"))
4 (ppr sig_ty)
\end{code}