Changeset 12785 for trunk

Timestamp:

05.11.2009 17:26:04 (4 months ago)

Author:

mgross

Message:

Replaced MVar with IORef.

Files:

• trunk/CMDL/Interface.hs (modified) (6 diffs)

trunk/CMDL/Interface.hs

@@ -36 +36 @@
 import Data.List
 
-import Control.Concurrent.MVar
+import Data.IORef
 import Control.Monad
 import Control.Monad.Trans (MonadIO(..))
 
 #ifdef HASKELINE
-shellSettings :: MVar CmdlState -> Settings IO
+shellSettings :: IORef CmdlState -> Settings IO
 shellSettings st =
   Settings {
@@ -51 +51 @@
 -- We need an MVar here
 -- because our CmdlState is not a Monad (and we use IO as Monad).
-cmdlComplete :: MVar CmdlState -> CompletionFunc IO
+cmdlComplete :: IORef CmdlState -> CompletionFunc IO
 cmdlComplete st (left, _) = do
-  state <- liftIO $ readMVar st
+  state <- liftIO $ readIORef st
   comps <- liftIO $ cmdlCompletionFn getCommands state $ reverse left
   let (_, nodes) = case i_state $ intState state of
@@ -66 +66 @@
 #endif
 
-shellLoop :: MVar CmdlState
+shellLoop :: IORef CmdlState
           -> Bool
 #ifdef HASKELINE
@@ -75 +75 @@
 shellLoop st isTerminal =
   do
-    state <- liftIO $ readMVar st
+    state <- liftIO $ readIORef st
     let prompt = if isTerminal then generatePrompter state else ""
 #ifdef HASKELINE
@@ -107 +107 @@
                                          Just cm -> checkCom
                                               cm { cmdDescription = c } newState
-                        liftIO $ swapMVar st newState'
+                        liftIO $ writeIORef st newState'
                         shellLoop st isTerminal
 
@@ -114 +114 @@
 cmdlRunShell state = do
   isTerminal <- hIsTerminalDevice stdin
-  st <- newMVar state
+  st <- newIORef state
 #ifdef HASKELINE
   runInputT (shellSettings st) $ shellLoop st isTerminal