From 364b40e6d8c42f0864fbe0afbe1633d9914ca226 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 16 Apr 2016 19:36:07 +0200 Subject: More sensible nomenclature --- events/src/Events/Types.hs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'events/src/Events/Types.hs') diff --git a/events/src/Events/Types.hs b/events/src/Events/Types.hs index 54aa34d..4527fc7 100644 --- a/events/src/Events/Types.hs +++ b/events/src/Events/Types.hs @@ -6,8 +6,8 @@ module Events.Types ( TimeRange(..), rangeStart, rangeDuration , Event(..), payload, occursWithin - , SpecCtx(..), ctxVars, ctxEvents - , Spec, interpret + , EvalCtx(..), ctxVars, ctxEvents + , Eval, evaluate , module Data.Aeson , module Data.Time.Clock , module Data.Default.Class @@ -42,21 +42,21 @@ data Event = Event } makeLenses ''Event -data SpecCtx = SpecCtx +data EvalCtx = EvalCtx { _ctxVars :: Object , _ctxEvents :: [Event] } -makeLenses ''SpecCtx +makeLenses ''EvalCtx -instance Default SpecCtx where - def = SpecCtx +instance Default EvalCtx where + def = EvalCtx { _ctxVars = mempty , _ctxEvents = mempty } -type Spec m a = ListT (StateT SpecCtx m) a +type Eval m a = ListT (StateT EvalCtx m) a -interpret :: MonadFix m => Spec m (Maybe Event) -> m [Event] -interpret x = catMaybes <$> mfix x' +evaluate :: MonadFix m => Eval m (Maybe Event) -> m [Event] +evaluate x = catMaybes <$> mfix x' where x' = evalStateT (ListT.toList x) . flip (set ctxEvents) def . catMaybes -- cgit v1.2.3