Changeset 15581

Timestamp:

03/11/07 03:18:14 (21 months ago)

Author:

audreyt

Message:

* Pugs.Monads: &?CALLER_CONTINUATION is now a simple constant

sub with a simple signature that matches "want", instead of
a multi; when we convert &want into MO, it can just box the
continuation's signature object and save all the guesswork.

Files:

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

src/Pugs/Monads.hs

@@ -260 +260 @@
     assertBlocks f name = forM_ (f sub) $ \cv -> do
         rv <- fromVal =<< (evalExp . Syn "block" . (:[]) . Syn "sub" . (:[]) . Val . castV $ cv)
-        if rv then return () else retError (name ++ " assertion failed") (subName sub)
+        if rv then return () else die (name ++ " assertion failed") (subName sub)
     typ = subType sub
     doCC :: (Val -> Eval b) -> [Val] -> Eval b
+    doCC cc []  = cc undef
     doCC cc [v] = cc =<< evalVal v
-    doCC _  _   = internalError "enterSub: doCC list length /= 1"
+    doCC _  _   = internalError "enterSub: doCC list length > 1"
     orig :: VCode -> VCode
     orig sub = sub { subBindings = [], subParams = (map fst (subBindings sub)) }
@@ -280 +281 @@
                 }
         | otherwise = do
-            subRec <- sequence
-                [ genSym (cast "&?ROUTINE") (codeRef (orig sub))
-                ]
-            -- retRec    <- genSubs env "&return" retSub
-            callerRec <- genSubs env "&?CALLER_CONTINUATION" (ccSub cc)
+            subRec    <- genSym (cast "&?ROUTINE") (codeRef (orig sub))
+            callerRec <- genSym (cast "&?CALLER_CONTINUATION") (codeRef $ ccSub cc env)
             return $ \e -> e
-                { envLexical = combine (concat [subRec, callerRec]) (subPad sub)
+                { envLexical = combine ([subRec, callerRec]) (subPad sub)
                 , envPackage = maybe (envPackage e) envPackage (subEnv sub)
                 , envOuter   = maybe Nothing envOuter (subEnv sub)
@@ -299 +297 @@
         }
 
-genSubs :: t -> String -> (t -> VCode) -> Eval [PadMutator]
-genSubs env name gen = sequence
-    [ genMultiSym (cast name) (codeRef $ gen env)
-    , genMultiSym (cast name) (codeRef $ (gen env) { subParams = [] })
-    ]
-
 makeParams :: Env -> [Param]
 makeParams MkEnv{ envContext = cxt, envLValue = lv }
     = [ MkOldParam
         { isInvocant = False
-        , isOptional = False
+        , isOptional = True
         , isNamed    = False
         , isLValue   = lv