lower levels it is preserved with @let@/@letrec@s).
\begin{code}
-module DsBinds ( dsMonoBinds, AutoScc(..) ) where
+module DsBinds ( dsHsBinds, AutoScc(..) ) where
#include "HsVersions.h"
-import {-# SOURCE #-} DsExpr( dsExpr )
+import {-# SOURCE #-} DsExpr( dsLExpr )
import DsMonad
import DsGRHSs ( dsGuarded )
import DsUtils
import HsSyn -- lots of things
import CoreSyn -- lots of things
import CoreUtils ( exprType, mkInlineMe, mkSCC )
-import TcHsSyn ( TypecheckedMonoBinds )
import Match ( matchWrapper )
import CmdLineOpts ( opt_AutoSccsOnAllToplevs, opt_AutoSccsOnExportedToplevs )
import Subst ( substTyWith )
import TysWiredIn ( voidTy )
import Outputable
+import SrcLoc ( Located(..) )
import Maybe ( isJust )
+import Bag ( Bag, bagToList )
+
+import Monad ( foldM )
\end{code}
%************************************************************************
%************************************************************************
\begin{code}
-dsMonoBinds :: AutoScc -- scc annotation policy (see below)
- -> TypecheckedMonoBinds
- -> [(Id,CoreExpr)] -- Put this on the end (avoid quadratic append)
- -> DsM [(Id,CoreExpr)] -- Result
+dsHsBinds :: AutoScc -- scc annotation policy (see below)
+ -> Bag (LHsBind Id)
+ -> [(Id,CoreExpr)] -- Put this on the end (avoid quadratic append)
+ -> DsM [(Id,CoreExpr)] -- Result
-dsMonoBinds _ EmptyMonoBinds rest = returnDs rest
+dsHsBinds auto_scc binds rest =
+ foldM (dsLHsBind auto_scc) rest (bagToList binds)
-dsMonoBinds auto_scc (AndMonoBinds binds_1 binds_2) rest
- = dsMonoBinds auto_scc binds_2 rest `thenDs` \ rest' ->
- dsMonoBinds auto_scc binds_1 rest'
+dsLHsBind :: AutoScc
+ -> [(Id,CoreExpr)] -- Put this on the end (avoid quadratic append)
+ -> LHsBind Id
+ -> DsM [(Id,CoreExpr)] -- Result
+dsLHsBind auto_scc rest (L loc bind)
+ = putSrcSpanDs loc $ dsHsBind auto_scc rest bind
-dsMonoBinds _ (CoreMonoBind var core_expr) rest
- = returnDs ((var, core_expr) : rest)
+dsHsBind :: AutoScc
+ -> [(Id,CoreExpr)] -- Put this on the end (avoid quadratic append)
+ -> HsBind Id
+ -> DsM [(Id,CoreExpr)] -- Result
-dsMonoBinds _ (VarMonoBind var expr) rest
- = dsExpr expr `thenDs` \ core_expr ->
+dsHsBind auto_scc rest (VarBind var expr)
+ = dsLExpr expr `thenDs` \ core_expr ->
-- Dictionary bindings are always VarMonoBinds, so
-- we only need do this here
returnDs ((var, core_expr'') : rest)
-dsMonoBinds auto_scc (FunMonoBind fun _ matches locn) rest
- = putSrcLocDs locn $
- matchWrapper (FunRhs fun) matches `thenDs` \ (args, body) ->
- addAutoScc auto_scc (fun, mkLams args body) `thenDs` \ pair ->
+dsHsBind auto_scc rest (FunBind (L _ fun) _ matches)
+ = matchWrapper (FunRhs (idName fun)) matches `thenDs` \ (args, body) ->
+ addAutoScc auto_scc (fun, mkLams args body) `thenDs` \ pair ->
returnDs (pair : rest)
-dsMonoBinds auto_scc (PatMonoBind pat grhss locn) rest
- = putSrcLocDs locn $
- dsGuarded grhss `thenDs` \ body_expr ->
+dsHsBind auto_scc rest (PatBind pat grhss)
+ = dsGuarded grhss `thenDs` \ body_expr ->
mkSelectorBinds pat body_expr `thenDs` \ sel_binds ->
- mapDs (addAutoScc auto_scc) sel_binds `thenDs` \ sel_binds ->
+ mappM (addAutoScc auto_scc) sel_binds `thenDs` \ sel_binds ->
returnDs (sel_binds ++ rest)
-- Common special case: no type or dictionary abstraction
-- For the (rare) case when there are some mixed-up
-- dictionary bindings (for which a Rec is convenient)
-- we reply on the enclosing dsBind to wrap a Rec around.
-dsMonoBinds auto_scc (AbsBinds [] [] exports inlines binds) rest
- = dsMonoBinds (addSccs auto_scc exports) binds []`thenDs` \ core_prs ->
- let
+dsHsBind auto_scc rest (AbsBinds [] [] exports inlines binds)
+ = dsHsBinds (addSccs auto_scc exports) binds []`thenDs` \ core_prs ->
+ let
core_prs' = addLocalInlines exports inlines core_prs
exports' = [(global, Var local) | (_, global, local) <- exports]
in
-- Another common case: one exported variable
-- Non-recursive bindings come through this way
-dsMonoBinds auto_scc
- (AbsBinds all_tyvars dicts exps@[(tyvars, global, local)] inlines binds) rest
+dsHsBind auto_scc rest
+ (AbsBinds all_tyvars dicts exps@[(tyvars, global, local)] inlines binds)
= ASSERT( all (`elem` tyvars) all_tyvars )
- dsMonoBinds (addSccs auto_scc exps) binds [] `thenDs` \ core_prs ->
+ dsHsBinds (addSccs auto_scc exps) binds [] `thenDs` \ core_prs ->
let
-- Always treat the binds as recursive, because the typechecker
-- makes rather mixed-up dictionary bindings
in
returnDs (export' : rest)
-dsMonoBinds auto_scc (AbsBinds all_tyvars dicts exports inlines binds) rest
- = dsMonoBinds (addSccs auto_scc exports) binds []`thenDs` \ core_prs ->
+dsHsBind auto_scc rest (AbsBinds all_tyvars dicts exports inlines binds)
+ = dsHsBinds (addSccs auto_scc exports) binds []`thenDs` \ core_prs ->
let
-- Rec because of mixed-up dictionary bindings
core_bind = Rec (addLocalInlines exports inlines core_prs)
let
dict_args = map Var dicts
- mk_bind (tyvars, global, local) n -- locals !! n == local
+ mk_bind ((tyvars, global, local), n) -- locals !! n == local
= -- Need to make fresh locals to bind in the selector, because
-- some of the tyvars will be bound to voidTy
newSysLocalsDs (map substitute local_tys) `thenDs` \ locals' ->
ty_args = map mk_ty_arg all_tyvars
substitute = substTyWith all_tyvars ty_args
in
- zipWithDs mk_bind exports [0..] `thenDs` \ export_binds ->
+ mappM mk_bind (exports `zip` [0..]) `thenDs` \ export_binds ->
-- don't scc (auto-)annotate the tuple itself.
returnDs ((poly_tup_id, poly_tup_expr) : (export_binds ++ rest))
\end{code}