(real_arg_stricts, strict_arg_tyss)
= unzip (zipWith (unbox_strict_arg_ty tycon) arg_stricts orig_arg_tys)
rep_arg_tys = concat strict_arg_tyss
-
- all_stricts = (map mk_dict_strict_mark ex_theta) ++ real_arg_stricts
- user_stricts = (map mk_dict_strict_mark ex_theta) ++ arg_stricts
+
+ ex_dict_stricts = map mk_dict_strict_mark ex_theta
-- Add a strictness flag for the existential dictionary arguments
+ all_stricts = ex_dict_stricts ++ real_arg_stricts
+ user_stricts = ex_dict_stricts ++ arg_stricts
tag = assoc "mkDataCon" (tyConDataCons tycon `zip` [fIRST_TAG..]) con
ty = mkSigmaTy (tyvars ++ ex_tyvars)
maybe_unpack_field set ty strict
= case splitAlgTyConApp_maybe ty of
Just (tycon,ty_args,[con])
+ -- loop breaker
| tycon `elementOfUniqSet` set -> Nothing
+ -- don't unpack constructors with existential tyvars
+ | not (null ex_tyvars) -> Nothing
+ -- ok, let's do it
| otherwise ->
let set' = addOneToUniqSet set tycon in
maybe_unpack_fields set'
(zip (dataConOrigArgTys con ty_args)
(dcUserStricts con))
+ where (_, _, ex_tyvars, _, _, _) = dataConSig con
_ -> Just [ty]
maybe_unpack_fields :: UniqSet TyCon -> [(Type,StrictnessMark)] -> Maybe [Type]
con_rhs = mkLams all_tyvars $ mkLams dict_args $
mkLams ex_dict_args $ mkLams id_args $
- foldr mk_case con_app (zip id_args strict_marks) i3 []
+ foldr mk_case con_app
+ (zip (ex_dict_args++id_args) strict_marks) i3 []
mk_case
:: (Id, StrictnessMark) -- arg, strictness
-> DsM (CoreExpr, [Id])
rebuildConArgs con [] stricts body = returnDs (body, [])
+rebuildConArgs con (arg:args) stricts body | isTyVar arg
+ = rebuildConArgs con args stricts body `thenDs` \ (body', args') ->
+ returnDs (body',arg:args')
rebuildConArgs con (arg:args) (str:stricts) body
= rebuildConArgs con args stricts body `thenDs` \ (body', real_args) ->
case str of
add_evals other_con vs = vs
cat_evals [] [] = []
- cat_evals (v:vs) (str:strs)
- | isTyVar v = cat_evals vs (str:strs)
+ cat_evals (v:vs) (str:strs)
+ | isTyVar v = v : cat_evals vs (str:strs)
| otherwise =
case str of
MarkedStrict ->