Changeset 7591

Timestamp:

10/13/05 13:14:33 (3 years ago)

Author:

autrijus

Message:

* change liftM to fmap for more golfing value...

Location:

src/Pugs

Files:

• AST/Internals.hs (modified) (1 diff)
• Compile.hs (modified) (1 diff)
• Eval/Var.hs (modified) (1 diff)
• Parser.hs (modified) (3 diffs)
• Prim/List.hs (modified) (1 diff)

src/Pugs/AST/Internals.hs

@@ -1287 +1287 @@
 
 findSym :: String -> Pad -> Maybe (TVar VRef)
-findSym name pad = liftM head (lookupPad name pad)
+findSym name pad = fmap head (lookupPad name pad)
 
 instance MonadEval Eval

src/Pugs/Compile.hs

@@ -79 +79 @@
         entries = sortBy padSort $ padToList pad
         canCompile (name@('&':_), xs) | length xs > 1 = do
-            liftM concat $ mapM (\x -> canCompile (name, [x])) xs
+            fmap concat $ mapM (\x -> canCompile (name, [x])) xs
         canCompile (name@('&':_), [(_, sym)]) = do
             ref <- liftSTM $ readTVar sym

src/Pugs/Eval/Var.hs

@@ -271 +271 @@
             _               -> Nothing
     subs :: Int -> [(String, Val)] -> Eval [((Bool, Bool, Int, Int), VCode)]
-    subs slurpLen subSyms = (liftM catMaybes) $ (`mapM` subSyms) $ \(_, val) -> do
+    subs slurpLen subSyms = fmap catMaybes . forM subSyms $ \(_, val) -> do
         sub@(MkCode{ subReturns = ret, subParams = prms }) <- fromVal val
         let rv = return $ arityMatch sub (length (maybeToList invs ++ args)) slurpLen

src/Pugs/Parser.hs

@@ -1576 +1576 @@
     nameExps <- many1 $ do
         string "::"
-        (parens ruleExpression) <|> (liftM (Val . VStr . concat) $ sequence [ruleTwigil, many1 wordAny])
+        (parens ruleExpression) <|> (fmap (Val . VStr . concat) $ sequence [ruleTwigil, many1 wordAny])
     -- Optimization: We don't have to construct a symbolic deref syn (":::()"),
     -- but can use a simple Var, if nameExps consists of only one expression
@@ -1967 +1967 @@
         -- XXX: This looks slightly odd to me -- is one forced to say
         --  $::("?SELF") instead?
-        (parens ruleExpression) <|> (liftM (Val . VStr) $ do
+        (parens ruleExpression) <|> (fmap (Val . VStr) $ do
             choice
                 [ string "!"  --  $!
                 , string "/"  --  $/
-                , liftM concat $ sequence [ruleTwigil, many1 wordAny] ])
+                , fmap concat $ sequence [ruleTwigil, many1 wordAny] ])
     return $ Syn (sigil:"::()") nameExps
 
@@ -2169 +2169 @@
         qLiteral1 qStart qEnd flags
       else do -- XXX an ugly kludge providing crude heredocs
-        endMarker <- (liftM (string) $ many1 wordAny)
+        endMarker <- (fmap string $ many1 wordAny)
         qEnd; ruleWhiteSpaceLine
         qLiteral1 (fail "never match") endMarker flags

src/Pugs/Prim/List.hs

@@ -220 +220 @@
 op2Map list sub = do
     args  <- fromVal list
-    arity <- liftM length $ (fromVal sub >>= return . subParams)
+    arity <- fmap length $ (fromVal sub >>= return . subParams)
     evl  <- asks envEval
     vals <- mapMn args arity $ \x -> do