Changeset 9988

Timestamp:

04/17/06 19:47:37 (3 years ago)

Author:

yiyihu

Message:

s/&\?SUB/&\?ROUTINE/g in Prim.hs and Monads.hs, So that &?ROUTINE()
works.
And initial import for misc/S29_round.pl. :-)

Files:

• misc/S29_round.pl (added)
• src/Pugs/Monads.hs (modified) (2 diffs)
• src/Pugs/Prim.hs (modified) (3 diffs)

src/Pugs/Monads.hs

@@ -271 +271 @@
         | otherwise = do
             subRec <- sequence
-                [ genSym "&?SUB" (codeRef (orig sub))
+                [ genSym "&?ROUTINE" (codeRef (orig sub))
                 , genSym "$?SUBNAME" (scalarRef $ VStr $ subName sub)]
             -- retRec    <- genSubs env "&return" retSub
@@ -280 +280 @@
                 , envOuter   = maybe Nothing envOuter (subEnv sub)
                 , envImplicit= envImplicit e `Map.union` Map.fromList
-                    [ ("&?SUB", ()), ("$?SUBNAME", ()), ("&?CALLER_CONTINUATION", ()) ]
+                    [ ("&?ROUTINE", ()), ("$?SUBNAME", ()), ("&?CALLER_CONTINUATION", ()) ]
                 }
     ccSub :: (Val -> Eval Val) -> Env -> VCode

src/Pugs/Prim.hs

@@ -686 +686 @@
     depth <- asks envDepth
     if depth == 0 then fail "cannot return() outside a subroutine" else do
-    sub   <- fromVal =<< readVar "&?SUB"
+    sub   <- fromVal =<< readVar "&?ROUTINE"
     -- If this is a coroutine, reset the entry point
     case subCont sub of
@@ -702 +702 @@
     depth <- asks envDepth
     if depth == 0 then fail "cannot yield() outside a coroutine" else do
-    sub   <- fromVal =<< readVar "&?SUB"
+    sub   <- fromVal =<< readVar "&?ROUTINE"
     case subCont sub of
         Nothing -> fail $ "cannot yield() from a " ++ pretty (subType sub)
@@ -1347 +1347 @@
         case envCaller cur of
             Just caller -> do
-                val <- local (const caller) (readVar "&?SUB")
+                val <- local (const caller) (readVar "&?ROUTINE")
                 if (val == undef) then return [(caller, Nothing)] else do
                 sub <- fromVal val