Changeset 4140

Timestamp:

05/30/05 04:44:55 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5706

Message:

* err, juxtaposed commit log. _this_ change was the .keys/.values

fix -- last change was temporarily disabling infix:<-> in Set.pm
during the investigation, and fixing the overloading from method
into multi subs.

Location:

src/Pugs

Files:

• Prim.hs (modified) (2 diffs)
• Prim/Keyed.hs (modified) (3 diffs)

src/Pugs/Prim.hs

@@ -524 +524 @@
 -- [,] is a noop -- It simply returns the input list
 op1 "prefix:[,]" = return
-op1 "assoc" = op1Assoc
+op1 "Code::assoc" = op1Assoc
 op1 other   = \_ -> fail ("Unimplemented unaryOp: " ++ other)
 
@@ -1499 +1499 @@
 \\n   Bool      pre     bool::false safe   ()\
 \\n   List      spre    prefix:[,]  safe   (List)\
-\\n   Str       pre     assoc       safe   (Code:)\
+\\n   Str       pre     Code::assoc safe   (Code:)\
 \\n"

src/Pugs/Prim/Keyed.hs

@@ -16 +16 @@
 
 pairsFromVal :: Val -> Eval [Val]
+pairsFromVal VUndef = return []
 pairsFromVal (PerlSV sv) = do
     keys    <- hash_fetchKeys sv
@@ -27 +28 @@
 
 keysFromVal :: Val -> Eval Val
+keysFromVal VUndef = return $ VList []
 keysFromVal (PerlSV sv) = do
     keys    <- hash_fetchKeys sv
@@ -37 +39 @@
 
 valuesFromVal :: Val -> Eval Val
+valuesFromVal VUndef = return $ VList []
 valuesFromVal (VJunc j) = return . VList . Set.elems $ juncSet j
 valuesFromVal v@(VList _) = return v