Changeset 12721 for src/Pugs/Val

Timestamp:

08/26/06 16:16:55 (2 years ago)

Author:

audreyt

Message:

Gaal's \(...) Capture-literal patch, hacked slightly so it compiles.

Files:

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

src/Pugs/Val/Code.hs

@@ -67 +67 @@
         , s_requiredNames             :: Set ID
         , s_positionalList            :: [Param]
-        , s_namedSet                  :: Map ID Param
+        , s_namedSet                  :: Map.Map ID Param
         , s_slurpyScalarList          :: [Param]
         , s_slurpyArray               :: Maybe Param
@@ -78 +78 @@
         , s_requiredNames             :: Set ID
         , s_positionalList            :: [Param]
-        , s_namedSet                  :: Map ID Param
+        , s_namedSet                  :: Map.Map ID Param
         , s_slurpyScalarList          :: [Param]
         , s_slurpyArray               :: Maybe Param
@@ -157 +157 @@
 data Feed a = MkFeed
     { f_positionals :: [a]
-    , f_nameds      :: Map ID [a]   -- ^ maps to [a] and not a since if the Sig stipulates
+    , 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!-}
 
+emptyFeed :: Feed a
+emptyFeed = MkFeed [] Map.empty
 
 -- | Runtime Capture with dynamic Exp for leaves
@@ -167 +169 @@
 -- | Static Capture with Val for leaves
 type ValCapt = Capt Val
+type ValFeed = Feed Val
 
+instance ICoercible P ValCapt where
+        asStr _ = return (cast "<capt>") -- XXX
+