Changeset 4102 for src/Pugs/Prim/Keyed.hs

Timestamp:

05/29/05 18:05:01 (3 years ago)

Author:

autrijus

svk:copy_cache_prev:

5515

Message:

* Perl5Embed: .kv, .keys, .values, .pairs etc now works on Perl hashrefs.

Files:

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

src/Pugs/Prim/Keyed.hs

@@ -16 +16 @@
 
 pairsFromVal :: Val -> Eval [Val]
+pairsFromVal (PerlSV sv) = do
+    keys    <- hash_fetchKeys sv
+    return $ VList (map castV keys)
+    elems   <- mapM (hash_fetchElem sv) keys
+    return $ map (VRef . MkRef . IPair) (keys `zip` elems)
 pairsFromVal v = do
     ref  <- fromVal v
@@ -22 +27 @@
 
 keysFromVal :: Val -> Eval Val
+keysFromVal (PerlSV sv) = do
+    keys    <- hash_fetchKeys sv
+    return $ VList (map castV keys)
 keysFromVal (VList vs) = return . VList $ map VInt [0 .. (genericLength vs) - 1]
 keysFromVal (VRef ref) = do
     vals <- keysFromRef ref
     return $ VList vals
-keysFromVal (PerlSV sv) = do
-    keys    <- hash_fetchKeys sv
-    return $ VList (map castV keys)
 keysFromVal v = retError "Not a keyed reference" v
 
@@ -37 +42 @@
     vals <- valuesFromRef ref
     return $ VList vals
+valuesFromVal (PerlSV sv) = do
+    pairs <- hash_fetch sv
+    return . VList $ Map.elems pairs
 valuesFromVal v = retError "Not a keyed reference" v