Changeset 15373

Timestamp:

02/27/07 18:56:54 (21 months ago)

Author:

audreyt

Message:

* First step in MO bridge:

vv('12345').reverse # '54321' (newVal)
vv('12345').reverse.reverse # '12345' (newVal)

It's the only method defined (and works) at the moment.
More tomorrow.

Location:

src/Pugs

Files:

• Class.hs (modified) (2 diffs)
• Eval/Var.hs (modified) (2 diffs)
• Val/Base.hs (modified) (1 diff)

src/Pugs/Class.hs

@@ -19 +19 @@
     , module MO.Util
     ) where
-import MO.Run
+import MO.Run hiding (__)
 import MO.Compile
 import MO.Compile.Class
@@ -74 +74 @@
         fun str   -- Note that we expect "fun" to be monadic
     }
+
+inv ./ meth = ivDispatch inv $ MkMethodInvocation meth (mkArgs [])

src/Pugs/Eval/Var.hs

@@ -17 +17 @@
 import Pugs.Config
 import Pugs.Monads
+import Pugs.Class
 import qualified Pugs.Val as Val
 import qualified Data.ByteString.Char8 as Buf
@@ -236 +237 @@
                 -- callMethod methName []
                 -- inv ./ meth = ivDispatch inv $ MkMethodInvocation meth (mkArgs [])
-                return . castV $ "CCall " ++ show methName ++ " " ++ show capt
+                case invVV of
+                    Val.VPure p -> return . runIdentity $ do
+                        obj <- mkObj p
+                        res <- fromObjBox =<< obj ./ cast methName
+                        return . castV $ Val.VPure (res `asTypeOf` p)
+                    _       -> do
+                        return . castV $ "CCall " ++ show methName ++ " " ++ show capt
             }
 

src/Pugs/Val/Base.hs

@@ -131 +131 @@
     asNum = cast . parseInt -- XXX - wrong
     asInt = cast . parseInt
-    fromObj (MkInvocant x _) = undefined
+    fromObj (MkInvocant x _) = fromTypeable x
     classOf _ = mkBoxClass "Str"
         [ "reverse"    ... (MkStr . Char8.reverse . unStr)