Changeset 3920

Timestamp:

05/26/05 23:35:17 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5482

Message:

* pugsembed callback #1 -- pugs_MkSvRef -- finished

Location:

src

Files:

• Pugs/AST/Internals.hs (modified) (1 diff)
• Pugs/Embed/Perl5.hs (modified) (2 diffs)
• Pugs/Run.hs (modified) (1 diff)
• Pugs/Run/Perl5.hs (added)
• perl5/pugsembed.c (modified) (1 diff)
• perl5/pugsembed.h (modified) (2 diffs)

src/Pugs/AST/Internals.hs

@@ -190 +190 @@
     v <- liftIO $ svToVal sv
     case v of
-        -- (PerlSV sv') -> fromSV sv'   -- it was a SV
-        Nothing     -> fromSV sv
-        Just val    -> fromVal val    -- it was a Val
+        PerlSV sv'  -> fromSV sv'   -- it was a SV
+        val         -> fromVal val  -- it was a Val
 fromVal' v = return $ vCast v
-{-do
-    rv <- liftIO $ catchJust errorCalls (return . Right $ vCast v) $
-        \str -> return (Left str)
-    case rv of
-        Right v -> return v
-        Left e  -> retError e v -- XXX: not working yet
--}
 
 {-|

src/Pugs/Embed/Perl5.hs

@@ -32 +32 @@
 svToVBool = constFail
 
-svToVal :: PerlSV -> IO (Maybe a)
+svToVal :: PerlSV -> IO a
 svToVal = constFail
 
@@ -123 +123 @@
 svToVBool = perl5_SvTRUE
 
-svToVal :: PerlSV -> IO (Maybe a)
+svToVal :: PerlSV -> IO a
 svToVal sv = do
     ptr <- pugs_SvToVal sv
-    if ptr == nullPtr
-        then return Nothing
-        else fmap Just $ deRefStablePtr (castPtrToStablePtr ptr)
+    deRefStablePtr (castPtrToStablePtr ptr)
 
 valToSV :: a -> IO PerlSV

src/Pugs/Run.hs

@@ -12 +12 @@
 module Pugs.Run where
 import Pugs.Run.Args
+import Pugs.Run.Perl5 ()
 import Pugs.Internals
 import Pugs.Config

src/perl5/pugsembed.c

@@ -29 +29 @@
 Val *pugs_PvToVal ( char *pv ) { return NULL; }
 
-Val *pugs_MkSvRef  ( SV *sv ) { return NULL; }
-
 SV  *pugs_ValToSv ( Val *val ) { return NULL; }

src/perl5/pugsembed.h

@@ -16 +16 @@
 PUGS_EXTERN Val *pugs_PvToVal ( char *pv );
 
-PUGS_EXTERN Val *pugs_MkSvRef  ( SV *sv );
 PUGS_EXTERN SV  *pugs_ValToSv ( Val *val );
 
@@ -22 +21 @@
 SV  *pugs_MkValRef ( Val *val );
 
+extern Val *pugs_MkSvRef  ( SV *sv );