diff options
| -rw-r--r-- | compiler/deSugar/DsMonad.lhs | 24 | ||||
| -rw-r--r-- | compiler/vectorise/Vectorise/Builtins/Initialise.hs | 6 |
2 files changed, 5 insertions, 25 deletions
diff --git a/compiler/deSugar/DsMonad.lhs b/compiler/deSugar/DsMonad.lhs index 603364a6b9..9403317ceb 100644 --- a/compiler/deSugar/DsMonad.lhs +++ b/compiler/deSugar/DsMonad.lhs @@ -23,7 +23,7 @@ module DsMonad ( getDOptsDs, getGhcModeDs, doptDs, woptDs, dsLookupGlobal, dsLookupGlobalId, dsLookupDPHId, dsLookupTyCon, dsLookupDataCon, - assertDAPPLoaded, lookupDAPPRdrEnv, dsImportDecl, dsImportId, dsImportTyCon, + assertDAPPLoaded, lookupDAPPRdrEnv, DsMetaEnv, DsMetaVal(..), dsLookupMetaEnv, dsExtendMetaEnv, @@ -386,7 +386,7 @@ assertDAPPLoaded :: DsM () assertDAPPLoaded = do { env <- ds_dph_env <$> getGblEnv ; when (null $ occEnvElts env) $ - panic "'Data.Array.Parallel.Prim' not available; probably missing dependencies in DPH package" + panic "'Data.Array.Parallel.Prim' not available; maybe missing dependency in DPH package" } -- Look up a name exported by 'Data.Array.Parallel.Prim'. @@ -400,26 +400,6 @@ lookupDAPPRdrEnv occ [gre] -> return $ gre_name gre _ -> pprPanic "Multiple definitions in 'Data.Array.Parallel.Prim':" (ppr occ) } - --- Find the thing referred to by an imported name. --- -dsImportDecl :: Name -> DsM TyThing -dsImportDecl name - = do { env <- getGblEnv - ; setEnvs (ds_if_env env) $ do - { mb_thing <- importDecl name - ; case mb_thing of - Failed err -> failIfM err - Succeeded thing -> return thing - } } - -dsImportId :: Name -> DsM Id -dsImportId name - = tyThingId <$> dsImportDecl name - -dsImportTyCon :: Name -> DsM TyCon -dsImportTyCon name - = tyThingTyCon <$> dsImportDecl name \end{code} \begin{code} diff --git a/compiler/vectorise/Vectorise/Builtins/Initialise.hs b/compiler/vectorise/Vectorise/Builtins/Initialise.hs index 4f8361be82..76f79bcec3 100644 --- a/compiler/vectorise/Vectorise/Builtins/Initialise.hs +++ b/compiler/vectorise/Vectorise/Builtins/Initialise.hs @@ -206,7 +206,7 @@ initBuiltinTyCons bi -- Lookup a variable given its name and the module that contains it. -- externalVar :: FastString -> DsM Var -externalVar fs = lookupDAPPRdrEnv (mkVarOccFS fs) >>= dsImportId +externalVar fs = lookupDAPPRdrEnv (mkVarOccFS fs) >>= dsLookupGlobalId -- Like `externalVar` but wrap the `Var` in a `CoreExpr`. -- @@ -216,7 +216,7 @@ externalFun fs = liftM Var $ externalVar fs -- Lookup a 'TyCon' in 'Data.Array.Parallel.Prim', given its name. -- externalTyCon :: FastString -> DsM TyCon -externalTyCon fs = lookupDAPPRdrEnv (mkTcOccFS fs) >>= dsImportTyCon +externalTyCon fs = lookupDAPPRdrEnv (mkTcOccFS fs) >>= dsLookupTyCon -- Lookup some `Type` given its name and the module that contains it. -- @@ -229,7 +229,7 @@ externalType fs -- externalClass :: FastString -> DsM Class externalClass fs - = do { tycon <- lookupDAPPRdrEnv (mkClsOccFS fs) >>= dsImportTyCon + = do { tycon <- lookupDAPPRdrEnv (mkClsOccFS fs) >>= dsLookupTyCon ; case tyConClass_maybe tycon of Nothing -> pprPanic "Vectorise.Builtins.Initialise" $ ptext (sLit "Data.Array.Parallel.Prim.") <> |