1 files changed, 33 insertions, 33 deletions

diff --git a/src/Types.hs b/src/Types.hs
index 2dff0f0..10cea7a 100644
--- a/src/Types.hs
+++ b/src/Types.hs
@@ -1,57 +1,57 @@
-{-# LANGUAGE TemplateHaskell, OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell, OverloadedStrings, ConstraintKinds, FlexibleContexts #-}
+{-# LANGUAGE FlexibleInstances, UndecidableInstances, MultiParamTypeClasses #-}
 
 module Types
        ( Entity(..)
-       , showEntity
+       , SequenceValue
        , Comment
        , Alteration(..)
-       , SequenceState, queue, history
+       , Sequence
+       , History
+       , SequenceM
        ) where
 
-import           Data.PQueue.Prio.Max (MaxPQueue)
-import qualified Data.PQueue.Prio.Max as MaxPQueue
+import Data.PQueue.Prio.Max (MaxPQueue)
+import qualified Data.PQueue.Prio.Max as MaxPQueue (empty)
 
-import           Data.Sequence (Seq)
-import qualified Data.Sequence as Seq
+import Data.Sequence (Seq)
 
-import           Data.Monoid (Monoid(..), (<>))
+import Data.Text (Text)
 
-import           Control.Monad.State.Lazy (MonadState)
-import           Control.Monad.IO.Class (MonadIO)
+import Data.Default.Class
 
-import           Data.Text (Text)
-import qualified Data.Text as Text
-import qualified Data.Text.IO as Text
+import Control.Monad.State.Strict (MonadState(..), MonadTrans(..))
+import Control.Monad.Writer.Strict (MonadWriter, MonadTrans(..))
 
-import           Control.Lens.TH
+import Control.Monad.IO.Class (MonadIO)
 
-import           Data.Default.Class
+import System.Console.Haskeline (InputT)
 
+  
 data Entity = Entity Text (Maybe Integer)
             deriving (Eq, Ord, Show)
 
-showEntity :: Entity -> Text
-showEntity (Entity t Nothing) = t
-showEntity (Entity t (Just n)) = t <> " " <> (Text.pack $ show n)
+type SequenceValue = Integer
 
 type Comment = Text
 
-data Alteration = Modify Entity Integer
-                | Override Entity Integer
+data Alteration = Modify Entity SequenceValue
+                | Override Entity SequenceValue
                 | Drop Entity
-                | Insert Entity Integer
+                | Insert Entity SequenceValue
                 | Rename Entity Entity
                 deriving (Show)
 
-data SequenceState = SequenceState
-                     { _queue   :: MaxPQueue Integer Entity -- Current state
-                     , _history :: Seq (Alteration, Maybe Comment) -- Most recent last
-                     }
-                   deriving (Show)
-makeLenses ''SequenceState
-
-instance Default SequenceState where
-  def = SequenceState
-        { _queue   = MaxPQueue.empty
-        , _history = Seq.empty
-        }
+type Sequence = MaxPQueue SequenceValue Entity
+
+type History = Seq (Alteration, Comment)
+
+type SequenceM m = (MonadWriter History m, MonadState Sequence m, MonadIO m)
+
+instance MonadState s m => MonadState s (InputT m) where
+  get = lift get
+  put = lift . put
+  state = lift . state
+
+instance Default (MaxPQueue k v) where
+  def = MaxPQueue.empty