From afc99742c619e2cbc06ce1e39e66d371a79c0fbe Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 29 May 2018 17:03:22 -0400 Subject: [PATCH] lookupEnv is an Env request. --- src/Control/Abstract/Environment.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Control/Abstract/Environment.hs b/src/Control/Abstract/Environment.hs index bb407605a..71a9f4521 100644 --- a/src/Control/Abstract/Environment.hs +++ b/src/Control/Abstract/Environment.hs @@ -69,8 +69,8 @@ localize :: Member (State (Environment location)) effects => Evaluator location localize = localEnv id -- | Look a 'Name' up in the current environment, trying the default environment if no value is found. -lookupEnv :: (Member (Reader (Environment location)) effects, Member (State (Environment location)) effects) => Name -> Evaluator location value effects (Maybe (Address location value)) -lookupEnv name = (<|>) <$> (Env.lookup name <$> getEnv) <*> (Env.lookup name <$> defaultEnvironment) +lookupEnv :: Member (Env location) effects => Name -> Evaluator location value effects (Maybe (Address location value)) +lookupEnv name = fmap Address <$> send (Lookup name) data Env location return where