1 files changed, 7 insertions, 11 deletions

diff --git a/events/src/Events/Spec.hs b/events/src/Events/Spec.hs
index 2af3446..e098886 100644
--- a/events/src/Events/Spec.hs
+++ b/events/src/Events/Spec.hs
@@ -1,11 +1,13 @@
-{-# LANGUAGE GADTs #-}
+{-# LANGUAGE GADTs, DataKinds, TypeOperators #-}
 
 module Events.Spec
        ( interpret
-       , Spec, Cmnd(..), Expr(..)
+       , Spec, Cmnd(..), Expr(..), Elem(..)
        ) where
 
 import Events.Types
+import Events.Spec.Types
+import Events.Spec.Eval
 
 import Control.Monad ((<=<))
 import Control.Monad.IO.Class
@@ -17,21 +19,15 @@ import Control.Lens
 
 import Debug.Trace
 
-type Spec = [Expr Cmnd] -- most significant last
+type Spec m = Expr (Eval m) '[] Cmnd -- most significant last
 
 data Cmnd = COverride Object
           | COccurs Bool
           | CNop
           deriving (Show)
 
-data Expr a where
-  ELit :: a -> Expr a
-
-interpret :: MonadIO m => Spec -> Eval m ()
-interpret = mapM_ $ interpretCmnd <=< interpretExpr
-
-interpretExpr :: MonadIO m => Expr Cmnd -> m Cmnd
-interpretExpr (ELit a) = return a
+interpret :: MonadIO m => Spec m -> Eval m ()
+interpret = join . fmap interpretCmnd . evalExpr
 
 interpretCmnd :: MonadIO m => Cmnd -> Eval m ()
 interpretCmnd (COverride obj) = objPayload ?= obj