Changeset 12503 for src/Pugs/Prim/Match.hs

Timestamp:

08/20/06 06:48:22 (2 years ago)

Author:

audreyt

Message:

* Implement ($lhs &code) correctly. Previously the

value of $lhs is ignored and only $_'s value is considered.
I wonder who implemented that... ;)

Files:

• src/Pugs/Prim/Match.hs (modified) (1 diff)

src/Pugs/Prim/Match.hs

@@ -105 +105 @@
 op2Match :: Val -> Val -> Eval Val
 
-op2Match _ y@(VCode _) = do
+op2Match x y@(VCode _) = do
     (arity :: Int) <- fromVal =<< op1CodeArity y
     res <- fromVal =<< case arity of
-        0 -> evalExp $ App (Val y) Nothing []
+        0 -> do
+            writeVar (cast "$*_") x
+            evalExp $ App (Val y) Nothing []
         1 -> do
-             topic <- readVar (cast "$_")
-             evalExp $ App (Val y) Nothing [Val topic]
+            evalExp $ App (Val y) Nothing [Val x]
         _ -> fail ("Unexpected arity in smart match: " ++ (show arity))
     return $ VBool $ res