Changeset 3933 for src/Pugs/Embed/Perl5.hs

Timestamp:

05/27/05 01:06:48 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5515

Message:

* still segfaulting... WIP

Files:

• src/Pugs/Embed/Perl5.hs (modified) (3 diffs)

src/Pugs/Embed/Perl5.hs

@@ -11 +11 @@
 constFail = const $ fail "perl5 not embedded"
 
-initPerl5 :: String -> PerlSV -> IO PerlInterpreter
+initPerl5 :: String -> Maybe a -> IO PerlInterpreter
 initPerl5 _ _ = return ()
 
@@ -98 +98 @@
 foreign import ccall "perl5.h perl5_get_sv"
     perl5_get_sv :: CString -> IO PerlSV
-foreign import ccall "perl5.h perl5_set_sv"
-    perl5_set_sv :: CString -> PerlSV -> IO PerlSV
+foreign import ccall "perl5.h perl5_set_svref"
+    perl5_set_svref :: CString -> PugsVal -> IO ()
 foreign import ccall "perl5.h perl5_call"
     perl5_call :: CString -> CInt -> Ptr PerlSV -> CInt -> IO PerlSV
@@ -114 +114 @@
     pugs_MkValRef :: PugsVal -> IO PerlSV
 
-initPerl5 :: String -> PerlSV -> IO PerlInterpreter
+initPerl5 :: String -> Maybe a -> IO PerlInterpreter
 initPerl5 str env = do
     withCString "-e" $ \prog -> withCString str $ \cstr -> do
         withArray [prog, prog, cstr] $ \argv -> do
-            perl5_init 3 argv
-            withCString "pugs::env" $ \name -> do
-                perl5_set_sv name env
+            interp <- perl5_init 3 argv
+            case env of
+                Just val -> withCString "pugs::env" $ \name -> do
+                    ptr <- fmap castStablePtrToPtr $ newStablePtr val
+                    perl5_set_svref name ptr
+                Nothing -> return ()
+            return interp
 
 svToVStr :: PerlSV -> IO String