framework for parsing Specs

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 @@
 module Events.Spec
        ( interpret
        , Spec, Cmnd(..), Expr(..), Elem(..)
+       , module Events.Spec.Parse
        ) where
 
-import Events.Types
 import Events.Spec.Types
 import Events.Spec.Eval
 
+import Events.Spec.Parse
+
 import Control.Monad ((<=<))
 import Control.Monad.IO.Class
 import Control.Monad.State.Lazy
@@ -19,13 +21,6 @@ import Control.Lens
 
 import Debug.Trace
 
-type Spec m = Expr (Eval m) '[] Cmnd -- most significant last
-
-data Cmnd = COverride Object
-          | COccurs Bool
-          | CNop
-          deriving (Show)
-
 interpret :: MonadIO m => Spec m -> Eval m ()
 interpret = join . fmap interpretCmnd . evalExpr