diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-09-17 13:15:42 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-09-17 17:39:22 +0100 |
| commit | 10cc42243817e5b812946a231a129a9d88277046 (patch) | |
| tree | 29c178c244e33289b83c21b275b0b765f3860df5 /compiler/deSugar/DsUtils.lhs | |
| parent | 79ee264a8df1c9c9617fbe109a3cdfc51bb3d42a (diff) | |
| download | haskell-10cc42243817e5b812946a231a129a9d88277046.tar.gz | |
Move tARGET_* out of HaskellConstants
Diffstat (limited to 'compiler/deSugar/DsUtils.lhs')
| -rw-r--r-- | compiler/deSugar/DsUtils.lhs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/deSugar/DsUtils.lhs b/compiler/deSugar/DsUtils.lhs index 52944e8347..0053484b13 100644 --- a/compiler/deSugar/DsUtils.lhs +++ b/compiler/deSugar/DsUtils.lhs @@ -308,11 +308,12 @@ mkCoPrimCaseMatchResult var ty match_alts mkCoAlgCaseMatchResult - :: Id -- Scrutinee + :: DynFlags + -> Id -- Scrutinee -> Type -- Type of exp -> [(DataCon, [CoreBndr], MatchResult)] -- Alternatives (bndrs *include* tyvars, dicts) -> MatchResult -mkCoAlgCaseMatchResult var ty match_alts +mkCoAlgCaseMatchResult dflags var ty match_alts | isNewTyCon tycon -- Newtype case; use a let = ASSERT( null (tail match_alts) && null (tail arg_ids1) ) mkCoLetMatchResult (NonRec arg_id1 newtype_rhs) match_result1 @@ -423,7 +424,7 @@ mkCoAlgCaseMatchResult var ty match_alts lit = MachInt $ toInteger (dataConSourceArity con) binds = [NonRec arg (indexExpr i) | (i, arg) <- zip [1..] args] -- - indexExpr i = mkApps (Var indexP) [Type elemTy, Var var, mkIntExpr i] + indexExpr i = mkApps (Var indexP) [Type elemTy, Var var, mkIntExpr dflags i] \end{code} %************************************************************************ |