lookupIfaceByModule, emptyModIface,
InteractiveContext(..), emptyInteractiveContext,
- icPrintUnqual, mkPrintUnqualified,
+ icPrintUnqual, mkPrintUnqualified, extendInteractiveContext,
ModIface(..), mkIfaceDepCache, mkIfaceVerCache, mkIfaceFixCache,
emptyIfaceDepCache,
HpcInfo, noHpcInfo,
-- Breakpoints
- ModBreaks (..), emptyModBreaks
+ ModBreaks (..), BreakIndex, emptyModBreaks
) where
#include "HsVersions.h"
import FamInstEnv ( FamInstEnv, FamInst )
import Rules ( RuleBase )
import CoreSyn ( CoreBind )
-import Id ( Id, isImplicitId )
+import VarSet
+import Id
import Type ( TyThing(..) )
import Class ( Class, classSelIds, classATs, classTyCon )
ic_rn_gbl_env :: GlobalRdrEnv, -- The cached GlobalRdrEnv, built from
-- ic_toplev_scope and ic_exports
- ic_rn_local_env :: LocalRdrEnv, -- Lexical context for variables bound
- -- during interaction
-
- ic_type_env :: TypeEnv -- Ditto for types
+ ic_type_env :: TypeEnv, -- Type env for names bound during
+ -- interaction. NB. the names from
+ -- these Ids are used to populate
+ -- the LocalRdrEnv used during
+ -- typechecking of a statement, so
+ -- there should be no duplicate
+ -- names in here.
+
+ ic_tyvars :: TyVarSet -- skolem type variables free in
+ -- ic_type_env. These arise at
+ -- breakpoints in a polymorphic
+ -- context, where we have only partial
+ -- type information.
}
emptyInteractiveContext
= InteractiveContext { ic_toplev_scope = [],
ic_exports = [],
ic_rn_gbl_env = emptyGlobalRdrEnv,
- ic_rn_local_env = emptyLocalRdrEnv,
- ic_type_env = emptyTypeEnv }
+ ic_type_env = emptyTypeEnv,
+ ic_tyvars = emptyVarSet }
icPrintUnqual :: InteractiveContext -> PrintUnqualified
icPrintUnqual ictxt = mkPrintUnqualified (ic_rn_gbl_env ictxt)
+
+
+extendInteractiveContext
+ :: InteractiveContext
+ -> [Id]
+ -> TyVarSet
+ -> InteractiveContext
+extendInteractiveContext ictxt ids tyvars
+ = ictxt { ic_type_env = extendTypeEnvWithIds filtered_type_env ids,
+ ic_tyvars = ic_tyvars ictxt `unionVarSet` tyvars }
+ where
+ type_env = ic_type_env ictxt
+ bound_names = map idName ids
+ -- Remove any shadowed bindings from the type_env;
+ -- we aren't allowed any duplicates because the LocalRdrEnv is
+ -- build directly from the Ids in the type env in here.
+ old_bound_names = map idName (typeEnvIds type_env)
+ shadowed = [ n | name <- bound_names,
+ n <- old_bound_names,
+ nameOccName name == nameOccName n ]
+ filtered_type_env = delListFromNameEnv type_env shadowed
\end{code}
%************************************************************************
%************************************************************************
\begin{code}
--- all the information about the breakpoints for a given module
+type BreakIndex = Int
+
+-- | all the information about the breakpoints for a given module
data ModBreaks
= ModBreaks
- { modBreaks_array :: BreakArray
- -- the array of breakpoint flags indexed by tick number
- , modBreaks_ticks :: !(Array Int SrcSpan)
+ { modBreaks_flags :: BreakArray
+ -- The array of flags, one per breakpoint,
+ -- indicating which breakpoints are enabled.
+ , modBreaks_locs :: !(Array BreakIndex SrcSpan)
+ -- An array giving the source span of each breakpoint.
+ , modBreaks_vars :: !(Array BreakIndex [OccName])
+ -- An array giving the names of the free variables at each breakpoint.
}
emptyModBreaks :: ModBreaks
emptyModBreaks = ModBreaks
- { modBreaks_array = error "ModBreaks.modBreaks_array not initialised"
+ { modBreaks_flags = error "ModBreaks.modBreaks_array not initialised"
-- Todo: can we avoid this?
- , modBreaks_ticks = array (0,-1) []
+ , modBreaks_locs = array (0,-1) []
+ , modBreaks_vars = array (0,-1) []
}
\end{code}