Changeset 3906 for src/Pugs/Bind.hs

Timestamp:

05/26/05 12:37:22 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5482

Message:

* starting single-invocant feature branch.

(maybe laso do multi-level MMD param here?)

Files:

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

src/Pugs/Bind.hs

@@ -150 +150 @@
 isPair (Cxt _ exp) = isPair exp
 isPair (Syn "=>" [(Val _), _])   = True
-isPair (App (Var "&infix:=>") [(Cxt _ (Val _)), _] [])   = True
-isPair (App (Var "&infix:=>") [(Val _), _] [])   = True
+isPair (App (Var "&infix:=>") Nothing [(Cxt _ (Val _)), _])   = True
+isPair (App (Var "&infix:=>") Nothing [(Val _), _])   = True
 isPair _                         = False
 
@@ -162 +162 @@
 unPair (Cxt _ exp) = unPair exp
 unPair (Syn "=>" [(Val k), exp]) = (vCast k, exp)
-unPair (App (Var "&infix:=>") [(Cxt _ (Val k)), exp] []) = (vCast k, exp)
-unPair (App (Var "&infix:=>") [(Val k), exp] []) = (vCast k, exp)
+unPair (App (Var "&infix:=>") Nothing [(Cxt _ (Val k)), exp]) = (vCast k, exp)
+unPair (App (Var "&infix:=>") Nothing [(Val k), exp]) = (vCast k, exp)
 unPair x                                = error ("Not a pair: " ++ show x)
 
@@ -181 +181 @@
 -}
 bindParams :: VCode -- ^ A code object to perform bindings on
-           -> [Exp] -- ^ List of invocants to bind
+           -> (Maybe Exp) -- ^ List of invocants to bind
            -> [Exp] -- ^ List of arguments (actual params) to bind
            -> MaybeError VCode -- ^ Returns either a new 'VCode' with all the
@@ -232 +232 @@
 -}
 bindSomeParams :: VCode -- ^ Code object to perform bindings on
-               -> [Exp] -- ^ List of invocant expressions
+               -> (Maybe Exp) -- ^ List of invocant expressions
                -> [Exp] -- ^ List of argument expressions
                -> MaybeError VCode -- ^ A new 'VCode' structure, augmented
@@ -242 +242 @@
         (invPrms, argPrms) = span isInvocant params
         (givenInvs, givenArgs) = if null invPrms
-            then ([], (invsExp++argsExp))
-            else (invsExp, argsExp)
+            then ([], (maybeToList invsExp++argsExp))
+            else (maybeToList invsExp, argsExp)
 
     let boundInv                = invPrms `zip` givenInvs -- invocants are just bound, params to given