diff options
Diffstat (limited to 'events/src/Events/Spec.hs')
-rw-r--r-- | events/src/Events/Spec.hs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/events/src/Events/Spec.hs b/events/src/Events/Spec.hs index e098886..cfa75be 100644 --- a/events/src/Events/Spec.hs +++ b/events/src/Events/Spec.hs | |||
@@ -3,12 +3,14 @@ | |||
3 | module Events.Spec | 3 | module Events.Spec |
4 | ( interpret | 4 | ( interpret |
5 | , Spec, Cmnd(..), Expr(..), Elem(..) | 5 | , Spec, Cmnd(..), Expr(..), Elem(..) |
6 | , module Events.Spec.Parse | ||
6 | ) where | 7 | ) where |
7 | 8 | ||
8 | import Events.Types | ||
9 | import Events.Spec.Types | 9 | import Events.Spec.Types |
10 | import Events.Spec.Eval | 10 | import Events.Spec.Eval |
11 | 11 | ||
12 | import Events.Spec.Parse | ||
13 | |||
12 | import Control.Monad ((<=<)) | 14 | import Control.Monad ((<=<)) |
13 | import Control.Monad.IO.Class | 15 | import Control.Monad.IO.Class |
14 | import Control.Monad.State.Lazy | 16 | import Control.Monad.State.Lazy |
@@ -19,13 +21,6 @@ import Control.Lens | |||
19 | 21 | ||
20 | import Debug.Trace | 22 | import Debug.Trace |
21 | 23 | ||
22 | type Spec m = Expr (Eval m) '[] Cmnd -- most significant last | ||
23 | |||
24 | data Cmnd = COverride Object | ||
25 | | COccurs Bool | ||
26 | | CNop | ||
27 | deriving (Show) | ||
28 | |||
29 | interpret :: MonadIO m => Spec m -> Eval m () | 24 | interpret :: MonadIO m => Spec m -> Eval m () |
30 | interpret = join . fmap interpretCmnd . evalExpr | 25 | interpret = join . fmap interpretCmnd . evalExpr |
31 | 26 | ||