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

Timestamp:

05/27/05 03:15:20 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5515

Message:

* switch to use PL_modglobal.

Files:

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

src/Pugs/Embed/Perl5.hs

@@ -101 +101 @@
     perl5_set_svref :: CString -> PugsVal -> IO ()
 foreign import ccall "perl5.h perl5_apply"
-    perl5_apply :: PerlSV -> PerlSV -> Ptr PerlSV -> PerlSV -> CInt -> IO PerlSV
+    perl5_apply :: PerlSV -> PerlSV -> Ptr PerlSV -> PugsVal -> CInt -> IO PerlSV
 foreign import ccall "perl5.h perl5_can"
     perl5_can :: PerlSV -> CString -> IO Bool
 foreign import ccall "perl.h perl5_eval"
-    perl5_eval :: CString -> PerlSV -> CInt -> IO PerlSV
+    perl5_eval :: CString -> PugsVal -> CInt -> IO PerlSV
 foreign import ccall "perl5.h perl5_init"
     perl5_init :: CInt -> Ptr CString -> IO PerlInterpreter
+
+foreign import ccall "pugsembed.h pugs_getenv"
+    pugs_getenv :: IO PugsVal
+foreign import ccall "pugsembed.h pugs_setenv"
+    pugs_setenv :: PugsVal -> IO ()
 
 foreign import ccall "pugsembed.h pugs_SvToVal"
@@ -120 +125 @@
             interp <- perl5_init 3 argv
             case env of
-                Just val -> withCString "pugs::env" $ \name -> do
+                Just val -> do
                     ptr <- fmap castStablePtrToPtr $ newStablePtr val
-                    perl5_set_svref name ptr
+                    pugs_setenv ptr
                 Nothing -> return ()
             return interp
@@ -157 +162 @@
 vnumToSV int = perl5_newSVnv (realToFrac int)
 
-callPerl5 :: PerlSV -> PerlSV -> [PerlSV] -> PerlSV -> CInt -> IO PerlSV
+callPerl5 :: PerlSV -> PerlSV -> [PerlSV] -> PugsVal -> CInt -> IO PerlSV
 callPerl5 sub inv args env cxt = do
     withArray0 nullPtr args $ \argv -> do
@@ -165 +170 @@
 canPerl5 sv meth = withCString meth $ \cstr -> perl5_can sv cstr
 
-evalPerl5 :: String -> PerlSV -> CInt -> IO PerlSV
+evalPerl5 :: String -> PugsVal -> CInt -> IO PerlSV
 evalPerl5 str env cxt = withCString str $ \cstr -> perl5_eval cstr env cxt