Changeset 4832 for src/Pugs/Bind.hs

Timestamp:

06/19/05 07:28:00 (4 years ago)

Author:

chromatic

svk:copy_cache_prev:

6641

Message:

r4832@windwheel: chromatic | 2005-06-18 18:24:08 -0700
attribute fixing
r4835@windwheel: chromatic | 2005-06-18 22:12:48 -0700
Fix argument passing to object attributes in methods by attempting to bind

named values regardless of sigil and twigil.

r4836@windwheel: chromatic | 2005-06-18 22:14:04 -0700
Untodo some tests that now work.
Unfortunately, test 40 now fails (and I'm not what should go in :todo<???>).
r4837@windwheel: chromatic | 2005-06-18 22:15:47 -0700
Untodo several attribute-passing tests that now pass.
r4838@windwheel: chromatic | 2005-06-18 22:16:53 -0700
Fix a handful of typos and thinkos, and now this test completely passes!
r4839@windwheel: chromatic | 2005-06-18 22:17:40 -0700
Unskip the whole test file, fix the test number, untodo some passes, and clean

up the rest and all of this test file passes too.

Files:

• src/Pugs/Bind.hs (modified) (1 diff)

src/Pugs/Bind.hs

@@ -39 +39 @@
     (bound, exps') = foldr doBind ([], []) (map unPair exps)
     doBind (name, exp) (bound, exps) 
-        | Just prm <- find ((name ==) . tail . paramName) prms
+        | Just prm <- find ((matchNamedAttribute name) . paramName) prms
         = ( ((prm, exp) : bound), exps )
         | otherwise
         = ( bound, (Syn "=>" [Val (VStr name), exp]:exps) )
 
+matchNamedAttribute :: String -> String -> Bool
+matchNamedAttribute arg (_:'.':param) = param == arg
+matchNamedAttribute arg (_:':':param) = param == arg
+matchNamedAttribute arg     (_:param) = param == arg
+matchNamedAttribute   _             _ = False
+
 emptyHashExp :: Exp
 emptyHashExp  = Val $ VList [] -- VHash $ vCast $ VList []
+
 emptyArrayExp :: Exp
 emptyArrayExp = Val $ VList [] -- VArray $ vCast $ VList []