1 files changed, 16 insertions, 10 deletions

diff --git a/events/src/Events/Spec/Parse.hs b/events/src/Events/Spec/Parse.hs
index 44aabd0..2847372 100644
--- a/events/src/Events/Spec/Parse.hs
+++ b/events/src/Events/Spec/Parse.hs
@@ -1,15 +1,18 @@
 {-# LANGUAGE GADTs, DataKinds, OverloadedStrings #-}
-{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE StandaloneDeriving, FlexibleContexts #-}
 
 module Events.Spec.Parse
   ( parse
   , ParseError(..)
+  , TypeError(..)
   ) where
 
 import Events.Spec.Types
+import Events.Spec.Parse.Token
+import Events.Spec.Parse.AST
 
-import Text.Parsec hiding (parse, ParseError)
-import qualified Text.Parsec as Parsec (parse, ParseError)
+import Text.Megaparsec hiding (parse)
+import qualified Text.Megaparsec.Lexer as L
 
 import Data.Text (Text)
 import qualified Data.Text as Text
@@ -23,13 +26,16 @@ import Data.Typeable (Typeable)
 import Control.Monad.Catch (Exception(..), MonadThrow(..))
 
 
-newtype ParseError = ParseError Parsec.ParseError
-  deriving (Typeable, Show, Eq)
-instance Exception ParseError
+data TypeError = TypeError
+  deriving (Typeable, Show)
 
+instance Exception TypeError
 
-parse :: MonadThrow m => SourceName -> Lazy.Text -> Eval m (Spec m)
-parse name = either (throwM . ParseError) return <=< runParserT pSpec () name
 
-pSpec :: ParsecT Lazy.Text () (Eval m) (Spec m)
-pSpec = mzero
+parse :: (MonadIO m, MonadThrow m) => String -> Lazy.Text -> m (Spec m)
+parse name = typecheck <=< runParserT' pAST name <=< runParserT' pTokens name
+  where
+    runParserT' parser name = either throwM return <=< runParserT parser name
+
+typecheck :: MonadThrow m => AST -> m (Spec m)
+typecheck = undefined