Changeset 14486 for src/Pugs/Prim.hs

Timestamp:

10/24/06 17:18:47 (2 years ago)

Author:

audreyt

Message:

* Pugs.Prim: Rename "atomically" to "contend" and "retry" to "defer".

Files:

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

src/Pugs/Prim.hs

@@ -106 +106 @@
 op0 "chomp"   = const $ return (VList [])
 op0 "fork"    = const $ opPerl5 "fork" []
+op0 "defer"   = const $ do
+    env <- ask
+    if envAtomic env then guardSTM retry else fail "Cannot call &defer outside a contend block."
 op0 other = const $ fail ("Unimplemented listOp: " ++ other)
 
@@ -289 +292 @@
 op1 "Pugs::Internals::eval_haskell" = op1EvalHaskell
 op1 "Pugs::Internals::eval_yaml" = evalYaml
-op1 "atomically" = \v -> do
-    genSymPrim "&retry" (const $ guardSTM retry) $ \symRetry -> do
-        enterLex [symRetry] $ do
-            env <- ask
-            guardSTM . runEvalSTM env . evalExp $ App (Val v) Nothing []
+op1 "contend" = \v -> do
+    env <- ask
+    guardSTM . runEvalSTM env . evalExp $ App (Val v) Nothing []
 op1 "try" = \v -> do
     sub <- fromVal v
@@ -1902 +1903 @@
 \\n   Any       pre     try     safe   (Code)\
 \\n   Any       pre     lazy    safe   (Code)\
-\\n   Any       pre     atomically     safe   (Code)\
+\\n   Any       pre     contend safe   (Code)\
+\\n   Void      pre     defer   safe   ()\
 \\n   Any       pre     Pugs::Internals::eval_perl6    safe   (Str)\
 \\n   Any       pre     evalfile     unsafe (Str)\