Changeset 14209

Timestamp:

10/11/06 05:36:27 (2 years ago)

Author:

audreyt

Message:

* Pugs.Monads: Make "break" and "continue" dependent no

"when" frames, instead of on "given" frames. That means
"given" is now strictly a $_ aliasing device, and is not
considered a special construct on its own.

Location:

src/Pugs

Files:

• AST/Internals.hs (modified) (4 diffs)
• Monads.hs (modified) (2 diffs)

src/Pugs/AST/Internals.hs

@@ -21 +21 @@
     VOpaque(..), -- uses Value
     VControl(..), -- uses Env, Eval, Val
-    ControlLoop(..), ControlGiven(..), Frame(..),
+    ControlLoop(..), ControlWhen(..), Frame(..),
     VScalar, -- uses Val
     VPair, -- uses Val
@@ -807 +807 @@
     | ControlEnv   !Env
     | ControlLoop  !ControlLoop
-    | ControlGiven !ControlGiven
+    | ControlWhen  !ControlWhen
     | ControlLeave
         { leaveType     :: !(SubType -> Bool)
@@ -822 +822 @@
     deriving (Show, Eq, Ord, Typeable) -- don't derive YAML for now
 
-data ControlGiven
-    = GivenContinue
-    | GivenBreak
+data ControlWhen
+    = WhenContinue
+    | WhenBreak
     deriving (Show, Eq, Ord, Typeable) -- don't derive YAML for now
 
@@ -1278 +1278 @@
 data Frame
     = FrameLoop
-    | FrameGiven
+    | FrameWhen
     | FrameGather
     | FrameRoutine

src/Pugs/Monads.hs

@@ -123 +123 @@
 enterGather = enterFrame FrameGather
 enterLoop   = enterFrame FrameLoop
-enterGiven  = enterFrame FrameGiven
+enterGiven  = id
 
 assertFrame :: Frame -> Eval a -> Eval a
@@ -144 +144 @@
           -> Eval Val
 enterWhen action = do
-    rv  <- action
+    rv  <- enterFrame FrameWhen action
     case rv of
-        VControl (ControlGiven GivenContinue)   -> retEmpty
-        VControl (ControlGiven GivenBreak)      -> retShiftEmpty
-        _                                       -> retShift rv
+        VControl (ControlWhen WhenContinue)   -> retEmpty
+        VControl (ControlWhen WhenBreak)      -> retShiftEmpty
+        _                                     -> retShift rv
 
 {-|