Changeset 8792 for src/Pugs/Bind.hs

Timestamp:

01/27/06 09:59:34 (3 years ago)

Author:

audreyt

Message:

* required named parameters should be checked along

with required positional parameters.

Files:

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

src/Pugs/Bind.hs

@@ -22 +22 @@
 -}
 type MaybeError a = Either String a
-
-isRequired :: Param -> Bool
-isRequired prm = not $ isOptional prm
 
 {-|
@@ -208 +205 @@
             ++ (show $ subName sub)
             
-    let (boundReq, boundOpt) = partition (isRequired . fst) bindings -- bound params which are required
-        (reqPrms, optPrms)   = span isRequired params -- all params which are required, and all params which are opt
+    let (boundOpt, boundReq) = partition (isOptional . fst) bindings -- bound params which are required
+        (optPrms, reqPrms)   = partition isOptional params -- all params which are required, and all params which are opt
 
     -- Check length of required parameters
     when (length boundReq < length reqPrms) $ do
-        fail $ "Insufficient number of required parameters: "
-            ++ (show $ length boundReq) ++ " actual, "
-            ++ (show $ length reqPrms) ++ " expected"
+        fail $ "Missing required parameters: "
+            ++ unwords (map paramName $ reqPrms \\ map fst boundReq)
 
     let unboundOptPrms = optPrms \\ (map fst boundOpt) -- unbound optParams are allPrms - boundPrms
@@ -250 +246 @@
         (namedArgs, posArgs)    = partition isNamedArg givenArgs
         (boundNamed, namedForSlurp, allPosPrms) = bindNames namedArgs argPrms -- bind pair args to params. namedForSlup = leftover pair args
-        (posPrms, slurpyPrms)   = break isSlurpy allPosPrms -- split any prms not yet bound, into regular and slurpy. allPosPrms = not bound by named
+        (itemPrms, slurpyPrms)  = break isSlurpy allPosPrms -- split any prms not yet bound, into regular and slurpy. allPosPrms = not bound by named
+        posPrms                 = filter (not . isNamed) itemPrms
         boundPos                = posPrms `zip` posArgs -- bind all the unbound params in positional order
         posForSlurp             = drop (length posPrms) posArgs -- and whatever's left will be slurped