Changeset 4158 for src/Pugs/Bind.hs

Timestamp:

05/30/05 10:41:25 (4 years ago)

Author:

scook0

svk:copy_cache_prev:

5706

Message:

* Changed var names & comments in Bind to reflect (Maybe invocant)
* Removed errant functions from class MonadEval?
* Corrected the "evil hack" comment for &not

Files:

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

src/Pugs/Bind.hs

@@ -180 +180 @@
 on in the call process.
 -}
-bindParams :: VCode -- ^ A code object to perform bindings on
-           -> (Maybe Exp) -- ^ List of invocants to bind
-           -> [Exp] -- ^ List of arguments (actual params) to bind
+bindParams :: VCode       -- ^ A code object to perform bindings on
+           -> (Maybe Exp) -- ^ (Optional) explicit invocant
+           -> [Exp]       -- ^ List of arguments (actual params) to bind
            -> MaybeError VCode -- ^ Returns either a new 'VCode' with all the
                                --     bindings in place, or an error message
-bindParams sub invsExp argsExp = do
-    case bindSomeParams sub invsExp argsExp of
+bindParams sub invExp argsExp = do
+    case bindSomeParams sub invExp argsExp of
         Left errMsg -> Left errMsg
         Right boundSub -> finalizeBindings boundSub
@@ -231 +231 @@
 parameters bound as possible (using the given invocants and args).
 -}
-bindSomeParams :: VCode -- ^ Code object to perform bindings on
-               -> (Maybe Exp) -- ^ List of invocant expressions
-               -> [Exp] -- ^ List of argument expressions
+bindSomeParams :: VCode       -- ^ Code object to perform bindings on
+               -> (Maybe Exp) -- ^ Explicit invocant expression
+               -> [Exp]       -- ^ List of argument expressions
                -> MaybeError VCode -- ^ A new 'VCode' structure, augmented
                                    --     with the new bindings
-bindSomeParams sub invsExp argsExp = do
+bindSomeParams sub invExp argsExp = do
     let params     = subParams sub
         bindings   = subBindings sub
@@ -242 +242 @@
         (invPrms, argPrms) = span isInvocant params
         (givenInvs, givenArgs) = if null invPrms
-            then ([], (maybeToList invsExp++argsExp))
-            else (maybeToList invsExp, argsExp)
+            then ([], (maybeToList invExp++argsExp))
+            else (maybeToList invExp, argsExp)
 
     let boundInv                = invPrms `zip` givenInvs -- invocants are just bound, params to given