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

Timestamp:

05/27/05 02:25:26 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5515

Message:

* all should work except this memory overflow thing

Files:

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

src/Pugs/Embed/Perl5.hs

@@ -47 +47 @@
 vnumToSV = constFail
 
-callPerl5 :: String -> [PerlSV] -> PerlSV -> CInt -> IO PerlSV
-callPerl5 _ _ _ = constFail
+callPerl5 :: PerlSV -> Maybe PerlSV -> [PerlSV] -> PerlSV -> CInt -> IO PerlSV
+callPerl5 _ _ _ _ = constFail
 
 canPerl5 :: PerlSV -> String -> IO Bool
@@ -100 +100 @@
 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 -> PerlSV -> CInt -> IO PerlSV
+foreign import ccall "perl5.h perl5_apply"
+    perl5_apply :: PerlSV -> PerlSV -> Ptr PerlSV -> PerlSV -> CInt -> IO PerlSV
 foreign import ccall "perl5.h perl5_can"
     perl5_can :: PerlSV -> CString -> IO Bool
@@ -157 +157 @@
 vnumToSV int = perl5_newSVnv (realToFrac int)
 
-callPerl5 :: String -> [PerlSV] -> PerlSV -> CInt -> IO PerlSV
-callPerl5 str args env cxt = do
-    withCString str $ \cstr -> do
-        withArray args $ \argv -> do
-            perl5_call cstr (toEnum $ length args) argv env cxt
+callPerl5 :: PerlSV -> PerlSV -> [PerlSV] -> PerlSV -> CInt -> IO PerlSV
+callPerl5 sub inv args env cxt = do
+    withArray0 nullPtr args $ \argv -> do
+        perl5_apply sub inv argv env cxt
 
 canPerl5 :: PerlSV -> String -> IO Bool