From a8c0c8578718098e7a0482678ab727533ee09862 Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Fri, 6 May 2011 19:15:40 +0200
Subject: Made the Plugin monad a Reader instead of a State since it can't
 change.

---
 Hsbot/Plugin.hs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'Hsbot/Plugin.hs')

diff --git a/Hsbot/Plugin.hs b/Hsbot/Plugin.hs
index ebcff8d..6d1eacf 100644
--- a/Hsbot/Plugin.hs
+++ b/Hsbot/Plugin.hs
@@ -23,19 +23,16 @@ loadPlugin pId = do
         let name = pluginName pId
             loop = pluginEp pId
             oldPlugins = botPlugins bot
-            pState = PluginState { pluginId     = pId
-                                 , pluginChan   = chan
-                                 , pluginMaster = master }
+            pEnv = PluginEnv { pluginId     = pId
+                             , pluginChan   = chan
+                             , pluginMaster = master }
         case M.lookup name oldPlugins of
             Just _  -> liftIO . warningM "Hsbot.Core.LoadPlugin" $ "Not loading already loaded plugin : " ++ name
             Nothing -> do
                 liftIO . infoM "Hsbot.Core.LoadPlugin" $ "Loading plugin : " ++ name
                 env <- lift ask
-                finalStateMVar <- liftIO newEmptyMVar
-                threadId <- liftIO . forkIO $ runReaderT (execStateT loop pState >>= storeFinalState finalStateMVar) env
-                let newPlugins = M.insert name (pState, finalStateMVar, threadId) oldPlugins
+                threadId <- liftIO . forkIO $ runReaderT (runReaderT loop pEnv) env
+                let newPlugins = M.insert name (pEnv, threadId) oldPlugins
                 put $ bot { botPlugins = newPlugins
                           , botHooks   = chan : botHooks bot }
-    storeFinalState :: MVar PluginState -> PluginState -> Env IO ()
-    storeFinalState finalStateMVar finalState = liftIO $ putMVar finalStateMVar finalState
 
-- 
cgit v1.2.3