Changeset 7593 for src/Pugs/Bind.hs

Timestamp:

10/13/05 13:51:55 (3 years ago)

Author:

scook0

Message:

* Can't let gaal & autrijus have all the golfing fun :)

Files:

• src/Pugs/Bind.hs (modified) (2 diffs)

src/Pugs/Bind.hs

@@ -47 +47 @@
 
 
-matchNamedAttribute :: String -> String -> Bool
+{-|
+Return @True@ if the given argument-pair-key matches the given parameter name.
+Sigils and the twigils '@.@' and '@:@' are discarded from the parameter name
+for the purposes of the match.
+-}
+matchNamedAttribute :: String -- ^ Named argument's key
+                    -> String -- ^ Parameter name to match against
+                    -> Bool
 matchNamedAttribute arg (_:'.':param) = param == arg
 matchNamedAttribute arg (_:':':param) = param == arg
@@ -199 +206 @@
     let params    = subParams sub
         bindings  = subBindings sub
-        boundInvs = filter (\x -> isInvocant (fst x)) bindings -- bound invocants
-        invocants = takeWhile isInvocant params                -- expected invocants
+        boundInvs = filter (isInvocant . fst) bindings    -- bound invocants
+        invocants = takeWhile isInvocant params           -- expected invocants
 
     -- Check that we have enough invocants bound
-    when (not $ null invocants) $ do
+    unless (null invocants) $ do
         let cnt = length invocants
             act = length boundInvs