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

Timestamp:

03/04/07 14:56:23 (21 months ago)

Author:

audreyt

Message:

* Pugs.Prim.Keyed: Rescind broken fixpoint trick.

In any case most of t/perl5/*.t is now revived.

Files:

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

src/Pugs/Prim/Keyed.hs

@@ -9 +9 @@
   existsFromRef, deleteFromRef,
 ) where
-import Pugs.Internals (forM, genericLength, fix)
+import Pugs.Internals (forM, genericLength, fix, warn)
 import Pugs.AST
 import Pugs.Types
@@ -23 +23 @@
     return $ map (VRef . MkRef . IPair) (keys `zip` elems)
 pairsFromVal (VRef ref) = pairsFromRef ref
-pairsFromVal v = fix err v
+pairsFromVal v = err pairsFromVal v
 
 err :: (Val -> Eval b) -> Val -> Eval b
@@ -42 +42 @@
     vals <- keysFromRef ref
     return $ VList vals
-keysFromVal v = fix err v
+keysFromVal v = err keysFromVal v
 
 valuesFromVal :: Val -> Eval Val
@@ -54 +54 @@
     pairs <- hash_fetch sv
     return . VList $ Map.elems pairs
-valuesFromVal v = fix err v
+valuesFromVal v = err valuesFromVal v
 
 -- XXX These bulks of code below screams for refactoring