Changeset 15412 for src/Pugs/Val

Timestamp:

03/03/07 14:47:06 (21 months ago)

Author:

audreyt

Message:

* Refactor Feed and Capture out to Pugs.Val.Capture

Location:

src/Pugs/Val

Files:

• Capture.hs (added)
• Code.hs (modified) (2 diffs)

src/Pugs/Val/Code.hs

@@ -4 +4 @@
 import Pugs.Types
 import Pugs.Val.Base
+import Pugs.Val.Capture
 import Data.Monoid
 import qualified Data.Map as Map
@@ -201 +202 @@
 -}
 
--- | a Capture is a frozen version of the arguments to an application.
-data Capt a
-    = CaptMeth
-        { c_invocant :: a
-        , c_feeds    :: [Feed a]
-        }
-    | CaptSub
-        { c_feeds    :: [Feed a]
-        }
-    deriving (Show, Eq, Ord, Typeable) {-!derive: YAML_Pos, Perl6Class, MooseClass!-}
-
--- | non-invocant arguments.
-data Feed a = MkFeed
-    { f_positionals :: [a]
-    , f_nameds      :: Map.Map ID [a]   -- ^ maps to [a] and not a since if the Sig stipulates
-                                    --   @x, "x => 1, x => 2" constructs @x = (1, 2).
-    }
-    deriving (Show, Eq, Ord, Typeable) {-!derive: YAML_Pos, Perl6Class, MooseClass!-}
-
-instance Monoid (Feed a) where
-    mempty = MkFeed mempty mempty
-    mappend (MkFeed x1 x2) (MkFeed y1 y2) = MkFeed (mappend x1 y1) (mappend x2 y2)
-    mconcat xs = MkFeed (mconcat (map f_positionals xs)) (mconcat (map f_nameds xs))
-
-emptyFeed :: Feed a
-emptyFeed = MkFeed [] Map.empty
-
 -- | Runtime Capture with dynamic Exp for leaves
 --type ExpCapt = Capt Exp