diff options
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/HscMain.hs | 6 | ||||
| -rw-r--r-- | compiler/main/HscTypes.hs | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs index c5cb9a182b..5af28cbba7 100644 --- a/compiler/main/HscMain.hs +++ b/compiler/main/HscMain.hs @@ -128,6 +128,7 @@ import CostCentre import ProfInit import TyCon import Name +import ConLike import SimplStg ( stg2stg ) import Cmm import CmmParse ( parseCmmFile ) @@ -1505,6 +1506,7 @@ hscDeclsWithLocation hsc_env0 str source linenumber = liftIO $ linkDecls hsc_env src_span cbc let tcs = filterOut isImplicitTyCon (mg_tcs simpl_mg) + patsyns = mg_patsyns simpl_mg ext_ids = [ id | id <- bindersOfBinds core_binds , isExternalName (idName id) @@ -1515,11 +1517,11 @@ hscDeclsWithLocation hsc_env0 str source linenumber = -- The DFunIds are in 'cls_insts' (see Note [ic_tythings] in HscTypes -- Implicit Ids are implicit in tcs - tythings = map AnId ext_ids ++ map ATyCon tcs + tythings = map AnId ext_ids ++ map ATyCon tcs ++ map (AConLike . PatSynCon) patsyns let icontext = hsc_IC hsc_env ictxt = extendInteractiveContext icontext ext_ids tcs - cls_insts fam_insts defaults + cls_insts fam_insts defaults patsyns return (tythings, ictxt) hscImport :: HscEnv -> String -> IO (ImportDecl RdrName) diff --git a/compiler/main/HscTypes.hs b/compiler/main/HscTypes.hs index 909004e14d..29ee78c2b3 100644 --- a/compiler/main/HscTypes.hs +++ b/compiler/main/HscTypes.hs @@ -1403,8 +1403,9 @@ extendInteractiveContext :: InteractiveContext -> [Id] -> [TyCon] -> [ClsInst] -> [FamInst] -> Maybe [Type] + -> [PatSyn] -> InteractiveContext -extendInteractiveContext ictxt ids tcs new_cls_insts new_fam_insts defaults +extendInteractiveContext ictxt ids tcs new_cls_insts new_fam_insts defaults new_patsyns = ictxt { ic_mod_index = ic_mod_index ictxt + 1 -- Always bump this; even instances should create -- a new mod_index (Trac #9426) @@ -1413,7 +1414,7 @@ extendInteractiveContext ictxt ids tcs new_cls_insts new_fam_insts defaults , ic_instances = (new_cls_insts ++ old_cls_insts, new_fam_insts ++ old_fam_insts) , ic_default = defaults } where - new_tythings = map AnId ids ++ map ATyCon tcs + new_tythings = map AnId ids ++ map ATyCon tcs ++ map (AConLike . PatSynCon) new_patsyns old_tythings = filterOut (shadowed_by ids) (ic_tythings ictxt) -- Discard old instances that have been fully overrridden |