[Fencommits] fenfire-hs: use forM instead of flip mapM

[Benja Fallenstein]

Mon Feb 19 16:59:57 EET 2007  Benja Fallenstein <benja.fallenstein at gmail.com>
  * use forM instead of flip mapM
diff -rN -u old-fenfire-hs/Fenfire.fhs new-fenfire-hs/Fenfire.fhs
--- old-fenfire-hs/Fenfire.fhs	2007-02-19 17:00:18.000000000 +0200
+++ new-fenfire-hs/Fenfire.fhs	2007-02-19 17:00:18.000000000 +0200
@@ -563,7 +563,7 @@
             , ( "quit"   , stockQuit          )
             , ( "about"  , stockAbout         )
             ]
-    flip mapM actionentries $ \(name,stock) -> do 
+    forM actionentries $ \(name,stock) -> do 
         action <- actionNew name Nothing Nothing (Just stock)
         actionGroupAddActionWithAccel actionGroup action Nothing
         actionSetAccelGroup action accelGroup
@@ -586,7 +586,7 @@
     Just addProp <- actionGroupGetAction actionGroup "addprop"
                 
     menu <- menuNew
-    flip mapM (fsPropertyList state) $ \prop -> do
+    forM (fsPropertyList state) $ \prop -> do
         item <- let ?graph = fsGraph state
                  in menuItemNewWithLabel $ getTextOrURI prop
         onActivateLeaf item $ do 
@@ -623,7 +623,7 @@
             , ("loadURI", Just "_Load node's URI"           ,
                stockGoForward     , Just "<Ctl>L"         )
             ]
-    flip mapM bindingentries $ \(name,label',stock,accel) -> do 
+    forM bindingentries $ \(name,label',stock,accel) -> do 
         action <- actionNew name label' Nothing (Just stock)
         actionGroupAddActionWithAccel actionGroup action accel
         actionSetAccelGroup action bindings
@@ -794,7 +794,7 @@
         name <- actionGetName action
         onActionActivate action $ canvasAction name >> return ()
         
-    viewActs <- flip mapM (zip [0..] ?views) $ \(index, (name, _view)) -> do
+    viewActs <- forM (zip [0..] ?views) $ \(index, (name, _view)) -> do
         action <- radioActionNew name name Nothing Nothing index
         actionGroupAddAction actionGroup action
         onActionActivate action $ do
diff -rN -u old-fenfire-hs/Utils.hs new-fenfire-hs/Utils.hs
--- old-fenfire-hs/Utils.hs	2007-02-19 17:00:18.000000000 +0200
+++ new-fenfire-hs/Utils.hs	2007-02-19 17:00:18.000000000 +0200
@@ -81,6 +81,12 @@
 ffor :: Functor f => f a -> (a -> b) -> f b
 ffor = flip fmap
 
+for :: [a] -> (a -> b) -> [b]
+for = flip map
+
+forM :: Monad m => [a] -> (a -> m b) -> m [b]
+forM = flip mapM
+
 forM_ :: Monad m => [a] -> (a -> m b) -> m ()
 forM_ = flip mapM_