Changeset 12153 for src/Pugs/Val

Timestamp:

08/12/06 08:28:23 (2 years ago)

Author:

gaal

Message:

* TimToady?++ observes that LEAVE traits may be interleaved with

KEEP/UNDO. Turn exit blocks into one tagged list.

Files:

• src/Pugs/Val/Code.hs (modified) (2 diffs)

src/Pugs/Val/Code.hs

@@ -26 +26 @@
         , c_postBlocks        :: [Code]
         , c_enterBlocks       :: [Code]    -- ^ AOPish hooks
-        , c_leaveBlocks       :: [Code]
+        , c_leaveBlocks       :: [CodeLeave]
         , c_firstBlocks       :: [Code]
         , c_lastBlocks        :: [Code]
         , c_nextBlocks        :: [Code]
-        , c_keepBlocks        :: [Code]
-        , c_undoBlocks        :: [Code]
         , c_catchBlock        :: Maybe Code
         , c_controlBlock      :: Maybe Code
@@ -42 +40 @@
         , c_isSafe            :: Bool
         }
+    deriving (Show, Eq, Ord, Data, Typeable) {-!derive: YAML_Pos, Perl6Class, MooseClass!-}
+
+-- | Block exit traits may be interleaved, so tag them by type
+data CodeLeave
+    = LeaveNormal Code        -- ^ LEAVE block
+    | LeaveKeep   Code        -- ^ KEEP block
+    | LeaveUndo   Code        -- ^ UNDO block
     deriving (Show, Eq, Ord, Data, Typeable) {-!derive: YAML_Pos, Perl6Class, MooseClass!-}