Changeset 16371 for src/Pugs/Eval.hs

Timestamp:

05/17/07 23:35:10 (18 months ago)

Author:

audreyt

Message:

* Make nextwith/callwith work.

Files:

• src/Pugs/Eval.hs (modified) (4 diffs)

src/Pugs/Eval.hs

@@ -1064 +1064 @@
                    }
         local callerEnv $ do
-            val <- apply sub Nothing args
+            val <- doApply ApplyDisplaced sub Nothing args
             retShift =<< evalVal val
             retEmpty
@@ -1128 +1128 @@
 
 applyCapture :: VCode -> ValCapt -> Eval Val
-applyCapture sub capt = apply sub inv (fromP argsPos ++ argsNam)
+applyCapture sub capt = doApply ApplyDisplaced sub inv (fromP argsPos ++ argsNam)
     where
     argsPos = mapP (Val . castV) (f_positionals feed)
@@ -1332 +1332 @@
     applyChainSub sub args = tryAnyComprehension [] args
         where
-        vanillaApply = apply sub' Nothing args
+        vanillaApply = doApply ApplyDisplaced sub' Nothing args
         tryAnyComprehension _ [] = vanillaApply
         tryAnyComprehension pre (pivot:post)
@@ -1345 +1345 @@
                 fmap VList . (`filterM` items) $ \item -> do
                     vbool <- enterRValue . enterContext (cxtItem "Bool") $ do
-                        apply sub' Nothing (reverse pre ++ (Val item:post))
+                        doApply ApplyDisplaced sub' Nothing (reverse pre ++ (Val item:post))
                     fromVal vbool
             | otherwise = do