Merge pull request #1 from garyb/trans'

Use MonadTrans

Author: cryogenian

src/ECharts/Monad.purs

@@ -4,23 +4,24 @@ import Prelude
 
 import Control.Alt (class Alt)
 import Control.Alternative (class Alternative)
-import Control.MonadPlus (class MonadPlus)
-import Control.MonadZero (class MonadZero)
+import Control.Monad.Aff.Class (class MonadAff)
 import Control.Monad.Cont.Class (class MonadCont)
+import Control.Monad.Eff (kind Effect)
 import Control.Monad.Eff.Class (class MonadEff)
-import Control.Monad.Aff.Class (class MonadAff)
 import Control.Monad.Error.Class (class MonadError, class MonadThrow)
 import Control.Monad.Reader.Class (class MonadAsk, class MonadReader)
-import Control.Monad.State.Class (class MonadState)
-import Control.Monad.Eff (kind Effect)
 import Control.Monad.Rec.Class (class MonadRec)
-import Control.Monad.Writer.Trans (WriterT(..), execWriterT)
+import Control.Monad.State.Class (class MonadState)
+import Control.Monad.Trans.Class (class MonadTrans, lift)
 import Control.Monad.Writer.Class (class MonadTell, class MonadWriter, tell)
+import Control.Monad.Writer.Trans (WriterT, execWriterT)
+import Control.MonadPlus (class MonadPlus)
+import Control.MonadZero (class MonadZero)
 import Control.Plus (class Plus, empty)
 import Data.Array as Arr
 import Data.Foldable as F
-import Data.Identity (Identity)
 import Data.Foreign (Foreign, toForeign)
+import Data.Identity (Identity)
 import Data.Maybe (Maybe(..), maybe)
 import Data.Newtype (class Newtype, unwrap)
 import Data.Tuple (Tuple(..), uncurry, snd, lookup)
@@ -80,10 +81,7 @@ derive newtype instance monadReaderCommandsT
 derive newtype instance monadStateCommandsT
   ∷ MonadState s m ⇒ MonadState s (CommandsT i m)
 
-lift ∷ ∀ m i a. Monad m ⇒ m a → CommandsT i m a
-lift a = CommandsT $ WriterT do
-  x ← a
-  pure $ Tuple x []
+derive newtype instance monadTransCommandsT ∷ MonadTrans (CommandsT i)
 
 set ∷ ∀ m. MonadTell Pairs m ⇒ String → Foreign → m Unit
 set k v = tell $ Arr.singleton $ Tuple k v